Changeset 310

Timestamp:

08/31/08 19:09:16 (3 months ago)

Author:

mbr

Message:

- Added new modes '--sign <dir>' and '--verify <dir>' to allow all files
in the specified directory to be signed or verified instead of encrypted
or decrypted. All GnuPG signatures are created as "<file>.asc", and the
original file is not removed in --sign mode. In --verify mode, if any
file does not match the expected .asc signature, then a warning like the
following will be generated:

[+] Verifying: /home/mbr/src/gpgdir/test/data-dir/multi-line-ascii.asc
[GNUPG:] BADSIG 9EDEEEEBA742EEEF Some User <someuser@domain.org>

- Bugfix to not die() when files that are encrypted with a different GnuPG
key are encountered in a directory that is being decrypted. A warning
message (see below) is now generated and the file is skipped:

[+] Decrypting: /home/mbr/tmp/gpgdir/a.gpg
[GNUPG:] BAD_PASSPHRASE CF16F0FCFFF3FF4F
[-] Skipping file encrypted with different GnuPG key: a.gpg

- Updated to use the status output from GnuPG::Interface to detect a bad
passphrase and whether a file is encrypted with the expected GnuPG key.

- Updated the test suite to generate files in the output/ directory
according to test number and append the result of each test within each
file. This makes it easy to tell which tests have failed with a simple
'grep fail output/*test'.

- Updated to use the 'auto' heuristic (first implemented in the fwknop
project) to detect perl module directories that should be used in the
--Lib-dir directory to import perl modules from.

Files:

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

gpgdir/trunk/ChangeLog

