Changeset 279

Timestamp:

05/08/08 00:13:42 (7 months ago)

Author:

mbr

Message:

• Changed --Obfuscate-filenames format to not include the gpgdir PID.
  This allows directories to be encrypted/decrypted under -O multiple
  times without creating new filenames (which would pollute encrypted
  directories under rsync to other systems). The new -O encrypted
  filename format is just "gpgdir_<num>.gpg".
  
• Added PID locking against directories so that multiple gpgdir processes
  cannot operate against the same top-level directory simultaneously.
  

Files:

• gpgdir/trunk/ChangeLog (modified) (1 diff)
• gpgdir/trunk/gpgdir (modified) (11 diffs)
• gpgdir/trunk/test/gpgdir_test.pl (modified) (1 diff)

gpgdir/trunk/ChangeLog

@@ +1 @@
+gpgdir-1.9 (05//2008):
+    - Changed --Obfuscate-filenames format to not include the gpgdir PID.
+      This allows directories to be encrypted/decrypted under -O multiple
+      times without creating new filenames (which would pollute encrypted
+      directories under rsync to other systems).  The new -O encrypted
+      filename format is just "gpgdir_<num>.gpg".
+    - Added PID locking against directories so that multiple gpgdir processes
+      cannot operate against the same top-level directory simultaneously.
+
-gpgdir-1.8 (04/04/2008):
-    - Updated the test suite to validate the gpgdir --Obfuscate-filenames

gpgdir/trunk/gpgdir

@@ -13 +13 @@
-# Version: 1.8
-#
-7
+8
-#
-# License (GNU General Public License):
@@ -61 +61 @@
-my $include_pat     = '';
-my $include_file    = '';
+my $pid_file        = '';
-my $total_encrypted = 0;
-my $total_decrypted = 0;
@@ -295 +296 @@
-$skip_test_mode = 1 if $trial_run;
-
+if ($dir eq '.') {
+    $dir = $initial_dir;
+} elsif ($dir !~ m|^/|) {
+    $dir = $initial_dir . '/' . $dir;
+}
+$dir =~ s|/$||;  ### remove any trailing slash
+
+### make sure another gpgdir process is not trying to operate
+### on the same directory
+$pid_file = "$dir/.gpgdir.pid";
+&unique_pid();
+&write_pid();
+
-if ($symmetric_mode) {
-    &get_password();
@@ -301 +315 @@
-}
-
-if ($dir eq '.') {
-    $dir = $initial_dir;
-} elsif ($dir !~ m|^/|) {
-    $dir = $initial_dir . '/' . $dir;
-}
-$dir =~ s|/$||;  ### remove any trailing slash
-
-### run a test to make sure gpgdir and encrypt and decrypt a file
-unless ($skip_test_mode) {
@@ -330 +337 @@
-unless ($obfuscate_mode) {
-    if ($have_obfuscated_file) {
-.
+
-            unless $quiet;
-    }
@@ -341 +348 @@
-    print "[+] Total number of files decrypted: " .
-        "$total_decrypted\n" unless $quiet;
+}
+
+if (-e $pid_file) {
+    unlink $pid_file or die "[*] Could not remove pid file $pid_file: $!";
-}
-
@@ -599 +610 @@
-                }
-
-
-
+
-            }
-
@@ -684 +694 @@
-
-            } else {
-
+
+
-                    ### be careful not to decrypt obfuscated file unless we
-                    ### are running in -O mode.  This ensures that the
@@ -854 +865 @@
-        "$obfuscate_map_filename: $!";
-    while (<F>) {
-
+
+
+
+
+
-            if (-e $1) {
-                push @existing_obfuscated_files, $_;
@@ -896 +911 @@
-        "$obfuscate_map_filename: $!";
-    while (<G>) {
-
+
+
+
+
-            $obfuscated_dirs{$dir}{$2} = $1;
-            $total_mapped_files++;
@@ -1156 +1174 @@
-    return 1 if $ans eq 'y';
-    return 0;
+}
+
+sub unique_pid() {
+    return unless -e $pid_file;
+    open P, "< $pid_file" or die "[*] Could not open $pid_file: $!";
+    my $pid = <P>;
+    chomp $pid;
+    close P;
+    if (kill 0, $pid) {
+        die "[*] Another gpgdir process (pid: $pid) is already ",
+            "running against\n    $dir";
+    }
+    return;
+}
+
+sub write_pid() {
+    open P, "> $pid_file" or die "[*] Could not open $pid_file: $!";
+    print P $$, "\n";
+    close P;
+    return;
-}
-

gpgdir/trunk/test/gpgdir_test.pl

@@ -236 +236 @@
-    for my $file (@data_dir_files) {
-        if (-f $file and not ($file =~ m|^\.| or $file =~ m|/\.|)) {
-20089_
-_\d+
+
+
-                return &print_errors("fail ($test_num)\n[*] " .
-                    "File $file not encrypted and obfuscated");