ops(docker): use Docker Compose V2 commands

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/workflows/build-pr.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the git repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Log in to Docker Hub
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Build Docker image
 
 on:
   push:
-    branches: [ master]
+    branches: [ master ]
   schedule:
     - cron: '0 18 * * 5'
 
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the git repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Log in to Docker Hub
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9

.github/workflows/codeql-analysis.yml

@@ -20,16 +20,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

Makefile

@@ -13,48 +13,48 @@ SERVICES          := db web proxy redis celery celery-beat
 .PHONY: setup certs up build username pull down stop restart rm logs
 
 certs:		    ## Generate certificates.
-	@${COMPOSE_PREFIX_CMD} docker-compose -f docker-compose.setup.yml run --rm certs
+	@${COMPOSE_PREFIX_CMD} docker compose -f docker-compose.setup.yml run --rm certs
 
 setup:			## Generate certificates.
 	@make certs
 
 up:				## Build and start all services.
-	${COMPOSE_PREFIX_CMD} docker-compose ${COMPOSE_ALL_FILES} up -d --build ${SERVICES}
+	${COMPOSE_PREFIX_CMD} docker compose ${COMPOSE_ALL_FILES} up -d --build ${SERVICES}
 
 build:			## Build all services.
-	${COMPOSE_PREFIX_CMD} docker-compose ${COMPOSE_ALL_FILES} build ${SERVICES}
+	${COMPOSE_PREFIX_CMD} docker compose ${COMPOSE_ALL_FILES} build ${SERVICES}
 
 username:		## Generate Username (Use only after make up).
-	${COMPOSE_PREFIX_CMD} docker-compose ${COMPOSE_ALL_FILES} exec web python3 manage.py createsuperuser
+	${COMPOSE_PREFIX_CMD} docker compose ${COMPOSE_ALL_FILES} exec web python3 manage.py createsuperuser
 
 pull:			## Pull Docker images.
 	docker login docker.pkg.github.com
-	${COMPOSE_PREFIX_CMD} docker-compose ${COMPOSE_ALL_FILES} pull
+	${COMPOSE_PREFIX_CMD} docker compose ${COMPOSE_ALL_FILES} pull
 
 down:			## Down all services.
-	${COMPOSE_PREFIX_CMD} docker-compose ${COMPOSE_ALL_FILES} down
+	${COMPOSE_PREFIX_CMD} docker compose ${COMPOSE_ALL_FILES} down
 
 stop:			## Stop all services.
-	${COMPOSE_PREFIX_CMD} docker-compose ${COMPOSE_ALL_FILES} stop ${SERVICES}
+	${COMPOSE_PREFIX_CMD} docker compose ${COMPOSE_ALL_FILES} stop ${SERVICES}
 
 restart:		## Restart all services.
-	${COMPOSE_PREFIX_CMD} docker-compose ${COMPOSE_ALL_FILES} restart ${SERVICES}
+	${COMPOSE_PREFIX_CMD} docker compose ${COMPOSE_ALL_FILES} restart ${SERVICES}
 
 rm:				## Remove all services containers.
-	${COMPOSE_PREFIX_CMD} docker-compose $(COMPOSE_ALL_FILES) rm -f ${SERVICES}
+	${COMPOSE_PREFIX_CMD} docker compose $(COMPOSE_ALL_FILES) rm -f ${SERVICES}
 
 test:
-	${COMPOSE_PREFIX_CMD} docker-compose $(COMPOSE_ALL_FILES) exec celery python3 -m unittest tests/test_scan.py
+	${COMPOSE_PREFIX_CMD} docker compose $(COMPOSE_ALL_FILES) exec celery python3 -m unittest tests/test_scan.py
 
 logs:			## Tail all logs with -n 1000.
-	${COMPOSE_PREFIX_CMD} docker-compose $(COMPOSE_ALL_FILES) logs --follow --tail=1000 ${SERVICES}
+	${COMPOSE_PREFIX_CMD} docker compose $(COMPOSE_ALL_FILES) logs --follow --tail=1000 ${SERVICES}
 
 images:			## Show all Docker images.
-	${COMPOSE_PREFIX_CMD} docker-compose $(COMPOSE_ALL_FILES) images ${SERVICES}
+	${COMPOSE_PREFIX_CMD} docker compose $(COMPOSE_ALL_FILES) images ${SERVICES}
 
 prune:			## Remove containers and delete volume data.
 	@make stop && make rm && docker volume prune -f
 
 help:			## Show this help.
-	@echo "Make application docker images and manage containers using docker-compose files."
+	@echo "Make application docker images and manage containers using docker compose files."
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m (default: help)\n\nTargets:\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-12s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST)

README.md