@@ -1 +1 @@
-gpgdir-1.9.2 (08//2008):
+    - Added new modes '--sign <dir>' and '--verify <dir>' to allow all files
+      in the specified directory to be signed or verified instead of encrypted
+      or decrypted.  All GnuPG signatures are created as "<file>.asc", and the
+      original file is not removed in --sign mode.  In --verify mode, if any
+      file does not match the expected .asc signature, then a warning like the
+      following will be generated:
+
+        [+] Verifying:  /home/mbr/src/gpgdir/test/data-dir/multi-line-ascii.asc
+        [GNUPG:] BADSIG 9EDEEEEBA742EEEF Some User <someuser@domain.org>
+
+    - Bugfix to not die() when files that are encrypted with a different GnuPG
+      key are encountered in a directory that is being decrypted. A warning
+      message (see below) is now generated and the file is skipped:
+
+      [+] Decrypting:  /home/mbr/tmp/gpgdir/a.gpg
+      [GNUPG:] BAD_PASSPHRASE CF16F0FCFFF3FF4F
+      [-] Skipping file encrypted with different GnuPG key: a.gpg
+
+    - Updated to use the status output from GnuPG::Interface to detect a bad
+      passphrase and whether a file is encrypted with the expected GnuPG key.
-    - Moved the GnuPG::Interface, Class::MethodMaker, and Term::ReadKey
-      modules to the deps/ directory, and updated the installer and RPM spec
-      file to account for the path change.  This change was suggested by
-      Franck Joncourt for the other cipherdyne.org projects.
+    - Updated the test suite to generate files in the output/ directory
+      according to test number and append the result of each test within each
+      file.  This makes it easy to tell which tests have failed with a simple
+      'grep fail output/*test'.
-    - Added the gpgdir-nodeps.spec file to allow an RPM to be built that does
-      not contain any perl modules dependencies.
-    - Updated gpgdir to import perl modules via 'require' statements instead
-      of 'use' statements so that the path to the modules directory can be
-
+
+
+
+
-
-gpgdir-1.9.1 (06/07/2008):

gpgdir/trunk/gpgdir

@@ -15 +15 @@
-# Copyright (C) 2002-2008 Michael Rash (mbr@cipherdyne.org)
-#
- (GNU General Public License):
+: GNU General Public License version 2 (GPLv2)
-#
-#    This program is distributed in the hope that it will be useful,
@@ -53 +53 @@
-my $encrypt_dir     = '';
-my $decrypt_dir     = '';
+my $sign_dir        = '';
+my $verify_dir      = '';
-my $homedir         = '';
-my $exclude_pat     = '';
@@ -77 +79 @@
-my $wipe_mode       = 0;
-my $encrypt_mode    = 0;
+my $signing_mode    = 0;
+my $verify_mode     = 0;
-my $use_default_key = 0;
-my $pw_file         = '';
@@ -97 +101 @@
-my $overwrite_encrypted = 0;
-my $overwrite_decrypted = 0;
-
-
+ 
+ 
-my $NO_DEL_SOURCE_FILE = 0;
-
@@ -107 +111 @@
-my $ACCEPT_YES_DEFAULT = 1;
-my $ACCEPT_NO_DEFAULT  = 2;
+
+### turn off buffering
+$| = 1;
-
-unless ($< == $>) {
@@ -120 +127 @@
-
-die "[*] Use --help for usage information.\n" unless(GetOptions (
-
-
+
+
+
+
-    'gnupg-dir=s'    => \$gpg_homedir,     # Path to /path/to/.gnupg directory.
-    'pw-file=s'      => \$pw_file,         # Read password out of this file.
@@ -159 +168 @@
-    'Default-key'    => \$use_default_key, # Assume that default-key is set within
-                                           # ~/.gnupg/options.
-
-       #
-       #
-       #
+ 
+#  
+#  
+#  
-    'Plain-ascii'    => \$ascii_armor_mode, # Ascii armor mode (creates non-binary
-                                            # encrypted files).
@@ -197 +206 @@
-}
-
+die "[*] Cannot --sign-dir and --verify-dir"
+    if $sign_dir and $verify_dir;
+
+if ($sign_dir) {
+    $encrypt_dir  = $sign_dir;
+    $signing_mode = 1;
+} elsif ($verify_dir) {
+    $decrypt_dir = $verify_dir;
+    $verify_mode = 1;
+}
+
-if ($encrypt_dir and $overwrite_decrypted) {
-    die "[*] The -e and --overwrite-decrypted options are incompatible.";
@@ -236 +256 @@
-}
-
-
+ or $signing_mode
-
-### get the path to the user's home directory
@@ -256 +276 @@
-
-if ($decrypt_dir and $encrypt_dir) {
-You c
+C
-}
-
-unless ($decrypt_dir or $encrypt_dir or $test_and_exit) {
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -306 +334 @@
-### don't need to test encrypt/decrypt ability if we are running
-### in --Trial-run mode.
-
+ or $signing_mode or $verify_mode
-
-if ($dir eq '.') {
@@ -321 +349 @@
-&write_pid();
-
-
+ or $signing_mode
-    &get_password();
-} else {
-
+
+
-}
-
@@ -333 +362 @@
-}
-
-
-
+
+
+
+
+
+
-} else {
-
+files in 
-}
-
@@ -369 +402 @@
-#==================== end main =====================
-
-
+or_sign_
-    my ($in_file, $out_file, $del_flag) = @_;
-
@@ -415 +448 @@
-        if ($symmetric_mode) {
-            $pid = $gpg->encrypt_symmetrically('handles' => $handles);
+        } elsif ($signing_mode) {
+            $pid = $gpg->detach_sign('handles' => $handles);
-        } else {
-            $pid = $gpg->encrypt('handles' => $handles);
@@ -446 +481 @@
-            die "[*] Created zero-size file: $out_file\n",
-"    Maybe gpg-agent does not yet have the password for that key?\n",
-re-running with -v.
+with --verbose
-        } else {
-            die "[*] Created zero-size file: $out_file\n",
-re-running with -v.
+with --verbose
-        }
-    }
@@ -456 +491 @@
-}
-
-
+or_verify_
-    my ($in_file, $out_file, $del_flag) = @_;
+
+    my $pid;
+    my $bad_passphrase = 0;
+    my $bad_signature  = 0;
+    my $file_encrypted_with_expected_key = 0;
+    my $input_fh  = '';
+    my $output_fh = '';
+    my $error_fh  = '';
+    my $pw_fh     = '';
+    my $status_fh = '';
+    my $handles   = '';
-
-    my $gpg = GnuPG::Interface->new();
@@ -465 +511 @@
-        "homedir: $gpg_homedir" unless $gpg;
-
-
+verify_mode or $
-        $gpg->options->default_key($encrypt_user);
-        $gpg->options->push_recipients($encrypt_user);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if ($use_gpg_agent) {
@@ -493 +550 @@
-            'command_args' => [ qw( --use-agent ) ]);
-    } else {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    my @errors = <$error_fh>;
-
-
-
-
-
-
-
-
+
-
-    close $input_fh;
@@ -516 +576 @@
-    waitpid $pid, 0;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        &delete_file($out_file);
-        &delete_file($in_file) if $del_flag == $DEL_SOURCE_FILE;
@@ -522 +629 @@
-            die "[*] Created zero-size file: $out_file\n",
-"    Maybe gpg-agent does not yet have the password for that key?\n",
-re-running with -v.
+with --verbose
-        } else {
-            die "[*] Created zero-size file: $out_file\n",
-re-running with -v.
+with --verbose
-        }
-    }
@@ -625 +732 @@
-            }
-
-
+ or $signing_mode
-                $encrypt_filename = "$filename.asc";
-            }
-
-            if (-e $encrypt_filename and not $overwrite_encrypted) {
-
+
+
+
-                    "exists, skipping.\n" unless $quiet;
-                next FILE;
@@ -636 +745 @@
-
-            if ($interactive_mode) {
+                my $str = 'Encrypt';
+                $str = 'Sign' if $signing_mode;
-                next FILE unless (&query_yes_no(
-
-
-
-
+
+
+
+
+
+
-
-            unless ($trial_run) {
-
-
+or_sign_
-                        $NO_DEL_SOURCE_FILE);
-
-&&
+and
-                    ### set the atime and mtime to be the same as the
-                    ### original file.
@@ -656 +769 @@
-                        }
-                    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-                    &delete_file($filename);
-
-                    if ($obfuscate_mode) {
-
-                        ### record the original file name mapping
-                        &append_obfuscated_mapping($filename,
-                            $encrypt_filename);
-
-                        $obfuscate_ctrs{$dir}++;
-                    }
-
-                    $total_encrypted++;
-
-                } else {
-
+
+
+
-                    next FILE;
-                }
@@ -720 +838 @@
-            next FILE unless length($decrypt_filename) > 0;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-            if ($interactive_mode) {
+                my $str = 'Decrypt';
+                $str = 'Verify' if $verify_mode;
-                next FILE unless (&query_yes_no(
-Decrypt
+$str
-            }
-
-            unless ($trial_run) {
-
-
-
+
+
+
+
-                        $NO_DEL_SOURCE_FILE);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                        }
+                        if ($wipe_mode and not $quiet) {
+                            print "    Securely deleting file: $file\n";
+                        }
+                        ### only delete the original encrypted
+                        ### file if the decrypted one exists
+                        &delete_file($filename);
+
+                        $total_decrypted++;
+
+                    } else {
+                        print "[-] Could not decrypt file: $file\n"
+                            unless $quiet;
+                        next FILE;
-                    }
-                    if ($wipe_mode and not $quiet) {
-                        print "    Securely deleting file: $file\n";
-                    }
-                    ### only delete the original encrypted
-                    ### file if the decrypted one exists
-                    &delete_file($filename);
-
-                    $total_decrypted++;
-
-                } else {
-                    print "[-] Could not decrypt file: $file\n" unless $quiet;
-                    next FILE;
-                }
-            }
@@ -837 +969 @@
-                "$dir/$obfuscate_map_filename\n" unless $quiet;
-            unless ($trial_run) {
-
+or_sign_
-                    "$obfuscate_map_filename.gpg", $NO_DEL_SOURCE_FILE);
-
@@ -849 +981 @@
-                "$dir/$obfuscate_map_filename.gpg\n" unless $quiet;
-            unless ($trial_run) {
-
+or_verify_
-                    $obfuscate_map_filename, $NO_DEL_SOURCE_FILE);
-
@@ -867 +999 @@
-    return unless -e "$obfuscate_map_filename.gpg";
-
-
+or_verify_
-            $obfuscate_map_filename, $NO_DEL_SOURCE_FILE);
-
@@ -917 +1049 @@
-    return unless -e "$obfuscate_map_filename.gpg";
-
-
+or_verify_
-            $obfuscate_map_filename, $NO_DEL_SOURCE_FILE);
-
@@ -1007 +1139 @@
-
-    close F;
-print
+die
-"[*] Please edit $homedir/.gpgdirrc to include your gpg key identifier,\n",
-"    or use the default GnuPG key defined in ~/.gnupg/options.  Exiting.\n";
-    exit 0;
-}
-
@@ -1026 +1157 @@
-    if (-e $file and not -l $file and -s $file != 0
-            and $file !~ m|/\.|) {
-
+ or $signing_mode
-            if ($file =~ m|\.gpg| or $file =~ m|\.asc|) {
-
+
+
+
+
+
+
-                return;
-            }
@@ -1076 +1212 @@
-            print "    *** test_mode() ***\n" unless $quiet;
-        }
-
+
+
+
-            print '    Enter password (for initial ' .
-                "encrypt/decrypt test)\n" unless $quiet;
@@ -1083 +1221 @@
-        ### get the password without echoing the chars back to the screen
-        ReadMode('noecho');
-!
+not
-            print $msg;
-            $pw = ReadLine(0);
@@ -1126 +1264 @@
-    }
-
-
+or_sign_
-
-    if (-e "$test_file.gpg" and (-s $test_file != 0)) {
@@ -1136 +1274 @@
-    }
-
-
+or_verify_
-
-    if (-e $test_file and (-s $test_file != 0)) {
@@ -1254 +1392 @@
-        next unless -d "$lib_dir/$dir";
-        push @paths, "$lib_dir/$dir"
-
+
+
-    }
-    return \@paths;
@@ -1271 +1410 @@
-
-Options:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    -a, --agent                 - Acquire password information from a
-                                  running instance of gpg-agent.
@@ -1283 +1433 @@
-                                  gpg keys (the default is ~/.gnupg if this
-                                  option is not used).
+    -S, --Symmetric             - Use symmetric encryption instead of the
+                                  default asymmetric encryption.
-    -p, --pw-file <file>        - Read password in from <file>.
-s, --skip-test
+-skip-test    
-    -t, --test-mode             - Run encrypt -> decrypt test and exit.
-    -T, --Trial-run             - Show what filesystem actions would take
@@ -1299 +1451 @@
-    --Include-from <file>       - Include only those filenames that match a
-                                  pattern contained within <file>.
-    -K, --Key-id <id>           - Specify GnuPG key ID, or key-matching
-                                  string. This overrides the use_key value
-                                  in ~/.gpgdirrc
-    -D, --Default-key           - Use the key that GnuPG defines as the
-                                  default (i.e. the key that is specified
-                                  by the default-key option in
-                                  ~/.gnupg/options).
-    -O, --Obfuscate-filenames   - Substitute all real filenames in a
-                                  directory with manufactured ones (the
@@ -1342 +1487 @@
-    --no-locale                 - Don't set the locale to anything (the
-                                  default is the "C" locale).
-v, -
+
-    -V, --Version               - print version.
-    -h, --help                  - print help.

