X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;f=scripts%2Fcertmaster-ca;h=7f8f9674c5a504756495ff47c37ba627e8fd0211;hb=af9d4112024b33b207ad562f3cadb199155b9575;hp=37a509c5b1e55ba4c666c2b74283865045cec2ca;hpb=9eac159f5ba172e999d5e36c30bb458ea0f530e9;p=certmaster.git

diff --git a/scripts/certmaster-ca b/scripts/certmaster-ca
index 37a509c..7f8f967 100755
--- a/scripts/certmaster-ca
+++ b/scripts/certmaster-ca
@@ -1,8 +1,9 @@
 #!/usr/bin/python -tt
 # sign/list keys
+# --ca ca sign/list certs for the 'ca' 
 # --sign hostname hostname hostname
 # --list # lists all csrs needing to be signed
-# --list-all ?
+# --list-all ca list all certs for a given ca
 # --clean? not sure what it will do
 
 import sys
@@ -27,7 +28,9 @@ class CertmasterCAOptionParser(optparse.OptionParser):
 def parseargs(args):
     usage = 'certmaster-ca <option> [args]'
     parser = CertmasterCAOptionParser(usage=usage,version=True)
-    
+
+    parser.add_option("", '--ca', default='', action="store", dest="ca", metavar="CA",
+          help="certificate authority used to sign/list certs")
     parser.add_option('-l', '--list', default=False, action="store_true",
           help='list signing requests remaining')
     parser.add_option('-s', '--sign', default=False, action="store_true",
@@ -61,9 +64,9 @@ def main(args):
 
         
     if opts.list:
-        hns = cm.get_csrs_waiting()
+        hns = cm.get_csrs_waiting(ca=opts.ca)
         if hns:
-            for hn in cm.get_csrs_waiting():
+            for hn in sorted(hns):
                 print hn
         else:
            print 'No certificates to sign'
@@ -76,14 +79,14 @@ def main(args):
             return 1
             
         for hn in args:
-            csrglob = '%s/%s.csr' % (cm.cfg.csrroot, hn)
+            csrglob = '%s/%s.csr' % (cm.cfg.cas[opts.ca]['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(fn)
+                certfile = cm.sign_this_csr(fn, ca=opts.ca)
                 print '%s signed - cert located at %s' % (fn, certfile)
         return 0
     
@@ -93,7 +96,7 @@ def main(args):
             return 1
         
         for hn in args:
-            cm.remove_this_cert(hn)
+            cm.remove_this_cert(hn, ca=opts.ca)
         
         return 0
 
@@ -102,9 +105,9 @@ def main(args):
         if args:
             hostglobs = args
 
-        signed_certs = cm.get_signed_certs(args)
+        signed_certs = cm.get_signed_certs(args, ca=opts.ca)
 
-        for i in signed_certs:
+        for i in sorted(signed_certs):
             print i
             
         return 0
@@ -114,9 +117,9 @@ def main(args):
         if args:
             hostglobs = args
             
-        cert_hashes = cm.get_cert_hashes(hostglobs)
+        cert_hashes = cm.get_cert_hashes(hostglobs, ca=opts.ca)
 
-        for i in cert_hashes:
+        for i in sorted(cert_hashes):
             print i
             
         return 0