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

Merge pull request #53 from drewkerrigan/fix-issue-34

Browse Source 
Add boundary check for SubArrayElement function
This commit is contained in:
Markus Opolka 2020-03-05 19:51:55 +01:00 committed by GitHub
commit 5c416cd0c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
check_http_json.py
View File

@ -108,6 +108,7 @@ class JsonHelper:
index = int(key[key.find(self.arrayOpener) + index = int(key[key.find(self.arrayOpener) +
1:key.find(self.arrayCloser)]) 1:key.find(self.arrayCloser)])
remainingKey = key[key.find(self.arrayCloser + self.separator) + 2:] remainingKey = key[key.find(self.arrayCloser + self.separator) + 2:]
if key.find(self.arrayCloser + self.separator) == -1: if key.find(self.arrayCloser + self.separator) == -1:
remainingKey = key[key.find(self.arrayCloser) + 1:] remainingKey = key[key.find(self.arrayCloser) + 1:]
if subElemKey in data: if subElemKey in data:
@ -115,6 +116,8 @@ class JsonHelper:
return self.get(remainingKey, data[subElemKey][index]) return self.get(remainingKey, data[subElemKey][index])
else: else:
return (None, 'not_found') return (None, 'not_found')
if index >= len(data):
return (None, 'not_found')
else: else:
if not subElemKey: if not subElemKey:
return self.get(remainingKey, data[index]) return self.get(remainingKey, data[index])

23
test/test_check_http_json.py
View File

@ -220,3 +220,26 @@ class UtilTest(unittest.TestCase):
{ "gauges": { "jvm.buffers.direct.capacity": [ { "gauges": { "jvm.buffers.direct.capacity": [
{"value": 215415},{"value": 1235}]}}]''', {"value": 215415},{"value": 1235}]}}]''',
WARNING_CODE) WARNING_CODE)
def test_array_with_missing_element(self):
"""
See https://github.com/drewkerrigan/nagios-http-json/issues/34
"""
rules = RulesHelper()
# This should simply work
data = '[{"Node": "there"}]'
self.check_data(rules.dash_q(['(0).Node,there']), data, OK_CODE)
# This should warn us
data = '[{"Node": "othervalue"}]'
self.check_data(rules.dash_q(['(0).Node,there']), data, WARNING_CODE)
# # This should not throw an IndexError
data = '[{"Node": "foobar"}]'
self.check_data(rules.dash_q(['(0).Node,foobar', '(1).Node,missing']), data, WARNING_CODE)
self.check_data(rules.dash_q(['(0).Node,foobar', '(1).Node,missing', '(2).Node,alsomissing']), data, WARNING_CODE)
# This should not throw a KeyError
data = '{}'
self.check_data(rules.dash_q(['(0).Node,foobar', '(1).Node,missing']), data, WARNING_CODE)