X-Git-Url: https://pwan.org/git/?p=certmaster.git;a=blobdiff_plain;f=scripts%2Fcertmaster-ca;h=75bfad3965f79bdf408de9a883ac1b6c6c205ffc;hp=0e43253b3e0ddee70e8c8923f99d916abc1cb23c;hb=240ba9b7e2ee00a8f6014c7d597a5afd1f96249c;hpb=1b1b6f5733d65cbb73f48ac9b4419aba3dc00eee

diff --git a/scripts/certmaster-ca b/scripts/certmaster-ca
index 0e43253..75bfad3 100755
--- a/scripts/certmaster-ca
+++ b/scripts/certmaster-ca
@@ -15,15 +15,12 @@ import certmaster
 import certmaster.certs
 import certmaster.certmaster
 
-
-
-
 def errorprint(stuff):
     print >> sys.stderr, stuff
 
 class CertmasterCAOptionParser(optparse.OptionParser):
     def get_version(self):
-        return file("/etc/func/version").read().strip()
+        return file("/etc/certmaster/version").read().strip()
 
 def parseargs(args):
     usage = 'certmaster-ca <option> [args]'
@@ -62,9 +59,15 @@ def main(args):
     
     (opts, args) = parseargs(args)
 
+    ## Check that the ca option matches a configured ca
+    try:
+        certauth = cm.cfg.ca[opts.ca]
+    except:
+        errorprint("Unknown ca %s: check /etc/certmaster.cfg" % opts.ca)
+        return 1
         
     if opts.list:
-        hns = cm.get_csrs_waiting(opts.ca)
+        hns = cm.get_csrs_waiting(certauth)
         if hns:
             for hn in sorted(hns):
                 print hn
@@ -79,14 +82,14 @@ def main(args):
             return 1
             
         for hn in args:
-            csrglob = '%s/%s.csr' % (cm.cfg.cas[opts.ca]['csrroot'], hn)
+            csrglob = '%s/%s.csr' % (certauth.csrroot, hn)
             csrs = glob.glob(csrglob)
             if not csrs:
                 errorprint('No match for %s to sign' % hn)
                 return 1
             
             for fn in csrs:
-                certfile = cm.sign_this_csr(opts.ca,fn)
+                certfile = cm.sign_this_csr(fn, certauth)
                 print '%s signed - cert located at %s' % (fn, certfile)
         return 0
     
@@ -96,7 +99,7 @@ def main(args):
             return 1
         
         for hn in args:
-            cm.remove_this_cert(opts.ca,hn)
+            cm.remove_this_cert(hn, certauth)
         
         return 0
 
@@ -105,7 +108,7 @@ def main(args):
         if args:
             hostglobs = args
 
-        signed_certs = cm.get_signed_certs(opts.ca, args)
+        signed_certs = cm.get_signed_certs(certauth, args)
 
         for i in sorted(signed_certs):
             print i
@@ -117,7 +120,7 @@ def main(args):
         if args:
             hostglobs = args
             
-        cert_hashes = cm.get_cert_hashes(opts.ca, hostglobs)
+        cert_hashes = cm.get_cert_hashes(certauth, hostglobs)
 
         for i in sorted(cert_hashes):
             print i