Changeset 34558 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

Dec 1, 2010 10:56:44 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68349

Message:

Updated VBox authentication library interface, removed references to VRDP.

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (4 diffs)

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

@@ -1131 +1131 @@
 
     static bool fAuthLibLoaded = false;
-    static PVRDPAUTHENTRY pfnAuthEntry = NULL;
-    static PVRDPAUTHENTRY2 pfnAuthEntry2 = NULL;
+    static PAUTHENTRY pfnAuthEntry = NULL;
+    static PAUTHENTRY2 pfnAuthEntry2 = NULL;
+    static PAUTHENTRY3 pfnAuthEntry3 = NULL;
 
     if (!fAuthLibLoaded)
@@ -1161 +1162 @@
                 }
 
-                if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, "VRDPAuth2", (void**)&pfnAuthEntry2)))
-                    WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, "VRDPAuth2", rc));
-
-                if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, "VRDPAuth", (void**)&pfnAuthEntry)))
-                    WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, "VRDPAuth", rc));
-
-                if (pfnAuthEntry || pfnAuthEntry2)
+                if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY3_NAME, (void**)&pfnAuthEntry3)))
+                    WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, AUTHENTRY3_NAME, rc));
+
+                if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY2_NAME, (void**)&pfnAuthEntry2)))
+                    WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, AUTHENTRY2_NAME, rc));
+
+                if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY_NAME, (void**)&pfnAuthEntry)))
+                    WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, AUTHENTRY_NAME, rc));
+
+                if (pfnAuthEntry || pfnAuthEntry2 || pfnAuthEntry3)
                     fAuthLibLoaded = true;
 
@@ -1175 +1179 @@
 
     rc = VERR_WEB_NOT_AUTHENTICATED;
-    VRDPAuthResult result;
-    if (pfnAuthEntry2)
-    {
-        result = pfnAuthEntry2(NULL, VRDPAuthGuestNotAsked, pcszUsername, pcszPassword, NULL, true, 0);
+    AuthResult result;
+    if (pfnAuthEntry3)
+    {
+        result = pfnAuthEntry3("webservice", NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL, true, 0);
+        WEBDEBUG(("%s(): result of AuthEntry(): %d\n", __FUNCTION__, result));
+        if (result == AuthResultAccessGranted)
+            rc = 0;
+    }
+    else if (pfnAuthEntry2)
+    {
+        result = pfnAuthEntry2(NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL, true, 0);
         WEBDEBUG(("%s(): result of VRDPAuth2(): %d\n", __FUNCTION__, result));
-        if (result == VRDPAuthAccessGranted)
+        if (result == AuthResultAccessGranted)
             rc = 0;
     }
     else if (pfnAuthEntry)
     {
-        result = pfnAuthEntry(NULL, VRDPAuthGuestNotAsked, pcszUsername, pcszPassword, NULL);
+        result = pfnAuthEntry(NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL);
         WEBDEBUG(("%s(): result of VRDPAuth(%s, [%d]): %d\n", __FUNCTION__, pcszUsername, strlen(pcszPassword), result));
-        if (result == VRDPAuthAccessGranted)
+        if (result == AuthResultAccessGranted)
             rc = 0;
     }
@@ -1196 +1207 @@
     else
     {
-        WEBDEBUG(("Could not resolve VRDPAuth2 or VRDPAuth entry point"));
+        WEBDEBUG(("Could not resolve AuthEntry, VRDPAuth2 or VRDPAuth entry point"));
     }