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.

Sign up for GitHub

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

Jump to bottom

AIK-3945 Port over new GeoIP PR #272

Merged
merged 18 commits into from
Dec 2, 2024
Merged

AIK-3945 Port over new GeoIP PR #272

merged 18 commits into from
Dec 2, 2024

Conversation

bitterpanda63
Copy link
Contributor

Wout Feys added 17 commits November 14, 2024 17:09
Add BlockList to python
d879587
Create helper function add_ip_address_to_blocklist with unit tests
0a51b98
Update the service config to store blocked_ips
34986fc
Merge branch 'AIK-3829' into AIK-3945
8b0f3dd
Merge remote-tracking branch 'origin/main' into AIK-3945
9415310
Create and use new helper function "check_if_ip_blocked"
53d92a9
Create new function on connection manager for blocked ips
7207f01
Create a fetch_blocked_ips function
875e6fa
Update way thread cache stores service config
5df62ce
Integrate with API endpoint
cd70533
Cleanup: fix broken tests, change service_config
cfa065d
Update check_if_ip_blocked to add geoip
87ca348
Merge branch 'AIK-3829' into AIK-3945
43dbe2b
Update aikido core and flask e2e test
8d8a47a
Cleanup, move endpoint matching to check_if_ip_blocked
bf5ec81
move to cache.get_endpoints
a64bf19
Fix middleware tests
87782c1
@bitterpanda63 bitterpanda63 changed the base branch from main to AIK-3829 November 28, 2024 15:09
@bitterpanda63 bitterpanda63 marked this pull request as ready for review November 28, 2024 15:28
Base automatically changed from AIK-3829 to main December 2, 2024 13:18
@willem-delbare willem-delbare merged commit 0260016 into main Dec 2, 2024
11 checks passed
@willem-delbare willem-delbare deleted the AIK-3945 branch December 2, 2024 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bitterpanda63 @willem-delbare