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

fix: async sms task params can json

pull/13766/head
jiangweidong 2024-07-12 18:34:34 +08:00 committed by Bryan
parent 370e959400
commit 223eb8ad38
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/sdk/sms/custom.py
View File

@ -39,8 +39,7 @@ class CustomSMS(BaseSMSClient):
kwargs = {'params': params} kwargs = {'params': params}
try: try:
response = action(url=settings.CUSTOM_SMS_URL, verify=False, **kwargs) response = action(url=settings.CUSTOM_SMS_URL, verify=False, **kwargs)
if response.reason != 'OK': response.raise_for_status()
raise JMSException(detail=response.text, code=response.status_code)
except Exception as exc: except Exception as exc:
logger.error('Custom sms error: {}'.format(exc)) logger.error('Custom sms error: {}'.format(exc))
raise JMSException(exc) raise JMSException(exc)

20
apps/common/utils/verify_code.py
View File

@ -13,9 +13,9 @@ from common.utils.random import random_string
logger = get_logger(__file__) logger = get_logger(__file__)
@shared_task(verbose_name=_('Send email')) @shared_task(verbose_name=_('Send SMS code'))
def send_async(sender): def send_sms_async(target, code):
sender.gen_and_send() SMS().send_verify_code(target, code)
class SendAndVerifyCodeUtil(object): class SendAndVerifyCodeUtil(object):
@ -35,7 +35,7 @@ class SendAndVerifyCodeUtil(object):
logger.warning('Send sms too frequently, delay {}'.format(ttl)) logger.warning('Send sms too frequently, delay {}'.format(ttl))
raise CodeSendTooFrequently(ttl) raise CodeSendTooFrequently(ttl)
return send_async.apply_async(kwargs={"sender": self}, priority=100) return self.gen_and_send()
def gen_and_send(self): def gen_and_send(self):
try: try:
@ -72,13 +72,15 @@ class SendAndVerifyCodeUtil(object):
return code return code
def __send_with_sms(self): def __send_with_sms(self):
sms = SMS() send_sms_async.apply_async(args=(self.target, self.code), priority=100)
sms.send_verify_code(self.target, self.code)
def __send_with_email(self): def __send_with_email(self):
subject = self.other_args.get('subject') subject = self.other_args.get('subject', '')
message = self.other_args.get('message') message = self.other_args.get('message', '')
send_mail_async(subject, message, [self.target], html_message=message) send_mail_async.apply_async(
args=(subject, message, [self.target]),
kwargs={'html_message': message}, priority=100
)
def __send(self, code): def __send(self, code):
""" """

2
apps/ops/signal_handlers.py
View File

@ -60,7 +60,7 @@ def check_registered_tasks(*args, **kwargs):
'perms.tasks.check_asset_permission_will_expired', 'perms.tasks.check_asset_permission_will_expired',
'ops.tasks.create_or_update_registered_periodic_tasks', 'perms.tasks.check_asset_permission_expired', 'ops.tasks.create_or_update_registered_periodic_tasks', 'perms.tasks.check_asset_permission_expired',
'settings.tasks.ldap.import_ldap_user_periodic', 'users.tasks.check_password_expired_periodic', 'settings.tasks.ldap.import_ldap_user_periodic', 'users.tasks.check_password_expired_periodic',
'common.utils.verify_code.send_async', 'assets.tasks.nodes_amount.check_node_assets_amount_period_task', 'common.utils.verify_code.send_sms_async', 'assets.tasks.nodes_amount.check_node_assets_amount_period_task',
'users.tasks.check_user_expired', 'orgs.tasks.refresh_org_cache_task', 'users.tasks.check_user_expired', 'orgs.tasks.refresh_org_cache_task',
'terminal.tasks.upload_session_replay_to_external_storage', 'terminal.tasks.clean_orphan_session', 'terminal.tasks.upload_session_replay_to_external_storage', 'terminal.tasks.clean_orphan_session',
'audits.tasks.clean_audits_log_period', 'authentication.tasks.clean_django_sessions' 'audits.tasks.clean_audits_log_period', 'authentication.tasks.clean_django_sessions'