fix pub and cert path

models/authority.py

@@ -59,7 +59,7 @@ class Authority(customModel.CustomModel):
 
         # write the key data from the request into
         # the output folder
-        with open(request.destination + '.pub', 'w') as stream:
+        with open(request.destination, 'w') as stream:
             stream.write(request.key_data)
 
         cert = Certificate(
@@ -68,6 +68,7 @@ class Authority(customModel.CustomModel):
                 date_issued = datetime.now(),
                 receiver = request.receiver,
                 serial_number = self.serial,
+                path = request.cert_destination,
                 )
 
         cert.validity_interval = self.generate_certificate(request)

models/certificate.py

@@ -41,12 +41,12 @@ class Certificate(customModel.CustomModel):
                 help_text = 'how long will the certificate be valid',
                 )
 
+    path = CharField(
+                help_text = 'certificate\'s path on filesystem',
+                )
+
     def __repr__(self):
         return ( "%s %s for %s on %s issued by %s"%(self.__class__.__name__, self.cert_id, self.receiver, self.date_issued, self.authority))
 
     def __bool__(self):
         return os.path.exists(self.path)
-
-    @property
-    def path(self):
-        return os.path.join(OUTPUT_PATH, self.cert_id + '-cert.pub')

models/request.py

@@ -33,7 +33,11 @@ class SignRequest(object):
 
     @property
     def destination(self):
-        return os.path.join(OUTPUT_PATH, self.req_id)
+        return os.path.join(OUTPUT_PATH, self.req_id + ".pub")
+
+    @property
+    def cert_destination(self):
+        return os.path.join(OUTPUT_PATH, self.req_id + '-cert.pub')
 
     @property
     def fields(self):

models/ssh.py

@@ -97,9 +97,9 @@ class SSHAuthority(Authority):
         Sign a *SSHRequest with this certification authority
         """
 
-        pub_key_path = request.destination + '.pub'
+        pub_key_path = request.destination
 
-        ca_private_key = self.path
+        ca_private_key = request.cert_destination
 
         if type(request) == UserSSHRequest:
             login_names = [ request.user_name, ]

models/ssl.py

@@ -73,7 +73,7 @@ class SSLAuthority(Authority):
         Sign a *SSLRequest with this certification authority
         """
 
-        pub_key_path = request.destination + '.pub'
+        pub_key_path = request.destination
         cert_path = request.destination + '-cert.pub'
 
         with open(pub_key_path, 'w') as stream: