Merge pull request #10349 from birarda/machine-guid-fingerprint

use MachineGuid for slightly safer windows machine fingerprint

libraries/networking/src/FingerprintUtils.cpp

@@ -19,8 +19,8 @@
 #include <DependencyManager.h>
 
 #ifdef Q_OS_WIN
-#include <comdef.h>
+#include <Windows.h>
-#include <Wbemidl.h>
+#include <winreg.h>
 #endif //Q_OS_WIN
 
 #ifdef Q_OS_MAC
@@ -30,6 +30,9 @@
 #endif //Q_OS_MAC
 
 static const QString FALLBACK_FINGERPRINT_KEY = "fallbackFingerprint";
+
+QUuid FingerprintUtils::_machineFingerprint { QUuid() };
+
 QString FingerprintUtils::getMachineFingerprintString() {
     QString uuidString;
 #ifdef Q_OS_LINUX
@@ -47,122 +50,32 @@ QString FingerprintUtils::getMachineFingerprintString() {
 #endif //Q_OS_MAC
 
 #ifdef Q_OS_WIN
-    HRESULT hres;
+    HKEY cryptoKey;
-    IWbemLocator *pLoc = NULL;
     
-    // initialize com.  Interface already does, but other
+    // try and open the key that contains the machine GUID
-    // users of this lib don't necessarily do so.
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Cryptography", 0, KEY_READ, &cryptoKey) == ERROR_SUCCESS) {
-    hres = CoInitializeEx(0, COINIT_MULTITHREADED);
+        DWORD type;
-    if (FAILED(hres)) {
+        DWORD guidSize;
-        qCDebug(networking) << "Failed to initialize COM library!";
-        return uuidString;
-    }
 
-    // initialize WbemLocator
+        const char* MACHINE_GUID_KEY = "MachineGuid";
-    hres = CoCreateInstance(
-            CLSID_WbemLocator,             
-            0, 
-            CLSCTX_INPROC_SERVER, 
-            IID_IWbemLocator, (LPVOID *) &pLoc);
 
-    if (FAILED(hres)) {
+        // try and retrieve the size of the GUID value
-        qCDebug(networking) << "Failed to initialize WbemLocator";
+        if (RegQueryValueEx(cryptoKey, MACHINE_GUID_KEY, NULL, &type, NULL, &guidSize) == ERROR_SUCCESS) {
-        return uuidString;
+            // make sure that the value is a string
-    }
+            if (type == REG_SZ) {
+                // retrieve the machine GUID and return that as our UUID string
+                std::string machineGUID(guidSize / sizeof(char), '\0');
 
-    // Connect to WMI through the IWbemLocator::ConnectServer method
+                if (RegQueryValueEx(cryptoKey, MACHINE_GUID_KEY, NULL, NULL,
-    IWbemServices *pSvc = NULL;
+                                    reinterpret_cast<LPBYTE>(&machineGUID[0]), &guidSize) == ERROR_SUCCESS) {
-
+                    uuidString = QString::fromStdString(machineGUID);
-    // Connect to the root\cimv2 namespace with
-    // the current user and obtain pointer pSvc
-    // to make IWbemServices calls.
-    hres = pLoc->ConnectServer(
-         _bstr_t(L"ROOT\\CIMV2"), // Object path of WMI namespace
-         NULL,                    // User name. NULL = current user
-         NULL,                    // User password. NULL = current
-         0,                       // Locale. NULL indicates current
-         NULL,                    // Security flags.
-         0,                       // Authority (for example, Kerberos)
-         0,                       // Context object 
-         &pSvc                    // pointer to IWbemServices proxy
-         );
-
-    if (FAILED(hres)) {
-        pLoc->Release();
-        qCDebug(networking) << "Failed to connect to WMI";
-        return uuidString;
-    }
-    
-    // Set security levels on the proxy
-    hres = CoSetProxyBlanket(
-       pSvc,                        // Indicates the proxy to set
-       RPC_C_AUTHN_WINNT,           // RPC_C_AUTHN_xxx
-       RPC_C_AUTHZ_NONE,            // RPC_C_AUTHZ_xxx
-       NULL,                        // Server principal name 
-       RPC_C_AUTHN_LEVEL_CALL,      // RPC_C_AUTHN_LEVEL_xxx 
-       RPC_C_IMP_LEVEL_IMPERSONATE, // RPC_C_IMP_LEVEL_xxx
-       NULL,                        // client identity
-       EOAC_NONE                    // proxy capabilities 
-    );
-
-    if (FAILED(hres)) {
-        pSvc->Release();
-        pLoc->Release();     
-        qCDebug(networking) << "Failed to set security on proxy blanket";
-        return uuidString;
-    }
-    
-    // Use the IWbemServices pointer to grab the Win32_BIOS stuff
-    IEnumWbemClassObject* pEnumerator = NULL;
-    hres = pSvc->ExecQuery(
-        bstr_t("WQL"), 
-        bstr_t("SELECT * FROM Win32_ComputerSystemProduct"),
-        WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, 
-        NULL,
-        &pEnumerator);
-
-    if (FAILED(hres)) {
-        pSvc->Release();
-        pLoc->Release();
-        qCDebug(networking) << "query to get Win32_ComputerSystemProduct info";
-        return uuidString;
-    }
-    
-    // Get the SerialNumber from the Win32_BIOS data 
-    IWbemClassObject *pclsObj;
-    ULONG uReturn = 0;
-
-    SHORT  sRetStatus = -100;
-
-    while (pEnumerator) {
-        HRESULT hr = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn);
-
-        if(0 == uReturn){
-            break;
-        }
-
-        VARIANT vtProp;
-
-        // Get the value of the Name property
-        hr = pclsObj->Get(L"UUID", 0, &vtProp, 0, 0);
-        if (!FAILED(hres)) {
-            switch (vtProp.vt) {
-                case VT_BSTR:
-                    uuidString = QString::fromWCharArray(vtProp.bstrVal);
-                    break;
                 }
             }
-        VariantClear(&vtProp);
-
-        pclsObj->Release();
         }
-    pEnumerator->Release();
 
-    // Cleanup
+        RegCloseKey(cryptoKey);
-    pSvc->Release();
+    }
-    pLoc->Release();
 
-    qCDebug(networking) << "Windows BIOS UUID: " << uuidString;
 #endif //Q_OS_WIN
 
     return uuidString;
@@ -171,12 +84,14 @@ QString FingerprintUtils::getMachineFingerprintString() {
 
 QUuid FingerprintUtils::getMachineFingerprint() {
 
+    if (_machineFingerprint.isNull()) {
         QString uuidString = getMachineFingerprintString();
 
         // now, turn into uuid.  A malformed string will
         // return QUuid() ("{00000...}"), which handles
         // any errors in getting the string
         QUuid uuid(uuidString);
+
         if (uuid == QUuid()) {
             // if you cannot read a fallback key cuz we aren't saving them, just generate one for
             // this session and move on
@@ -187,6 +102,7 @@ QUuid FingerprintUtils::getMachineFingerprint() {
             Settings settings;
             uuid = QUuid(settings.value(FALLBACK_FINGERPRINT_KEY).toString());
             qCDebug(networking) << "read fallback maching fingerprint: " << uuid.toString();
+
             if (uuid == QUuid()) {
                 // no fallback yet, set one
                 uuid = QUuid::createUuid();
@@ -194,6 +110,10 @@ QUuid FingerprintUtils::getMachineFingerprint() {
                 qCDebug(networking) << "no fallback machine fingerprint, setting it to: " << uuid.toString();
             }
         }
-    return uuid;
+
+        _machineFingerprint = uuid;
+    }
+
+    return _machineFingerprint;
 }
 

libraries/networking/src/FingerprintUtils.h

@@ -21,6 +21,7 @@ public:
 
 private:
     static QString getMachineFingerprintString();
+    static QUuid _machineFingerprint;
 };
 
 #endif // hifi_FingerprintUtils_h