Initial work support torch_geometric (and some cleanup) (#259)

.github/dependabot.yml

@@ -1,3 +1,5 @@
+---
+
 version: 2
 updates:
   - package-ecosystem: github-actions

.github/workflows/makefile.yml

@@ -1,8 +1,10 @@
+---
+
 name: CI Test Action
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 env:
   MODE: emu
@@ -14,22 +16,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-
-    - uses: conda-incubator/setup-miniconda@v2
-      with:
-        auto-update-conda: true
-        python-version: ${{ matrix.python-version }}
-      
-    - name: Set up environment 
-      run:  echo $ENV_FILE | base64 --decode > manager/.env && make init 
-    
-    - name: Build Containers 
-      run:  make build
-
-    - name: Run tests
-      run:  make test
-
-    - name: Dump docker logs on failure
-      if: failure()
-      uses: jwalton/gh-docker-logs@v2
+      - uses: actions/checkout@v3
+
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-update-conda: true
+          python-version: ${{ matrix.python-version }}
+
+      - name: Set up environment
+        run: echo $ENV_FILE | base64 --decode > manager/.env && make init
+
+      - name: Build Containers
+        run: make build
+
+      - name: Run tests
+        run: make test
+
+      - name: Dump docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v2

.yamllint

@@ -1,3 +1,11 @@
+---
+
+extends: default
+
+ignore: |
+  aica-manager/
+  target/etc/aica-config.yml
+
 rules:
   line-length:
     max: 120

docker-compose-emu.yml

@@ -1,3 +1,5 @@
+---
+
 services:
   manager:
     environment:
@@ -13,7 +15,7 @@ services:
       # but this or "tap_net" (in virt mode) should both come up as eth1
       target:
         ipv4_address: 10.107.100.150
-  
+
   siem:
     networks:
       target:
@@ -56,7 +58,7 @@ services:
       target:
         ipv4_address: 10.107.100.170
     healthcheck:
-      test: [ "CMD-SHELL", "ls /tmp | grep eicar" ]
+      test: ["CMD-SHELL", "ls /tmp | grep eicar"]
       interval: 10s
       timeout: 10s
       retries: 5
@@ -75,13 +77,13 @@ services:
     networks:
       target:
         ipv4_address: 10.107.100.190
-  
+
 networks:
   target:
     internal: true
     ipam:
       driver: default
       config:
-        - subnet: 10.107.100.0/24 
+        - subnet: 10.107.100.0/24
           ip_range: 10.107.100.128/25
           gateway: 10.107.100.1

docker-compose-local-overrides.yaml.example

@@ -1,3 +1,5 @@
+---
+
 # Can't put these here until this is resolved: https://github.com/docker/compose/issues/11404
 # For now, you need to modify this directly into the docker-compose-virt.yml file (but no not check into git)
 #services:

docker-compose-virt.yml

@@ -1,15 +1,17 @@
+---
+
 services:
   manager:
     environment:
       MODE: "virt"
       TAP_IF: "eth1"
-      # This has to go here pending resolution of https://github.com/docker/compose/issues/11404 
+      # This has to go here pending resolution of https://github.com/docker/compose/issues/11404
       HOME_NET: "146.137.56.0/24"
     networks:
       # Docker brings interfaces up in alphabetical order (except internal, which are last)
       # but this or "target" (in emu mode) should both come up as eth1
       - tap_net
-  
+
   ids:
     build: ./ids
     container_name: ids
@@ -18,11 +20,11 @@ services:
       - NET_ADMIN
     environment:
       SURICATA_IF: "eth0"
-      # This has to go here pending resolution of https://github.com/docker/compose/issues/11404 
+      # This has to go here pending resolution of https://github.com/docker/compose/issues/11404
       HOME_NET: "146.137.56.0/24"
     networks:
       tap_net:  # Should be eth0
       control:  # Should be eth1 (internal networks comes last)
 
 include:
-  - docker-compose-local-overrides.yaml
+  - docker-compose-local-overrides.yaml

docker-compose.yml

@@ -1,3 +1,5 @@
+---
+
 services:
   manager:
     build: manager
@@ -6,8 +8,8 @@ services:
     env_file:
       - manager/.env
     ports:
-      - "8000:8000" # Django frontend
-      - "5555:5555" # Celery Flower
+      - "8000:8000"  # Django frontend
+      - "5555:5555"  # Celery Flower
     depends_on:
       manager_mq:
         condition: service_healthy
@@ -79,7 +81,7 @@ services:
       retries: 5
 
   manager_graphdb:
-    build: manager_graphdb 
+    build: manager_graphdb
     container_name: manager_graphdb
     restart: unless-stopped
     environment:
@@ -101,10 +103,10 @@ services:
       control:
         ipv4_address: 10.107.50.230
     healthcheck:
-      test: [ "CMD-SHELL", "wget http://localhost:7474/" ]
+      test: ["CMD-SHELL", "wget http://localhost:7474/"]
       interval: 10s
       timeout: 10s
-      retries: 10 
+      retries: 10
 
   elasticsearch:
     build: elasticsearch
@@ -134,8 +136,8 @@ services:
           memory: 1g
     healthcheck:
       test: ["CMD-SHELL",
-              "curl --insecure -u elastic:$${ELASTIC_PASSWORD} -s -X GET 'http://localhost:9200/_cluster/health?pretty' 
-              | grep '\"status\" : \"green\"'"]
+             "curl --insecure -u elastic:$${ELASTIC_PASSWORD} -s -X GET 'http://localhost:9200/_cluster/health?pretty'
+             | grep '\"status\" : \"green\"'"]
       interval: 10s
       timeout: 30s
       retries: 20
@@ -156,7 +158,7 @@ services:
     ports:
       - "9000:9000"  # Graylog web GUI
     healthcheck:
-      test: [ "CMD-SHELL", "wget http://localhost:9000"]
+      test: ["CMD-SHELL", "wget http://localhost:9000"]
       interval: 10s
       timeout: 10s
       retries: 5
@@ -175,6 +177,6 @@ networks:
     ipam:
       driver: default
       config:
-        - subnet: 10.107.50.0/24 
+        - subnet: 10.107.50.0/24
           ip_range: 10.107.50.128/25
-          gateway: 10.107.50.1 
+          gateway: 10.107.50.1

environment.yml

@@ -15,10 +15,11 @@ dependencies:
       - celery-types==0.22.0
       - charset-normalizer==3.3.2
       - django-stubs==4.2.7
+      - networkx-stubs==0.0.1
       - pandas-stubs==2.2.0.240218
       - safety==3.0.1
       - types-requests==2.31.0.20240218
       - types-dateparser==1.1.4.20240106
       - types-openpyxl==3.1.0.20240220
       - types-paramiko==3.4.0.20240103
-      - urllib3==2.2.1
+      - urllib3==2.2.1