Merge pull request #44 from Hamstring-NDR/dev

Dev

Author: maldwg

.github/workflows/publish_dev.yml

@@ -1,8 +1,8 @@
 name: Publish Docker Images (dev)
 
-# Triggers on direct pushes to the 'dev' branch, which includes PR merges.
 on:
-  push:
+  pull_request_target:
+    types: [ closed ]
     branches: [ "dev" ]
 
 env:
@@ -11,41 +11,48 @@ env:
 jobs:
   bump-version:
     name: Bump VERSION file
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       contents: write   # needed to push the updated VERSION file back
     outputs:
       new_version: ${{ steps.bump.outputs.version }}
+      version_changed: ${{ steps.bump.outputs.changed }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.PIPELINE_PAT }}
+          ref: ${{ github.event.pull_request.base.ref }}
           fetch-depth: 0
 
       - name: Detect source branch and bump version
         id: bump
         run: |
-          # ── Detect source branch from merge commit subject ──────────────────
-          # Standard merge commit message: "Merge branch 'feature/foo' into dev"
-          MERGE_SUBJECT="$(git log --merges -1 --pretty=%s HEAD)"
-          echo "Merge subject: ${MERGE_SUBJECT}"
-
-          SOURCE=$(echo "$MERGE_SUBJECT" | sed -n "s/Merge branch '\([^']*\)'.*/\1/p")
-          SOURCE="${SOURCE#origin/}"   # strip remote prefix if present
+          SOURCE="${{ github.event.pull_request.head.ref }}"
 
           if [[ -z "$SOURCE" ]]; then
             SOURCE="unknown"
-            echo "::warning::Could not detect source branch; defaulting to 'unknown' (no bump)."
+            echo "::warning::Could not detect source branch from pull request metadata; defaulting to 'unknown' (no bump)."
           fi
           echo "Detected source branch: ${SOURCE}"
 
           # ── Read and parse current VERSION ──────────────────────────────────
           RAW="$(cat VERSION | tr -d '[:space:]')"
