licensing: HWID diagnosability, matcher widening, delete-condition fix
- hwid.cpp: BitStream3 buffer 125 -> 160 bits (writes totalled 147 bits and overflowed the old allocation; encoded HWID bytes unchanged). Log component availability (uuid/cpu/mac/hdd) once per distinct HWID, and warn when WMI yields no components at all. - Matcher widened only, generation untouched: exact-string match short-circuits, UUID match accepts any WMI list entry (generator hashes the last valid one), fuzzy-match point breakdown is logged so field status-12 rejections are diagnosable. - ANSLicense.cpp: fix inverted delete condition (!p != NULL) at 6 sites; detect the shared "empty fingerprint" HWID of WMI-broken PCs and warn with repair steps; mask activation keys in error strings. - licensingclient.h: explain SetKey/validation/NTP failures on stderr. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
#define _WIN32_DCOM
|
||||
#include <iostream>
|
||||
#include <cstdio>
|
||||
#include <comdef.h>
|
||||
#include <Wbemidl.h>
|
||||
#include <list>
|
||||
@@ -45,17 +46,19 @@ public:
|
||||
);
|
||||
|
||||
hres = CoCreateInstance(
|
||||
CLSID_WbemLocator,
|
||||
0,
|
||||
CLSCTX_INPROC_SERVER,
|
||||
CLSID_WbemLocator,
|
||||
0,
|
||||
CLSCTX_INPROC_SERVER,
|
||||
IID_IWbemLocator, (LPVOID *) &wbemLocator);
|
||||
|
||||
|
||||
if (FAILED(hres))
|
||||
{
|
||||
if (ownCoInitialize)
|
||||
CoUninitialize();
|
||||
|
||||
throw new exception("failed to create IWbemLocator", hres);
|
||||
// Fail soft: leave wbemServices NULL so queries return empty results.
|
||||
// Throwing here would escape callers (e.g. hardware id generation)
|
||||
// that have no exception handling and crash the host application.
|
||||
ReportFailure("CoCreateInstance(IWbemLocator)", hres);
|
||||
wbemLocator = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
// Connect to the root\cimv2 namespace with the
|
||||
@@ -76,12 +79,11 @@ public:
|
||||
|
||||
if (FAILED(hres))
|
||||
{
|
||||
ReportFailure("ConnectServer(ROOT\\CIMV2)", hres);
|
||||
wbemLocator->Release();
|
||||
|
||||
if (ownCoInitialize)
|
||||
CoUninitialize();
|
||||
|
||||
throw new exception("could not connect to WMI", hres);
|
||||
wbemLocator = NULL;
|
||||
wbemServices = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
// Set the IWbemServices proxy so that impersonation
|
||||
@@ -99,10 +101,12 @@ public:
|
||||
|
||||
if (FAILED(hres))
|
||||
{
|
||||
wbemServices->Release();
|
||||
wbemLocator->Release();
|
||||
if (ownCoInitialize) CoUninitialize();
|
||||
throw new exception("could not connecto to WMI", hres);
|
||||
ReportFailure("CoSetProxyBlanket", hres);
|
||||
wbemServices->Release();
|
||||
wbemLocator->Release();
|
||||
wbemServices = NULL;
|
||||
wbemLocator = NULL;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,32 +119,44 @@ public:
|
||||
|
||||
void GetPropertyList(const char * wqlQuery, const char * propertyName, list<string> * propList, int maxElements = 0x7FFFFFFF)
|
||||
{
|
||||
if (wbemServices == NULL)
|
||||
return; // WMI unavailable; already reported by the constructor
|
||||
|
||||
HRESULT hres;
|
||||
|
||||
// For example, query for all the running processes
|
||||
IEnumWbemClassObject* pEnumerator = NULL;
|
||||
hres = wbemServices->ExecQuery(
|
||||
bstr_t("WQL"),
|
||||
bstr_t("WQL"),
|
||||
bstr_t(wqlQuery),
|
||||
WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
|
||||
WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
|
||||
NULL,
|
||||
&pEnumerator);
|
||||
|
||||
|
||||
if (FAILED(hres))
|
||||
{
|
||||
throw new exception("WMI query failed");
|
||||
ReportFailure(wqlQuery, hres);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
IWbemClassObject *pclsObj;
|
||||
ULONG uReturn = 0;
|
||||
int numElements = 0;
|
||||
|
||||
|
||||
while (1)
|
||||
{
|
||||
hres = pEnumerator->Next(WBEM_INFINITE, 1,
|
||||
hres = pEnumerator->Next(WBEM_INFINITE, 1,
|
||||
&pclsObj, &uReturn);
|
||||
|
||||
if (FAILED(hres))
|
||||
{
|
||||
// An enumeration error is not "no more rows" — report it,
|
||||
// otherwise a broken WMI silently yields an empty fingerprint
|
||||
ReportFailure(wqlQuery, hres);
|
||||
break;
|
||||
}
|
||||
|
||||
if(0 == uReturn)
|
||||
{
|
||||
break;
|
||||
@@ -203,6 +219,12 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
static void ReportFailure(const char * what, HRESULT hres)
|
||||
{
|
||||
fprintf(stderr, "[anslicensing] WMI failure (hr=0x%08lX): %s — hardware fingerprint will be degraded\n",
|
||||
(unsigned long)hres, what);
|
||||
}
|
||||
|
||||
bool ownCoInitialize;
|
||||
IWbemServices * wbemServices;
|
||||
IWbemLocator * wbemLocator;
|
||||
|
||||
Reference in New Issue
Block a user