gitorious/nagios-http-json
1
0
Fork 0
mirror of https://github.com/drewkerrigan/nagios-http-json.git synced 2024-11-22 10:23:50 +01:00
Code Issues Releases Wiki Activity

Changed from square brackets to normal paranthesis for arrays. Nagios doesn't like square brackets.

Browse Source 
(http://sourceforge.net/p/nagios/nrpe/ci/master/tree/SECURITY illegal metachars section)
Fixed case when no dot after array (e.g. checks(0) wasn't working)
Extract paranthesis characters in attribute.
This commit is contained in:
Hunor Kovács 2015-05-05 14:32:16 +03:00
parent 3b048f66c5
commit aa90ecad65
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
check_http_json.py
View File

@ -45,6 +45,8 @@ class JsonHelper:
def __init__(self, json_data, separator): def __init__(self, json_data, separator):
self.data = json_data self.data = json_data
self.separator = separator self.separator = separator
self.arrayOpener = '('
self.arrayCloser = ')'
def getSubElement(self, key, data): def getSubElement(self, key, data):
separatorIndex = key.find(self.separator) separatorIndex = key.find(self.separator)
@ -56,9 +58,12 @@ class JsonHelper:
return (None, 'not_found') return (None, 'not_found')
def getSubArrayElement(self, key, data): def getSubArrayElement(self, key, data):
subElemKey = key[:key.find('[')] subElemKey = key[:key.find(self.arrayOpener)]
index = int(key[key.find('[') + 1:key.find(']')]) index = int(key[key.find(self.arrayOpener) + 1:key.find(self.arrayCloser)])
remainingKey = key[key.find('].') + 2:] remainingKey = key[key.find(self.arrayCloser + self.separator) + 2:]
if key.find(self.arrayCloser + self.separator) == -1:
remainingKey = key[key.find(self.arrayCloser) + 1:]
if subElemKey in data: if subElemKey in data:
if index < len(data[subElemKey]): if index < len(data[subElemKey]):
return self.get(remainingKey, data[subElemKey][index]) return self.get(remainingKey, data[subElemKey][index])
@ -81,8 +86,8 @@ class JsonHelper:
if len(key) <= 0: if len(key) <= 0:
return data return data
if key.find(self.separator) != -1 and key.find('[') != -1 : if key.find(self.separator) != -1 and key.find(self.arrayOpener) != -1 :
if key.find(self.separator) < key.find('[') : if key.find(self.separator) < key.find(self.arrayOpener) :
return self.getSubElement(key, data) return self.getSubElement(key, data)
else: else:
return self.getSubArrayElement(key, data) return self.getSubArrayElement(key, data)
@ -90,7 +95,7 @@ class JsonHelper:
if key.find(self.separator) != -1 : if key.find(self.separator) != -1 :
return self.getSubElement(key, data) return self.getSubElement(key, data)
else: else:
if key.find('[') != -1 : if key.find(self.arrayOpener) != -1 :
return self.getSubArrayElement(key, data) return self.getSubArrayElement(key, data)
else: else:
if key in data: if key in data: