From c895dc76277ae2272278c772b21bd3fae77f3103 Mon Sep 17 00:00:00 2001 From: Joseph Montanaro Date: Thu, 29 Oct 2020 23:10:58 -0700 Subject: [PATCH] use remember_web cookie instead of pterodactyl_session --- bot.py | 6 ++++-- heavynode/main.py | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bot.py b/bot.py index 9452838..4e9bf48 100644 --- a/bot.py +++ b/bot.py @@ -15,7 +15,9 @@ import heavynode DISCORD_TOKEN = os.environ['discord_token'] DISCORD_SERVER_ID = 530446700058509323 HEAVYNODE_TOKEN = os.environ['heavynode_token'] -SESSION_COOKIE = os.environ['pterodactyl_session_cookie'] +# SESSION_COOKIE = os.environ['pterodactyl_session_cookie'] +COOKIE_NAME = 'remember_web_59ba36addc2b2f9401580f014c7f58ea4e30989d' +COOKIE_VALUE = os.environ[COOKIE_NAME] logging.basicConfig() @@ -24,7 +26,7 @@ intents = discord.Intents.default() intents.members = True bot = lib.MineBot(command_prefix='!', intents=intents) -hn = heavynode.Client(HEAVYNODE_TOKEN, SESSION_COOKIE) +hn = heavynode.Client(HEAVYNODE_TOKEN, COOKIE_NAME, COOKIE_VALUE) bot.add_cleanup(hn.shutdown) diff --git a/heavynode/main.py b/heavynode/main.py index dbc41ff..2ce784e 100644 --- a/heavynode/main.py +++ b/heavynode/main.py @@ -78,9 +78,10 @@ class Socket: class Client: - def __init__(self, token, session_cookie): + def __init__(self, token, cookie_name, cookie_value): self.token = token - self.session_cookie = session_cookie + self.cookie_name = cookie_name + self.cookie_value = cookie_value self.baseurl = 'https://control.heavynode.com/api' self.stats = [] # global state is icky, but it sure is convenient @@ -148,7 +149,7 @@ class Client: await self.socket.connect_socket() async def fetch_daemon_secret(self): - cookie = {'pterodactyl_session': self.session_cookie} + cookie = {self.cookie_name: self.cookie_value} async with aiohttp.ClientSession(cookies=cookie) as session: r = await session.get('https://control.heavynode.com/server/' + self.server['identifier']) m = re.search('"daemonSecret"\s?:\s?"([^"]*)"', await r.text())