From 41154d3793aeba3f476d1928f9f1de7ab17e7aa7 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 31 Jan 2023 17:57:06 +0800 Subject: [PATCH] asset: specific to spec_info --- .../change_secret/database/mongodb/main.yml | 12 ++-- .../change_secret/database/oracle/main.yml | 10 ++-- .../database/postgresql/main.yml | 10 ++-- .../change_secret/database/sqlserver/main.yml | 58 +++++++++---------- .../gather_accounts/database/mongodb/main.yml | 2 +- .../gather_accounts/database/oracle/main.yml | 2 +- .../database/postgresql/main.yml | 2 +- .../verify_account/database/mongodb/main.yml | 2 +- .../verify_account/database/oracle/main.yml | 2 +- .../database/postgresql/main.yml | 2 +- .../database/sqlserver/main.yml | 2 +- .../gather_facts/database/mongodb/main.yml | 2 +- .../gather_facts/database/oracle/main.yml | 2 +- .../gather_facts/database/postgresql/main.yml | 2 +- .../ping/database/mongodb/main.yml | 2 +- .../automations/ping/database/oracle/main.yml | 2 +- .../ping/database/postgresql/main.yml | 2 +- .../ping/database/sqlserver/main.yml | 2 +- apps/terminal/applets/chrome/app.py | 4 +- apps/terminal/applets/navicat/app.py | 2 +- 20 files changed, 62 insertions(+), 62 deletions(-) diff --git a/apps/accounts/automations/change_secret/database/mongodb/main.yml b/apps/accounts/automations/change_secret/database/mongodb/main.yml index 02a568e0b..95702c8bb 100644 --- a/apps/accounts/automations/change_secret/database/mongodb/main.yml +++ b/apps/accounts/automations/change_secret/database/mongodb/main.yml @@ -10,7 +10,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" register: db_info - name: Display MongoDB version @@ -24,8 +24,8 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" - db: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" + db: "{{ jms_asset.spec_info.db_name }}" name: "{{ account.username }}" password: "{{ account.secret }}" when: db_info is succeeded @@ -37,7 +37,7 @@ login_password: "{{ account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" when: - - db_info is succeeded - - change_info is succeeded + - db_info is succeeded + - change_info is succeeded diff --git a/apps/accounts/automations/change_secret/database/oracle/main.yml b/apps/accounts/automations/change_secret/database/oracle/main.yml index c7b20a8db..a58d776a7 100644 --- a/apps/accounts/automations/change_secret/database/oracle/main.yml +++ b/apps/accounts/automations/change_secret/database/oracle/main.yml @@ -10,7 +10,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" mode: "{{ jms_account.mode }}" register: db_info @@ -25,7 +25,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" mode: "{{ jms_account.mode }}" name: "{{ account.username }}" password: "{{ account.secret }}" @@ -38,8 +38,8 @@ login_password: "{{ account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" mode: "{{ account.mode }}" when: - - db_info is succeeded - - change_info is succeeded + - db_info is succeeded + - change_info is succeeded diff --git a/apps/accounts/automations/change_secret/database/postgresql/main.yml b/apps/accounts/automations/change_secret/database/postgresql/main.yml index ada11bbd6..6a903171f 100644 --- a/apps/accounts/automations/change_secret/database/postgresql/main.yml +++ b/apps/accounts/automations/change_secret/database/postgresql/main.yml @@ -10,7 +10,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_db: "{{ jms_asset.specific.db_name }}" + login_db: "{{ jms_asset.spec_info.db_name }}" register: db_info - name: Display PostgreSQL version @@ -24,7 +24,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - db: "{{ jms_asset.specific.db_name }}" + db: "{{ jms_asset.spec_info.db_name }}" name: "{{ account.username }}" password: "{{ account.secret }}" when: db_info is succeeded @@ -36,7 +36,7 @@ login_password: "{{ account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - db: "{{ jms_asset.specific.db_name }}" + db: "{{ jms_asset.spec_info.db_name }}" when: - - db_info is succeeded - - change_info is succeeded + - db_info is succeeded + - change_info is succeeded diff --git a/apps/accounts/automations/change_secret/database/sqlserver/main.yml b/apps/accounts/automations/change_secret/database/sqlserver/main.yml index a617a1434..d3ea188b0 100644 --- a/apps/accounts/automations/change_secret/database/sqlserver/main.yml +++ b/apps/accounts/automations/change_secret/database/sqlserver/main.yml @@ -10,38 +10,38 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - name: '{{ jms_asset.specific.db_name }}' + name: '{{ jms_asset.spec_info.db_name }}' script: | SELECT @@version register: db_info - - name: SQLServer version - set_fact: - info: - version: "{{ db_info.query_results[0][0][0][0].splitlines()[0] }}" - - debug: - var: info + - name: SQLServer version + set_fact: + info: + version: "{{ db_info.query_results[0][0][0][0].splitlines()[0] }}" + - debug: + var: info - - name: Change SQLServer password - community.general.mssql_script: - login_user: "{{ jms_account.username }}" - login_password: "{{ jms_account.secret }}" - login_host: "{{ jms_asset.address }}" - login_port: "{{ jms_asset.port }}" - name: '{{ jms_asset.specific.db_name }}' - script: "ALTER LOGIN {{ account.username }} WITH PASSWORD = '{{ account.secret }}'; select @@version" - when: db_info is succeeded - register: change_info + - name: Change SQLServer password + community.general.mssql_script: + login_user: "{{ jms_account.username }}" + login_password: "{{ jms_account.secret }}" + login_host: "{{ jms_asset.address }}" + login_port: "{{ jms_asset.port }}" + name: '{{ jms_asset.spec_info.db_name }}' + script: "ALTER LOGIN {{ account.username }} WITH PASSWORD = '{{ account.secret }}'; select @@version" + when: db_info is succeeded + register: change_info - - name: Verify password - community.general.mssql_script: - login_user: "{{ account.username }}" - login_password: "{{ account.secret }}" - login_host: "{{ jms_asset.address }}" - login_port: "{{ jms_asset.port }}" - name: '{{ jms_asset.specific.db_name }}' - script: | - SELECT @@version - when: - - db_info is succeeded - - change_info is succeeded + - name: Verify password + community.general.mssql_script: + login_user: "{{ account.username }}" + login_password: "{{ account.secret }}" + login_host: "{{ jms_asset.address }}" + login_port: "{{ jms_asset.port }}" + name: '{{ jms_asset.spec_info.db_name }}' + script: | + SELECT @@version + when: + - db_info is succeeded + - change_info is succeeded diff --git a/apps/accounts/automations/gather_accounts/database/mongodb/main.yml b/apps/accounts/automations/gather_accounts/database/mongodb/main.yml index fd7a296b7..b94f2be1d 100644 --- a/apps/accounts/automations/gather_accounts/database/mongodb/main.yml +++ b/apps/accounts/automations/gather_accounts/database/mongodb/main.yml @@ -10,7 +10,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" filter: users register: db_info diff --git a/apps/accounts/automations/gather_accounts/database/oracle/main.yml b/apps/accounts/automations/gather_accounts/database/oracle/main.yml index a0e20ff7b..f492583f4 100644 --- a/apps/accounts/automations/gather_accounts/database/oracle/main.yml +++ b/apps/accounts/automations/gather_accounts/database/oracle/main.yml @@ -10,7 +10,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" mode: "{{ jms_account.mode }}" filter: users register: db_info diff --git a/apps/accounts/automations/gather_accounts/database/postgresql/main.yml b/apps/accounts/automations/gather_accounts/database/postgresql/main.yml index f282b390d..c1c25c8b4 100644 --- a/apps/accounts/automations/gather_accounts/database/postgresql/main.yml +++ b/apps/accounts/automations/gather_accounts/database/postgresql/main.yml @@ -10,7 +10,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_db: "{{ jms_asset.specific.db_name }}" + login_db: "{{ jms_asset.spec_info.db_name }}" filter: "roles" register: db_info diff --git a/apps/accounts/automations/verify_account/database/mongodb/main.yml b/apps/accounts/automations/verify_account/database/mongodb/main.yml index 1cf79b694..a65eee915 100644 --- a/apps/accounts/automations/verify_account/database/mongodb/main.yml +++ b/apps/accounts/automations/verify_account/database/mongodb/main.yml @@ -10,4 +10,4 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" diff --git a/apps/accounts/automations/verify_account/database/oracle/main.yml b/apps/accounts/automations/verify_account/database/oracle/main.yml index ed4091401..12896f09a 100644 --- a/apps/accounts/automations/verify_account/database/oracle/main.yml +++ b/apps/accounts/automations/verify_account/database/oracle/main.yml @@ -10,5 +10,5 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" mode: "{{ jms_account.mode }}" diff --git a/apps/accounts/automations/verify_account/database/postgresql/main.yml b/apps/accounts/automations/verify_account/database/postgresql/main.yml index 08db4d869..cb6344b39 100644 --- a/apps/accounts/automations/verify_account/database/postgresql/main.yml +++ b/apps/accounts/automations/verify_account/database/postgresql/main.yml @@ -10,4 +10,4 @@ login_password: "{{ account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - db: "{{ jms_asset.specific.db_name }}" + db: "{{ jms_asset.spec_info.db_name }}" diff --git a/apps/accounts/automations/verify_account/database/sqlserver/main.yml b/apps/accounts/automations/verify_account/database/sqlserver/main.yml index 256803702..bb079fa59 100644 --- a/apps/accounts/automations/verify_account/database/sqlserver/main.yml +++ b/apps/accounts/automations/verify_account/database/sqlserver/main.yml @@ -10,6 +10,6 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - name: '{{ jms_asset.specific.db_name }}' + name: '{{ jms_asset.spec_info.db_name }}' script: | SELECT @@version diff --git a/apps/assets/automations/gather_facts/database/mongodb/main.yml b/apps/assets/automations/gather_facts/database/mongodb/main.yml index 37ce8bbd3..7cfe212a4 100644 --- a/apps/assets/automations/gather_facts/database/mongodb/main.yml +++ b/apps/assets/automations/gather_facts/database/mongodb/main.yml @@ -10,7 +10,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" register: db_info - name: Define info by set_fact diff --git a/apps/assets/automations/gather_facts/database/oracle/main.yml b/apps/assets/automations/gather_facts/database/oracle/main.yml index 21ab639a4..f88fc11a1 100644 --- a/apps/assets/automations/gather_facts/database/oracle/main.yml +++ b/apps/assets/automations/gather_facts/database/oracle/main.yml @@ -10,7 +10,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" mode: "{{ jms_account.mode }}" register: db_info diff --git a/apps/assets/automations/gather_facts/database/postgresql/main.yml b/apps/assets/automations/gather_facts/database/postgresql/main.yml index a3c481b48..302fe1f9d 100644 --- a/apps/assets/automations/gather_facts/database/postgresql/main.yml +++ b/apps/assets/automations/gather_facts/database/postgresql/main.yml @@ -10,7 +10,7 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_db: "{{ jms_asset.specific.db_name }}" + login_db: "{{ jms_asset.spec_info.db_name }}" register: db_info - name: Define info by set_fact diff --git a/apps/assets/automations/ping/database/mongodb/main.yml b/apps/assets/automations/ping/database/mongodb/main.yml index 867c51ace..f89c44b1e 100644 --- a/apps/assets/automations/ping/database/mongodb/main.yml +++ b/apps/assets/automations/ping/database/mongodb/main.yml @@ -10,4 +10,4 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" diff --git a/apps/assets/automations/ping/database/oracle/main.yml b/apps/assets/automations/ping/database/oracle/main.yml index fefad7148..9cc6695ac 100644 --- a/apps/assets/automations/ping/database/oracle/main.yml +++ b/apps/assets/automations/ping/database/oracle/main.yml @@ -10,5 +10,5 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_database: "{{ jms_asset.specific.db_name }}" + login_database: "{{ jms_asset.spec_info.db_name }}" mode: "{{ jms_account.mode }}" diff --git a/apps/assets/automations/ping/database/postgresql/main.yml b/apps/assets/automations/ping/database/postgresql/main.yml index e97b3946d..f48c7d4f7 100644 --- a/apps/assets/automations/ping/database/postgresql/main.yml +++ b/apps/assets/automations/ping/database/postgresql/main.yml @@ -10,4 +10,4 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - login_db: "{{ jms_asset.specific.db_name }}" + login_db: "{{ jms_asset.spec_info.db_name }}" diff --git a/apps/assets/automations/ping/database/sqlserver/main.yml b/apps/assets/automations/ping/database/sqlserver/main.yml index 839a785a5..ca242538e 100644 --- a/apps/assets/automations/ping/database/sqlserver/main.yml +++ b/apps/assets/automations/ping/database/sqlserver/main.yml @@ -10,6 +10,6 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - name: '{{ jms_asset.specific.db_name }}' + name: '{{ jms_asset.spec_info.db_name }}' script: | SELECT @@version diff --git a/apps/terminal/applets/chrome/app.py b/apps/terminal/applets/chrome/app.py index 89ae3fc3b..7d9b12c36 100644 --- a/apps/terminal/applets/chrome/app.py +++ b/apps/terminal/applets/chrome/app.py @@ -89,11 +89,11 @@ class WebAPP(object): self.extra_data = self.asset.specific self._steps = list() - autofill_type = self.asset.specific.autofill + autofill_type = self.asset.spec_info.autofill if autofill_type == "basic": self._steps = self._default_custom_steps() elif autofill_type == "script": - script_list = self.asset.specific.script + script_list = self.asset.spec_info.script steps = sorted(script_list, key=lambda step_item: step_item.step) for item in steps: val = item.value diff --git a/apps/terminal/applets/navicat/app.py b/apps/terminal/applets/navicat/app.py index 37c80f144..f7447007b 100644 --- a/apps/terminal/applets/navicat/app.py +++ b/apps/terminal/applets/navicat/app.py @@ -23,7 +23,7 @@ class AppletApplication(BaseApplication): self.privileged = self.account.privileged self.host = self.asset.address self.port = self.asset.get_protocol_port(self.protocol) - self.db = self.asset.spec.db_name + self.db = self.asset.spec_info.db_name self.name = '%s-%s' % (self.host, self.db) self.pid = None self.app = None