orc: - - Права доступа в случае незаявленного пользователя (Hotfix)

- - Возможность авторизации в формате login@domain

Sources/pyOpenRPA/Orchestrator/Server.py

@@ -79,29 +79,41 @@ def IdentifyAuthorize(inRequest:Request, inResponse:Response,
             if "\\" in lUser:
                 lDomain = lUser.split("\\")[0]
                 lUser = lUser.split("\\")[1]
+            elif "@" in lUser:
+                lDomain = lUser.split("@")[1]
+                lUser = lUser.split("@")[0]
             lLogonBool = __Orchestrator__.OSCredentialsVerify(inUserStr=lUser, inPasswordStr=lPassword, inDomainStr=lDomain)
             #Check result
-            if lLogonBool:
-                lResult["Domain"] = lDomain
-                lResult["User"] = lUser
-                #Create token
-                lAuthToken=str(uuid.uuid1())
-                __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken] = {}
-                __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken]["Domain"] = lResult["Domain"]
-                __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken]["User"] = lResult["User"]
-                __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken]["FlagDoNotExpire"] = False
-                __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken]["TokenDatetime"] = datetime.datetime.now()
-                #Set-cookie
-                inResponse.set_cookie(key="AuthToken",value=lAuthToken)
-                mOpenRPA={}
-                mOpenRPA["AuthToken"] = lAuthToken
-                mOpenRPA["Domain"] = lResult["Domain"]
-                mOpenRPA["User"] = lResult["User"]
-                mOpenRPA["IsSuperToken"] = __Orchestrator__.GSettingsGet().get("ServerDict", {}).get("AccessUsers", {}).get("AuthTokensDict", {}).get(mOpenRPA["AuthToken"], {}).get("FlagDoNotExpire", False)
-                return lAuthToken
-                #inRequest.OpenRPASetCookie = {}
-                #New engine of server
-                #inRequest.OpenRPAResponseDict["SetCookies"]["AuthToken"] = lAuthToken
+            if lLogonBool: # check user in gsettings rules
+                lLogonBool = False
+                gSettings = __Orchestrator__.GSettingsGet()  # Set the global settings
+                lUserTurple = (lDomain.upper(),lUser.upper()) # Create turple key for inGSettings["ServerDict"]["AccessUsers"]["RuleDomainUserDict"]
+                lUserTurple2 = ("",lUser.upper()) # Create turple key for inGSettings["ServerDict"]["AccessUsers"]["RuleDomainUserDict"]
+                if lUserTurple in gSettings.get("ServerDict",{}).get("AccessUsers", {}).get("RuleDomainUserDict", {}): lLogonBool = True
+                elif lUserTurple2 in gSettings.get("ServerDict",{}).get("AccessUsers", {}).get("RuleDomainUserDict", {}): lLogonBool = True
+                if lLogonBool: # If user exists in UAC Dict
+                    lResult["Domain"] = lDomain
+                    lResult["User"] = lUser
+                    #Create token
+                    lAuthToken=str(uuid.uuid1())
+                    __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken] = {}
+                    __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken]["Domain"] = lResult["Domain"]
+                    __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken]["User"] = lResult["User"]
+                    __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken]["FlagDoNotExpire"] = False
+                    __Orchestrator__.GSettingsGet()["ServerDict"]["AccessUsers"]["AuthTokensDict"][lAuthToken]["TokenDatetime"] = datetime.datetime.now()
+                    #Set-cookie
+                    inResponse.set_cookie(key="AuthToken",value=lAuthToken)
+                    mOpenRPA={}
+                    mOpenRPA["AuthToken"] = lAuthToken
+                    mOpenRPA["Domain"] = lResult["Domain"]
+                    mOpenRPA["User"] = lResult["User"]
+                    mOpenRPA["IsSuperToken"] = __Orchestrator__.GSettingsGet().get("ServerDict", {}).get("AccessUsers", {}).get("AuthTokensDict", {}).get(mOpenRPA["AuthToken"], {}).get("FlagDoNotExpire", False)
+                    return lAuthToken
+                    #inRequest.OpenRPASetCookie = {}
+                    #New engine of server
+                    #inRequest.OpenRPAResponseDict["SetCookies"]["AuthToken"] = lAuthToken
+                else:
+                    raise HTTPException(status_code=401, detail="Попытка авторизации не прошла успешно (для пользователя не заявлен доступ к оркестратору pyOpenRPA. Обратитесь в техническую поддержку)", headers={})
             else:
                 raise HTTPException(status_code=401, detail="Попытка авторизации не прошла успешно (неверная пара логин / пароль)", headers={})
         ######################################
@@ -111,6 +123,7 @@ def IdentifyAuthorize(inRequest:Request, inResponse:Response,
 
 
 
+
 lRouteList =[]
 for lItem in app.router.routes:
     lRouteList.append(lItem)

Sources/pyOpenRPA/Orchestrator/ServerSettings.py

@@ -148,7 +148,7 @@ async def pyOpenRPA_ServerData(inRequest: Request, inAuthTokenStr:str=Depends(Id
             "CPDict": HiddenCPDictGenerate(inAuthTokenStr=inAuthTokenStr),
             "RDPDict": HiddenRDPDictGenerate(inAuthTokenStr=inAuthTokenStr),
             "AgentDict": HiddenAgentDictGenerate(inAuthTokenStr=inAuthTokenStr),
-            "UserDict": {"UACClientDict": {}, "CWDPathStr": os.getcwd(), "VersionStr": inGSettings["VersionStr"]},
+            "UserDict": {"UACClientDict": __Orchestrator__.WebUserUACHierarchyGet(inAuthTokenStr=inAuthTokenStr), "CWDPathStr": os.getcwd(), "VersionStr": inGSettings["VersionStr"]},
         }
         # Create JSON
         lServerDataDictJSONStr = json.dumps(lServerDataDict)