Changeset 59645 in vbox

Timestamp:

Feb 12, 2016 10:56:22 AM (9 years ago)

Author:

vboxsync

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

105495

Message:

webservice/vboxweb: be a bit more verbose when logging AuthResult, cosmetical fixes

File:

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

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

@@ -756 +756 @@
 }
 
+/**
+ * Helper for decoding AuthResult.
+ * @param result AuthResult
+ */
+static const char * decodeAuthResult(AuthResult result)
+{
+    switch (result)
+    {
+        case AuthResultAccessDenied:    return "access DENIED";
+        case AuthResultAccessGranted:   return "access granted";
+        case AuthResultDelegateToGuest: return "delegated to guest";
+        default:                        return "unknown AuthResult";
+    }
+}
+
 #ifdef WITH_OPENSSL
 /****************************************************************************
@@ -1800 +1815 @@
  *  otherwise.
  */
-
 int WebServiceSession::authenticate(const char *pcszUsername,
                                     const char *pcszPassword,
@@ -1849 +1863 @@
                 if (RT_FAILURE(rc))
                 {
-                    WEBDEBUG(("%s() Failed to load external authentication library. Error code: %Rrc\n", __FUNCTION__, rc));
+                    WEBDEBUG(("%s() Failed to load external authentication library '%s'. Error code: %Rrc\n",
+                              __FUNCTION__, filename.c_str(), rc));
                     break;
                 }
@@ -1855 +1870 @@
                 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));
+                    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));
+                        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));
+                            WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n",
+                                      __FUNCTION__, AUTHENTRY_NAME, rc));
                     }
                 }
@@ -1878 +1896 @@
     {
         result = pfnAuthEntry3("webservice", NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL, true, 0);
-        WEBDEBUG(("%s(): result of AuthEntry(): %d\n", __FUNCTION__, result));
+        WEBDEBUG(("%s(): result of AuthEntry(): %d (%s)\n", __FUNCTION__, result, decodeAuthResult(result)));
         if (result == AuthResultAccessGranted)
             rc = 0;
@@ -1885 +1903 @@
     {
         result = pfnAuthEntry2(NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL, true, 0);
-        WEBDEBUG(("%s(): result of VRDPAuth2(): %d\n", __FUNCTION__, result));
+        WEBDEBUG(("%s(): result of VRDPAuth2(): %d (%s)\n", __FUNCTION__, result, decodeAuthResult(result)));
         if (result == AuthResultAccessGranted)
             rc = 0;
@@ -1892 +1910 @@
     {
         result = pfnAuthEntry(NULL, AuthGuestNotAsked, pcszUsername, pcszPassword, NULL);
-        WEBDEBUG(("%s(): result of VRDPAuth(%s, [%d]): %d\n", __FUNCTION__, pcszUsername, strlen(pcszPassword), result));
+        WEBDEBUG(("%s(): result of VRDPAuth(%s, [%d]): %d (%s)\n", __FUNCTION__, pcszUsername, strlen(pcszPassword), result, decodeAuthResult(result)));
         if (result == AuthResultAccessGranted)
             rc = 0;