swisskyrepo
/
NetExec
mirror of https://github.com/swisskyrepo/NetExec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(ssh): read in keyfile and pass it to paramiko due to bug in paramiko looping through key types on failure; closes #454

main
Marshall Hallenbeck 2023-04-30 21:49:45 -04:00
parent 35a45d5f4f
commit f651abfd68
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
cme/protocols/ssh.py
View File

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import logging import logging
import paramiko import sys
from cme.config import process_secret from cme.config import process_secret
from cme.connection import * from cme.connection import *
@ -129,34 +129,28 @@ class ssh(connection):
def plaintext_login(self, username, password, private_key=None): def plaintext_login(self, username, password, private_key=None):
try: try:
if self.args.key_file: if self.args.key_file or private_key:
self.logger.debug(f"Logging in with keyfile: {self.args.key_file}") if private_key:
pkey = paramiko.RSAKey.from_private_key(StringIO(private_key))
else:
pkey = paramiko.RSAKey.from_private_key_file(self.args.key_file)
self.logger.debug(f"Logging in with key")
self.conn.connect(
self.host,
port=self.args.port,
username=username,
passphrase=password if password != "" else None,
pkey=pkey,
look_for_keys=False,
allow_agent=False
)
if private_key:
cred_id = self.db.add_credential("key", username, password if password != "" else "", key=private_key)
else:
with open(self.args.key_file, "r") as f: with open(self.args.key_file, "r") as f:
key_data = f.read() key_data = f.read()
self.conn.connect(
self.host,
port=self.args.port,
username=username,
passphrase=password if password != "" else None,
key_filename=self.args.key_file,
look_for_keys=False,
allow_agent=False
)
cred_id = self.db.add_credential("key", username, password if password != "" else "", key=key_data) cred_id = self.db.add_credential("key", username, password if password != "" else "", key=key_data)
elif private_key:
self.logger.debug(f"Logging in with private key string")
key_paramiko = paramiko.RSAKey.from_private_key(StringIO(private_key))
self.conn.connect(
self.host,
port=self.args.port,
username=username,
passphrase=password if password != "" else None,
pkey=key_paramiko,
look_for_keys=False,
allow_agent=False
)
cred_id = self.db.add_credential("key", username, password if password != "" else "", key=private_key)
else: else:
self.logger.debug(f"Logging in with password") self.logger.debug(f"Logging in with password")
self.conn.connect( self.conn.connect(