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.

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

fixed bug in exist filter #23

Merged
merged 1 commit into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
## 2.2.x
### 2.2.7
#### Bugfix
* Fixed bug in exist filter
### 2.2.6
#### Bugfix
* Removed error logging in *filters.py*
Expand Down
7 changes: 7 additions & 0 deletions routing_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def setUp(self):
self.test_event_16 = load_test_data("test_event_16")
self.test_event_17 = load_test_data("test_event_17")
self.test_event_18 = load_test_data("test_event_18")
self.test_event_19 = load_test_data("test_event_19")
self.test_event_with_list_1 = load_test_data("test_event_with_list_1")
self.test_event_with_list_2 = load_test_data("test_event_with_list_2")

Expand Down Expand Up @@ -467,6 +468,12 @@ def test_count(self):
self.routing.load_from_dicts(rule_list)
self.assertEqual(self.routing.count(), 5)

def test_exist_source_ip(self):
self.routing.load_from_dicts([load_test_data("test_rule_31_equals_exist")])
match = self.routing.match(self.test_event_19)
self.assertTrue(match)
self.assertDictEqual(match[0].output, {"Workshop": {"workers_needed": 1}})


if __name__ == "__main__":
unittest.main()
2 changes: 1 addition & 1 deletion routingfilter/filters/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def match(self, event: DictQuery) -> bool:
:rtype: bool
"""
for key in self._key:
if key in event.keys():
if event.get(key) is not None:
return True
return False

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name="routingfilter",
version="2.2.6",
version="2.2.7",
packages=find_packages(include=["routingfilter", "routingfilter.*"]),
include_package_data=True,
install_requires=["IPy~=1.1", "macaddress~=2.0.2"],
Expand Down
36 changes: 36 additions & 0 deletions test_data/test_event_19.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"tags": [
"elastic_query",
"foobar"
],
"user": {
"name": "mario.rossi"
},
"event": {
"kind": "event",
"type": "start",
"action": "login",
"outcome": "success",
"category": "authentication"
},
"radius": {
"ttl": 17.044188022613525,
"result": "success"
},
"source": {
"ip": "1.1.1.1",
"port": 10402
},
"network": {
"protocol": "radius"
},
"severity": 3,
"reply_msg": "Enter your SecurID OTP or select another method: 1 to Approve on your registered authenticator, 2 for Biometrics"
}







37 changes: 37 additions & 0 deletions test_data/test_rule_31_equals_exist.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"streams": {
"rules": {
"elastic_query": [
{
"id": "equals-ffh498",
"filters": [
{
"id": 5540,
"key": [
"tags"
],
"type": "EQUALS",
"value": [
"bar",
"foobar"
]
},
{
"id": 6001,
"key": [
"source.ip"
],
"type": "EXISTS",
"value": []
}
],
"streams": {
"Workshop": {
"workers_needed": 1
}
}
}
]
}
}
}
Loading