Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: wrapped all initialization requests into loops to avoid stack overflows #33

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

WIP: wrapped all initialization requests into loops to avoid stack overflows #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44faec4
wrapped all initialization requests into loops to avoid stack overflows
s3inlc Jul 28, 2022
b4432df
updated changelog
s3inlc Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## v0.6.1 -> v0.x.x

### Bugfixes

* Preventing stack overflows when server errors occur in the initialization of the agent (issue #691).

## v0.6.0 -> v0.6.1

### Features
Expand Down
169 changes: 89 additions & 80 deletions htpclient/initialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,28 @@ def get_os_extension():
return dict_ext[operating_system]

def __login(self):
query = copy_and_set_token(dict_login, self.config.get_value('token'))
query['clientSignature'] = self.get_version()
req = JsonRequest(query)
ans = req.execute()
if ans is None:
logging.error("Login failed!")
sleep(5)
self.__login()
elif ans['response'] != 'SUCCESS':
logging.error("Error from server: " + str(ans))
self.config.set_value('token', '')
self.__login()
else:
logging.info("Login successful!")
if 'server-version' in ans:
logging.info("Hashtopolis Server version: " + ans['server-version'])
if 'multicastEnabled' in ans and ans['multicastEnabled'] and self.get_os() == 0: # currently only allow linux
logging.info("Multicast enabled!")
self.config.set_value('multicast', True)
if not os.path.isdir("multicast"):
os.mkdir("multicast")
while True:
query = copy_and_set_token(dict_login, self.config.get_value('token'))
query['clientSignature'] = self.get_version()
req = JsonRequest(query)
ans = req.execute()
if ans is None:
logging.error("Login failed!")
sleep(5)
elif ans['response'] != 'SUCCESS':
logging.error("Error from server: " + str(ans))
self.config.set_value('token', '')
sleep(5)
else:
logging.info("Login successful!")
if 'server-version' in ans:
logging.info("Hashtopolis Server version: " + ans['server-version'])
if 'multicastEnabled' in ans and ans['multicastEnabled'] and self.get_os() == 0: # currently only allow linux
logging.info("Multicast enabled!")
self.config.set_value('multicast', True)
if not os.path.isdir("multicast"):
os.mkdir("multicast")
return

def __update_information(self):
if not self.config.get_value('uuid'):
Expand Down Expand Up @@ -127,47 +128,52 @@ def __update_information(self):
line = line.split(":")
devices.append(line[1].strip())

query = copy_and_set_token(dict_updateInformation, self.config.get_value('token'))
query['uid'] = self.config.get_value('uuid')
query['os'] = self.get_os()
query['devices'] = devices
req = JsonRequest(query)
ans = req.execute()
if ans is None:
logging.error("Information update failed!")
sleep(5)
self.__update_information()
elif ans['response'] != 'SUCCESS':
logging.error("Error from server: " + str(ans))
sleep(5)
self.__update_information()

def __check_token(self, args):
if not self.config.get_value('token'):
if self.config.get_value('voucher'):
# voucher is set in config and can be used to autoregister
voucher = self.config.get_value('voucher')
elif args.voucher:
voucher = args.voucher
else:
voucher = input("No token found! Please enter a voucher to register your agent:\n").strip()
name = platform.node()
query = dict_register.copy()
query['voucher'] = voucher
query['name'] = name
while True:
query = copy_and_set_token(dict_updateInformation, self.config.get_value('token'))
query['uid'] = self.config.get_value('uuid')
query['os'] = self.get_os()
query['devices'] = devices
req = JsonRequest(query)
ans = req.execute()
if ans is None:
logging.error("Request failed!")
self.__check_token(args)
elif ans['response'] != 'SUCCESS' or not ans['token']:
logging.error("Registering failed: " + str(ans))
self.__check_token(args)
logging.error("Information update failed!")
sleep(5)
elif ans['response'] != 'SUCCESS':
logging.error("Error from server: " + str(ans))
sleep(5)
else:
token = ans['token']
self.config.set_value('voucher', '')
self.config.set_value('token', token)
logging.info("Successfully registered!")
return

def __check_token(self, args):
if not self.config.get_value('token'):
while True:
if self.config.get_value('voucher'):
# voucher is set in config and can be used to autoregister
voucher = self.config.get_value('voucher')
elif args.voucher:
voucher = args.voucher
else:
voucher = input("No token found! Please enter a voucher to register your agent:\n").strip()
name = platform.node()
query = dict_register.copy()
query['voucher'] = voucher
query['name'] = name
req = JsonRequest(query)
ans = req.execute()
if ans is None:
logging.error("Request failed!")
sleep(1)
elif ans['response'] != 'SUCCESS' or not ans['token']:
if self.config.get_value('voucher'):
self.config.set_value('voucher', ''):
logging.error("Registering failed: " + str(ans))
sleep(1)
else:
token = ans['token']
self.config.set_value('voucher', '')
self.config.set_value('token', token)
logging.info("Successfully registered!")
return

def __check_cert(self, args):
cert = self.config.get_value('cert')
Expand All @@ -182,29 +188,32 @@ def __check_cert(self, args):
logging.debug("Configuration session cert to: " + cert)

def __check_url(self, args):
if not self.config.get_value('url'):
# ask for url
if args.url is None:
url = input("Please enter the url to the API of your Hashtopolis installation:\n").strip()
while True:
if not self.config.get_value('url'):
# ask for url
if args.url is None:
url = input("Please enter the url to the API of your Hashtopolis installation:\n").strip()
else:
url = args.url
logging.debug("Setting url to: " + url)
self.config.set_value('url', url)
else:
return

query = dict_testConnection.copy()
req = JsonRequest(query)
ans = req.execute()
if ans is None:
logging.error("Connection test failed!")
self.config.set_value('url', '')
sleep(1)
elif ans['response'] != 'SUCCESS':
logging.error("Connection test failed: " + str(ans))
self.config.set_value('url', '')
sleep(1)
else:
url = args.url
logging.debug("Setting url to: " + url)
self.config.set_value('url', url)
else:
return
query = dict_testConnection.copy()
req = JsonRequest(query)
ans = req.execute()
if ans is None:
logging.error("Connection test failed!")
self.config.set_value('url', '')
self.__check_url(args)
elif ans['response'] != 'SUCCESS':
logging.error("Connection test failed: " + str(ans))
self.config.set_value('url', '')
self.__check_url(args)
else:
logging.debug("Connection test successful!")
logging.debug("Connection test successful!")
return

@staticmethod
def __build_directories():
Expand Down