Changeset 67814 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 6, 2017 8:37:31 AM (7 years ago)

Author:

vboxsync

Message:

Additions/VBoxCredProv: Also try to return the current values in VBoxCredProvProvider::GetFieldDescriptorAt() (except passwords), as Windows 10 also uses those values for the new logon UI.

Location:

trunk/src/VBox/Additions/WINNT/VBoxCredProv

Files:

• VBoxCredProvCredential.cpp (modified) (1 diff)
• VBoxCredProvCredential.h (modified) (1 diff)
• VBoxCredProvProvider.cpp (modified) (2 diffs)

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

@@ -385 +385 @@
 
     return S_OK;
+}
+
+
+/**
+ * Returns the current value of a specific credential provider field.
+ *
+ * @return  Pointer (const) to the credential provider field requested, or NULL if not found / invalid.
+ * @param   dwFieldID           Field ID of the credential provider field to get.
+ */
+PCRTUTF16 VBoxCredProvCredential::getField(DWORD dwFieldID)
+{
+    if (dwFieldID >= VBOXCREDPROV_NUM_FIELDS)
+        return NULL;
+
+    /* Paranoia: Don't ever reveal passwords. */
+    if (dwFieldID == VBOXCREDPROV_FIELDID_PASSWORD)
+        return NULL;
+
+    return m_apwszFields[dwFieldID];
 }
 

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvCredential.h

@@ -87 +87 @@
     /** @} */
 
+    PCRTUTF16 getField(DWORD dwFieldID);
     HRESULT setField(DWORD dwFieldID, const PRTUTF16 pcwszString, bool fNotifyUI);
     HRESULT Reset(void);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012-2016 Oracle Corporation
+ * Copyright (C) 2012-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -417 +417 @@
             pcpFieldDesc->dwFieldID     = field.desc.dwFieldID;
             pcpFieldDesc->cpft          = field.desc.cpft;
-            if (field.desc.pszLabel)
-            {
-                hr = SHStrDupW(field.desc.pszLabel, &pcpFieldDesc->pszLabel);
-
-                VBoxCredProvVerbose(0, "VBoxCredProv::GetFieldDescriptorAt: dwIndex=%ld, pszLabel=%ls\n",
-                                    dwIndex,
+
+            PCRTUTF16 pcwszField = NULL;
+
+            if (dwIndex != VBOXCREDPROV_FIELDID_PASSWORD) /* Don't ever get any password. Never ever, ever. */
+            {
+                if (m_pCred) /* If we have retrieved credentials, get the actual (current) value. */
+                    pcwszField = m_pCred->getField(dwIndex);
+                else /* Otherwise get the default value. */
+                    pcwszField = field.desc.pszLabel;
+            }
+
+            hr = SHStrDupW(pcwszField ? pcwszField : L"", &pcpFieldDesc->pszLabel);
+
+            VBoxCredProvVerbose(0, "VBoxCredProv::GetFieldDescriptorAt: dwIndex=%ld, pszLabel=%ls, hr=0x%08x\n",
+                                dwIndex,
 #ifdef DEBUG /* Don't show any (sensitive data) in release mode. */
-                                    field.desc.pszLabel);
+                                pcwszField ? pcwszField : L"",
 #else
-                                    L"XXX");
+                                L"XXX",
 #endif
-            }
+                                hr);
+
             pcpFieldDesc->guidFieldType = field.desc.guidFieldType;
         }