Changeset 269

Timestamp:

04/04/08 22:34:47 (8 months ago)

Author:

mbr

Message:

updated to delete the .gpgdir_map_file after successful decrypt

Files:

• gpgdir/trunk/gpgdir (modified) (5 diffs)
• gpgdir/trunk/test/gpgdir_test.pl (modified) (9 diffs, 1 prop)

gpgdir/trunk/gpgdir

@@ -91 +91 @@
-my %obfuscate_ctrs   = ();
-my %obfuscated_dirs  = ();
+my $total_mapped_files = 0;
-my $have_obfuscated_file = 0;
-my $cmdline_no_password = 0;
@@ -678 +679 @@
-                } else {
-                    ###
-
-
+
+
+
-                    next FILE;
-                }
@@ -792 +794 @@
-
-sub obfuscated_mapping_files() {
-
+
+
-
-    if ($encrypt_mode) {
@@ -829 +832 @@
-
-                unlink "$obfuscate_map_filename.gpg";
+                if ($total_mapped_files == $total_decrypted) {
+                    ### we are confident that we decrypted all of them,
+                    ### so delete the mapping file.
+                    unlink $obfuscate_map_filename;
+                }
-            }
-        }
@@ -892 +900 @@
-        if (/^\s*(.*)\s+(gpgdir_\d+_\d+.gpg)/) {
-            $obfuscated_dirs{$dir}{$2} = $1;
+            $total_mapped_files++;
-        }
-    }

gpgdir/trunk/test/gpgdir_test.pl

@@ -10 +10 @@
-# Author: Michael Rash (mbr@cipherdyne.org)
-#
-7
+8
-#
-# License (GNU Public License):
@@ -26 +26 @@
-#############################################################################
-#
-: gpgdir_test.pl 1004 2008-02-10 04:49:04Z mbr 
+
-#
-
@@ -103 +103 @@
-    \&md5sum_validation);
-
+### obfuscate filenames encrypt/decrypt cycle
+&test_driver('(Obfuscate filenames) gpgdir directory encryption',
+    \&obf_encrypt);
+&test_driver('(Obfuscate filenames) Files recursively encrypted',
+    \&obf_recursively_encrypted);
+&test_driver('(Obfuscate filenames) Excluded hidden files/dirs',
+    \&obf_skipped_hidden_files_dirs);
+&test_driver('(Decrypt dir) gpgdir directory decryption',
+    \&obf_decrypt);
+&test_driver('(Decrypt dir) Files recursively decrypted',
+    \&obf_recursively_decrypted);  ### same as ascii_recursively_decrypted()
+&test_driver('(MD5 digest) match across encrypt/decrypt cycle',
+    \&md5sum_validation);
+
-&logr("\n");
-if ($successful_tests) {
@@ -148 +162 @@
-}
-
+sub obf_encrypt() {
+    if (&run_cmd("$gpgdirCmd -O --gnupg-dir $gpg_dir " .
+            " --pw-file $pw_file --Key-id $key_id -e $data_dir")) {
+        return 1;
+    }
+    return &print_errors("fail ($test_num)\n[*] " .
+        "Directory encryption");
+}
+
-sub decrypt() {
-    if (&run_cmd("$gpgdirCmd --gnupg-dir $gpg_dir " .
@@ -157 +180 @@
-}
-
+sub obf_decrypt() {
+    if (&run_cmd("$gpgdirCmd -O --gnupg-dir $gpg_dir " .
+            " --pw-file $pw_file --Key-id $key_id -d $data_dir")) {
+        return 1;
+    }
+    return &print_errors("fail ($test_num)\n[*] " .
+        "Directory decryption");
+}
+
-sub recursively_encrypted() {
-    @data_dir_files = ();
@@ -199 +231 @@
-}
-
+sub obf_recursively_encrypted() {
+    @data_dir_files = ();
+    find(\&find_files, $data_dir);
+    for my $file (@data_dir_files) {
+        if (-f $file and not ($file =~ m|^\.| or $file =~ m|/\.|)) {
+            ### gpgdir_20089_1.gpg
+            unless ($file =~ m|gpgdir_\d+_\d+\.gpg$|) {
+                return &print_errors("fail ($test_num)\n[*] " .
+                    "File $file not encrypted and obfuscated");
+            }
+        }
+    }
+    return 1;
+}
+
-sub ascii_recursively_decrypted() {
-    @data_dir_files = ();
@@ -213 +260 @@
-}
-
+sub obf_recursively_decrypted() {
+    @data_dir_files = ();
+    find(\&find_files, $data_dir);
+    for my $file (@data_dir_files) {
+        if (-f $file and not ($file =~ m|^\.| or $file =~ m|/\.|)) {
+            if ($file =~ m|\.asc$|) {
+                return &print_errors("fail ($test_num)\n[*] " .
+                    "File $file not encrypted");
+            }
+        }
+    }
+    return 1;
+}
+
-sub skipped_hidden_files_dirs() {
-    @data_dir_files = ();
@@ -218 +279 @@
-    for my $file (@data_dir_files) {
-        if ($file =~ m|^\.| or $file =~ m|/\.|) {
-
+
+
-            if ($file =~ m|\.gpg$| or $file =~ m|\.asc$|) {
-                return &print_errors("fail ($test_num)\n[*] " .
@@ -227 +289 @@
-    return 1;
-}
+
+sub obf_skipped_hidden_files_dirs() {
+    @data_dir_files = ();
+    find(\&find_files, $data_dir);
+    for my $file (@data_dir_files) {
+        if ($file =~ m|^\.| or $file =~ m|/\.|) {
+            ### check for any .gpg or .asc extensions except
+            ### for the gpgdir_map_file
+            if ($file !~ m|gpgdir_map_file| and ($file =~ m|\.gpg$|
+                    or $file =~ m|\.asc$|)) {
+                return &print_errors("fail ($test_num)\n[*] " .
+                    "Encrypted hidden file");
+            }
+        }
+    }
+    return 1;
+}
+
-
-sub find_files() {