Skip to content

Commit d84431b

Browse files
authored
added forgotten Initialization checks
1 parent 4528e41 commit d84431b

File tree

1 file changed

+43
-21
lines changed

1 file changed

+43
-21
lines changed

keyauth.py

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def __init__(self, name, ownerid, secret, version):
3636
self.version = version
3737

3838
sessionid = enckey = ""
39+
initialized = False
3940

4041
def init(self):
4142

@@ -61,13 +62,25 @@ def init(self):
6162
response = encryption.decrypt(response, self.secret, init_iv)
6263
json = jsond.loads(response)
6364

65+
if json["message"] == "invalidver":
66+
if json["download"] != "":
67+
print("New Version Available")
68+
download_link = json["download"]
69+
os.system(f"start {download_link}")
70+
sys.exit()
71+
else:
72+
print("Invalid Version, Contact owner to add download link to latest app version")
73+
sys.exit()
74+
6475
if not json["success"]:
6576
print(json["message"])
6677
sys.exit()
6778

6879
self.sessionid = json["sessionid"]
80+
self.initialized = True
6981

7082
def register(self, user, password, license, hwid=None):
83+
self.checkinit()
7184
if hwid is None:
7285
hwid = others.get_hwid()
7386

@@ -98,7 +111,7 @@ def register(self, user, password, license, hwid=None):
98111
sys.exit()
99112

100113
def upgrade(self, user, license):
101-
114+
self.checkinit()
102115
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
103116

104117
post_data = {
@@ -124,6 +137,7 @@ def upgrade(self, user, license):
124137
sys.exit()
125138

126139
def login(self, user, password, hwid=None):
140+
self.checkinit()
127141
if hwid is None:
128142
hwid = others.get_hwid()
129143

@@ -154,6 +168,7 @@ def login(self, user, password, hwid=None):
154168
sys.exit()
155169

156170
def license(self, key, hwid=None):
171+
self.checkinit()
157172
if hwid is None:
158173
hwid = others.get_hwid()
159174

@@ -182,7 +197,7 @@ def license(self, key, hwid=None):
182197
sys.exit()
183198

184199
def var(self, name):
185-
200+
self.checkinit()
186201
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
187202

188203
post_data = {
@@ -208,7 +223,7 @@ def var(self, name):
208223
sys.exit()
209224

210225
def file(self, fileid):
211-
226+
self.checkinit()
212227
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
213228

214229
post_data = {
@@ -231,53 +246,55 @@ def file(self, fileid):
231246
time.sleep(5)
232247
sys.exit()
233248
return binascii.unhexlify(json["contents"])
234-
235-
def check(self):
249+
250+
def webhook(self, webid, param):
251+
self.checkinit()
236252
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
253+
237254
post_data = {
238-
"type": binascii.hexlify(("check").encode()),
255+
"type": binascii.hexlify(("webhook").encode()),
256+
"webid": encryption.encrypt(webid, self.enckey, init_iv),
257+
"params": encryption.encrypt(param, self.enckey, init_iv),
239258
"sessionid": binascii.hexlify(self.sessionid.encode()),
240259
"name": binascii.hexlify(self.name.encode()),
241260
"ownerid": binascii.hexlify(self.ownerid.encode()),
242261
"init_iv": init_iv
243262
}
263+
244264
response = self.__do_request(post_data)
245265

246266
response = encryption.decrypt(response, self.enckey, init_iv)
247267
json = jsond.loads(response)
268+
248269
if json["success"]:
249-
return True
270+
return json["message"]
250271
else:
251-
return False
252-
253-
def webhook(self, webid, param):
272+
print(json["message"])
273+
time.sleep(5)
274+
sys.exit()
254275

276+
def check(self):
277+
self.checkinit()
255278
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
256-
257279
post_data = {
258-
"type": binascii.hexlify(("webhook").encode()),
259-
"webid": encryption.encrypt(webid, self.enckey, init_iv),
260-
"params": encryption.encrypt(param, self.enckey, init_iv),
280+
"type": binascii.hexlify(("check").encode()),
261281
"sessionid": binascii.hexlify(self.sessionid.encode()),
262282
"name": binascii.hexlify(self.name.encode()),
263283
"ownerid": binascii.hexlify(self.ownerid.encode()),
264284
"init_iv": init_iv
265285
}
266-
267286
response = self.__do_request(post_data)
268287

269288
response = encryption.decrypt(response, self.enckey, init_iv)
270289
json = jsond.loads(response)
271-
272290
if json["success"]:
273-
return json["message"]
291+
return True
274292
else:
275-
print(json["message"])
276-
time.sleep(5)
277-
sys.exit()
293+
return False
278294

279-
def log(self, message):
280295

296+
def log(self, message):
297+
self.checkinit()
281298
init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
282299

283300
post_data = {
@@ -292,6 +309,11 @@ def log(self, message):
292309

293310
self.__do_request(post_data)
294311

312+
def checkinit(self):
313+
if not self.initialized:
314+
print("Initialize first, in order to use the functions")
315+
sys.exit()
316+
295317
def __do_request(self, post_data):
296318

297319
rq_out = requests.post(

0 commit comments

Comments
 (0)