From 841d828cb57199353cf330266d04c5a10076a268 Mon Sep 17 00:00:00 2001
From: ZhymabekRoman <robanokssamit@yandex.ru>
Date: Fri, 7 Jun 2024 18:28:29 +0500
Subject: [PATCH] anti-bot: adding curl to the block list

---
 docker-compose-dev.yml   | 75 ++++++++++++++++++++--------------------
 server/utils/anti_bot.py |  2 +-
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index e042d88..e18a82c 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -18,7 +18,7 @@ services:
     networks:
       - web_network
     healthcheck:
-      test: ["CMD-SHELL", "curl http://caddy:6752/ --max-time 80"]
+      test: ["CMD-SHELL", "curl -f http://caddy:6752/ --max-time 80 --header 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3 Safari/605.1.15'"]
       interval: 30s
       start_period: 20s
       timeout: 80s
@@ -35,30 +35,31 @@ services:
       # - ./server/user_data/logs:/app/server/user_data/logs
       - .:/app
       - ./core/medium_parser/:/app/medium_parser
-    develop:
-      watch:
-        - action: rebuild
-          path: ./server
-          target: /app/server
-        - action: rebuild
-          path: ./core
-          target: /app/core
-        - action: rebuild
-          path: ./rl_string_helper
-          target: /app/rl_string_helper
-        - action: rebuild
-          path: ./database-lib
-          target: /app/database-lib
-        - action: rebuild
-          path: "**/requirements.txt"
-        - action: rebuild
-          path: "**/requirements-fast.txt"
+      - ./core/rl_string_helper/:/app/rl_string_helper
+    # develop:
+    #   watch:
+    #     - action: rebuild
+    #       path: ./server
+    #       target: /app/server
+    #     - action: rebuild
+    #       path: ./core
+    #       target: /app/core
+    #     - action: rebuild
+    #       path: ./rl_string_helper
+    #       target: /app/rl_string_helper
+    #     - action: rebuild
+    #       path: ./database-lib
+    #       target: /app/database-lib
+    #     - action: rebuild
+    #       path: "**/requirements.txt"
+    #     - action: rebuild
+    #       path: "**/requirements-fast.txt"
     expose:
       - 7080
     networks:
       - web_network
     healthcheck:
-      test: ["CMD-SHELL", "curl http://localhost:7080/ --max-time 60"]
+      test: ["CMD-SHELL", "curl -f http://localhost:7080/ --max-time 80 --header 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3 Safari/605.1.15'"]
       interval: 30s
       start_period: 20s
       timeout: 80s
@@ -66,23 +67,23 @@ services:
     restart: always
     mem_limit: 2g
 
-  # dragonfly:
-  #   image: 'docker.dragonflydb.io/dragonflydb/dragonfly'
-  #   ulimits:
-  #     memlock: -1
-  #   expose:
-  #     - 6379
-  #   networks:
-  #     - web_network
-  #   volumes:
-  #     - dragonflydata:/data
-  #   healthcheck:
-  #     test: ["CMD", "redis-cli", "ping"]
-  #     interval: 30s
-  #     start_period: 20s
-  #     timeout: 10s
-  #     retries: 3
-  #   restart: always
+  dragonfly:
+    image: 'docker.dragonflydb.io/dragonflydb/dragonfly'
+    ulimits:
+      memlock: -1
+    expose:
+      - 6379
+    networks:
+      - web_network
+    volumes:
+      - dragonflydata:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 30s
+      start_period: 20s
+      timeout: 10s
+      retries: 3
+    restart: always
 
   autoheal:
     restart: always
diff --git a/server/utils/anti_bot.py b/server/utils/anti_bot.py
index bf4c7b1..a289440 100644
--- a/server/utils/anti_bot.py
+++ b/server/utils/anti_bot.py
@@ -28,7 +28,7 @@ bot_signatures = {
     "okhttp/",
     "go-resty/",
     "Faraday v",
-    # "curl/"
+    "curl/",
 }