From 765ac5e71410384eaa5a1e5b737a6eb94f15f61c Mon Sep 17 00:00:00 2001 From: ibuler Date: Sun, 2 Nov 2014 00:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jumpserver.py | 30 ++++++++++++++++++----------- webroot/AutoSa/AutoSa/views.py | 2 +- webroot/AutoSa/UserManage/models.py | 2 +- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/jumpserver.py b/jumpserver.py index 9757ee304..992b5466b 100755 --- a/jumpserver.py +++ b/jumpserver.py @@ -22,7 +22,7 @@ cur_dir = os.path.dirname(__file__) sys.path.append('%s/webroot/AutoSa/' % cur_dir) os.environ['DJANGO_SETTINGS_MODULE'] = 'AutoSa.settings' -from UserManage.models import User +from UserManage.models import User,Logs cf = ConfigParser.ConfigParser() @@ -40,8 +40,6 @@ assets_user_table = cf.get('jumpserver', 'assets_user_table') key = cf.get('jumpserver', 'key') - - class PyCrypt(object): """It's used to encrypt and decrypt password.""" def __init__(self, key): @@ -120,11 +118,16 @@ def connect(host, port, user, password): log_date_dir = '%s/%s' % (log_dir, time.strftime('%Y%m%d')) if not os.path.isdir(log_date_dir): os.mkdir(log_date_dir) - logfile = open("%s/%s_%s_%s" % (log_date_dir, host, user, time.strftime('%Y%m%d%H%M%S')), 'a') - db, cursor = connect_db(db_user, db_password, db_db, db_host, db_port) - cursor.execute('insert into logs (Fuser, Fhost, Flogfile, Fstart_time) value (%s, %s, %s, UNIX_TIMESTAMP())' - % (user, host, logfile)) - logfile.write('\n%s\n' % time.strftime('%Y/%m/%d %H:%M:%S')) + structtime_now = time.localtime() + datetime_now = time.strftime('%Y%m%d%H%M%S', structtime_now) + logtime_now = time.strftime('%Y/%m/%d %H:%M:%S', structtime_now) + timestamp_now = int(time.mktime(structtime_now)) + + logfile_name = "%s/%s_%s_%s" % (log_date_dir, host, user, datetime_now) + logfile = open(logfile_name, 'a') + log = Logs(user=user, host=host, logfile=logfile_name, start_time=timestamp_now) + log.save() + logfile.write('\n%s\n' % logtime_now) try: global foo foo = pxssh.pxssh() @@ -133,13 +136,18 @@ def connect(host, port, user, password): foo.sendline('') signal.signal(signal.SIGWINCH, sigwinch_passthrough) foo.interact(escape_character=chr(28)) - cursor.execute('update logs set Ffindsh=True, Fend_time=UNIX_TIMESTAMP() where Flogfile=%s' % logfile) + log.finish = 1 + log.end_time = int(time.time()) + log.save() except pxssh.ExceptionPxssh as e: print('登录失败: %s' % e) - cursor.execute('update logs set Ffindsh=2 where Flogfile=%s' % logfile) + log.finish = 2 + log.save() except KeyboardInterrupt: foo.logout() - cursor.execute('update logs set Ffindsh=True, Fend_time=UNIX_TIMESTAMP() where Flogfile=%s ' % logfile) + log.finish = 1 + log.end_time = int(time.time()) + log.save() def ip_all_select(username): diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py index cb8e1cf2b..9fdcc526d 100644 --- a/webroot/AutoSa/AutoSa/views.py +++ b/webroot/AutoSa/AutoSa/views.py @@ -26,7 +26,7 @@ cf = ConfigParser.ConfigParser() cf.read('%s/jumpserver.conf' % CONF_DIR) key = cf.get('jumpserver', 'key') -rsa_dir = cf.get('jumpserver', 'rsa_dir') +rsa_dir = os.path.join(CONF_DIR, 'keys') ldap_host = cf.get('jumpserver', 'ldap_host') ldap_base_dn = cf.get('jumpserver', 'ldap_base_dn') admin_cn = cf.get('jumpserver', 'admin_cn') diff --git a/webroot/AutoSa/UserManage/models.py b/webroot/AutoSa/UserManage/models.py index d9f991581..8bae81273 100644 --- a/webroot/AutoSa/UserManage/models.py +++ b/webroot/AutoSa/UserManage/models.py @@ -27,7 +27,7 @@ class Logs(models.Model): user = models.CharField(max_length=50) host = models.CharField(max_length=20) logfile = models.CharField(max_length=1000) - finish = models.SmallIntegerField(max_length=4) + finish = models.SmallIntegerField(max_length=4, default=0) start_time = models.IntegerField() end_time = models.IntegerField()