Merge pull request #2135 from CybercentreCanada/email_validation_tests

Add more email validation tests

Author: cccs-rs

dev/core/docker-compose.yml

@@ -3,7 +3,9 @@ version: "2.4"
 services:
   # Service server
   al_service_server:
-    image: cccs/assemblyline-rust:4.7.latest
+    image: cccs/assemblyline-rust:4.7.stable
+    environment:
+      BIND_ADDRESS: "0.0.0.0:5003"
     env_file:
       - .env
     ports:
@@ -196,7 +198,7 @@ services:
         ]
 
   al_plumber:
-    image: cccs/assemblyline-rust:4.7.latest
+    image: cccs/assemblyline-rust:4.7.stable
     env_file:
       - .env
     volumes:
@@ -205,7 +207,7 @@ services:
 
   # Dispatcher processes
   al_dispatcher:
-    image: cccs/assemblyline-rust:4.7.latest
+    image: cccs/assemblyline-rust:4.7.stable
     env_file:
       - .env
     volumes:
@@ -216,7 +218,7 @@ services:
 
   # Ingester Processes
   al_ingester:
-    image: cccs/assemblyline-rust:4.7.latest
+    image: cccs/assemblyline-rust:4.7.stable
     env_file:
       - .env
     volumes:

…er/nginx-ssl-frontend:mui5/full.template dev/depends/config/nginx_full.templatedocker/nginx-ssl-frontend:mui5/full.template renamed to dev/depends/config/nginx_full.template docker/nginx-ssl-frontend:mui5/full.template renamed to dev/depends/config/nginx_full.template

@@ -46,7 +46,7 @@ services:
       retries: 3
 
   nginx:
-    image: cccs/nginx-ssl-frontend:mui5
+    image: cccs/nginx-ssl-frontend:latest
     ports:
       - "80:80"
       - "443:443"
@@ -57,6 +57,8 @@ services:
       - FQDN=localhost
       - MAX_BODY_SIZE=100M
       - TEMPLATE=minimal
+    volumes:
+      - ${PATH_REWRITE:-.}/config/nginx_minimal.template:/opt/minimal.template:ro
 
 networks:
   default:

…nginx-ssl-frontend:mui5/minimal.template dev/depends/config/nginx_minimal.templatedocker/nginx-ssl-frontend:mui5/minimal.template renamed to dev/depends/config/nginx_minimal.template docker/nginx-ssl-frontend:mui5/minimal.template renamed to dev/depends/config/nginx_minimal.template

@@ -120,7 +120,7 @@ services:
       retries: 3
 
   nginx:
-    image: cccs/nginx-ssl-frontend:mui5
+    image: cccs/nginx-ssl-frontend:latest
     ports:
       - "80:80"
       - "443:443"
@@ -130,6 +130,8 @@ services:
       - SOCKET_HOST=172.17.0.1
       - FQDN=localhost
       - MAX_BODY_SIZE=100M
+    volumes:
+      - ${PATH_REWRITE:-.}/config/nginx_full.template:/opt/full.template:ro
     depends_on:
       kibana:
         condition: service_started

dev/depends/docker-compose-minimal.yml

@@ -2,7 +2,6 @@
 
 # Build core containers
 (cd nginx-ssl-frontend && docker build -t cccs/nginx-ssl-frontend .)
-(cd nginx-ssl-frontend:mui5 && docker build -t cccs/nginx-ssl-frontend:mui5 .)
 (cd minio && docker build -t cccs/minio .)
 
 # Build default dev containers

dev/depends/docker-compose.yml

@@ -74,6 +74,21 @@ def test_valid_email():
     assert not is_valid_email('')
     assert not is_valid_email('""@cyber.gc.ca')
 
+    # Missing structure
+    assert not is_valid_email("admin*")
+    assert not is_valid_email("x || email:*")
+    assert not is_valid_email("x && email:*")
+    assert not is_valid_email("email:* OR uname:admin")
+    assert not is_valid_email("admin@cyber.gc.ca AND password:*")
+    assert not is_valid_email("x}email:{*")
+    assert not is_valid_email('" OR email:*')
+
+    # Space in input (always invalid)
+    assert not is_valid_email("test@example.com OR email:*")
+
+    # Backslash splits into multiple @ contexts
+    assert not is_valid_email("user\\@evil.com@legit.com")
+
 
 def test_is_ip_in_network():
     from ipaddress import ip_network