Changeset 30252 in vbox for trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredPoller.cpp

Timestamp:

Jun 16, 2010 1:48:29 PM (15 years ago)

Author:

vboxsync

Message:

Windows Guest Additions Credential Provider:

• Added reverse lookup for using "display names" as the user account name ("John Doe" -> "jdoe").
• Fixed showing empty user tile on invalid user/credentials.
• Fixed domain name handling.
• Fixed "dot" caption when no domain name is used.
• Wipe credentials after passing over to Kerberos.
• Beautified code a bit.

File:

• trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredPoller.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredPoller.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -57 +57 @@
     m_pProv->AddRef();
 
-    /* don't create more than one of them */
+    /* Don't create more than one of them. */
     if (m_hThreadPoller != NIL_RTTHREAD)
     {
@@ -68 +68 @@
         Log(("VBoxCredPoller: Could not init critical section! rc = %Rrc\n", rc));
 
-    /* create the poller thread */
+    /* Create the poller thread. */
     rc = RTThreadCreate(&m_hThreadPoller, VBoxCredPoller::threadPoller, this, 0, RTTHREADTYPE_INFREQUENT_POLLER,
                         RTTHREADFLAGS_WAITABLE, "creds");
@@ -90 +90 @@
     }
 
-    /* Post termination event semaphore */
+    /* Post termination event semaphore. */
     int rc = RTThreadUserSignal(m_hThreadPoller);
     if (RT_SUCCESS(rc))
     {
         Log(("VBoxCredPoller::Shutdown: Waiting for thread to terminate\n"));
-        /* wait until the thread has terminated */
+        /* Wait until the thread has terminated. */
         rc = RTThreadWait(m_hThreadPoller, RT_INDEFINITE_WAIT, NULL);
         Log(("VBoxCredPoller::Shutdown: Thread has (probably) terminated (rc = %Rrc)\n", rc));
@@ -101 +101 @@
     else
     {
-        /* failed to signal the thread - very unlikely - so no point in waiting long. */
+        /* Failed to signal the thread - very unlikely - so no point in waiting long. */
         Log(("VBoxCredPoller::Shutdown: Failed to signal semaphore, rc = %Rrc\n", rc));
         rc = RTThreadWait(m_hThreadPoller, 100, NULL);
@@ -125 +125 @@
     credentialsReset();
 
-    /* get credentials */
+    /* Get credentials. */
     RTCritSectEnter(&m_csCredUpate);
     int rc = VbglR3CredentialsRetrieve(&m_pszUser, &m_pszPw, &m_pszDomain);
     if (RT_SUCCESS(rc))
     {
-        Log(("VBoxCredPoller::credentialsRetrieve: Credentials retrieved (user=%s, pw=%s, domain=%s)\n",
+        /* NULL/free domain if it's empty (""). */
+        if (m_pszDomain && strlen(m_pszDomain) == 0)
+        {
+            RTStrFree(m_pszDomain);
+            m_pszDomain = NULL;
+        }
+
+        Log(("VBoxCredPoller::credentialsRetrieve: Credentials retrieved (User=%s, Password=%s, Domain=%s)\n",
              m_pszUser ? m_pszUser : "<empty>",
              m_pszPw ? m_pszPw : "<empty>",
-             m_pszDomain ? m_pszDomain : "<empty>"));
-
-        /* allocated but empty? delete and re-fill with default value in block below. */
-        if (strlen(m_pszDomain) == 0)
-        {
-            RTStrFree(m_pszDomain);
-            m_pszDomain = NULL;
-        }
-
-        /* if we don't have a domain specified, fill in a dot (".") specifying the
-         * local computer. */
-        if (m_pszDomain == NULL)
-        {
-            rc = RTStrAPrintf(&m_pszDomain, ".");
-            if (RT_FAILURE(rc))
-                Log(("VBoxCredPoller::credentialsRetrieve: Could not set default domain name, rc = %Rrc", rc));
-            else
-                Log(("VBoxCredPoller::credentialsRetrieve: No domain name given, set default value to: %s\n", m_pszDomain));
-        }
-    }
-
-    /* if all went fine, notify parent */
-    if (RT_SUCCESS(rc))
-    {
+             m_pszDomain ? m_pszDomain : "NULL"));
+
         AssertPtr(m_pProv);
-        m_pProv->OnCredentialsProvided(m_pszUser,
-                                       m_pszPw,
-                                       m_pszDomain);
+        m_pProv->OnCredentialsProvided();
     }
     RTCritSectLeave(&m_csCredUpate);
@@ -216 +199 @@
         if (RT_FAILURE(rc))
         {
-            if (rc == VERR_NOT_FOUND)
-                Log(("VBoxCredPoller::threadPoller: No credentials availabe.\n"));
-            else
+            if (rc != VERR_NOT_FOUND)
                 Log(("VBoxCredPoller::threadPoller: Could not retrieve credentials! rc = %Rc\n", rc));
         }
@@ -228 +209 @@
         }
 
-        /* wait a bit */
+        /* Wait a bit. */
         if (RTThreadUserWait(ThreadSelf, 500) == VINF_SUCCESS)
         {
             Log(("VBoxCredPoller::threadPoller: Terminating\n"));
-            /* we were asked to terminate, do that instantly! */
+            /* We were asked to terminate, do that instantly! */
             return 0;
         }