Support set pwd_hash for gc and fsck

haiwen · Oct 16, 2024 · 31aba6c · 31aba6c
1 parent b2999a3
commit 31aba6c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/fuse/repo-mgr.c b/fuse/repo-mgr.c
@@ -94,11 +94,6 @@ seaf_repo_from_commit (SeafRepo *repo, SeafCommit *commit)
     repo->name = g_strdup (commit->repo_name);
     repo->desc = g_strdup (commit->repo_desc);
     repo->encrypted = commit->encrypted;
-    if (repo->encrypted) {
-        repo->enc_version = commit->enc_version;
-        if (repo->enc_version >= 1)
-            memcpy (repo->magic, commit->magic, 33);
-    }
     repo->no_local_history = commit->no_local_history;
     repo->version = commit->version;
 }
@@ -109,11 +104,6 @@ seaf_repo_to_commit (SeafRepo *repo, SeafCommit *commit)
     commit->repo_name = g_strdup (repo->name);
     commit->repo_desc = g_strdup (repo->desc);
     commit->encrypted = repo->encrypted;
-    if (commit->encrypted) {
-        commit->enc_version = repo->enc_version;
-        if (commit->enc_version >= 1)
-            commit->magic = g_strdup (repo->magic);
-    }
     commit->no_local_history = repo->no_local_history;
     commit->version = repo->version;
 }

diff --git a/server/gc/repo-mgr.c b/server/gc/repo-mgr.c
@@ -60,6 +60,8 @@ seaf_repo_free (SeafRepo *repo)
     if (repo->desc) g_free (repo->desc);
     if (repo->category) g_free (repo->category);
     if (repo->head) seaf_branch_unref (repo->head);
+    g_free (repo->pwd_hash_algo);
+    g_free (repo->pwd_hash_params);
     g_free (repo);
 }
 
@@ -97,11 +99,24 @@ seaf_repo_from_commit (SeafRepo *repo, SeafCommit *commit)
     repo->repaired = commit->repaired;
     if (repo->encrypted) {
         repo->enc_version = commit->enc_version;
-        if (repo->enc_version == 1)
+        if (repo->enc_version == 1 && !commit->pwd_hash_algo)
             memcpy (repo->magic, commit->magic, 32);
         else if (repo->enc_version == 2) {
-            memcpy (repo->magic, commit->magic, 64);
             memcpy (repo->random_key, commit->random_key, 96);
+        } else if (repo->enc_version == 3) {
+            memcpy (repo->random_key, commit->random_key, 96);
+            memcpy (repo->salt, commit->salt, 64);
+        } else if (repo->enc_version == 4) {
+            memcpy (repo->random_key, commit->random_key, 96);
+            memcpy (repo->salt, commit->salt, 64);
+        }
+        if (repo->enc_version >= 2 && !commit->pwd_hash_algo) {
+            memcpy (repo->magic, commit->magic, 64);
+        }
+        if (commit->pwd_hash_algo) {
+            memcpy (repo->pwd_hash, commit->pwd_hash, 64);
+            repo->pwd_hash_algo = g_strdup (commit->pwd_hash_algo);
+            repo->pwd_hash_params = g_strdup (commit->pwd_hash_params);
         }
     }
     repo->no_local_history = commit->no_local_history;
@@ -117,11 +132,24 @@ seaf_repo_to_commit (SeafRepo *repo, SeafCommit *commit)
     commit->repaired = repo->repaired;
     if (commit->encrypted) {
         commit->enc_version = repo->enc_version;
-        if (commit->enc_version == 1)
+        if (commit->enc_version == 1 && !repo->pwd_hash_algo)
             commit->magic = g_strdup (repo->magic);
         else if (commit->enc_version == 2) {
-            commit->magic = g_strdup (repo->magic);
             commit->random_key = g_strdup (repo->random_key);
+        } else if (commit->enc_version == 3) {
+            commit->random_key = g_strdup (repo->random_key);
+            commit->salt = g_strdup (repo->salt);
+        } else if (commit->enc_version == 4) {
+            commit->random_key = g_strdup (repo->random_key);
+            commit->salt = g_strdup (repo->salt);
+        }
+        if (commit->enc_version >= 2 && !repo->pwd_hash_algo) {
+            commit->magic = g_strdup (repo->magic);
+        }
+        if (repo->pwd_hash_algo) {
+            commit->pwd_hash = g_strdup (repo->pwd_hash);
+            commit->pwd_hash_algo = g_strdup (repo->pwd_hash_algo);
+            commit->pwd_hash_params = g_strdup (repo->pwd_hash_params);
         }
     }
     commit->no_local_history = repo->no_local_history;

diff --git a/server/gc/repo-mgr.h b/server/gc/repo-mgr.h
@@ -28,7 +28,11 @@ struct _SeafRepo {
     gboolean    encrypted;
     int         enc_version;
     gchar       magic[65];       /* hash(repo_id + passwd), key stretched. */
+    gchar       pwd_hash[65];       /* hash(repo_id + passwd), key stretched. */
+    gchar       *pwd_hash_algo;
+    gchar       *pwd_hash_params;
     gchar       random_key[97];
+    gchar       salt[65];
     gboolean    no_local_history;
 
     SeafBranch *head;