Skip to content

Commit 2e95ddb

Browse files
committed
revert(ml-waf): ⏪
Remove `ml-waf` from logger
1 parent 6df4376 commit 2e95ddb

File tree

9 files changed

+3
-99
lines changed

9 files changed

+3
-99
lines changed

.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
USAGE_LOGGERS_DISABLE=False
22
USAGE_LOGGERS_URL="http://localhost:4001/message"
3-
WAF_ENABLED=True

.isort.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
line_length = 88
33
multi_line_output = 3
44
include_trailing_comma = True
5-
known_third_party = aiohttp,django,joblib,requests,setuptools,werkzeug
5+
known_third_party = aiohttp,django,requests,setuptools,werkzeug

requirements_dev.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ Werkzeug==1.0.1
1212
django==3.1.12
1313
aiohttp==3.7.4
1414
tox==3.24.3
15-
joblib

setup.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ def read_file(name):
1010

1111
middleware = util.convert_path("usagelogger/middleware")
1212
utils = util.convert_path("usagelogger/utils")
13-
artifacts = util.convert_path("usagelogger/artifacts")
1413

1514
setup(
1615
name="usagelogger",
@@ -37,17 +36,11 @@ def read_file(name):
3736
"usagelogger": "usagelogger",
3837
"usagelogger.middleware": middleware,
3938
"usagelogger.utils": utils,
40-
"usagelogger.artifacts": artifacts,
4139
},
42-
packages=[
43-
"usagelogger",
44-
"usagelogger.middleware",
45-
"usagelogger.utils",
46-
"usagelogger.artifacts",
47-
],
40+
packages=["usagelogger", "usagelogger.middleware", "usagelogger.utils"],
4841
# packages=find_packages(exclude=["tests"]),
4942
python_requires=">=3.7, <4",
50-
install_requires=["requests>=2", "joblib>=1.0.1"],
43+
install_requires=["requests>=2"],
5144
include_package_data=True,
5245
tests_require=["pytest"],
5346
project_urls={

usagelogger/_waf.py

Lines changed: 0 additions & 73 deletions
This file was deleted.

usagelogger/artifacts/__init__.py

Whitespace-only changes.

usagelogger/artifacts/classifier.pkl

-765 KB
Binary file not shown.

usagelogger/artifacts/vectorizer.pkl

-5.6 MB
Binary file not shown.

usagelogger/base_logger.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
enclosure_queue: Queue = Queue()
1919

20-
WAF_ENABLED = bool(os.getenv("WAF_ENABLED", False))
21-
2220

2321
class BaseLogger:
2422
"""Basic usage logger to embed or extend."""
@@ -69,12 +67,6 @@ def __init__(
6967
self._submit_failures_lock = threading.Lock()
7068
self._submit_successes = 0
7169
self._submit_successes_lock = threading.Lock()
72-
if WAF_ENABLED:
73-
from ._waf import WAF
74-
75-
self.waf = WAF.load_model()
76-
else:
77-
self.waf = None
7870

7971
def disable(self):
8072
self._enabled = False
@@ -113,12 +105,6 @@ def __internal_submission(self, q: Queue):
113105

114106
while not q.empty():
115107
payload = q.get()
116-
# ML WAF
117-
if WAF_ENABLED:
118-
proba = self.waf.get_threat_probabilities(
119-
query=payload["msg"][1][1]
120-
)
121-
payload["msg"].append(["threat_score", proba])
122108
payload["msg"] = json.dumps(payload["msg"], separators=(",", ":"))
123109
if not payload["skip_compression"]:
124110
body = payload["msg"]

0 commit comments

Comments
 (0)