Skip to content

Commit 99fbbc1

Browse files
authored
Merge pull request #1524 from stratosphereips/develop
Slips v1.1.11
2 parents 9ac25d4 + b78f9b9 commit 99fbbc1

File tree

105 files changed

+1206
-902
lines changed

Some content is hidden

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

105 files changed

+1206
-902
lines changed

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
- test_whitelist.py
3838
- test_arp.py
3939
- test_arp_poisoner.py
40+
- test_arp_filter.py
4041
- test_blocking.py
4142
- test_unblocker.py
4243
- test_flow_handler.py

.pre-commit-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,11 @@ repos:
4343
- id: yamllint
4444
args: ["-d", "{rules: {line-length: {max: 100}}}"]
4545
files: "slips.yaml"
46+
47+
- repo: local
48+
hooks:
49+
- id: vulture
50+
name: vulture dead code check
51+
entry: bash -c 'files=$(git diff --cached --name-only --diff-filter=ACM | grep -E "\.py$" | grep -vE "^(tests/|migrations/)"); [ -n "$files" ] && vulture --exclude "tests/*,venv/*" $files || true'
52+
language: system
53+
types: [python]

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.1.11 (July 3rd, 2025)
2+
- Fix local P2P trust model.
3+
- Fix SQLite cursor errors.
4+
- Avoid reporting own self or other slips peers when arp poisoning attackers.
5+
6+
17
1.1.10 (May 26, 2025)
28
- Add support for unblocking attackers using IP tables after a probation period.
39
- Add support for blocking attackers using ARP poisoning.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h1 align="center">
2-
Slips v1.1.10
2+
Slips v1.1.11
33
</h1>
44

55

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.10
1+
1.1.11

conftest.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@ def profiler_queue():
6767
profiler_queue.put = do_nothing
6868
return profiler_queue
6969

70-
71-
@pytest.fixture
72-
def database():
73-
db = DBManager(Output(), "output/", 6379)
74-
db.print = do_nothing
75-
return db
76-
77-
7870
@pytest.fixture
7971
def flow():
8072
"""returns a dummy flow for testing"""

docker/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ RUN apt update && apt install -y --no-install-recommends \
5959
nano \
6060
tree \
6161
tmux \
62+
arp-scan \
6263
&& echo 'deb http://download.opensuse.org/repositories/security:/zeek/xUbuntu_22.04/ /' | tee /etc/apt/sources.list.d/security:zeek.list \
6364
&& curl -fsSL https://download.opensuse.org/repositories/security:zeek/xUbuntu_22.04/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/security_zeek.gpg > /dev/null \
6465
&& apt update \

docs/create_new_module.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,8 @@ import json
365365

366366
from slips_files.common.flow_classifier import FlowClassifier
367367
from slips_files.core.structures.evidence import
368-
(
368+
369+
(
369370
Evidence,
370371
ProfileID,
371372
TimeWindow,
@@ -378,7 +379,7 @@ from slips_files.core.structures.evidence import
378379
)
379380
from slips_files.common.parsers.config_parser import ConfigParser
380381
from slips_files.common.slips_utils import utils
381-
from slips_files.common.abstracts.module import IModule
382+
from slips_files.common.abstracts.imodule import IModule
382383

383384

384385
class LocalConnectionDetector(
83 KB
Loading
31.7 KB
Loading

0 commit comments

Comments
 (0)