From d1ebe98239fbc2baffa345558d396fa539e79202 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 21 Sep 2012 06:32:40 +0900
Subject: added --no-provider-checks and --no-ca-verify for ease of debugging

Close #604
---
 src/leap/util/leap_argparse.py            | 17 +++++++++++++++--
 src/leap/util/tests/test_leap_argparse.py |  2 ++
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'src/leap/util')

diff --git a/src/leap/util/leap_argparse.py b/src/leap/util/leap_argparse.py
index 3b38aa77..2f996a31 100644
--- a/src/leap/util/leap_argparse.py
+++ b/src/leap/util/leap_argparse.py
@@ -2,12 +2,16 @@ import argparse
 
 
 def build_parser():
+    """
+    all the options for the leap arg parser
+    Some of these could be switched on only if debug flag is present!
+    """
     epilog = "Copyright 2012 The Leap Project"
     parser = argparse.ArgumentParser(description="""
 Launches main LEAP Client""", epilog=epilog)
-    parser.add_argument('--debug', action="store_true",
+    parser.add_argument('-d', '--debug', action="store_true",
                         help='launches in debug mode')
-    parser.add_argument('--config', metavar="CONFIG FILE", nargs='?',
+    parser.add_argument('-c', '--config', metavar="CONFIG FILE", nargs='?',
                         action="store", dest="config_file",
                         type=argparse.FileType('r'),
                         help='optional config file')
@@ -19,6 +23,15 @@ Launches main LEAP Client""", epilog=epilog)
                         type=int,
                         action="store", dest="openvpn_verb",
                         help='verbosity level for openvpn logs [1-6]')
+    parser.add_argument('-l', '--no-provider-checks',
+                        action="store_true", default=False,
+                        help="skips download of provider config files. gets "
+                        "config from local files only. Will fail if cannot "
+                        "find any")
+    parser.add_argument('-k', '--no-ca-verify',
+                        action="store_true", default=False,
+                        help="(insecure). Skips verification of the server "
+                        "certificate used in TLS handshake.")
     return parser
 
 
diff --git a/src/leap/util/tests/test_leap_argparse.py b/src/leap/util/tests/test_leap_argparse.py
index 173c87bb..082919b7 100644
--- a/src/leap/util/tests/test_leap_argparse.py
+++ b/src/leap/util/tests/test_leap_argparse.py
@@ -27,6 +27,8 @@ class LeapArgParseTest(unittest.TestCase):
                 config_file=None,
                 debug=True,
                 log_file=None,
+                no_provider_checks=False,
+                no_ca_verify=False,
                 openvpn_verb=None))
 
 if __name__ == "__main__":
-- 
cgit v1.2.3