From 8b5666b238170fdda55929b124328585ff186530 Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Tue, 3 May 2022 12:48:06 +0000 Subject: [PATCH] Ensure API key is used --- salt/sensoroni/files/analyzers/greynoise/greynoise.py | 3 ++- salt/sensoroni/files/analyzers/greynoise/greynoise_test.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/salt/sensoroni/files/analyzers/greynoise/greynoise.py b/salt/sensoroni/files/analyzers/greynoise/greynoise.py index 223fd366d..deeef5414 100755 --- a/salt/sensoroni/files/analyzers/greynoise/greynoise.py +++ b/salt/sensoroni/files/analyzers/greynoise/greynoise.py @@ -19,7 +19,8 @@ def sendReq(conf, meta, ip): url = url + 'v3/community/' + ip elif conf['api_version'] == 'investigate' or 'automate': url = url + 'v2/noise/context/' + ip - response = requests.request('GET', url) + headers = {"key": conf['api_key']} + response = requests.request('GET', url=url, headers=headers) return response.json() diff --git a/salt/sensoroni/files/analyzers/greynoise/greynoise_test.py b/salt/sensoroni/files/analyzers/greynoise/greynoise_test.py index ffc96527a..768107adb 100644 --- a/salt/sensoroni/files/analyzers/greynoise/greynoise_test.py +++ b/salt/sensoroni/files/analyzers/greynoise/greynoise_test.py @@ -37,7 +37,7 @@ class TestGreynoiseMethods(unittest.TestCase): conf = {"base_url": "https://myurl/", "api_key": "abcd1234", "api_version": "community"} ip = "192.168.1.1" response = greynoise.sendReq(conf=conf, meta=meta, ip=ip) - mock.assert_called_once_with("GET", "https://myurl/v3/community/192.168.1.1") + mock.assert_called_once_with("GET", headers={'key': 'abcd1234'}, url="https://myurl/v3/community/192.168.1.1") self.assertIsNotNone(response) def test_sendReq_investigate(self): @@ -46,7 +46,7 @@ class TestGreynoiseMethods(unittest.TestCase): conf = {"base_url": "https://myurl/", "api_key": "abcd1234", "api_version": "investigate"} ip = "192.168.1.1" response = greynoise.sendReq(conf=conf, meta=meta, ip=ip) - mock.assert_called_once_with("GET", "https://myurl/v2/noise/context/192.168.1.1") + mock.assert_called_once_with("GET", headers={'key': 'abcd1234'}, url="https://myurl/v2/noise/context/192.168.1.1") self.assertIsNotNone(response) def test_sendReq_automate(self): @@ -55,7 +55,7 @@ class TestGreynoiseMethods(unittest.TestCase): conf = {"base_url": "https://myurl/", "api_key": "abcd1234", "api_version": "automate"} ip = "192.168.1.1" response = greynoise.sendReq(conf=conf, meta=meta, ip=ip) - mock.assert_called_once_with("GET", "https://myurl/v2/noise/context/192.168.1.1") + mock.assert_called_once_with("GET", headers={'key': 'abcd1234'}, url="https://myurl/v2/noise/context/192.168.1.1") self.assertIsNotNone(response) def test_prepareResults_invalidIP(self):