Updated API
This commit is contained in:
DarkCat09
parent
6ca89bf959
commit
ae85a218ea
11 changed files with 289 additions and 208 deletions
|
|
@ -10,8 +10,8 @@ class Client:
|
|||
|
||||
def __init__(
|
||||
self, username:str,
|
||||
md5:Optional[str]=None,
|
||||
password:Optional[str]=None) -> None:
|
||||
password:Optional[str]=None,
|
||||
md5:Optional[str]=None) -> None:
|
||||
|
||||
if (password == None) and (md5 == None):
|
||||
raise AttributeError('Password was not specified')
|
||||
|
|
@ -52,7 +52,7 @@ class Client:
|
|||
atconnect.REQGET
|
||||
)
|
||||
serverstree = lxml.html.fromstring(serverspage.content)
|
||||
serverslist = serverstree.xpath('//div[@class="servers"]/div')
|
||||
serverslist = serverstree.xpath('//div[contains(@class,"servers ")]/div')
|
||||
|
||||
servers = []
|
||||
for server in serverslist:
|
||||
|
|
|
|||
|
|
@ -7,23 +7,7 @@ from cloudscraper import CloudScraper
|
|||
from typing import Optional, Union
|
||||
|
||||
from . import aterrors
|
||||
|
||||
# TEST
|
||||
import js2py
|
||||
import base64
|
||||
|
||||
# Set obj for js
|
||||
presettings = """
|
||||
let window = {};
|
||||
"""
|
||||
|
||||
# Convert array function to CMAScript 5 function
|
||||
def toECMAScript5Function(f):
|
||||
return "(function() { " + f[f.index("{")+1 : f.index("}")] + "})();"
|
||||
|
||||
# Emulation of atob - https://developer.mozilla.org/en-US/docs/Web/API/atob
|
||||
def atob(s):
|
||||
return base64.standard_b64decode(str(s)).decode("utf-8")
|
||||
from . import atjsparse
|
||||
|
||||
REQGET = 0
|
||||
REQPOST = 1
|
||||
|
|
@ -31,144 +15,139 @@ REQUA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Goann
|
|||
|
||||
class AternosConnect:
|
||||
|
||||
def __init__(self) -> None:
|
||||
def __init__(self) -> None:
|
||||
|
||||
pass
|
||||
pass
|
||||
|
||||
def parse_token(self, response:Optional[Union[str,bytes]]=None) -> str:
|
||||
def parse_token(self, response:Optional[Union[str,bytes]]=None) -> str:
|
||||
|
||||
if response == None:
|
||||
loginpage = self.request_cloudflare(
|
||||
f'https://aternos.org/go/', REQGET
|
||||
).content
|
||||
pagetree = lxml.html.fromstring(loginpage)
|
||||
else:
|
||||
pagetree = lxml.html.fromstring(response)
|
||||
if response == None:
|
||||
loginpage = self.request_cloudflare(
|
||||
f'https://aternos.org/go/', REQGET
|
||||
).content
|
||||
pagetree = lxml.html.fromstring(loginpage)
|
||||
else:
|
||||
pagetree = lxml.html.fromstring(response)
|
||||
|
||||
try:
|
||||
# fetch text
|
||||
pagehead = pagetree.head
|
||||
text = pagehead.text_content()
|
||||
try:
|
||||
pagehead = pagetree.head
|
||||
text = pagehead.text_content()
|
||||
|
||||
#search
|
||||
js_funcs = re.findall(r"\(\(\)(.*?)\)\(\);", text)
|
||||
token_js_func = js_funcs[1] if len(js_funcs) > 1 else js_funcs[0]
|
||||
js_code = re.findall(r'\(\(\)(.*?)\)\(\);', text)
|
||||
token_func = js_code[1] if len(js_code) > 1 else js_code[0]
|
||||
|
||||
# run js
|
||||
ctx = js2py.EvalJs({ 'atob': atob })
|
||||
jsf = toECMAScript5Function(token_js_func)
|
||||
ctx.execute(presettings + jsf)
|
||||
|
||||
self.token = ctx.window['AJAX_TOKEN']
|
||||
except (IndexError, TypeError):
|
||||
raise aterrors.AternosCredentialsError(
|
||||
'Unable to parse TOKEN from the page'
|
||||
)
|
||||
ctx = atjsparse.exec(token_func)
|
||||
self.token = ctx.window['AJAX_TOKEN']
|
||||
|
||||
return self.token
|
||||
except (IndexError, TypeError):
|
||||
raise aterrors.AternosCredentialsError(
|
||||
'Unable to parse TOKEN from the page'
|
||||
)
|
||||
|
||||
def generate_sec(self) -> str:
|
||||
return self.token
|
||||
|
||||
randkey = self.generate_aternos_rand()
|
||||
randval = self.generate_aternos_rand()
|
||||
self.sec = f'{randkey}:{randval}'
|
||||
self.session.cookies.set(
|
||||
f'ATERNOS_SEC_{randkey}', randval,
|
||||
domain='aternos.org'
|
||||
)
|
||||
def generate_sec(self) -> str:
|
||||
|
||||
return self.sec
|
||||
randkey = self.generate_aternos_rand()
|
||||
randval = self.generate_aternos_rand()
|
||||
self.sec = f'{randkey}:{randval}'
|
||||
self.session.cookies.set(
|
||||
f'ATERNOS_SEC_{randkey}', randval,
|
||||
domain='aternos.org'
|
||||
)
|
||||
|
||||
def generate_aternos_rand(self, randlen:int=16) -> str:
|
||||
return self.sec
|
||||
|
||||
rand_arr = []
|
||||
for i in range(randlen+1):
|
||||
rand_arr.append('')
|
||||
def generate_aternos_rand(self, randlen:int=16) -> str:
|
||||
|
||||
rand_alphanum = \
|
||||
self.convert_num(random.random(),36) + \
|
||||
'00000000000000000'
|
||||
return (rand_alphanum[2:18].join(rand_arr)[:randlen])
|
||||
rand_arr = []
|
||||
for i in range(randlen+1):
|
||||
rand_arr.append('')
|
||||
|
||||
def convert_num(self, num:Union[int,float], base:int) -> str:
|
||||
rand_alphanum = \
|
||||
self.convert_num(random.random(),36) + \
|
||||
'00000000000000000'
|
||||
return (rand_alphanum[2:18].join(rand_arr)[:randlen])
|
||||
|
||||
result = ''
|
||||
while num > 0:
|
||||
result = str(num % base) + result
|
||||
num //= base
|
||||
return result
|
||||
def convert_num(self, num:Union[int,float], base:int) -> str:
|
||||
|
||||
def request_cloudflare(
|
||||
self, url:str, method:int,
|
||||
retries:int=10,
|
||||
params:Optional[dict]=None,
|
||||
data:Optional[dict]=None,
|
||||
headers:Optional[dict]=None,
|
||||
reqcookies:Optional[dict]=None,
|
||||
sendtoken:bool=False) -> Response:
|
||||
result = ''
|
||||
while num > 0:
|
||||
result = str(num % base) + result
|
||||
num //= base
|
||||
return result
|
||||
|
||||
cftitle = '<title>Please Wait... | Cloudflare</title>'
|
||||
def request_cloudflare(
|
||||
self, url:str, method:int,
|
||||
retries:int=10,
|
||||
params:Optional[dict]=None,
|
||||
data:Optional[dict]=None,
|
||||
headers:Optional[dict]=None,
|
||||
reqcookies:Optional[dict]=None,
|
||||
sendtoken:bool=False) -> Response:
|
||||
|
||||
if sendtoken:
|
||||
if params == None:
|
||||
params = {}
|
||||
params['SEC'] = self.sec
|
||||
params['TOKEN'] = self.token
|
||||
cftitle = '<title>Please Wait... | Cloudflare</title>'
|
||||
|
||||
if headers == None:
|
||||
headers = {}
|
||||
headers['User-Agent'] = REQUA
|
||||
if sendtoken:
|
||||
if params == None:
|
||||
params = {}
|
||||
params['SEC'] = self.sec
|
||||
params['TOKEN'] = self.token
|
||||
|
||||
try:
|
||||
cookies = self.session.cookies
|
||||
except AttributeError:
|
||||
cookies = None
|
||||
if headers == None:
|
||||
headers = {}
|
||||
headers['User-Agent'] = REQUA
|
||||
|
||||
self.session = CloudScraper()
|
||||
if cookies != None:
|
||||
self.session.cookies = cookies
|
||||
try:
|
||||
cookies = self.session.cookies
|
||||
except AttributeError:
|
||||
cookies = None
|
||||
|
||||
if method == REQPOST:
|
||||
req = self.session.post(
|
||||
url,
|
||||
data=data,
|
||||
headers=headers,
|
||||
cookies=reqcookies
|
||||
)
|
||||
else:
|
||||
req = self.session.get(
|
||||
url,
|
||||
params=params,
|
||||
headers=headers,
|
||||
cookies=reqcookies
|
||||
)
|
||||
self.session = CloudScraper()
|
||||
if cookies != None:
|
||||
self.session.cookies = cookies
|
||||
|
||||
countdown = retries
|
||||
while cftitle in req.text \
|
||||
and (countdown > 0):
|
||||
if method == REQPOST:
|
||||
req = self.session.post(
|
||||
url,
|
||||
data=data,
|
||||
headers=headers,
|
||||
cookies=reqcookies
|
||||
)
|
||||
else:
|
||||
req = self.session.get(
|
||||
url,
|
||||
params=params,
|
||||
headers=headers,
|
||||
cookies=reqcookies
|
||||
)
|
||||
|
||||
self.session = CloudScraper()
|
||||
if cookies != None:
|
||||
self.session.cookies = cookies
|
||||
if reqcookies != None:
|
||||
for cookiekey in reqcookies:
|
||||
self.session.cookies.set(cookiekey, reqcookies[cookiekey])
|
||||
countdown = retries
|
||||
while cftitle in req.text \
|
||||
and (countdown > 0):
|
||||
|
||||
time.sleep(1)
|
||||
if method == REQPOST:
|
||||
req = self.session.post(
|
||||
url,
|
||||
data=data,
|
||||
headers=headers,
|
||||
cookies=reqcookies
|
||||
)
|
||||
else:
|
||||
req = self.session.get(
|
||||
url,
|
||||
params=params,
|
||||
headers=headers,
|
||||
cookies=reqcookies
|
||||
)
|
||||
countdown -= 1
|
||||
self.session = CloudScraper()
|
||||
if cookies != None:
|
||||
self.session.cookies = cookies
|
||||
if reqcookies != None:
|
||||
for cookiekey in reqcookies:
|
||||
self.session.cookies.set(cookiekey, reqcookies[cookiekey])
|
||||
|
||||
return req
|
||||
time.sleep(1)
|
||||
if method == REQPOST:
|
||||
req = self.session.post(
|
||||
url,
|
||||
data=data,
|
||||
headers=headers,
|
||||
cookies=reqcookies
|
||||
)
|
||||
else:
|
||||
req = self.session.get(
|
||||
url,
|
||||
params=params,
|
||||
headers=headers,
|
||||
cookies=reqcookies
|
||||
)
|
||||
countdown -= 1
|
||||
|
||||
return req
|
||||
|
|
|
|||
37
python_aternos/atjsparse.py
Normal file
37
python_aternos/atjsparse.py
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
import re
|
||||
import js2py
|
||||
import base64
|
||||
|
||||
brkregex = re.compile(r'\((?!\)|[\'\"])(.+?)(?<!\(|[\'\"])\)')
|
||||
|
||||
def parse_brackets(f):
|
||||
return brkregex.search(f)[1]
|
||||
|
||||
def to_ecma5_function(f):
|
||||
fnstart = f.find('{')+1
|
||||
fnend = f.rfind('}')
|
||||
f = arrow_conv(f[fnstart:fnend])
|
||||
return f
|
||||
|
||||
def atob(s):
|
||||
return base64.standard_b64decode(str(s)).decode('utf-8')
|
||||
|
||||
def arrow_conv(f):
|
||||
if '=>' in f:
|
||||
inner = parse_brackets(f)
|
||||
while brkregex.match(inner) != None:
|
||||
inner = parse_brackets(inner)
|
||||
|
||||
func = re.sub(
|
||||
r'(\w+)\s*=>\s*(.+)',
|
||||
r'function(\1){return \2}', inner
|
||||
)
|
||||
start = f.find(inner)
|
||||
end = start + len(inner)
|
||||
f = f[:start] + func + f[end:]
|
||||
return f
|
||||
|
||||
def exec(f):
|
||||
ctx = js2py.EvalJs({'atob': atob})
|
||||
ctx.execute(to_ecma5_function(f))
|
||||
return ctx
|
||||
|
|
@ -159,7 +159,8 @@ class AternosServer:
|
|||
def motd(self, value:str) -> None:
|
||||
self.atserver_request(
|
||||
'https://aternos.org/panel/ajax/options/motd.php',
|
||||
atconnect.REQPOST, data={'motd': value}
|
||||
atconnect.REQPOST, data={'motd': value},
|
||||
sendtoken=True
|
||||
)
|
||||
|
||||
@property
|
||||
|
|
|
|||
Reference in a new issue