mirror of
https://github.com/Py-KMS-Organization/py-kms.git
synced 2024-09-19 07:18:51 -04:00
Merge pull request #115 from Py-KMS-Organization/feature/newKmsDatabase
New KMS database & website extension
This commit is contained in:
commit
e60cc1b7e1
5 changed files with 462 additions and 235 deletions
File diff suppressed because it is too large
Load diff
|
@ -184,7 +184,7 @@ def client_update():
|
|||
if sName == name + 'Enterprise' or \
|
||||
sName == name[:6] + 'ProfessionalPlus' + name[6:]:
|
||||
clt_config['KMSClientSkuID'] = skuitem['Id']
|
||||
clt_config['RequiredClientCount'] = int(kmsitem['NCountPolicy'])
|
||||
clt_config['RequiredClientCount'] = int(kmsitem.get('NCountPolicy', 25)) # if not given default to 25
|
||||
clt_config['KMSProtocolMajorVersion'] = int(float(kmsitem['DefaultKmsProtocol']))
|
||||
clt_config['KMSProtocolMinorVersion'] = 0
|
||||
clt_config['KMSClientLicenseStatus'] = 2
|
||||
|
|
|
@ -20,7 +20,7 @@ def epidGenerator(kmsId, version, lcid):
|
|||
for csvlkitem in csvlkitems:
|
||||
try:
|
||||
if kmsId in [ uuid.UUID(kmsitem) for kmsitem in csvlkitem['Activate'] ]:
|
||||
pkeys.append( (csvlkitem['GroupId'], csvlkitem['MinKeyId'], csvlkitem['MaxKeyId'], csvlkitem['InvalidWinBuild']) )
|
||||
pkeys.append( (csvlkitem['GroupId'], csvlkitem['MinKeyId'], csvlkitem['MaxKeyId'], csvlkitem.get('InvalidWinBuild', '[]')) )
|
||||
else:
|
||||
# fallback to Windows Server 2019 parameters.
|
||||
pkeys.append( ('206', '551000000', '570999999', '[0,1,2]') )
|
||||
|
@ -40,10 +40,11 @@ def epidGenerator(kmsId, version, lcid):
|
|||
hosts.append(winbuild)
|
||||
except KeyError:
|
||||
# fallback to Windows Server 2019 parameters.
|
||||
hosts.append( {'BuildNumber':'17763', 'PlatformId':'3612', 'MinDate':'02/10/2018'} )
|
||||
hosts.append( {'BuildNumber':'17763', 'PlatformId':'3612', 'ReleaseDate':'2018-10-02T00:00:00Z'} )
|
||||
|
||||
host = random.choice(hosts)
|
||||
BuildNumber, PlatformId, MinDate = host['BuildNumber'], host['PlatformId'], host['MinDate']
|
||||
|
||||
BuildNumber, PlatformId, ReleaseDate = host['BuildNumber'], host['PlatformId'], host['ReleaseDate'].rstrip("Z")
|
||||
|
||||
# Generate Part 3 and Part 4: Product Key ID
|
||||
productKeyID = random.randint(MinKeyId, MaxKeyId)
|
||||
|
@ -55,7 +56,7 @@ def epidGenerator(kmsId, version, lcid):
|
|||
languageCode = lcid # (C# CultureInfo.InstalledUICulture.LCID)
|
||||
|
||||
# Generate Part 8: KMS Host Activation Date
|
||||
d = datetime.datetime.strptime(MinDate, "%d/%m/%Y")
|
||||
d = datetime.datetime.fromisoformat(ReleaseDate)
|
||||
minTime = datetime.date(d.year, d.month, d.day)
|
||||
|
||||
# Generate Year and Day Number
|
||||
|
|
|
@ -15,33 +15,34 @@ def _get_serve_count():
|
|||
return _serve_count
|
||||
|
||||
_kms_items = None
|
||||
_kms_items_ignored = None
|
||||
_kms_items_noglvk = None
|
||||
def _get_kms_items_cache():
|
||||
global _kms_items, _kms_items_ignored
|
||||
global _kms_items, _kms_items_noglvk
|
||||
if _kms_items is None:
|
||||
_kms_items = {}
|
||||
_kms_items_ignored = 0
|
||||
queue = [kmsDB2Dict()]
|
||||
while len(queue):
|
||||
item = queue.pop(0)
|
||||
if isinstance(item, list):
|
||||
for i in item:
|
||||
queue.append(i)
|
||||
elif isinstance(item, dict):
|
||||
if 'KmsItems' in item:
|
||||
queue.append(item['KmsItems'])
|
||||
elif 'SkuItems' in item:
|
||||
queue.append(item['SkuItems'])
|
||||
elif 'Gvlk' in item:
|
||||
if len(item['Gvlk']):
|
||||
_kms_items[item['DisplayName']] = item['Gvlk']
|
||||
else:
|
||||
_kms_items_ignored += 1
|
||||
#else:
|
||||
# print(item)
|
||||
else:
|
||||
raise NotImplementedError(f'Unknown type: {type(item)}')
|
||||
return _kms_items, _kms_items_ignored
|
||||
_kms_items = {} # {group: str -> {product: str -> gvlk: str}}
|
||||
_kms_items_noglvk = 0
|
||||
for section in kmsDB2Dict():
|
||||
for element in section:
|
||||
if "KmsItems" in element:
|
||||
for product in element["KmsItems"]:
|
||||
group_name = product["DisplayName"]
|
||||
items = {}
|
||||
for item in product["SkuItems"]:
|
||||
items[item["DisplayName"]] = item["Gvlk"]
|
||||
if not item["Gvlk"]:
|
||||
_kms_items_noglvk += 1
|
||||
if len(items) == 0:
|
||||
continue
|
||||
if group_name not in _kms_items:
|
||||
_kms_items[group_name] = {}
|
||||
_kms_items[group_name].update(items)
|
||||
elif "DisplayName" in element and "BuildNumber" in element and "PlatformId" in element:
|
||||
pass # these are WinBuilds
|
||||
elif "DisplayName" in element and "Activate" in element:
|
||||
pass # these are CsvlkItems
|
||||
else:
|
||||
raise NotImplementedError(f'Unknown element: {element}')
|
||||
return _kms_items, _kms_items_noglvk
|
||||
|
||||
app = Flask('pykms_webui')
|
||||
app.jinja_env.globals['start_time'] = datetime.datetime.now()
|
||||
|
@ -90,7 +91,7 @@ def root():
|
|||
count_clients=countClients,
|
||||
count_clients_windows=countClientsWindows,
|
||||
count_clients_office=countClientsOffice,
|
||||
count_projects=len(_get_kms_items_cache()[0])
|
||||
count_projects=sum([len(entries) for entries in _get_kms_items_cache()[0].values()])
|
||||
), 200 if error is None else 500
|
||||
|
||||
@app.route('/readyz')
|
||||
|
@ -125,15 +126,15 @@ def license():
|
|||
@app.route('/products')
|
||||
def products():
|
||||
_increase_serve_count()
|
||||
items, ignored = _get_kms_items_cache()
|
||||
countProducts = len(items)
|
||||
countProductsWindows = len([i for i in items if 'windows' in i.lower()])
|
||||
countProductsOffice = len([i for i in items if 'office' in i.lower()])
|
||||
items, noglvk = _get_kms_items_cache()
|
||||
countProducts = sum([len(entries) for entries in items.values()])
|
||||
countProductsWindows = sum([len(entries) for (name, entries) in items.items() if 'windows' in name.lower()])
|
||||
countProductsOffice = sum([len(entries) for (name, entries) in items.items() if 'office' in name.lower()])
|
||||
return render_template(
|
||||
'products.html',
|
||||
path='/products/',
|
||||
products=items,
|
||||
filtered=ignored,
|
||||
filtered=noglvk,
|
||||
count_products=countProducts,
|
||||
count_products_windows=countProductsWindows,
|
||||
count_products_office=countProductsOffice
|
||||
|
|
|
@ -32,22 +32,36 @@
|
|||
|
||||
<hr>
|
||||
|
||||
<style scoped>
|
||||
td.glvk {
|
||||
width: 24rem;
|
||||
}
|
||||
|
||||
pre.glvk {
|
||||
width: min-content;
|
||||
}
|
||||
</style>
|
||||
|
||||
{% for group_name, group_products in products | dictsort %}
|
||||
<h1 class="title">{{ group_name }}</h1>
|
||||
<table class="table is-bordered is-striped is-hoverable is-fullwidth">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th><abbr title="Group Volume License Key">GVLK</abbr></th>
|
||||
<th>Name</th>
|
||||
<th class="glvk"><abbr title="Group Volume License Key">GVLK</abbr></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for name, gvlk in products | dictsort %}
|
||||
{% if gvlk %}
|
||||
<tr>
|
||||
<td>{{ name }}</td>
|
||||
<td><pre>{{ gvlk }}</pre></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% for name, gvlk in group_products | dictsort %}
|
||||
<tr>
|
||||
<td>{{ name }}</td>
|
||||
<td class="glvk">
|
||||
{% if gvlk %}
|
||||
<pre class="glvk">{{ gvlk }}</pre>{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% endblock %}
|
||||
{% endfor %}
|
||||
{% endblock %}
|
||||
|
|
Loading…
Reference in a new issue