Changeset 59650 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 12, 2016 11:49:57 AM (9 years ago)

Author:

vboxsync

Message:

webservice: cleanup

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (1 diff)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -1891 +1891 @@
     }
 
-    rc = VERR_WEB_NOT_AUTHENTICATED;
-    AuthResult result;
-    if (pfnAuthEntry3)
-    {
-        result = pfnAuthEntry3("webservice", NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL, true, 0);
-        WEBDEBUG(("%s(): result of AuthEntry(): %d (%s)\n", __FUNCTION__, result, decodeAuthResult(result)));
+    if (pfnAuthEntry3 || pfnAuthEntry2 || pfnAuthEntry)
+    {
+        const char *pszFn;
+        AuthResult result;
+        if (pfnAuthEntry3)
+        {
+            result = pfnAuthEntry3("webservice", NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL, true, 0);
+            pszFn = AUTHENTRY3_NAME;
+        }
+        else if (pfnAuthEntry2)
+        {
+            result = pfnAuthEntry2(NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL, true, 0);
+            pszFn = AUTHENTRY2_NAME;
+        else
+        {
+            result = pfnAuthEntry(NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL);
+            pszFn = AUTHENTRY_NAME;
+        }
+        WEBDEBUG(("%s(): result of %s(%s, [%d]): %d (%s)\n",
+                  __FUNCTION__, pszFn, pcszUsername, strlen(pcszPassword), result, decodeAuthResult(result)));
         if (result == AuthResultAccessGranted)
-            rc = 0;
-    }
-    else if (pfnAuthEntry2)
-    {
-        result = pfnAuthEntry2(NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL, true, 0);
-        WEBDEBUG(("%s(): result of VRDPAuth2(): %d (%s)\n", __FUNCTION__, result, decodeAuthResult(result)));
-        if (result == AuthResultAccessGranted)
-            rc = 0;
-    }
-    else if (pfnAuthEntry)
-    {
-        result = pfnAuthEntry(NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL);
-        WEBDEBUG(("%s(): result of VRDPAuth(%s, [%d]): %d (%s)\n", __FUNCTION__, pcszUsername, strlen(pcszPassword), result, decodeAuthResult(result)));
-        if (result == AuthResultAccessGranted)
-            rc = 0;
+        {
+            WebLog(("Access of '%s' granted\n", pcszUsername));
+            rc = VINF_SUCCESS;
+        }
+        else
+        {
+            if (result == AuthResultAccessDenied)
+                WebLog(("Access of '%s' denied\n", pcszUsername));
+            rc = VERR_WEB_NOT_AUTHENTICATED;
+        }
     }
     else if (fAuthLibLoaded)
-        // fAuthLibLoaded = true but both pointers are NULL:
-        // then the authlib was "null" and auth was disabled
-        rc = 0;
+    {
+        // fAuthLibLoaded = true but all pointers are NULL:
+        // The authlib was "null" and auth was disabled
+        rc = VINF_SUCCESS;
+    }
     else
     {
         WEBDEBUG(("Could not resolve AuthEntry, VRDPAuth2 or VRDPAuth entry point"));
+        rc = VERR_WEB_NOT_AUTHENTICATED;
     }