Adding unknown ca tests

diff --git a/certmaster/config.py b/certmaster/config.py
index 7f7e623..2cec66f 100644 (file)
--- a/certmaster/config.py
+++ b/certmaster/config.py
@@ -478,14 +478,8 @@ def read_config(config_file, BaseConfigDerived):
 
     ## build up the cas structure
     opts.ca = {}
-#    opts.ca[''] = {}
 
     ## Add the default items when just using a single ca
-#    main_items = confparser.items('main')
-#    for (key,value) in main_items:
-#        if key in ['autosign','cadir','cert_dir','certroot','csrroot']:
-#            print "main ca: key: %s, value: %s" % (key,value)
-#            opts.ca[''][key] = value
     opts.ca[''] = BaseConfigDerived()
     opts.ca[''].populate(confparser,'main')
 
@@ -494,10 +488,6 @@ def read_config(config_file, BaseConfigDerived):
     for a_section in sections:
         if a_section.startswith('ca:'):
             ca_name = a_section[3:]
-#            items = confparser.items(a_section)
-#            opts.ca[ca_name] = {}
-#            for (key,value) in items:
-#                opts.ca[ca_name][key] = value
             opts.ca[ca_name] = BaseConfigDerived()
             opts.ca[ca_name].populate(confparser,a_section)
             opts.ca[ca_name].cakey = None

diff --git a/scripts/certmaster-request b/scripts/certmaster-request
index 6b3414f..de4d047 100755 (executable)
--- a/scripts/certmaster-request
+++ b/scripts/certmaster-request
@@ -17,6 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 import distutils.sysconfig
 import optparse
+import sys
 
 from certmaster import requester
 
@@ -33,4 +34,7 @@ if __name__ == "__main__":
     
     (opts, args) = parser.parse_args()
 
-    requester.request_cert(hostname=opts.hostname, ca_name=opts.ca)
+    try:
+        requester.request_cert(hostname=opts.hostname, ca_name=opts.ca)
+    except Exception as e:
+        print >> sys.stderr, "error: %s" % str(e)

diff --git a/tests/test-certmaster.sh b/tests/test-certmaster.sh
index eab2d9a..b9c6be1 100755 (executable)
--- a/tests/test-certmaster.sh
+++ b/tests/test-certmaster.sh
@@ -88,6 +88,17 @@ EOF
 
 }
 
+test_CertmasterRequest_UnknownCA()
+{
+    actual=$(certmaster-request --hostname unknown.pwan.co --ca unknown 2>&1)
+    expected=$(cat <<EOF
+error: Unknown cert authority: unknown
+EOF
+)
+
+   assertEquals "certmaster-request --ca unknown" "$actual" "$expected"
+}
+
 test_CertmasterCAHelp()
 {
     actual=`certmaster-ca --help`
@@ -139,6 +150,18 @@ test_CertmasterCAVersion()
     assertTrue "version includes a release" $?
 }
 
+test_CertmasterCA_UnknownCA()
+{
+    actual=$(certmaster-ca --list --ca unknown 2>&1)
+
+    expected=$(cat <<EOF
+Unknown ca unknown: check /etc/certmaster.cfg
+EOF
+)
+
+    assertEquals "certmaster-ca --ca unknown" "$actual" "$expected"
+}
+
 test_TestCA_Autosigning()
 {
     certmaster-request --hostname testcert.pwan.co --ca test