BUG FIX

2025-11-12 04:56:09 +08:00 · 2021-05-22 17:27:42 +08:00
parent 870cc106ba
commit 72fe535f3c
3 changed files with 173 additions and 129 deletions
--- a/resetpwd/utils.py
+++ b/resetpwd/utils.py
@@ -10,6 +10,7 @@ from django.shortcuts import render
 from django.http import HttpResponseRedirect
 import logging
 from utils.crypto_ops import Crypto
+from ldap3.core.exceptions import LDAPInvalidCredentialsResult, LDAPOperationResult, LDAPExceptionError, LDAPException

 from django.conf import settings
 from pwdselfservice import crypto_key
@@ -23,7 +24,10 @@ else:
 logger = logging.getLogger('django')


-def code_2_user_id(ops, request, msg_template, home_url, code):
+def code_2_user_info(ops, request, msg_template, home_url, code):
+    """
+    临时授权码换取userinfo
+    """
    _status, user_id = ops.get_user_id_by_code(code)
    # 判断 user_id 在本企业钉钉/微信中是否存在
    if not _status:
@@ -45,6 +49,9 @@ def code_2_user_id(ops, request, msg_template, home_url, code):


 def crypto_id_2_user_info(ops, request, msg_template, home_url, scan_app_tag):
+    """
+    能过前端提交的加密的userid来获取用户信息<userinfo>
+    """
    try:
        crypto_tmp_id = request.COOKIES.get('tmpid')
        if not crypto_tmp_id:
@@ -73,6 +80,9 @@ def crypto_id_2_user_info(ops, request, msg_template, home_url, scan_app_tag):


 def crypto_user_id_2_cookie(user_id):
+    """
+    加密userid，写入到cookie
+    """
    crypto = Crypto(crypto_key)
    # 对user_id进行加密，因为user_id基本上固定不变的，为了防止user_id泄露而导致重复使用，进行加密后再传回。
    _id_cryto = crypto.encrypt(user_id)
@@ -83,6 +93,9 @@ def crypto_user_id_2_cookie(user_id):


 def crypto_id_2_user_id(request, msg_template, home_url):
+    """
+    前端提交的加密的userid，解密出真实的userid
+    """
    try:
        crypto_tmp_id = request.COOKIES.get('tmpid')
        # 解密
@@ -100,55 +113,74 @@ def crypto_id_2_user_id(request, msg_template, home_url):


 def ops_account(ad_ops, request, msg_template, home_url, username, new_password):
-    if ad_ops.ad_ensure_user_by_account(username) is False:
-        context = {
-            'msg': "账号[%s]在AD中不存在，请确认当前钉钉扫码账号绑定的邮箱是否和您正在使用的邮箱一致？或者该账号己被禁用！\n猜测：您的账号或邮箱是否是带有数字或其它字母区分？" % username,
-            'button_click': "window.location.href='%s'" % home_url,
-            'button_display': "返回主页"
-        }
-        return render(request, msg_template, context)
+    """
+    ad 账号操作，判断账号状态，重置密码或解锁账号
+    """
+    try:
+        print("ops_account: {}" .format(username))
+        _status, _account = ad_ops.ad_ensure_user_by_account(username=username)
+        if not _status:
+            context = {
+                'msg': "账号[%s]在AD中不存在，请确认当前钉钉扫码账号绑定的邮箱是否和您正在使用的邮箱一致？或者该账号己被禁用！\n猜测：您的账号或邮箱是否是带有数字或其它字母区分？" % username,
+                'button_click': "window.location.href='%s'" % home_url,
+                'button_display': "返回主页"
+            }
+            return render(request, msg_template, context)

