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

Blacklist tagging #211

Merged
merged 7 commits into from Nov 2, 2019

Conversation

@0xdade
Copy link
Member

0xdade commented Oct 31, 2019

This pull request fixes the issue reported in #206, "Blacklist IP Tagging not working". It also pulls inline javascript into it's own file. This method isn't necessarily ideal, maybe it should have just been included in the natlas.js file and wrapped in an onReady or something, but this way the javascript is only present when it's needed while still getting to take advantage of caching. Only a certain subset of users on any deployment will likely ever need to access this particular javascript, anyways.

0xdade added 2 commits Oct 25, 2019
Fixes #206, makes scope tagging available on both scope and blacklist pages. Tried to make some code cleanup while I was at it, as well as improve other inconsistencies with tags.
@0xdade 0xdade requested a review from ajacques Oct 31, 2019
Copy link
Member

ajacques left a comment

We need some better Javascript organization and management.

natlas-server/app/static/js/natlas-tagging.js Outdated Show resolved Hide resolved
natlas-server/app/admin/routes.py Show resolved Hide resolved
natlas-server/app/admin/routes.py Outdated Show resolved Hide resolved
natlas-server/app/static/js/natlas-tagging.js Outdated Show resolved Hide resolved
@lgtm-com

This comment has been minimized.

Copy link

lgtm-com bot commented Oct 31, 2019

This pull request introduces 1 alert when merging e96b5ea into 950b1c1 - view on LGTM.com

new alerts:

  • 1 for Unused variable, import, function or class
@codeclimate

This comment has been minimized.

Copy link

codeclimate bot commented Oct 31, 2019

Code Climate has analyzed commit 1bdce69 and detected 0 issues on this pull request.

View more on Code Climate.

@0xdade 0xdade requested a review from ajacques Nov 1, 2019
@pryorda
pryorda approved these changes Nov 2, 2019
Copy link
Contributor

pryorda left a comment

LGTM

@0xdade 0xdade merged commit a1a8ba4 into natlas:main Nov 2, 2019
3 checks passed
3 checks passed
LGTM analysis: JavaScript No new or fixed alerts
Details
LGTM analysis: Python No new or fixed alerts
Details
codeclimate 33 fixed issues
Details
@0xdade 0xdade deleted the 0xdade:blacklist_tagging branch Nov 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.