Skip to content

Commit 8596c9a

Browse files
authored
Merge pull request #1208 from stratosphereips/develop
Slips v1.1.6
2 parents 232ba5b + 7b847cd commit 8596c9a

File tree

273 files changed

+4948
-989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+4948
-989
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
## Steps you followed to test the changes purposed in this PR:
2323

2424

25-
*
25+
*
2626
*
2727

2828

@@ -35,6 +35,7 @@
3535
- [ ] All new and existing tests passed.
3636
- [ ] This PR does not contain plagiarized content.
3737
- [ ] The title of my pull request is a short description of the requested changes.
38+
- [ ] My PR is based on develop branch. (mandatory)
3839

3940
## Screenshots
4041

.github/workflows/integration-tests.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,19 @@ jobs:
1818
# make this job depend on the first job
1919
needs: install-dependencies-using-reusable-workflow
2020

21+
# suppress tensorflow warnings
22+
env:
23+
TF_CPP_MIN_LOG_LEVEL: 3
24+
TF_ENABLE_ONEDNN_OPTS: 0
25+
2126
strategy:
2227
matrix:
2328
test_file:
2429
- test_config_files.py
2530
- test_portscans.py
2631
- test_dataset.py
32+
- test_pcap_dataset.py
33+
- test_zeek_dataset.py
2734

2835
steps:
2936
- uses: actions/checkout@v4
@@ -70,13 +77,17 @@ jobs:
7077
- name: Start redis server
7178
run: redis-server --daemonize yes
7279

80+
- name: Print zeek version
81+
run: (command -v zeek && zeek --version) || (command -v bro && bro --version)
82+
83+
7384
- name: Run Integration Tests for ${{ matrix.test_file }}
7485
run: |
75-
python3 -m pytest tests/integration_tests/${{ matrix.test_file }} -p no:warnings -vv -s -n 5
86+
python3 -m pytest tests/integration_tests/${{ matrix.test_file }} -p no:warnings -vv -s -n 3
7687
7788
- name: Upload Artifacts
7889
if: success() || failure()
79-
uses: actions/upload-artifact@v3
90+
uses: actions/upload-artifact@v4
8091
with:
8192
name: test_slips_locally-integration-tests-output
8293
path: |

.github/workflows/unit-tests.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ jobs:
1818
# make this job depend on the first job
1919
needs: install-dependencies-using-reusable-workflow
2020

21+
# suppress tensorflow warnings
22+
env:
23+
TF_CPP_MIN_LOG_LEVEL: 3
24+
TF_ENABLE_ONEDNN_OPTS: 0
25+
2126
strategy:
2227
matrix:
2328
test_file:
@@ -72,6 +77,12 @@ jobs:
7277
- test_database.py
7378
- test_symbols_handler.py
7479
- test_profile_handler.py
80+
- test_process_manager.py
81+
- test_metadata_manager.py
82+
- test_host_ip_manager.py
83+
- test_host_ip_manager.py
84+
- test_rnn_cc_detection.py
85+
- test_idea_format.py
7586

7687
steps:
7788
- uses: actions/checkout@v4
@@ -114,7 +125,7 @@ jobs:
114125
115126
- name: Upload Artifacts
116127
if: success() || failure()
117-
uses: actions/upload-artifact@v3
128+
uses: actions/upload-artifact@v4
118129
with:
119130
name: test_slips_locally-integration-tests-output
120131
path: |

.pre-commit-config.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@ repos:
2020
exclude: '.*dataset/.*|^config/local_ti_files/own_malicious_JA3.csv$|.*test.*|.*\.md$'
2121

2222
- repo: https://github.com/astral-sh/ruff-pre-commit
23-
# Ruff version.
2423
rev: v0.3.4
2524
hooks:
2625
# Run the linter.
2726
- id: ruff
2827
args: [ --fix ]
2928
# excludes formatting slips_files/common/imports.py
30-
exclude: (imports|sqlite_db.*)
29+
exclude: (imports|sqlite_db.*|conftest.py)
3130

3231
- repo: https://github.com/psf/black-pre-commit-mirror
3332
rev: 24.4.2
@@ -36,7 +35,7 @@ repos:
3635
args: ['--line-length' , '79']
3736
language_version: python3.12.3
3837
# excludes formatting slips_files/common/imports.py
39-
exclude: imports
38+
exclude: (imports|conftest.py)
4039

4140
- repo: https://github.com/adrienverge/yamllint.git
4241
rev: v1.31.0

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
1.1.6 (Jan 31st, 2025)
2+
* 3x speedup of the profiler process responsible for analyzing the given flows.
3+
* Fix false positive "connection without DNS" detection.
4+
* Fix false positive "DNS without connection" detection.
5+
* Fix problem parsing Suricata DNS flows.
6+
* Fix problem using threat intelligence feeds from cache even if they are not present in the given config file.
7+
* Fix regex warning when starting Slips. Special thanks to @Sekhar-Kumar-Dash.
8+
* Fix Tranco whitelists.
9+
* Improve "Incompatible CN" detection.
10+
* Improve "Invalid DNS answer" detection.
11+
* Improve unit tests. Special thanks to @Sekhar-Kumar-Dash.
12+
* Improve whitelisting by checking if the SNI of each evidence is whitelisted or not.
13+
* Update the license used.
114

215
1.1.5 (Jan 3rd, 2025)
316
- 200x times speedup of domain lookups in the threat intelligence module.

LICENCE

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)