github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8973 from jumpserver/dev 

v2.27.0-rc5
pull/9057/head
Jiangjie.Bai 2022-10-19 20:30:13 +08:00 committed by GitHub
parent 129c0e1bf4 c6a3a141bb
commit 613a7d63b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/jumpserver/conf.py
View File

@ -485,8 +485,7 @@ class Config(dict):
'SECURITY_DATA_CRYPTO_ALGO': None, 'SECURITY_DATA_CRYPTO_ALGO': None,
'GMSSL_ENABLED': False, 'GMSSL_ENABLED': False,
# Magnus 组件需要监听的端口范围 # Magnus 组件需要监听的端口范围
'MAGNUS_DB_PORTS_START': 30000, 'MAGNUS_PORTS': '30000-30100',
'MAGNUS_DB_PORTS_LIMIT_COUNT': 1000,
# 记录清理清理 # 记录清理清理
'LOGIN_LOG_KEEP_DAYS': 200, 'LOGIN_LOG_KEEP_DAYS': 200,

3
apps/jumpserver/settings/custom.py
View File

@ -179,5 +179,4 @@ SESSION_RSA_PRIVATE_KEY_NAME = 'jms_private_key'
SESSION_RSA_PUBLIC_KEY_NAME = 'jms_public_key' SESSION_RSA_PUBLIC_KEY_NAME = 'jms_public_key'
# Magnus DB Port # Magnus DB Port
MAGNUS_DB_PORTS_START = CONFIG.MAGNUS_DB_PORTS_START MAGNUS_PORTS = CONFIG.MAGNUS_PORTS
MAGNUS_DB_PORTS_LIMIT_COUNT = CONFIG.MAGNUS_DB_PORTS_LIMIT_COUNT

2
apps/terminal/signal_handlers.py
View File

@ -21,7 +21,7 @@ def init_db_port_mapper(sender, **kwargs):
try: try:
db_port_manager.init() db_port_manager.init()
except (ProgrammingError,) as e: except (ProgrammingError,) as e:
logger.error('Init db port mapper error: {}'.format(e)) pass
@receiver(post_save, sender=Application) @receiver(post_save, sender=Application)

15
apps/terminal/utils/db_port_mapper.py
View File

@ -20,15 +20,20 @@ class DBPortManager(object):
CACHE_KEY = 'PORT_DB_MAPPER' CACHE_KEY = 'PORT_DB_MAPPER'
def __init__(self): def __init__(self):
self.port_start = settings.MAGNUS_DB_PORTS_START try:
self.port_limit = settings.MAGNUS_DB_PORTS_LIMIT_COUNT port_start, port_end = settings.MAGNUS_PORTS.split('-')
self.port_end = self.port_start + self.port_limit port_start, port_end = int(port_start), int(port_end)
except Exception as e:
logger.error('MAGNUS_PORTS config error: {}'.format(e))
port_start, port_end = 30000, 30100
self.port_start, self.port_end = port_start, port_end
# 可以使用的端口列表 # 可以使用的端口列表
self.all_available_ports = list(range(self.port_start, self.port_end)) self.all_available_ports = list(range(self.port_start, self.port_end + 1))
@property @property
def magnus_listen_port_range(self): def magnus_listen_port_range(self):
return f'{self.port_start}-{self.port_end - 1}' return settings.MAGNUS_PORTS
def init(self): def init(self):
with tmp_to_root_org(): with tmp_to_root_org():