kbx,gpg,gpgsm: Introduce keybox_compress_when_no_other_users.

* kbx/keybox.h (keybox_compress_when_no_other_users): Rename from
keybox_compress, changing the arguments and the return type.
* kbx/keybox-update.c (keybox_compress_when_no_other_users): Open the
HD internally and make sure all resources are closed before unlocking.
* g10/keydb.c (keydb_add_resource): Simply call
keybox_compress_when_no_other_users which handles locking internally.
* sm/keydb.c (keydb_add_resource): Likewise.

--

GnuPG-bug-id: 7855
Signed-off-by: NIIBE Yutaka <[email protected]>

1 files changed, 57 insertions, 19 deletions

diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
index be49e7b4a..a712a6bf2 100644
--- a/kbx/keybox-update.c
+++ b/kbx/keybox-update.c
@@ -624,12 +624,13 @@ keybox_delete (KEYBOX_HANDLE hd)
 }
 
 
-/* Compress the keybox file.  This should be run with the file
-   locked. */
-int
-keybox_compress (KEYBOX_HANDLE hd)
+/* Compress the keybox file, if needed and not used by other
+ * process.  */
+void
+keybox_compress_when_no_other_users (void *token, int for_openpgp)
 {
-  gpg_err_code_t ec;
+  KEYBOX_HANDLE hd;
+  gpg_error_t err;
   int read_rc, rc, rc2;
   const char *fname;
   estream_t fp, newfp;
@@ -641,28 +642,49 @@ keybox_compress (KEYBOX_HANDLE hd)
   int any_changes = 0;
   int skipped_deleted;
 
-  if (!hd)
-    return gpg_error (GPG_ERR_INV_HANDLE);
-  if (!hd->kb)
-    return gpg_error (GPG_ERR_INV_HANDLE);
+  if (for_openpgp)
+    hd = keybox_new_openpgp (token, 0);
+  else
+    hd = keybox_new_x509 (token, 0);
+  if (!hd || !hd->kb)
+    return;
+
   if (hd->secret)
-    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+    return;
   fname = hd->kb->fname;
   if (!fname)
-    return gpg_error (GPG_ERR_INV_HANDLE);
+    {
+      keybox_release (hd);
+      return;
+    }
+
+  if (keybox_lock (hd, 1, 0))
+    {
+      keybox_release (hd);
+      return;
+    }
 
   _keybox_close_file (hd);
 
   /* Open the source file. Because we do a rename, we have to check the
      permissions of the file */
-  if ((ec = gnupg_access (fname, W_OK)))
-    return gpg_error (ec);
+  if ((rc = gnupg_access (fname, W_OK)))
+    {
+      err = gpg_error (rc);
+      goto leave;
+    }
 
   rc = _keybox_ll_open (&fp, fname, 0);
   if (gpg_err_code (rc) == GPG_ERR_ENOENT)
-    return 0; /* Ready. File has been deleted right after the access above. */
+    {
+      err = 0; /* Ready. File has been deleted right after the access above. */
+      goto leave;
+    }
   if (rc)
-    return rc;
+    {
+      err = gpg_error (rc);
+      goto leave;
+    }
 
   /* A quick test to see if we need to compress the file at all.  We
      schedule a compress run after 3 hours. */
@@ -680,7 +702,8 @@ keybox_compress (KEYBOX_HANDLE hd)
             {
               _keybox_ll_close (fp);
               _keybox_release_blob (blob);
-              return 0; /* Compress run not yet needed. */
+              err = 0;
+              goto leave; /* Compress run not yet needed. */
             }
         }
       _keybox_release_blob (blob);
@@ -693,7 +716,8 @@ keybox_compress (KEYBOX_HANDLE hd)
   if (rc)
     {
       _keybox_ll_close (fp);
-      return rc;;
+      err = gpg_error (rc);
+      goto leave;
     }
 
 
@@ -747,7 +771,7 @@ keybox_compress (KEYBOX_HANDLE hd)
                                      KEYBOX_FLAG_BLOB, &pos, &size)
           || size != 2)
         {
-          rc = gpg_error (GPG_ERR_BUG);
+          rc = GPG_ERR_BUG;
           break;
         }
       blobflags = buf16_to_uint (buffer+pos);
@@ -794,5 +818,19 @@ keybox_compress (KEYBOX_HANDLE hd)
 
   xfree(bakfname);
   xfree(tmpfname);
-  return rc;
+  if (rc)
+    err = gpg_error (rc);
+  else
+    err = 0;
+
+  if (err)
+    log_error ("keybox: error compressing keybox '%s': %s\n",
+               fname, gpg_strerror (err));
+
+ leave:
+  /* Here, we unlock before the release of HD.  It's safe because
+     references to the resource are all closed.  */
+  keybox_lock (hd, 0, 0);
+  keybox_release (hd);
+  return;
 }