Skip to content

Commit c15eb10

Browse files
author
6nz
authored
small cleanup
1 parent 715fe6e commit c15eb10

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

‎keyauth.py

+18-18
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def init(self):
6464
self.enckey = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
6565

6666
post_data = {
67-
"type": binascii.hexlify(("init").encode()),
67+
"type": binascii.hexlify("init".encode()),
6868
"ver": encryption.encrypt(self.version, self.secret, init_iv),
6969
"hash": self.hash_to_check,
7070
"enckey": encryption.encrypt(self.enckey, self.secret, init_iv),
@@ -108,7 +108,7 @@ def register(self, user, password, license, hwid=None):
108108
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
109109

110110
post_data = {
111-
"type": binascii.hexlify(("register").encode()),
111+
"type": binascii.hexlify("register".encode()),
112112
"username": encryption.encrypt(user, self.enckey, init_iv),
113113
"pass": encryption.encrypt(password, self.enckey, init_iv),
114114
"key": encryption.encrypt(license, self.enckey, init_iv),
@@ -135,7 +135,7 @@ def upgrade(self, user, license):
135135
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
136136

137137
post_data = {
138-
"type": binascii.hexlify(("upgrade").encode()),
138+
"type": binascii.hexlify("upgrade".encode()),
139139
"username": encryption.encrypt(user, self.enckey, init_iv),
140140
"key": encryption.encrypt(license, self.enckey, init_iv),
141141
"sessionid": binascii.hexlify(self.sessionid.encode()),
@@ -167,7 +167,7 @@ def login(self, user, password, hwid=None):
167167
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
168168

169169
post_data = {
170-
"type": binascii.hexlify(("login").encode()),
170+
"type": binascii.hexlify("login".encode()),
171171
"username": encryption.encrypt(user, self.enckey, init_iv),
172172
"pass": encryption.encrypt(password, self.enckey, init_iv),
173173
"hwid": encryption.encrypt(hwid, self.enckey, init_iv),
@@ -198,7 +198,7 @@ def license(self, key, hwid=None):
198198
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
199199

200200
post_data = {
201-
"type": binascii.hexlify(("license").encode()),
201+
"type": binascii.hexlify("license".encode()),
202202
"key": encryption.encrypt(key, self.enckey, init_iv),
203203
"hwid": encryption.encrypt(hwid, self.enckey, init_iv),
204204
"sessionid": binascii.hexlify(self.sessionid.encode()),
@@ -224,7 +224,7 @@ def var(self, name):
224224
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
225225

226226
post_data = {
227-
"type": binascii.hexlify(("var").encode()),
227+
"type": binascii.hexlify("var".encode()),
228228
"varid": encryption.encrypt(name, self.enckey, init_iv),
229229
"sessionid": binascii.hexlify(self.sessionid.encode()),
230230
"name": binascii.hexlify(self.name.encode()),
@@ -250,7 +250,7 @@ def getvar(self, var_name):
250250
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
251251

252252
post_data = {
253-
"type": binascii.hexlify(("getvar").encode()),
253+
"type": binascii.hexlify("getvar".encode()),
254254
"var": encryption.encrypt(var_name, self.enckey, init_iv),
255255
"sessionid": binascii.hexlify(self.sessionid.encode()),
256256
"name": binascii.hexlify(self.name.encode()),
@@ -272,7 +272,7 @@ def setvar(self, var_name, var_data):
272272
self.checkinit()
273273
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
274274
post_data = {
275-
"type": binascii.hexlify(("setvar").encode()),
275+
"type": binascii.hexlify("setvar".encode()),
276276
"var": encryption.encrypt(var_name, self.enckey, init_iv),
277277
"data": encryption.encrypt(var_data, self.enckey, init_iv),
278278
"sessionid": binascii.hexlify(self.sessionid.encode()),
@@ -295,7 +295,7 @@ def ban(self):
295295
self.checkinit()
296296
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
297297
post_data = {
298-
"type": binascii.hexlify(("ban").encode()),
298+
"type": binascii.hexlify("ban".encode()),
299299
"sessionid": binascii.hexlify(self.sessionid.encode()),
300300
"name": binascii.hexlify(self.name.encode()),
301301
"ownerid": binascii.hexlify(self.ownerid.encode()),
@@ -317,7 +317,7 @@ def file(self, fileid):
317317
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
318318

319319
post_data = {
320-
"type": binascii.hexlify(("file").encode()),
320+
"type": binascii.hexlify("file".encode()),
321321
"fileid": encryption.encrypt(fileid, self.enckey, init_iv),
322322
"sessionid": binascii.hexlify(self.sessionid.encode()),
323323
"name": binascii.hexlify(self.name.encode()),
@@ -342,7 +342,7 @@ def webhook(self, webid, param, body = "", conttype = ""):
342342
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
343343

344344
post_data = {
345-
"type": binascii.hexlify(("webhook").encode()),
345+
"type": binascii.hexlify("webhook".encode()),
346346
"webid": encryption.encrypt(webid, self.enckey, init_iv),
347347
"params": encryption.encrypt(param, self.enckey, init_iv),
348348
"body": encryption.encrypt(body, self.enckey, init_iv),
@@ -369,7 +369,7 @@ def check(self):
369369
self.checkinit()
370370
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
371371
post_data = {
372-
"type": binascii.hexlify(("check").encode()),
372+
"type": binascii.hexlify("check".encode()),
373373
"sessionid": binascii.hexlify(self.sessionid.encode()),
374374
"name": binascii.hexlify(self.name.encode()),
375375
"ownerid": binascii.hexlify(self.ownerid.encode()),
@@ -389,7 +389,7 @@ def checkblacklist(self):
389389
hwid = others.get_hwid()
390390
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
391391
post_data = {
392-
"type": binascii.hexlify(("checkblacklist").encode()),
392+
"type": binascii.hexlify("checkblacklist".encode()),
393393
"hwid": encryption.encrypt(hwid, self.enckey, init_iv),
394394
"sessionid": binascii.hexlify(self.sessionid.encode()),
395395
"name": binascii.hexlify(self.name.encode()),
@@ -410,7 +410,7 @@ def log(self, message):
410410
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
411411

412412
post_data = {
413-
"type": binascii.hexlify(("log").encode()),
413+
"type": binascii.hexlify("log".encode()),
414414
"pcuser": encryption.encrypt(os.getenv('username'), self.enckey, init_iv),
415415
"message": encryption.encrypt(message, self.enckey, init_iv),
416416
"sessionid": binascii.hexlify(self.sessionid.encode()),
@@ -426,7 +426,7 @@ def fetchOnline(self):
426426
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
427427

428428
post_data = {
429-
"type": binascii.hexlify(("fetchOnline").encode()),
429+
"type": binascii.hexlify("fetchOnline".encode()),
430430
"sessionid": binascii.hexlify(self.sessionid.encode()),
431431
"name": binascii.hexlify(self.name.encode()),
432432
"ownerid": binascii.hexlify(self.ownerid.encode()),
@@ -451,7 +451,7 @@ def chatGet(self, channel):
451451
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
452452

453453
post_data = {
454-
"type": binascii.hexlify(("chatget").encode()),
454+
"type": binascii.hexlify("chatget".encode()),
455455
"channel": encryption.encrypt(channel, self.enckey, init_iv),
456456
"sessionid": binascii.hexlify(self.sessionid.encode()),
457457
"name": binascii.hexlify(self.name.encode()),
@@ -474,7 +474,7 @@ def chatSend(self, message, channel):
474474
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
475475

476476
post_data = {
477-
"type": binascii.hexlify(("chatsend").encode()),
477+
"type": binascii.hexlify("chatsend".encode()),
478478
"message": encryption.encrypt(message, self.enckey, init_iv),
479479
"channel": encryption.encrypt(channel, self.enckey, init_iv),
480480
"sessionid": binascii.hexlify(self.sessionid.encode()),
@@ -545,7 +545,7 @@ def get_hwid():
545545
return hwid
546546
elif platform.system() == 'Windows':
547547
winuser = os.getlogin()
548-
sid = win32security.LookupAccountName(None, winuser)[0]
548+
sid = win32security.LookupAccountName(None, winuser)[0] # You can also use WMIC (better than SID, some users had problems with WMIC)
549549
hwid = win32security.ConvertSidToStringSid(sid)
550550
return hwid
551551
elif platform.system() == 'Darwin':

0 commit comments

Comments
 (0)