-          CLEAN="${RAW#v}"        # strip leading v
-          CLEAN="${CLEAN%-dev}"   # strip any existing -dev suffix
-          IFS='.' read -r MAJOR MINOR PATCH <<< "$CLEAN"
+          CLEAN="${RAW#v}"   # strip leading v
+          while [[ "$CLEAN" == *-dev ]]; do
+            CLEAN="${CLEAN%-dev}"
+          done
+
+          if [[ ! "$CLEAN" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
+            echo "::error::VERSION must be in the form v<major>.<minor>.<patch>[-dev], got '${RAW}'"
+            exit 1
+          fi
+
+          MAJOR="${BASH_REMATCH[1]}"
+          MINOR="${BASH_REMATCH[2]}"
+          PATCH="${BASH_REMATCH[3]}"
 
           # ── Apply bump based on branch prefix ────────────────────────────────
           PREFIX="${SOURCE%%/*}"
@@ -69,18 +76,29 @@ jobs:
           echo "${NEW_VERSION}" > VERSION
 
           echo "version=${NEW_VERSION}" >> "$GITHUB_OUTPUT"
+          if [[ "$RAW" != "$NEW_VERSION" ]]; then
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+          fi
           echo "New version: ${NEW_VERSION}"
 
       - name: Commit and push updated VERSION
+        if: steps.bump.outputs.changed == 'true'
         run: |
           git config user.name  "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add VERSION
+          if git diff --cached --quiet; then
+            echo "No VERSION changes to commit."
+            exit 0
+          fi
           git commit -m "chore: bump version to ${{ steps.bump.outputs.version }} [skip ci]"
           git push
 
   build-and-push:
     name: Build & Push ${{ matrix.container }}
+    if: github.event.pull_request.merged == true
     needs: bump-version
     runs-on: ubuntu-latest
     strategy:
@@ -103,7 +121,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: dev   # pick up the commit that includes the updated VERSION
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/publish_main.yml

@@ -1,8 +1,8 @@
 name: Publish Docker Images (main)
 
-# Triggers on direct pushes to 'main', which includes PR/merge-commit merges.
 on:
-  push:
+  pull_request_target:
+    types: [ closed ]
     branches: [ "main" ]
 
 env:
@@ -11,41 +11,48 @@ env:
 jobs:
   bump-version:
     name: Bump VERSION file
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       contents: write   # needed to push back VERSION + Git tag
     outputs:
       new_version: ${{ steps.bump.outputs.version }}
+      version_changed: ${{ steps.bump.outputs.changed }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.PIPELINE_PAT }}
+          ref: ${{ github.event.pull_request.base.ref }}
           fetch-depth: 0
 
       - name: Detect source branch and bump version
         id: bump
         run: |
-          # ── Detect source branch from merge commit subject ──────────────────
-          # Standard merge commit message: "Merge branch 'feature/foo' into main"
-          MERGE_SUBJECT="$(git log --merges -1 --pretty=%s HEAD)"
-          echo "Merge subject: ${MERGE_SUBJECT}"
-
-          SOURCE=$(echo "$MERGE_SUBJECT" | sed -n "s/Merge branch '\([^']*\)'.*/\1/p")
-          SOURCE="${SOURCE#origin/}"   # strip remote prefix if present
+          SOURCE="${{ github.event.pull_request.head.ref }}"
 
           if [[ -z "$SOURCE" ]]; then
             SOURCE="unknown"
-            echo "::warning::Could not detect source branch; defaulting to 'unknown' (no bump)."
+            echo "::warning::Could not detect source branch from pull request metadata; defaulting to 'unknown' (no bump)."
           fi
           echo "Detected source branch: ${SOURCE}"
 
           # ── Read and parse current VERSION ──────────────────────────────────
           RAW="$(cat VERSION | tr -d '[:space:]')"
-          CLEAN="${RAW#v}"        # strip leading v
-          CLEAN="${CLEAN%-dev}"   # strip any existing -dev suffix
-          IFS='.' read -r MAJOR MINOR PATCH <<< "$CLEAN"
+          CLEAN="${RAW#v}"   # strip leading v
+          while [[ "$CLEAN" == *-dev ]]; do
+            CLEAN="${CLEAN%-dev}"
+          done
+
+          if [[ ! "$CLEAN" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
+            echo "::error::VERSION must be in the form v<major>.<minor>.<patch>[-dev], got '${RAW}'"
+            exit 1
+          fi
+
+          MAJOR="${BASH_REMATCH[1]}"
+          MINOR="${BASH_REMATCH[2]}"
+          PATCH="${BASH_REMATCH[3]}"
 
           # ── Decide bump strategy ─────────────────────────────────────────────
           # When the source branch is 'dev', the version was already incremented
@@ -74,23 +81,38 @@ jobs:
           echo "${NEW_VERSION}" > VERSION
 
           echo "version=${NEW_VERSION}" >> "$GITHUB_OUTPUT"
+          if [[ "$RAW" != "$NEW_VERSION" ]]; then
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+          fi
           echo "New version: ${NEW_VERSION}"
 
       - name: Commit and push updated VERSION
+        if: steps.bump.outputs.changed == 'true'
         run: |
           git config user.name  "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add VERSION
+          if git diff --cached --quiet; then
+            echo "No VERSION changes to commit."
+            exit 0
+          fi
           git commit -m "chore: release ${{ steps.bump.outputs.version }} [skip ci]"
           git push
 
       - name: Create and push Git release tag
         run: |
+          if git rev-parse -q --verify "refs/tags/${{ steps.bump.outputs.version }}" >/dev/null 2>&1; then
+            echo "Tag '${{ steps.bump.outputs.version }}' already exists; skipping."
+            exit 0
+          fi
           git tag "${{ steps.bump.outputs.version }}"
           git push origin "${{ steps.bump.outputs.version }}"
 
   build-and-push:
     name: Build & Push ${{ matrix.container }}
+    if: github.event.pull_request.merged == true
     needs: bump-version
     runs-on: ubuntu-latest
     strategy:
@@ -113,7 +135,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: main   # pick up the commit that includes the updated VERSION
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Derive partial version tags
         id: version

README.md

@@ -43,33 +43,29 @@
     <a href="https://github.com/hamstring-ndr/hamstring/actions/workflows/build_test_macos.yml">
     <img src="https://img.shields.io/github/actions/workflow/status/hamstring-ndr/hamstring/build_test_macos.yml?branch=main&logo=apple&style=for-the-badge&label=macos" alt="MacOS WorkFlows" />
     </a>
-    <a href="https://github.com/hamstring-ndr/hamstring/actions/workflows/build_test_windows.yml">
-    <img src="https://img.shields.io/github/actions/workflow/status/hamstring-ndr/hamstring/build_test_windows.yml?branch=main&logo=windows&style=for-the-badge&label=windows" alt="Windows WorkFlows" />
-    </a>
   </td>
 </tr>
 </table>
 
 ## About the Project
 
-![Pipeline overview](./assets/heidgaf_architecture.svg)
+![Pipeline overview](./assets/hamstring_architecture.svg)
 
 ## Getting Started
 
 #### Run **HAMSTRING** using Docker Compose:
 ```sh
 HOST_IP=127.0.0.1 docker compose -f docker/docker-compose.yml --profile prod up
 ```
-<p align="center">
-  <img src="https://raw.githubusercontent.com/hamstring-ndr/hamstring/main/assets/terminal_example.gif?raw=true" alt="Terminal example"/>
-</p>
-
 #### Use the dev profile for testing out changes in docker containers:
 ```sh
 HOST_IP=127.0.0.1 docker compose -f docker/docker-compose.yml --profile dev up
 ```
+<p align="center">
+  <img src="./assets/hamstring_terminal.gif" alt="Terminal example"/>
+</p>
+
 
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
 
 
 
@@ -85,7 +81,7 @@ possibly infrastructure.
 
 The section `pipeline.log_collection.collector.logline_format` has to be adjusted to reflect your specific input log
 line format. Using our adjustable and flexible log line configuration, you can rename, reorder and fully configure each
-field of a valid log line. Freely define timestamps, RegEx patterns, lists, and IP addresses. For example, your
+field of a valid log line. You can freely define timestamps, RegEx patterns, lists, and IP addresses. For example, your
 configuration might look as follows:
 
 ```yml
@@ -187,24 +183,11 @@ Have a look at the following pictures showing examples of how these dashboards m
 
 </details>
 
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
-
-
 ## Models and Training
 
-To train and test our and possibly your own models, we currently rely on the following datasets:
-
-- [DGTA Benchmark](https://data.mendeley.com/datasets/2wzf9bz7xr/1)
-- [DNS Tunneling Queries for Binary Classification](https://data.mendeley.com/datasets/mzn9hvdcxg/1)
-- [UMUDGA - University of Murcia Domain Generation Algorithm Dataset](https://data.mendeley.com/datasets/y8ph45msv8/1)
-- [DGArchive](https://dgarchive.caad.fkie.fraunhofer.de/)
-- [DNS Exfiltration](https://data.mendeley.com/datasets/c4n7fckkz3/3)
-
-We compute all features separately and only rely on the `domain` and `class` for binary classification.
-
 ### Inserting Data for Testing
 
-For testing purposes, you can ingest PCAPs or tap on network interfaces using the zeek-based sensor in its `1.0.0` release. For more information on it, please refer to [the documentation](https://github.com/Hamstring-NDR/hamstring-zeek).
+For testing purposes, you can ingest PCAPs or tap on network interfaces using the zeek-based sensor that is integrated into the docker-compose file. For more information on the sensor, please refer to [the documentation](https://github.com/Hamstring-NDR/hamstring-zeek).
 
 ### Training Your Own Models
 
@@ -260,33 +243,6 @@ The results will be saved per default to `./results`, if not configured otherwis
 ```
 This will create a `rules.txt` file containing the innards of the model, explaining the rules it created.
 
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
-
-
-### Data
-
-> [!IMPORTANT]
-> We support custom schemes.
-
-Depending on your data and usecase, you can customize the data scheme to fit your needs.
-The below configuration is part of the [main configuration file](./config.yaml) which is detailed in our [documentation](https://HAMSTRING.readthedocs.io/en/latest/usage.html#id2)
-
-```yml
-loglines:
-  fields:
-    - [ "timestamp", RegEx, '^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$' ]
-    - [ "status_code", ListItem, [ "NOERROR", "NXDOMAIN" ], [ "NXDOMAIN" ] ]
-    - [ "src_ip", IpAddress ]
-    - [ "dns_server_ip", IpAddress ]
-    - [ "domain_name", RegEx, '^(?=.{1,253}$)((?!-)[A-Za-z0-9-]{1,63}(?<!-)\.)+[A-Za-z]{2,63}$' ]
-    - [ "record_type", ListItem, [ "A", "AAAA" ] ]
-    - [ "response_ip", IpAddress ]
-    - [ "size", RegEx, '^\d+b$' ]
-```
-
-
-
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
 
 <!-- CONTRIBUTING -->
 ## Contributing
@@ -305,16 +261,12 @@ Don't forget to give the project a star! Thanks again!
 </a>
 
 
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
-
 <!-- LICENSE -->
 
 ## License
 
 Distributed under the EUPL License. See `LICENSE.txt` for more information.
 
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
-
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->

assets/heidgaf_architecture.svg assets/hamstring_architecture.svgassets/heidgaf_architecture.svg renamed to assets/hamstring_architecture.svg

@@ -1,6 +1,6 @@
 services:
   monitoring_agent:
-    image: ghcr.io/hamstring-ndr/hamstring-monitoring:v1.0.0
+    image: ghcr.io/hamstring-ndr/hamstring-monitoring:v2.0.0
     restart: "unless-stopped"
     volumes:
       - ../../../config.yaml:/app/config.yaml