gpgdir/trunk/test/gpgdir_test.pl

@@ -33 +33 @@
-use Digest::MD5 'md5_base64';
-use File::Find;
+use File::Copy;
-use Getopt::Long;
-use strict;
@@ -47 +48 @@
-my $gpg_dir = "$conf_dir/test-gpg";
-my $pw_file = "$conf_dir/test.pw";
+my $broken_pw_file = "$conf_dir/broken.pw";
-my $key_id  = '375D7DB9';
-
-my $cmd_stdout = "$output_dir/cmd.stdout";
-my $cmd_stderr = "$output_dir/cmd.stderr";
-#==================== end config ==================
-
@@ -56 +55 @@
-my $test_num  = 0;
-my $PRINT_LEN = 68;
+my $APPEND    = 1;
+my $NO_APPEND = 0;
-my $failed_tests = 0;
-my $prepare_results = 0;
-my $successful_tests = 0;
+my $current_test_file = "$output_dir/$test_num.test";
+my $previous_test_file = '';
-my @data_dir_files = ();
-my %md5sums = ();
@@ -125 +128 @@
-&test_driver('(Sign/verify dir) Excluded hidden files/dirs',
-    \&skipped_hidden_files_dirs);
+&test_driver('(Sign/verify dir) Broken signature detection',
+    \&broken_sig_detection);
-&test_driver('(Sign/verify dir) gpgdir directory verification', \&verify);
-&test_driver('(Sign/verify dir) Files recursively verified',
-    \&recursively_verified);
-
+
+
+
+
-
-&logr("\n");
@@ -147 +155 @@
-    my ($msg, $func_ref) = @_;
-
+    my $test_status = 'pass';
-    &dots_print($msg);
-    if (&{$func_ref}) {
-        &pass();
-    } else {
+        $test_status = 'fail';
-        $failed_tests++;
-    }
+
+    open C, ">> $current_test_file"
+        or die "[*] Could not open $current_test_file: $!";
+    print C "\nTEST: $msg, STATUS: $test_status\n";
+    close C;
+
+    $previous_test_file = $current_test_file;
-    $test_num++;
+    $current_test_file = "$output_dir/$test_num.test";
-    return;
+}
+
+sub broken_passphrase() {
+    if (not &run_cmd("$gpgdirCmd --gnupg-dir $gpg_dir " .
+            " --pw-file $broken_pw_file --Key-id $key_id -e $data_dir",
+            $NO_APPEND)) {
+        my $found_bad_pass = 0;
+        open F, "< $current_test_file" or die $!;
+        while (<F>) {
+            if (/BAD_?PASS/) {
+                $found_bad_pass = 1;
+            }
+        }
+        close F;
+        if ($found_bad_pass) {
+            return 1;
+        }
+    }
+    return &print_errors("[-] Accepted broken passphrase");
-}
-
-sub encrypt() {
-    if (&run_cmd("$gpgdirCmd --gnupg-dir $gpg_dir " .
-)) {
-return 1;
-}
-return &print_errors("fail ($test_num)\n[*] " .
-    "
+,
+    $NO_APPEND)) {
+    return 1;
+}
+return &print_errors("[-] 
-}
-
-sub ascii_encrypt() {
-    if (&run_cmd("$gpgdirCmd --Plain-ascii --gnupg-dir $gpg_dir " .
-)) {
-return 1;
-}
-return &print_errors("fail ($test_num)\n[*] " .
-    "
+,
+    $NO_APPEND)) {
+    return 1;
+}
+return &print_errors("[-] 
-}
-
-sub obf_encrypt() {
-    if (&run_cmd("$gpgdirCmd -O --gnupg-dir $gpg_dir " .
-)) {
-return 1;
-}
-return &print_errors("fail ($test_num)\n[*] " .
-    "
+,
+    $NO_APPEND)) {
+    return 1;
+}
+return &print_errors("[-] 
-}
-
-sub sign() {
-    if (&run_cmd("$gpgdirCmd --gnupg-dir $gpg_dir " .
-)) {
-return 1;
-}
-return &print_errors("fail ($test_num)\n[*] " .
-    "
+,
+    $NO_APPEND)) {
+    return 1;
+}
+return &print_errors("[-] 
-}
-
-sub decrypt() {
-    if (&run_cmd("$gpgdirCmd --gnupg-dir $gpg_dir " .
-)) {
-return 1;
-}
-return &print_errors("fail ($test_num)\n[*] " .
-    "
+,
+    $NO_APPEND)) {
+    return 1;
+}
+return &print_errors("[-] 
-}
-
-sub obf_decrypt() {
-    if (&run_cmd("$gpgdirCmd -O --gnupg-dir $gpg_dir " .
-)) {
-return 1;
-}
-return &print_errors("fail ($test_num)\n[*] " .
-    "
+,
+    $NO_APPEND)) {
+    return 1;
+}
+return &print_errors("[-] 
-}
-
-sub verify() {
-    if (&run_cmd("$gpgdirCmd --gnupg-dir $gpg_dir " .
-)) {
-return 1;
-}
-return &print_errors("fail ($test_num)\n[*] " .
-    "
+,
+    $NO_APPEND)) {
+    return 1;
+}
+return &print_errors("[-] 
-}
-
@@ -226 +263 @@
-        if (-f $file and not ($file =~ m|^\.| or $file =~ m|/\.|)) {
-            unless ($file =~ m|\.gpg$|) {
-
-
+
-            }
-        }
@@ -241 +277 @@
-            if ($file !~ m|\.asc$|) {
-                unless (-e "$file.asc") {
-