d_mcknight/Varken
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add URL check to InfluxDB

Browse source
This commit is contained in:
samwiseg0 2018-12-14 15:25:17 -05:00
parent cb966f2cc6
commit 7b8403c9ba
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
varken/iniparser.py
View file

@ -68,29 +68,40 @@ class INIParser(object):
self.logger.error('Config file missing (varken.ini) in %s', self.data_folder) self.logger.error('Config file missing (varken.ini) in %s', self.data_folder)
exit(1) exit(1)
def url_check(self, url=None): def url_check(self, url=None, include_port=True):
url_check = url url_check = url
inc_port = include_port
regex = re.compile( search = (r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' #domain...
r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' #domain... r'localhost|' #localhost...
r'localhost|' #localhost... r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip )
r'(?::\d+)?' # optional port
r'(?:/?|[/?]\S+)$', re.IGNORECASE if inc_port:
) search = (search + r'(?::\d+)?' + r'(?:/?|[/?]\S+)$')
else:
search = (search + r'(?:/?|[/?]\S+)$')
regex = re.compile('{}'.format(search), re.IGNORECASE)
print(re.match(regex, url_check))
valid = re.match(regex, url_check) is not None valid = re.match(regex, url_check) is not None
if not valid: if not valid:
self.logger.error('%s is invalid! URL must host/IP and port if not 80 or 443. ie. localhost:8080', url_check) if inc_port:
exit(1) self.logger.error('%s is invalid! URL must host/IP and port if not 80 or 443. ie. localhost:8080', url_check)
exit(1)
else:
self.logger.error('%s is invalid! URL must host/IP. ie. localhost', url_check)
exit(1)
else: else:
self.logger.debug('%s is a vlaid URL in the config', url_check) self.logger.debug('%s is a vlaid URL in the config.', url_check)
return url_check return url_check
def parse_opts(self): def parse_opts(self):
self.read_file() self.read_file()
# Parse InfluxDB options # Parse InfluxDB options
url = self.config.get('influxdb', 'url') url = self.url_check(self.config.get('influxdb', 'url'), include_port=False)
port = self.config.getint('influxdb', 'port') port = self.config.getint('influxdb', 'port')