Merge pull request AlessandroZ#354 from ocastejon/master

Dump valid JSON file and minor correction for opensshforwindows keys
bambit · Feb 19, 2019 · e9f13f4 · e9f13f4
2 parents c96744a + d692b35
commit e9f13f4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Linux/lazagne/config/write_output.py b/Linux/lazagne/config/write_output.py
@@ -279,7 +279,7 @@ def write_in_file(result):
             # Human readable Json format
             pretty_json = json.dumps(result, sort_keys=True, indent=4, separators=(',', ': '))
             with open(os.path.join(constant.folder_name, constant.file_name_results + '.json'), 'a+b') as f:
-                f.write(pretty_json.decode('unicode-escape').encode('UTF-8'))
+                f.write(pretty_json.encode('UTF-8'))
 
             constant.st.do_print(u'[+] File written: {file}'.format(
                 file=os.path.join(constant.folder_name, constant.file_name_results + '.json'))

diff --git a/Mac/lazagne/config/write_output.py b/Mac/lazagne/config/write_output.py
@@ -281,7 +281,7 @@ def write_in_file(result):
             # Human readable Json format
             pretty_json = json.dumps(result, sort_keys=True, indent=4, separators=(',', ': '))
             with open(os.path.join(constant.folder_name, constant.file_name_results + '.json'), 'a+b') as f:
-                f.write(pretty_json.decode('unicode-escape').encode('UTF-8'))
+                f.write(pretty_json.encode('UTF-8'))
             constant.st.do_print(
                 '[+] File written: ' + constant.folder_name + os.sep + constant.file_name_results + '.json')
         except Exception as e:

diff --git a/Windows/lazagne/config/write_output.py b/Windows/lazagne/config/write_output.py
@@ -347,7 +347,7 @@ def write_in_file(result):
                 # Human readable Json format
                 pretty_json = json.dumps(result, sort_keys=True, indent=4, separators=(',', ': '))
                 with open(os.path.join(constant.folder_name, constant.file_name_results + '.json'), 'a+b') as f:
-                    f.write(pretty_json.decode('unicode-escape').encode('UTF-8'))
+                    f.write(pretty_json.encode('UTF-8'))
 
                 constant.st.do_print(u'[+] File written: {file}'.format(
                     file=os.path.join(constant.folder_name, constant.file_name_results + '.json'))

diff --git a/Windows/lazagne/softwares/sysadmin/opensshforwindows.py b/Windows/lazagne/softwares/sysadmin/opensshforwindows.py
@@ -84,7 +84,7 @@ def run(self):
         # Parse and process the list of keys
         key_found = []
         for key in unprotected_private_keys:
-            values = {"PrivateKey": key}
+            values = {"Privatekey": key}
             key_found.append(values)
 
         return key_found