When decrypting a log item also clear out the IV field.

[bluesky.git] / bluesky / log.c

diff --git a/bluesky/log.c b/bluesky/log.c
index 97b4f30..e5f0321 100644 (file)
--- a/bluesky/log.c
+++ b/bluesky/log.c
@@ -67,7 +67,8 @@ static void log_commit(BlueSkyLog *log)
         g_mutex_lock(item->lock);
         bluesky_cloudlog_stats_update(item, -1);
         item->pending_write &= ~CLOUDLOG_JOURNAL;
-        item->location_flags |= CLOUDLOG_JOURNAL;
+        item->location_flags
+            = (item->location_flags & ~CLOUDLOG_UNCOMMITTED) | CLOUDLOG_JOURNAL;
         bluesky_cloudlog_stats_update(item, 1);
         g_cond_signal(item->cond);
         g_mutex_unlock(item->lock);
@@ -252,6 +253,20 @@ BlueSkyLog *bluesky_log_new(const char *log_directory)
     log->mmap_lock = g_mutex_new();
     log->mmap_cache = g_hash_table_new(g_str_hash, g_str_equal);
 
+    /* Determine the highest-numbered log file, so that we can start writing
+     * out new journal entries at the next sequence number. */
+    GDir *dir = g_dir_open(log_directory, 0, NULL);
+    if (dir != NULL) {
+        const gchar *file;
+        while ((file = g_dir_read_name(dir)) != NULL) {
+            if (strncmp(file, "journal-", 8) == 0) {
+                log->seq_num = MAX(log->seq_num, atoi(&file[8]) + 1);
+            }
+        }
+        g_dir_close(dir);
+        g_print("Starting journal at sequence number %d\n", log->seq_num);
+    }
+
     log->dirfd = open(log->log_directory, O_DIRECTORY);
     if (log->dirfd < 0) {
         fprintf(stderr, "Unable to open logging directory: %m\n");
@@ -265,9 +280,12 @@ BlueSkyLog *bluesky_log_new(const char *log_directory)
 
 void bluesky_log_item_submit(BlueSkyCloudLog *item, BlueSkyLog *log)
 {
-    bluesky_cloudlog_ref(item);
-    g_atomic_int_add(&item->data_lock_count, 1);
-    g_async_queue_push(log->queue, item);
+    if (!(item->location_flags & CLOUDLOG_JOURNAL)) {
+        bluesky_cloudlog_ref(item);
+        item->location_flags |= CLOUDLOG_UNCOMMITTED;
+        g_atomic_int_add(&item->data_lock_count, 1);
+        g_async_queue_push(log->queue, item);
+    }
 }
 
 void bluesky_log_finish_all(GList *log_items)
@@ -276,7 +294,7 @@ void bluesky_log_finish_all(GList *log_items)
         BlueSkyCloudLog *item = (BlueSkyCloudLog *)log_items->data;
 
         g_mutex_lock(item->lock);
-        while ((item->pending_write & CLOUDLOG_JOURNAL))
+        while ((item->location_flags & CLOUDLOG_UNCOMMITTED))
             g_cond_wait(item->cond, item->lock);
         g_mutex_unlock(item->lock);
         bluesky_cloudlog_unref(item);
@@ -317,7 +335,7 @@ void bluesky_log_write_commit_point(BlueSkyFS *fs, BlueSkyCloudLog *marker)
     bluesky_cloudlog_sync(commit);
 
     g_mutex_lock(commit->lock);
-    while ((commit->pending_write & CLOUDLOG_JOURNAL))
+    while ((commit->location_flags & CLOUDLOG_UNCOMMITTED))
         g_cond_wait(commit->cond, commit->lock);
     g_mutex_unlock(commit->lock);
 
@@ -363,6 +381,9 @@ static void cloudlog_fetch_complete(BlueSkyStoreAsync *async,
         char *pathname = g_strdup_printf("%s/%s",
                                          cachefile->log->log_directory,
                                          cachefile->filename);
+        async->data = bluesky_string_dup(async->data);
+        bluesky_cloudlog_decrypt(async->data->data, async->data->len,
+                                 cachefile->fs->keys);
         if (!g_file_set_contents(pathname, async->data->data, async->data->len,
                                  NULL))
             g_print("Error writing out fetched file to cache!\n");
@@ -486,8 +507,6 @@ BlueSkyRCStr *bluesky_log_map_object(BlueSkyFS *fs, int log_dir,
         close(fd);
     }
 
-    g_mutex_unlock(log->mmap_lock);
-
     BlueSkyRCStr *str;
     map->atime = bluesky_get_current_time();
     str = bluesky_string_new_from_mmap(map, log_offset, log_size);