diff --git a/Dockerfile b/Dockerfile index 37f573be9..cf8f73a29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,7 @@ ARG TOOLS=" \ default-mysql-client \ locales \ openssh-client \ + procps \ sshpass \ telnet \ unzip \ diff --git a/Dockerfile.loong64 b/Dockerfile.loong64 index 5e942d5a3..f1abd0fe6 100644 --- a/Dockerfile.loong64 +++ b/Dockerfile.loong64 @@ -36,6 +36,7 @@ ARG TOOLS=" \ default-mysql-client \ locales \ openssh-client \ + procps \ sshpass \ telnet \ unzip \ diff --git a/apps/rbac/const.py b/apps/rbac/const.py index 541b0b3da..dc9d2592b 100644 --- a/apps/rbac/const.py +++ b/apps/rbac/const.py @@ -94,6 +94,7 @@ exclude_permissions = ( ('terminal', 'sessionsharing', 'view,add,change,delete', 'sessionsharing'), ('terminal', 'session', 'delete,share', 'session'), ('terminal', 'session', 'delete,change', 'command'), + ('applications', '*', '*', '*'), ) diff --git a/apps/terminal/signal_handlers.py b/apps/terminal/signal_handlers.py index d98e21eee..046c1b122 100644 --- a/apps/terminal/signal_handlers.py +++ b/apps/terminal/signal_handlers.py @@ -42,10 +42,10 @@ def on_applet_create(sender, instance, created=False, **kwargs): @receiver(django_ready) -def init_db_port_mapper(sender, **kwargs): +def check_db_port_mapper(sender, **kwargs): logger.info('Init db port mapper') try: - db_port_manager.init() + db_port_manager.check() except (ProgrammingError,) as e: pass diff --git a/apps/terminal/utils/db_port_mapper.py b/apps/terminal/utils/db_port_mapper.py index d343dd3cb..4ca8cebec 100644 --- a/apps/terminal/utils/db_port_mapper.py +++ b/apps/terminal/utils/db_port_mapper.py @@ -34,9 +34,22 @@ class DBPortManager(object): def magnus_listen_port_range(self): return settings.MAGNUS_PORTS - def init(self): + @staticmethod + def fetch_dbs(): with tmp_to_root_org(): - db_ids = Asset.objects.filter(platform__category=Category.DATABASE).values_list('id', flat=True) + dbs = Asset.objects.filter(platform__category=Category.DATABASE).order_by('id') + return dbs + + def check(self): + dbs = self.fetch_dbs() + for db in dbs: + port = self.get_port_by_db(db, raise_exception=False) + if not port: + self.add(db) + + def init(self): + dbs = self.fetch_dbs() + db_ids = dbs.values_list('id', flat=True) db_ids = [str(i) for i in db_ids] mapper = dict(zip(self.all_available_ports, list(db_ids))) self.set_mapper(mapper)