Merge pull request #1324 from stratosphereips/develop

Slips v1.1.7

Author: AlyaGomaa

.github/workflows/integration-tests.yml

@@ -31,6 +31,8 @@ jobs:
           - test_dataset.py
           - test_pcap_dataset.py
           - test_zeek_dataset.py
+          - test_fides.py
+          - test_iris.py
 
     steps:
     - uses: actions/checkout@v4
@@ -86,9 +88,9 @@ jobs:
         python3 -m pytest tests/integration_tests/${{ matrix.test_file }} -p no:warnings -vv -s -n 3
 
     - name: Upload Artifacts
-      if: success() || failure()
+      if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: test_slips_locally-integration-tests-output
+        name: ${{ matrix.test_file }}-integration-tests-output
         path: |
           output/integration_tests

.github/workflows/publish-slips-images.yml

@@ -26,6 +26,7 @@ jobs:
         ref: 'master'
         # Fetch all history for all tags and branches
         fetch-depth: ''
+        # submodules are needed for local and global p2p
         submodules: true
 
 

.github/workflows/unit-tests.yml

@@ -70,6 +70,7 @@ jobs:
           - test_spamhaus.py
           - test_circllu.py
           - test_evidence_handler.py
+          - test_evidence_formatter.py
           - test_alert_handler.py
           - test_redis_manager.py
           - test_ioc_handler.py
@@ -83,6 +84,8 @@ jobs:
           - test_host_ip_manager.py
           - test_rnn_cc_detection.py
           - test_idea_format.py
+          - test_fides_sqlite_db.py
+          - test_fides_module.py
 
     steps:
     - uses: actions/checkout@v4
@@ -124,7 +127,7 @@ jobs:
         python3 -m pytest tests/${{ matrix.test_file }} -p no:warnings -vv -s -n 5
 
     - name: Upload Artifacts
-      if: success() || failure()
+      if: always()
       uses: actions/upload-artifact@v4
       with:
         name: test_slips_locally-integration-tests-output

.gitignore

@@ -172,3 +172,9 @@ output/
 config-live-macos-*
 dataset-private/*
 appendonly.aof
+/slipsOut/flows.sqlite
+/slipsOut/metadata/info.txt
+/slipsOut/metadata/slips.yaml
+/slipsOut/metadata/whitelist.conf
+/p2p_db.sqlite
+

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
 -   repo: https://github.com/Yelp/detect-secrets
-    rev: v1.4.0
+    rev: v1.5.0
     hooks:
         - id: detect-secrets
           args: ['--baseline', '.secrets.baseline']
           exclude: '.*dataset/.*|^config/local_ti_files/own_malicious_JA3.csv$|.*test.*|.*\.md$'
 
 
 -     repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v3.1.0
+      rev: v5.0.0
       hooks:
         - id: trailing-whitespace
         - id: check-added-large-files
@@ -20,7 +20,7 @@ repos:
           exclude: '.*dataset/.*|^config/local_ti_files/own_malicious_JA3.csv$|.*test.*|.*\.md$'
 
 -     repo: https://github.com/astral-sh/ruff-pre-commit
-      rev: v0.3.4
+      rev: v0.9.6
       hooks:
         # Run the linter.
         - id: ruff
@@ -29,7 +29,7 @@ repos:
           exclude: (imports|sqlite_db.*|conftest.py)
 
 -     repo: https://github.com/psf/black-pre-commit-mirror
-      rev: 24.4.2
+      rev: 25.1.0
       hooks:
         - id: black
           args: ['--line-length' , '79']
@@ -38,7 +38,8 @@ repos:
           exclude: (imports|conftest.py)
 
 -     repo: https://github.com/adrienverge/yamllint.git
-      rev: v1.31.0
+      rev: v1.35.1
       hooks:
         - id: yamllint
+          args: ["-d", "{rules: {line-length: {max: 100}}}"]
           files: "slips.yaml"