| SMTP服务器 | diff --git a/server/www/teleport/webroot/app/base/configs.py b/server/www/teleport/webroot/app/base/configs.py index 37bd03d..38986da 100644 --- a/server/www/teleport/webroot/app/base/configs.py +++ b/server/www/teleport/webroot/app/base/configs.py @@ -468,12 +468,12 @@ class AppConfig(BaseAppConfig): _password = {} self.sys.password = tp_convert_to_attr_dict(_password) - if not self.sys.password.is_exists('find'): - self.sys.password.find = True - if not self.sys.password.is_exists('strong'): - self.sys.password.strong = True + if not self.sys.password.is_exists('allow_reset'): + self.sys.password.allow_reset = True + if not self.sys.password.is_exists('force_strong'): + self.sys.password.force_strong = True if not self.sys.password.is_exists('timeout'): - self.sys.password.timeout = 30 + self.sys.password.timeout = 0 # ===================================== # 登录相关 @@ -492,7 +492,7 @@ class AppConfig(BaseAppConfig): if not self.sys.login.is_exists('lock_timeout'): self.sys.login.lock_timeout = 30 # 30 min if not self.sys.login.is_exists('auth'): - self.sys.login.auth = TP_LOGIN_AUTH_USERNAME_PASSWORD | TP_LOGIN_AUTH_USERNAME_PASSWORD_CAPTCHA | TP_LOGIN_AUTH_USERNAME_OATH + self.sys.login.auth = TP_LOGIN_AUTH_USERNAME_PASSWORD | TP_LOGIN_AUTH_USERNAME_PASSWORD_CAPTCHA | TP_LOGIN_AUTH_USERNAME_OATH | TP_LOGIN_AUTH_USERNAME_PASSWORD_OATH # print('==login==', json.dumps(self.sys.login, separators=(',', ':'))) # ===================================== diff --git a/server/www/teleport/webroot/app/base/database/create.py b/server/www/teleport/webroot/app/base/database/create.py index af44f4c..2a35f61 100644 --- a/server/www/teleport/webroot/app/base/database/create.py +++ b/server/www/teleport/webroot/app/base/database/create.py @@ -704,16 +704,16 @@ class DatabaseInit: 'INSERT INTO `{}config` (`name`, `value`) VALUES ("db_ver", "{}");'.format(self.db.table_prefix, self.db.DB_VERSION) ) - self._db_exec( - '设置初始化配置', - [ - 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_server", "");'.format(self.db.table_prefix), - 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_port", "-1");'.format(self.db.table_prefix), - 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_ssl", "-1");'.format(self.db.table_prefix), - 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_sender", "");'.format(self.db.table_prefix), - 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_password", "");'.format(self.db.table_prefix), - ] - ) + # self._db_exec( + # '设置初始化配置', + # [ + # 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_server", "");'.format(self.db.table_prefix), + # 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_port", "-1");'.format(self.db.table_prefix), + # 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_ssl", "-1");'.format(self.db.table_prefix), + # 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_sender", "");'.format(self.db.table_prefix), + # 'INSERT INTO `{}config` (`name`, `value`) VALUES ("smtp_password", "");'.format(self.db.table_prefix), + # ] + # ) privilege_admin = TP_PRIVILEGE_ALL privilege_ops = TP_PRIVILEGE_LOGIN_WEB | TP_PRIVILEGE_OPS diff --git a/server/www/teleport/webroot/app/base/db.py b/server/www/teleport/webroot/app/base/db.py index 58614dd..cabc805 100644 --- a/server/www/teleport/webroot/app/base/db.py +++ b/server/www/teleport/webroot/app/base/db.py @@ -46,6 +46,7 @@ class TPDatabase: self.current_ver = 0 self.auto_increment = '' + self.place_holder = '' self._table_prefix = '' self._conn_pool = None @@ -109,6 +110,7 @@ class TPDatabase: def _init_sqlite(self, db_file): self.db_type = self.DB_TYPE_SQLITE self.auto_increment = 'AUTOINCREMENT' + self.place_holder = '?' self.sqlite_file = db_file self._table_prefix = 'tp_' @@ -124,6 +126,7 @@ class TPDatabase: def _init_mysql(self, mysql_host, mysql_port, mysql_db, mysql_prefix, mysql_user, mysql_password): self.db_type = self.DB_TYPE_MYSQL self.auto_increment = 'AUTO_INCREMENT' + self.place_holder = '%s' self._table_prefix = mysql_prefix self.mysql_host = mysql_host @@ -196,10 +199,11 @@ class TPDatabase: # log.d('[db] cost {} seconds.\n'.format(_end - _start)) return ret - def exec(self, sql): - log.d('[db] {}\n'.format(sql)) + def exec(self, sql, args=()): + # log.d('[db] {}\n'.format(sql, args)) + print('[db]', sql, args) # _start = datetime.datetime.utcnow().timestamp() - ret = self._conn_pool.exec(sql) + ret = self._conn_pool.exec(sql, args) # _end = datetime.datetime.utcnow().timestamp() # log.d('[db] cost {} seconds.\n'.format(_end - _start)) return ret @@ -327,11 +331,11 @@ class TPDatabasePool: return None return self._do_query(_conn, sql) - def exec(self, sql): + def exec(self, sql, args): _conn = self._get_connect() if _conn is None: return False - return self._do_exec(_conn, sql) + return self._do_exec(_conn, sql, args) def transaction(self, sql_list): _conn = self._get_connect() @@ -363,7 +367,7 @@ class TPDatabasePool: def _do_query(self, conn, sql): return None - def _do_exec(self, conn, sql): + def _do_exec(self, conn, sql, args): return None def _do_transaction(self, conn, sql_list): @@ -401,10 +405,10 @@ class TPSqlitePool(TPDatabasePool): finally: cursor.close() - def _do_exec(self, conn, sql): + def _do_exec(self, conn, sql, args): try: with conn: - conn.execute(sql) + conn.execute(sql, args) return True except Exception as e: log.e('[sqlite] _do_exec() failed: {}\n'.format(e.__str__())) diff --git a/server/www/teleport/webroot/app/controller/system.py b/server/www/teleport/webroot/app/controller/system.py index c24db3c..8221319 100644 --- a/server/www/teleport/webroot/app/controller/system.py +++ b/server/www/teleport/webroot/app/controller/system.py @@ -75,7 +75,7 @@ class DoRoleUpdateHandler(TPBaseJsonHandler): return self.write_json(TPE_PARAM) if role_id == 0: - err, role_id = system_model.add_role(self, role_id, role_name, privilege) + err, role_id = system_model.add_role(self, role_name, privilege) else: if role_id == 1: return self.write_json(TPE_FAILED, '禁止修改系统管理员角色！') @@ -246,8 +246,8 @@ class DoSaveCfgSmtpHandler(TPBaseJsonHandler): return self.write_json(TPE_PARAM) # 调用Model模块来操作数据库 - code, msg = system_model.save_mail_config(_server, _port, _ssl, _sender, _password) - if code == TPE_OK: + err = system_model.save_smtp_config(self, _server, _port, _ssl, _sender, _password) + if err == TPE_OK: # 同时更新内存缓存 get_cfg().sys.smtp.server = _server get_cfg().sys.smtp.port = _port @@ -255,4 +255,4 @@ class DoSaveCfgSmtpHandler(TPBaseJsonHandler): get_cfg().sys.smtp.sender = _sender get_cfg().sys_smtp_password = _password - self.write_json(code, message=msg) + self.write_json(err) diff --git a/server/www/teleport/webroot/app/model/system.py b/server/www/teleport/webroot/app/model/system.py index 8443a98..bc19b95 100644 --- a/server/www/teleport/webroot/app/model/system.py +++ b/server/www/teleport/webroot/app/model/system.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +import json from app.const import * from app.base.db import get_db, SQL from app.base.logger import log @@ -7,26 +8,38 @@ from app.base.utils import tp_timestamp_utc_now from . import syslog -def save_mail_config(_server, _port, _ssl, _sender, _password): - log.v('save mail config.\n') - +def save_smtp_config(handler, _server, _port, _ssl, _sender, _password): db = get_db() - sql_list = list() - sql_list.append('UPDATE `{}config` SET `value`="{}" WHERE `name`="smtp_server";'.format(db.table_prefix, _server)) - sql_list.append('UPDATE `{}config` SET `value`="{}" WHERE `name`="smtp_port";'.format(db.table_prefix, _port)) - sql_list.append('UPDATE `{}config` SET `value`="{}" WHERE `name`="smtp_ssl";'.format(db.table_prefix, _ssl)) - sql_list.append('UPDATE `{}config` SET `value`="{}" WHERE `name`="smtp_sender";'.format(db.table_prefix, _sender)) - sql_list.append('UPDATE `{}config` SET `value`="{}" WHERE `name`="smtp_password";'.format(db.table_prefix, _password)) + _smtp = { + 'server': _server, + 'port': _port, + 'ssl': _ssl, + 'sender': _sender, + 'password': _password + } - ret = db.transaction(sql_list) - if ret: - return TPE_OK, '' + str_smtp = json.dumps(_smtp, separators=(',', ':')) - return TPE_FAILED, '数据库操作失败' + sql = 'SELECT name FROM `{dbtp}config` WHERE name="smtp";'.format(dbtp=db.table_prefix) + db_ret = db.query(sql) + if db_ret is not None and len(db_ret) > 0: + sql = 'UPDATE `{dbtp}config` SET value={dbph} WHERE name="smtp";'.format(dbtp=db.table_prefix, dbph=db.place_holder) + db_ret = db.exec(sql, (str_smtp,)) + else: + sql = 'INSERT INTO `{dbtp}config` (name, value) VALUES ("smtp", {dbph});'.format(dbtp=db.table_prefix, dbph=db.place_holder) + db_ret = db.exec(sql, (str_smtp,)) + + if not db_ret: + return TPE_DATABASE + + operator = handler.get_current_user() + syslog.sys_log(operator, handler.request.remote_ip, TPE_OK, "更新SMTP设置") + + return TPE_OK -def add_role(handler, role_id, role_name, privilege): +def add_role(handler, role_name, privilege): db = get_db() _time_now = tp_timestamp_utc_now() operator = handler.get_current_user() @@ -39,8 +52,7 @@ def add_role(handler, role_id, role_name, privilege): sql = 'INSERT INTO `{}role` (name, privilege, creator_id, create_time) VALUES ' \ '("{name}", {privilege}, {creator_id}, {create_time});' \ - ''.format(db.table_prefix, - name=role_name, privilege=privilege, creator_id=operator['id'], create_time=_time_now) + ''.format(db.table_prefix, name=role_name, privilege=privilege, creator_id=operator['id'], create_time=_time_now) db_ret = db.exec(sql) if not db_ret: return TPE_DATABASE, 0 @@ -104,40 +116,3 @@ def remove_role(handler, role_id): syslog.sys_log(handler.get_current_user(), handler.request.remote_ip, TPE_OK, "删除角色：{}".format(role_name)) return TPE_OK - - -# def get_config_list(): -# try: -# from eom_app.module.common import get_db_con -# from eom_app.module.common import DbItem -# sql_exec = get_db_con() -# field_a = ['name', 'value'] -# string_sql = 'SELECT {} FROM ts_config as a ;'.format(','.join(['a.{}'.format(i) for i in field_a])) -# db_ret = sql_exec.ExecProcQuery(string_sql) -# h = dict() -# for item in db_ret: -# x = DbItem() -# x.load(item, ['a_{}'.format(i) for i in field_a]) -# h[x.a_name] = x.a_value -# -# return h -# except Exception as e: -# return None -# -# -# def set_config(change_list): -# from eom_app.module.common import get_db_con -# sql_exec = get_db_con() -# # -# for item in change_list: -# name = item['name'] -# value = item['value'] -# str_sql = 'UPDATE ts_config SET value = \'{}\' ' \ -# ' WHERE name = \'{}\''.format(value, name) -# ret = sql_exec.ExecProcNonQuery(str_sql) -# -# return ret -# -# def get_config_list(): -# print(cfg.base) -# return cfg.base