From 65f253145c13f3d786c52cc2de86d87368fdaab2 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Thu, 30 Nov 2023 13:11:20 +0000 Subject: [PATCH 1/2] Removed divide char and added comment restriction --- crawlers/mooncrawl/mooncrawl/stats_worker/queries.py | 2 +- crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crawlers/mooncrawl/mooncrawl/stats_worker/queries.py b/crawlers/mooncrawl/mooncrawl/stats_worker/queries.py index a5d954c2..4c9b9453 100644 --- a/crawlers/mooncrawl/mooncrawl/stats_worker/queries.py +++ b/crawlers/mooncrawl/mooncrawl/stats_worker/queries.py @@ -23,7 +23,7 @@ from ..settings import MOONSTREAM_S3_QUERIES_BUCKET_PREFIX logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) -QUERY_REGEX = re.compile("[\[\]@#$%^&?;`/]") +QUERY_REGEX = re.compile(r"[\[\]@#$%^&?;`]|/\*|\*/") class QueryNotValid(Exception): diff --git a/crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py b/crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py index a71911d7..3b647341 100644 --- a/crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py +++ b/crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py @@ -60,6 +60,6 @@ class TestQueries(unittest.TestCase): with self.assertRaises(queries.QueryNotValid): queries.query_validation("OR(1=1)#") - + with self.assertRaises(queries.QueryNotValid): - queries.query_validation("/etc/hosts") + queries.query_validation("0/**/or/**/1") From ea04e61f60d3971015085173d72f7079528c96f3 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Thu, 30 Nov 2023 13:15:26 +0000 Subject: [PATCH 2/2] Black check --- crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py b/crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py index 3b647341..c3c76d34 100644 --- a/crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py +++ b/crawlers/mooncrawl/mooncrawl/stats_worker/test_queries.py @@ -60,6 +60,6 @@ class TestQueries(unittest.TestCase): with self.assertRaises(queries.QueryNotValid): queries.query_validation("OR(1=1)#") - + with self.assertRaises(queries.QueryNotValid): queries.query_validation("0/**/or/**/1")