-    account_code = ad_ops.ad_get_user_status_by_account(username)
-    if account_code in settings.AD_ACCOUNT_DISABLE_CODE:
-        context = {
-            'msg': "此账号状态为己禁用，请联系HR确认账号是否正确。",
-            'button_click': "window.location.href='%s'" % home_url,
-            'button_display': "返回主页"
-        }
-        return render(request, msg_template, context)
+        _status, account_code = ad_ops.ad_get_user_status_by_account(username)
+        if _status and account_code in settings.AD_ACCOUNT_DISABLE_CODE:
+            context = {
+                'msg': "此账号状态为己禁用，请联系HR确认账号是否正确。",
+                'button_click': "window.location.href='%s'" % home_url,
+                'button_display': "返回主页"
+            }
+            return render(request, msg_template, context)
+        elif not _status:
+            context = {
+                'msg': "错误：{}" .format(account_code),
+                'button_click': "window.location.href='%s'" % home_url,
+                'button_display': "返回主页"
+            }
+            return render(request, msg_template, context)

-    if new_password:
-        reset_status, result = ad_ops.ad_reset_user_pwd_by_account(username=username, new_password=new_password)
-        if reset_status:
-            # 重置密码并执行一次解锁，防止重置后账号还是锁定状态。
-            unlock_status, result = ad_ops.ad_unlock_user_by_account(username)
-            if unlock_status:
+        if new_password:
+            reset_status, result = ad_ops.ad_reset_user_pwd_by_account(username=username, new_password=new_password)
+            if reset_status:
+                # 重置密码并执行一次解锁，防止重置后账号还是锁定状态。
+                unlock_status, result = ad_ops.ad_unlock_user_by_account(username)
+                if unlock_status:
+                    context = {
+                        'msg': "密码己修改/重置成功，请妥善保管。你可以点击返回主页或直接关闭此页面！",
+                        'button_click': "window.location.href='%s'" % home_url,
+                        'button_display': "返回主页"
+                    }
+                    return render(request, msg_template, context)
+            else:
                context = {
-                    'msg': "密码己修改/重置成功，请妥善保管。你可以点击返回主页或直接关闭此页面！",
+                    'msg': "密码未修改/重置成功，错误信息：{}".format(result),
                    'button_click': "window.location.href='%s'" % home_url,
                    'button_display': "返回主页"
                }
                return render(request, msg_template, context)
        else:
-            context = {
-                'msg': "密码未修改/重置成功，错误信息：{}".format(result),
-                'button_click': "window.location.href='%s'" % home_url,
-                'button_display': "返回主页"
-            }
-            return render(request, msg_template, context)
-    else:
-        unlock_status, result = ad_ops.ad_unlock_user_by_account(username)
-        if unlock_status:
-            context = {
-                'msg': "账号己解锁成功。你可以点击返回主页或直接关闭此页面！",
-                'button_click': "window.location.href='%s'" % home_url,
-                'button_display': "返回主页"
-            }
-            return render(request, msg_template, context)
-        else:
-            context = {
-                'msg': "账号未能解锁，错误信息：{}".format(result),
-                'button_click': "window.location.href='%s'" % home_url,
-                'button_display': "返回主页"
-            }
-            return render(request, msg_template, context)
+            unlock_status, result = ad_ops.ad_unlock_user_by_account(username)
+            if unlock_status:
+                context = {
+                    'msg': "账号己解锁成功。你可以点击返回主页或直接关闭此页面！",
+                    'button_click': "window.location.href='%s'" % home_url,
+                    'button_display': "返回主页"
+                }
+                return render(request, msg_template, context)
+            else:
+                context = {
+                    'msg': "账号未能解锁，错误信息：{}".format(result),
+                    'button_click': "window.location.href='%s'" % home_url,
+                    'button_display': "返回主页"
+                }
+                return render(request, msg_template, context)
+    except LDAPInvalidCredentialsResult as lic_e:
+        raise LDAPOperationResult("LDAPInvalidCredentialsResult: " + str(lic_e.message))
+    except LDAPOperationResult as lo_e:
+        raise LDAPOperationResult("LDAPOperationResult: " + str(lo_e.message))
+    except LDAPException as l_e:
+        raise LDAPException("LDAPException: " + str(l_e))