Changeset 1253

Timestamp:

09/28/08 18:02:20 (2 months ago)

Author:

mbr

Message:

minor update to validate command line args in a separate function, and added checks for --gpg-path

Files:

• fwknop/trunk/fwknop (modified) (3 diffs)

fwknop/trunk/fwknop

@@ -243 +243 @@
-### set LC_ALL env variable
-$ENV{'LC_ALL'} = $locale unless $no_locale;
-
-die "[*] Cannot run in both --quiet and --verbose modes simultaneously"
-    if $quiet and $verbose;
-
-die "[*] Must also specify a GnuPG signing key with --gpg-signing-key or\n",
-    "    use --gpg-default-key to use a default key (specified in\n",
-    "    ~/.gnupg/options with the default-key variable).\n"
-    if ($gpg_recipient and (not $gpg_default_key and not $gpg_signing_key));
-
-die "[*] Must specify a GnuPG recipient key (on the fwknopd side) with\n",
-    "    --gpg-recipient"
-    if (($gpg_default_key or $gpg_signing_key) and not $gpg_recipient);
-
-die "[*] Cannot assume a default key when --gpg-no-options is used."
-    if ($gpg_default_key and $gpg_no_options);
-
-die "[*] Cannot spoof source address for a real TCP socket."
-    if ($spoof_src and $spa_established_tcp);
-
-die "[*] Server auth method not supported in NAT access mode.\n"
-    if $server_auth_method and $NAT_access_str;
-
-&set_digest_type() if $cmdl_digest_alg;
@@ -1695 +1674 @@
-        'help'           => \$print_help
-    );
+
+    ### run a few minor checks against the supplied args
+    &validate_command_line();
+
-    return;
-}
@@ -1907 +1890 @@
-sub rand_port() {
-    return int(rand($max_port - $min_port)) + $min_port;
+}
+
+sub validate_command_line() {
+    die "[*] Cannot run in both --quiet and --verbose modes simultaneously"
+        if $quiet and $verbose;
+
+    die "[*] Must also specify a GnuPG signing key with --gpg-signing-key or\n",
+        "    use --gpg-default-key to use a default key (specified in\n",
+        "    ~/.gnupg/options with the default-key variable).\n"
+        if ($gpg_recipient and (not $gpg_default_key and not $gpg_signing_key));
+
+    die "[*] Must specify a GnuPG recipient key (on the fwknopd side) with\n",
+        "    --gpg-recipient"
+        if (($gpg_default_key or $gpg_signing_key) and not $gpg_recipient);
+
+    die "[*] Cannot assume a default key when --gpg-no-options is used."
+        if ($gpg_default_key and $gpg_no_options);
+
+    die "[*] Cannot spoof source address for a real TCP socket."
+        if ($spoof_src and $spa_established_tcp);
+
+    die "[*] Server auth method not supported in NAT access mode.\n"
+        if $server_auth_method and $NAT_access_str;
+
+    if ($gpg_path) {
+        die "[*] $gpg_path does not exist." unless -e $gpg_path;
+        die "[*] $gpg_path not executable." unless -x $gpg_path;
+    }
+    return;
-}
-