Py-KMS-Organization/py-kms
1
0
Fork 0
mirror of https://github.com/Py-KMS-Organization/py-kms.git synced 2026-03-17 00:44:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed now useless error-wrapping

Browse source 
Signed-off-by: simonmicro <simon@simonmicro.de>
This commit is contained in:
simonmicro 2025-12-06 21:13:25 +01:00
parent da80390b73
commit 49fb60fe6b
No known key found for this signature in database
GPG key ID: 033A4D4CE4E063D6
1 changed files with 58 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
py-kms/pykms_Sql.py
View file

@ -33,40 +33,34 @@ def sql_initialize(dbName):
return return
loggersrv.debug(f'SQLite database support enabled. Database file: "{dbName}"') loggersrv.debug(f'SQLite database support enabled. Database file: "{dbName}"')
if not os.path.isfile(dbName): if not os.path.isfile(dbName):
# Initialize the database. # Initialize the database
loggersrv.debug(f'Initializing database file "{dbName}"...') loggersrv.debug(f'Initializing database file "{dbName}"...')
try: with sqlite3.connect(dbName) as con:
with sqlite3.connect(dbName) as con: cur = con.cursor()
cur = con.cursor() cur.execute("CREATE TABLE clients(clientMachineId TEXT, machineName TEXT, applicationId TEXT, skuId TEXT, licenseStatus TEXT, lastRequestTime INTEGER, kmsEpid TEXT, requestCount INTEGER, PRIMARY KEY(clientMachineId, applicationId))")
cur.execute("CREATE TABLE clients(clientMachineId TEXT, machineName TEXT, applicationId TEXT, skuId TEXT, licenseStatus TEXT, lastRequestTime INTEGER, kmsEpid TEXT, requestCount INTEGER, PRIMARY KEY(clientMachineId, applicationId))")
except sqlite3.Error as e:
loggersrv.exception("Sqlite Error during database initialization!")
raise
if os.path.isfile(dbName): if os.path.isfile(dbName):
# Update database # Update database
try: with sqlite3.connect(dbName) as con:
with sqlite3.connect(dbName) as con: cur = con.cursor()
cur = con.cursor() # Create simple "metadata" table if not exists.
# Create simple "metadata" table if not exists. cur.execute("CREATE TABLE IF NOT EXISTS metadata (key TEXT PRIMARY KEY, value TEXT);")
cur.execute("CREATE TABLE IF NOT EXISTS metadata (key TEXT PRIMARY KEY, value TEXT);") # Get the current schema version
# Get the current schema version cur.execute("SELECT value FROM metadata WHERE key='schema_version';")
cur.execute("SELECT value FROM metadata WHERE key='schema_version';") row = cur.fetchone()
row = cur.fetchone() if row is None:
if row is None: current_version = 0
current_version = 0 else:
else: current_version = int(row[0])
current_version = int(row[0]) loggersrv.debug(f'Current database schema version: {current_version}')
loggersrv.debug(f'Current database schema version: {current_version}') # Apply necessary migrations
# Apply necessary migrations if current_version < 1:
if current_version < 1: # v1: Add "lastRequestIP" column to "clients" table.
# v1: Add "lastRequestIP" column to "clients" table. loggersrv.info("Upgrading database schema to version 1...")
loggersrv.info("Upgrading database schema to version 1...") cur.execute("ALTER TABLE clients ADD COLUMN lastRequestIP TEXT;")
cur.execute("ALTER TABLE clients ADD COLUMN lastRequestIP TEXT;") cur.execute("INSERT OR REPLACE INTO metadata (key, value) VALUES ('schema_version', '1');")
cur.execute("INSERT OR REPLACE INTO metadata (key, value) VALUES ('schema_version', '1');") loggersrv.info("Database schema updated to version 1.")
loggersrv.info("Database schema updated to version 1.")
except sqlite3.Error as e:
loggersrv.exception("Sqlite Error during database upgrade!")
raise
def sql_get_all(dbName): def sql_get_all(dbName):
if available is False: if available is False:
@ -100,51 +94,45 @@ def sql_update(dbName, infoDict):
if col_name not in infoDict: if col_name not in infoDict:
raise ValueError(f"infoDict is missing required column: {col_name}") raise ValueError(f"infoDict is missing required column: {col_name}")
try: with sqlite3.connect(dbName) as con:
with sqlite3.connect(dbName) as con: cur = con.cursor()
cur = con.cursor() cur.execute(f"SELECT {', '.join(_column_name_to_index.keys())} FROM clients WHERE clientMachineId=:clientMachineId AND applicationId=:applicationId;", infoDict)
cur.execute(f"SELECT {', '.join(_column_name_to_index.keys())} FROM clients WHERE clientMachineId=:clientMachineId AND applicationId=:applicationId;", infoDict) data = cur.fetchone()
data = cur.fetchone() if not data:
if not data: # Insert new row with all given info
# Insert new row with all given info infoDict["kmsEpid"] = "" # Default empty value
infoDict["kmsEpid"] = "" # Default empty value infoDict["requestCount"] = 1
infoDict["requestCount"] = 1 cur.execute(f"""INSERT INTO clients ({', '.join(_column_name_to_index.keys())})
cur.execute(f"""INSERT INTO clients ({', '.join(_column_name_to_index.keys())}) VALUES ({', '.join(':' + col for col in _column_name_to_index.keys())});""", infoDict)
VALUES ({', '.join(':' + col for col in _column_name_to_index.keys())});""", infoDict)
else: else:
# Update only changed columns # Update only changed columns
common_postfix = "WHERE clientMachineId=:clientMachineId AND applicationId=:applicationId" common_postfix = "WHERE clientMachineId=:clientMachineId AND applicationId=:applicationId"
def update_column_if_changed(column_name, new_value): def update_column_if_changed(column_name, new_value):
assert column_name in _column_name_to_index, f"Unknown column name: {column_name}" assert column_name in _column_name_to_index, f"Unknown column name: {column_name}"
assert "clientMachineId" in infoDict and "applicationId" in infoDict, "infoDict must contain 'clientMachineId' and 'applicationId'" assert "clientMachineId" in infoDict and "applicationId" in infoDict, "infoDict must contain 'clientMachineId' and 'applicationId'"
if data[_column_name_to_index[column_name]] != new_value: if data[_column_name_to_index[column_name]] != new_value:
query = f"UPDATE clients SET {column_name}=:value {common_postfix}" query = f"UPDATE clients SET {column_name}=:value {common_postfix}"
cur.execute(query, {"value": new_value, "clientMachineId": infoDict['clientMachineId'], "applicationId": infoDict['applicationId']}) cur.execute(query, {"value": new_value, "clientMachineId": infoDict['clientMachineId'], "applicationId": infoDict['applicationId']})
# Dynamically check and maybe update all columns # Dynamically check and maybe update all columns
for column_name in _column_name_to_index.keys(): for column_name in _column_name_to_index.keys():
if column_name in ["clientMachineId", "applicationId", "requestCount"]: if column_name in ["clientMachineId", "applicationId", "requestCount"]:
continue # Skip these columns continue # Skip these columns
if column_name == "kmsEpid": if column_name == "kmsEpid":
# this one can only be updated by the special function # this one can only be updated by the special function
continue continue
update_column_if_changed(column_name, infoDict[column_name]) update_column_if_changed(column_name, infoDict[column_name])
# Finally increment requestCount # Finally increment requestCount
cur.execute(f"UPDATE clients SET requestCount=requestCount+1 {common_postfix}", infoDict) cur.execute(f"UPDATE clients SET requestCount=requestCount+1 {common_postfix}", infoDict)
except sqlite3.Error:
loggersrv.exception("Sqlite Error during sql_update!")
def sql_update_epid(dbName, kmsRequest, response, appName): def sql_update_epid(dbName, kmsRequest, response, appName):
if available is False: if available is False:
return return
cmid = str(kmsRequest['clientMachineId'].get()) cmid = str(kmsRequest['clientMachineId'].get())
try: with sqlite3.connect(dbName) as con:
with sqlite3.connect(dbName) as con: cur = con.cursor()
cur = con.cursor() cur.execute("UPDATE clients SET kmsEpid=? WHERE clientMachineId=? AND applicationId=?;",
cur.execute("UPDATE clients SET kmsEpid=? WHERE clientMachineId=? AND applicationId=?;", (str(response["kmsEpid"].decode('utf-16le')), cmid, appName))
(str(response["kmsEpid"].decode('utf-16le')), cmid, appName))
except sqlite3.Error:
loggersrv.exception("Sqlite Error during sql_update_epid!")