Merge pull request #92 from skalenetwork/fix-ssl-certs-uploading

Fix ssl certs uploading

Author: dmytrotkk

cli/ssl.py

@@ -17,11 +17,10 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import json
 import click
 from terminaltables import SingleTable
 
-from core.helper import login_required, get, post, safe_load_texts, load_ssl_files
+from core.helper import login_required, get, safe_load_texts, upload_certs
 
 
 TEXTS = safe_load_texts()
@@ -69,9 +68,7 @@ def status():
 @click.option('--force', '-f', is_flag=True, help='Overwrite existing certificates')
 @login_required
 def upload(key_path, cert_path, force):
-    files = load_ssl_files(key_path, cert_path)
-    files['json'] = (None, json.dumps({'force': force}), 'application/json')
-    response = post('ssl_upload', files=files)
+    response = upload_certs(key_path, cert_path, force)
     if not response:
         print('Someting went wrong, sorry')
         return

core/helper.py

@@ -17,6 +17,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import json
 import os
 import re
 import pickle
@@ -265,3 +266,18 @@ def load_ssl_files(key_path, cert_path):
 def read_file(path, mode='rb'):
     with open(path, mode) as f:
         return f
+
+
+def upload_certs(key_path, cert_path, force):
+    with open(key_path, 'rb') as key_file, open(cert_path, 'rb') as cert_file:
+        files_data = {
+            'ssl_key': (os.path.basename(key_path), key_file,
+                        'application/octet-stream'),
+            'ssl_cert': (os.path.basename(cert_path), cert_file,
+                         'application/octet-stream')
+        }
+        files_data['json'] = (
+            None, json.dumps({'force': force}),
+            'application/json'
+        )
+        return post('ssl_upload', files=files_data)

text.yml

@@ -19,5 +19,5 @@ ssl:
     No SSL certificates on the node. 
     Run < skale ssl upload > to add new certificates.
   uploaded: |-
-    Certificates are sucsesfully uploaded. 
-    You can check status by running < skale ssl status >
+    Certificates are successfully uploaded.
+    You can check status by running < skale ssl status >