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 b5c643f..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);
@@ -279,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)
@@ -290,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);
@@ -331,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);
 
@@ -377,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");