mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-08 02:39:22 +00:00
merge: with pam (#14911)
* perf: change i18n
* perf: pam
* perf: change translate
* perf: add check account
* perf: add date field
* perf: add account filter
* perf: remove some js
* perf: add account status action
* perf: update pam
* perf: 修改 discover account
* perf: update filter
* perf: update gathered account
* perf: 修改账号同步
* perf: squash migrations
* perf: update pam
* perf: change i18n
* perf: update account risk
* perf: 更新风险发现
* perf: remove css
* perf: Admin connection token
* perf: Add a switch to check connectivity after changing the password, and add a custom ssh command for push tasks
* perf: Modify account migration files
* perf: update pam
* perf: remove to check account dir
* perf: Admin connection token
* perf: update check account
* perf: 优化发送结果
* perf: update pam
* perf: update bulk update create
* perf: prepaire using thread timer for bulk_create_decorator
* perf: update bulk create decorator
* perf: 优化 playbook manager
* perf: 优化收集账号的报表
* perf: Update poetry
* perf: Update Dockerfile with new base image tag
* fix: Account migrate 0012 file
* perf: 修改备份
* perf: update pam
* fix: Expand resource_type filter to include raw type
* feat: PAM Service (#14552)
* feat: PAM Service
* perf: import package name
---------
Co-authored-by: jiangweidong <1053570670@qq.com>
* perf: Change secret dashboard (#14551)
Co-authored-by: feng <1304903146@qq.com>
* perf: update migrations
* perf: 修改支持 pam
* perf: Change secret record table dashboard
* perf: update status
* fix: Automation send report
* perf: Change secret report
* feat: windows accounts gather
* perf: update change status
* perf: Account backup
* perf: Account backup report
* perf: Account migrate
* perf: update service to application
* perf: update migrations
* perf: update logo
* feat: oracle accounts gather (#14571)
* feat: oracle accounts gather
* feat: sqlserver accounts gather
* feat: postgresql accounts gather
* feat: mysql accounts gather
---------
Co-authored-by: wangruidong <940853815@qq.com>
* feat: mongodb accounts gather
* perf: Change secret
* perf: Migrate
* perf: Merge conflicting migration files
* perf: Change secret
* perf: Automation filter org
* perf: Account push
* perf: Random secret string
* perf: Enhance SQL query and update risk handling in accounts
* perf: Ticket filter assignee_id
* perf: 修改 account remote
* perf: 修改一些 adhoc 任务
* perf: Change secret
* perf: Remove push account extra api
* perf: update status
* perf: The entire organization can view activity log
* fix: risk field check
* perf: add account details api
* perf: add demo mode
* perf: Delete gather_account
* perf: Perfect solution to account version problem
* perf: Update status action to handle multiple accounts
* perf: Add GatherAccountDetailField and update serializers
* perf: Display account history in combination with password change records
* perf: Lina translate
* fix: Update mysql_filter to handle nested user info
* perf: Admin connection token validate_permission account
* perf: copy move account
* perf: account filter risk
* perf: account risk filter
* perf: Copy move account failed message
* fix: gather account sync account to asset
* perf: Pam dashboard
* perf: Account dashboard total accounts
* perf: Pam dashboard
* perf: Change secret filter account secret_reset
* perf: 修改 risk filter
* perf: pam translate
* feat: Check for leaked duplicate passwords. (#14711)
* feat: Check for leaked duplicate passwords.
* perf: Use SQLite instead of txt as leak password database
---------
Co-authored-by: jiangweidong <1053570670@qq.com>
Co-authored-by: 老广 <ibuler@qq.com>
* perf: merge with remote
* perf: Add risk change_password_add handle
* perf: Pam dashboard
* perf: check account manager import
* perf: 重构扫描
* perf: 修改 db
* perf: Gather account manager
* perf: update change db lib
* perf: dashboard
* perf: Account gather
* perf: 修改 asset get queryset
* perf: automation report
* perf: Pam account
* perf: Pam dashboard api
* perf: risk add account
* perf: 修改 risk check
* perf: Risk account
* perf: update risk add reopen action
* perf: add pylintrc
* Revert "perf: automation report"
This reverts commit 22aee54207
.
* perf: check account engine
* perf: Perf: Optimism Gather Report Style
* Perf: Remove unuser actions
* Perf: Perf push account
* perf: perf gather account
* perf: Automation report
* perf: Push account recorder
* perf: Push account record
* perf: Pam dashboard
* perf: perf
* perf: update intergration
* perf: integrations application detail add account tab page
* feat: Custom change password supports configuration of interactive items
* perf: Go and Python demo code
* perf: Custom secret change
* perf: add user filter
* perf: translate
* perf: Add demo code docs
* perf: update some i18n
* perf: update some i18n
* perf: Add Java, Node, Go, and cURL demo code
* perf: Translate
* perf: Change secret translate
* perf: Translate
* perf: update some i18n
* perf: translate
* perf: Ansible playbook
* perf: update some choice
* perf: update some choice
* perf: update account serializer remote unused code
* perf: conflict
* perf: update import
---------
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: wangruidong <940853815@qq.com>
Co-authored-by: jiangweidong <1053570670@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
Co-authored-by: zhaojisen <1301338853@qq.com>
This commit is contained in:
@@ -7,14 +7,44 @@ __metaclass__ = type
|
||||
DOCUMENTATION = '''
|
||||
---
|
||||
module: custom_rdp_ping
|
||||
short_description: Use rdp to probe whether an asset is connectable
|
||||
short_description: Use RDP to probe whether an asset is connectable.
|
||||
description:
|
||||
- Use rdp to probe whether an asset is connectable
|
||||
- Use RDP to probe whether an asset is connectable.
|
||||
options:
|
||||
login_host:
|
||||
description: Target host to connect.
|
||||
type: str
|
||||
required: False
|
||||
default: localhost
|
||||
login_port:
|
||||
description: Target port to connect.
|
||||
type: int
|
||||
required: False
|
||||
default: 22
|
||||
login_user:
|
||||
description: Login user for the connection.
|
||||
type: str
|
||||
required: False
|
||||
default: root
|
||||
login_password:
|
||||
description: Login password.
|
||||
type: str
|
||||
required: False
|
||||
no_log: True
|
||||
login_secret_type:
|
||||
description: Authentication method.
|
||||
type: str
|
||||
required: False
|
||||
default: password
|
||||
gateway_args:
|
||||
description: Arguments for setting up an SSH tunnel.
|
||||
type: dict
|
||||
required: False
|
||||
default: null
|
||||
'''
|
||||
|
||||
EXAMPLES = '''
|
||||
- name: >
|
||||
Ping asset server.
|
||||
- name: Ping asset server using RDP.
|
||||
custom_rdp_ping:
|
||||
login_host: 127.0.0.1
|
||||
login_port: 3389
|
||||
@@ -24,12 +54,12 @@ EXAMPLES = '''
|
||||
|
||||
RETURN = '''
|
||||
is_available:
|
||||
description: Windows server availability.
|
||||
description: Indicates if the Windows asset is available.
|
||||
returned: always
|
||||
type: bool
|
||||
sample: true
|
||||
conn_err_msg:
|
||||
description: Connection error message.
|
||||
description: Connection error message (if any).
|
||||
returned: always
|
||||
type: str
|
||||
sample: ''
|
||||
@@ -41,11 +71,6 @@ from sshtunnel import SSHTunnelForwarder
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
|
||||
|
||||
# =========================================
|
||||
# Module execution.
|
||||
#
|
||||
|
||||
|
||||
def common_argument_spec():
|
||||
options = dict(
|
||||
login_host=dict(type='str', required=False, default='localhost'),
|
||||
@@ -67,13 +92,12 @@ class RDPConnectionManager:
|
||||
self.result_queue = multiprocessing.Queue()
|
||||
|
||||
def build_connection_details(self):
|
||||
connection_details = {
|
||||
return {
|
||||
'hostname': self.params['login_host'],
|
||||
'port': self.params['login_port'],
|
||||
'username': self.params['login_user'],
|
||||
'password': self.params['login_password']
|
||||
}
|
||||
return connection_details
|
||||
|
||||
def setup_ssh_tunnel(self):
|
||||
gateway_args = self.params['gateway_args'] or {}
|
||||
@@ -90,8 +114,8 @@ class RDPConnectionManager:
|
||||
self.connection_details['port']
|
||||
)
|
||||
)
|
||||
|
||||
tunnel.start()
|
||||
|
||||
self.connection_details['hostname'] = '127.0.0.1'
|
||||
self.connection_details['port'] = tunnel.local_bind_port
|
||||
self.ssh_tunnel = tunnel
|
||||
@@ -107,13 +131,23 @@ class RDPConnectionManager:
|
||||
self.close_ssh_tunnel()
|
||||
|
||||
def check_rdp_connectivity(self):
|
||||
connect_params = list(self.connection_details.values()) + ['', 0]
|
||||
is_reachable = pyfreerdp.check_connectivity(*connect_params)
|
||||
connect_params = [
|
||||
self.connection_details['hostname'],
|
||||
self.connection_details['port'],
|
||||
self.connection_details['username'],
|
||||
self.connection_details['password'],
|
||||
'', # extra parameter (if needed)
|
||||
0 # timeout (if needed)
|
||||
]
|
||||
try:
|
||||
is_reachable = pyfreerdp.check_connectivity(*connect_params)
|
||||
except Exception as ex:
|
||||
is_reachable = False
|
||||
self.result_queue.put(is_reachable)
|
||||
|
||||
def attempt_connection(self):
|
||||
if self.params['login_secret_type'] != 'password':
|
||||
error_message = f'unsupported authentication method: {self.params["login_secret_type"]}'
|
||||
error_message = f"Unsupported authentication method: {self.params['login_secret_type']}"
|
||||
return False, error_message
|
||||
|
||||
try:
|
||||
@@ -138,17 +172,21 @@ class RDPConnectionManager:
|
||||
def main():
|
||||
argument_spec = common_argument_spec()
|
||||
module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
|
||||
result = {'changed': False}
|
||||
module_params = module.params
|
||||
rdp_manager = RDPConnectionManager(module_params)
|
||||
rdp_manager = RDPConnectionManager(module.params)
|
||||
is_available, error_message = rdp_manager.attempt_connection()
|
||||
result['is_available'] = is_available
|
||||
|
||||
# Prepare the result structure.
|
||||
result = {
|
||||
'changed': False,
|
||||
'is_available': is_available,
|
||||
'conn_err_msg': error_message
|
||||
}
|
||||
|
||||
if not is_available:
|
||||
module.fail_json(msg=f'Unable to connect to asset: {error_message}')
|
||||
|
||||
return module.exit_json(**result)
|
||||
module.fail_json(msg=f"Unable to connect to asset: {error_message}", **result)
|
||||
else:
|
||||
module.exit_json(**result)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
main()
|
||||
|
Reference in New Issue
Block a user