@@ -272,7 +272,7 @@ vulnerability_scan: {
   'timeout': 5,
   'fetch_gpt_report': true,
   'nuclei': {
-    'use_conf': false,
+    'use_nuclei_config': false,
     'severities': [
       'unknown',
       'info',

install.sh

@@ -63,15 +63,15 @@ fi
 echo " "
 tput setaf 4;
 echo "#########################################################################"
-echo "Installing docker-compose"
+echo "Installing docker compose"
 echo "#########################################################################"
-if [ -x "$(command -v docker-compose)" ]; then
-  tput setaf 2; echo "docker-compose already installed, skipping."
+if [ -x "$(command -v docker compose)" ]; then
+  tput setaf 2; echo "docker compose already installed, skipping."
 else
   curl -L "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
   chmod +x /usr/local/bin/docker-compose
   ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
-  tput setaf 2; echo "docker-compose installed!!!"
+  tput setaf 2; echo "docker compose installed!!!"
 fi
 
 echo " "

make.bat

@@ -6,30 +6,30 @@ set COMPOSE_ALL_FILES  = -f docker-compose.yml
 set SERVICES           = db web proxy redis celery celery-beat
 
 :: Generate certificates.
-if "%1" == "certs" docker-compose -f docker-compose.setup.yml run --rm certs
+if "%1" == "certs" docker compose -f docker-compose.setup.yml run --rm certs
 :: Generate certificates.
-if "%1" == "setup" docker-compose -f docker-compose.setup.yml run --rm certs
+if "%1" == "setup" docker compose -f docker-compose.setup.yml run --rm certs
 :: Build and start all services.
-if "%1" == "up" docker-compose %COMPOSE_ALL_FILES% up -d --build %SERVICES%
+if "%1" == "up" docker compose %COMPOSE_ALL_FILES% up -d --build %SERVICES%
 :: Build all services.
-if "%1" == "build" docker-compose %COMPOSE_ALL_FILES% build %SERVICES%
+if "%1" == "build" docker compose %COMPOSE_ALL_FILES% build %SERVICES%
 :: Generate Username (Use only after make up).
-if "%1" == "username" docker-compose %COMPOSE_ALL_FILES% exec web python3 manage.py createsuperuser
+if "%1" == "username" docker compose %COMPOSE_ALL_FILES% exec web python3 manage.py createsuperuser
 :: Pull Docker images.
-if "%1" == "pull" docker login docker.pkg.github.com & docker-compose %COMPOSE_ALL_FILES% pull
+if "%1" == "pull" docker login docker.pkg.github.com & docker compose %COMPOSE_ALL_FILES% pull
 :: Down all services.
-if "%1" == "down" docker-compose %COMPOSE_ALL_FILES% down
+if "%1" == "down" docker compose %COMPOSE_ALL_FILES% down
 :: Stop all services.
-if "%1" == "stop" docker-compose %COMPOSE_ALL_FILES% stop %SERVICES%
+if "%1" == "stop" docker compose %COMPOSE_ALL_FILES% stop %SERVICES%
 :: Restart all services.
-if "%1" == "restart" docker-compose %COMPOSE_ALL_FILES% restart %SERVICES%
+if "%1" == "restart" docker compose %COMPOSE_ALL_FILES% restart %SERVICES%
 :: Remove all services containers.
-if "%1" == "rm" docker-compose %COMPOSE_ALL_FILES% rm -f %SERVICES%
+if "%1" == "rm" docker compose %COMPOSE_ALL_FILES% rm -f %SERVICES%
 :: Tail all logs with -n 1000.
-if "%1" == "logs" docker-compose %COMPOSE_ALL_FILES% logs --follow --tail=1000 %SERVICES%
+if "%1" == "logs" docker compose %COMPOSE_ALL_FILES% logs --follow --tail=1000 %SERVICES%
 :: Show all Docker images.
-if "%1" == "images" docker-compose %COMPOSE_ALL_FILES% images %SERVICES%
+if "%1" == "images" docker compose %COMPOSE_ALL_FILES% images %SERVICES%
 :: Remove containers and delete volume data.
-if "%1" == "prune" docker-compose %COMPOSE_ALL_FILES% stop %SERVICES% & docker-compose %COMPOSE_ALL_FILES% rm -f %SERVICES% & docker volume prune -f
+if "%1" == "prune" docker compose %COMPOSE_ALL_FILES% stop %SERVICES% & docker compose %COMPOSE_ALL_FILES% rm -f %SERVICES% & docker volume prune -f
 :: Show this help.
-if "%1" == "help" @echo Make application docker images and manage containers using docker-compose files only for windows.
+if "%1" == "help" @echo Make application docker images and manage containers using docker compose files only for windows.

web/Dockerfile

@@ -1,5 +1,5 @@
 # Base image
-FROM ubuntu:22.04
+FROM --platform=linux/amd64 ubuntu:22.04
 
 # Labels and Credits
 LABEL \
@@ -67,7 +67,6 @@ ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
 # Download Go packages
-RUN go install -v -v github.com/bp0lr/gauplus@latest
 RUN go install -v github.com/jaeles-project/gospider@latest
 RUN go install -v github.com/tomnomnom/gf@latest
 RUN go install -v github.com/tomnomnom/unfurl@latest

web/art/reNgine.txt

@@ -3,6 +3,6 @@
   _ __ ___|  \| | __ _ _ _ __   ___
  | '__/ _ \ . ` |/ _` | | '_ \ / _ \
  | | |  __/ |\  | (_| | | | | |  __/
- |_|  \___|_| \_|\__, |_|_| |_|\___| v2.0.0-jasper
+ |_|  \___|_| \_|\__, |_|_| |_|\___| v2.0.2-jasper
                   __/ |
                  |___/

web/dashboard/templates/dashboard/admin.html

@@ -279,6 +279,13 @@ <h4>Users</h4>
           var create_username = document.getElementById('create_username').value;
           var role_selected = document.getElementById('create_user_role').value;
           var create_password = document.getElementById('create_password').value;
+          if (!create_password) {
+            Swal.fire({
+              title: "Oops! Passwords can't be empty!",
+              icon: 'error',
+            })
+            return
+          }
           const data = {
             'username': create_username,
             'role': role_selected,

web/dashboard/views.py

@@ -220,8 +220,8 @@ def admin_interface_update(request, slug):
             try:
                 user.delete()
                 messages.add_message(
-                request,
-                messages.INFO,
+                    request,
+                    messages.INFO,
                     f'User {user.username} successfully deleted.'
                 )
                 messageData = {'status': True}
@@ -245,6 +245,9 @@ def admin_interface_update(request, slug):
         elif mode == 'create':
             try:
                 response = json.loads(request.body)
+                if not response.get('password'):
+                    messageData = {'status': False, 'error': 'Empty passwords are not allowed'}
+                    return JsonResponse(messageData)
                 UserModel = get_user_model()
                 user = UserModel.objects.create_user(
                     username=response.get('username'),

web/fixtures/default_scan_engines.yaml

@@ -30,7 +30,7 @@
       \ 'run_nuclei': true,\r\n  'run_dalfox': true,\r\n  'run_crlfuzz': true,\r\n
       \ 'enable_http_crawl': true,\r\n  'concurrency': 50,\r\n  'intensity': 'normal',\r\n
       \ 'rate_limit': 150,\r\n  'retries': 1,\r\n  'timeout': 5,\r\n  'fetch_gpt_report':
-      true,\r\n  'nuclei': {\r\n    'use_conf': false,\r\n    'severities': ['unknown',
+      true,\r\n  'nuclei': {\r\n    'use_nuclei_config': false,\r\n    'severities': ['unknown',
       'info', 'low', 'medium', 'high', 'critical']\r\n  }\r\n}\r\nwaf_detection: {\r\n\r\n}\r\nscreenshot:
       {\r\n  'enable_http_crawl': true,\r\n  'intensity': 'normal',\r\n  'timeout':
       10,\r\n  'threads': 40\r\n}\r\n\r\n# custom_header: \"Cookie: Test\""
@@ -72,7 +72,7 @@
       {\r\n  'run_nuclei': true,\r\n  'run_dalfox': true,\r\n  'run_crlfuzz': true,\r\n
       \ 'enable_http_crawl': true,\r\n  'concurrency': 50,\r\n  'intensity': 'normal',\r\n
       \ 'rate_limit': 150,\r\n  'retries': 1,\r\n  'timeout': 5,\r\n  'fetch_gpt_report':
-      true,\r\n  'nuclei': {\r\n    'use_conf': false,\r\n    'severities': ['unknown',
+      true,\r\n  'nuclei': {\r\n    'use_nuclei_config': false,\r\n    'severities': ['unknown',
       'info', 'low', 'medium', 'high', 'critical']\r\n  }\r\n}"
     default_engine: true
 - model: scanEngine.enginetype
@@ -99,6 +99,6 @@
       {\r\n  'run_nuclei': true,\r\n  'run_dalfox': true,\r\n  'run_crlfuzz': true,\r\n
       \ 'enable_http_crawl': false,\r\n  'concurrency': 50,\r\n  'intensity': 'normal',\r\n
       \ 'rate_limit': 150,\r\n  'retries': 1,\r\n  'timeout': 5,\r\n  'fetch_gpt_report':
-      true,\r\n  'nuclei': {\r\n    'use_conf': false,\r\n    'severities': ['low',
+      true,\r\n  'nuclei': {\r\n    'use_nuclei_config': false,\r\n    'severities': ['low',
       'medium', 'high', 'critical']\r\n  }\r\n}"
     default_engine: true