Skip to content
Snippets Groups Projects
Commit 8144c7a5 authored by Chris Hines's avatar Chris Hines
Browse files

Merge branch 'dev' into 'test'

Dev

See merge request !94
parents 80b95a69 bc30f0a1
No related branches found
No related tags found
2 merge requests!95Test,!94Dev
Pipeline #68927 passed
......@@ -27,6 +27,8 @@ else:
api = Api(app)
sshsessions = {}
lastcleanup = datetime.datetime.now()
cleanupinterval = datetime.timedelta(minutes=10)
if DEV:
from flask_cors import CORS, cross_origin
CORS(app, supports_credentials=True, origin="localhost:4200")
......@@ -44,6 +46,13 @@ def after_cleanup_sessions(response):
import logging
import hashlib
import json
global lastcleanup
global sshsessions
now = datetime.datetime.now()
if (now - lastcleanup) < cleanupinterval:
return response
lastcleanup = datetime.datetime.now()
logger=logging.getLogger()
events = logging.getLogger('connection_events')
slist = []
......@@ -79,6 +88,7 @@ def after_cleanup_sessions(response):
logger.error(e)
logger.error(traceback.format_exc())
events.info('currently {} active sessions'.format(len(sshsessions)))
return response
......
......@@ -150,6 +150,12 @@ class Ssh:
return ctrlsocket
else:
sess.lock.release()
try:
certs = sess.get_certs()
if b'The agent has no identities.\n' == certs:
raise SshCtrlException(certs.decode())
except Exception as e:
pass
raise SshCtrlException(stderr.decode())
@staticmethod
......
......@@ -14,6 +14,7 @@ class SSHSession:
"""
def __init__(self,sshsessid,**kwargs):
self.last = datetime.datetime.now()
self.first = datetime.datetime.now()
self.socket = None
self.token = None
self.port = {}
......
......@@ -198,7 +198,7 @@ def mainserver(port=None):
to_log = to_log + traceback.format_exc()
logging.basicConfig(filename=os.path.expanduser("~/.tws.log"),format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
logger = logging.getLogger()
logger.setLevel(logging.DEBUG)
logger.setLevel(logging.ERROR)
if to_log is not None:
logger.debug(to_log)
logger.debug("starting TWS proxy")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment