Bump version to 3.0.8 and add py313 and py314 builds

Author: ostefano

.github/workflows/release-package.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -48,15 +48,15 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install packages
-        run: sudo apt-get install libgl1 libpoppler-cpp-dev libpoppler-cpp0v5 libzbar0 tesseract-ocr
+        run: sudo apt-get install libgl1 libfuzzy-dev libpoppler-cpp-dev libpoppler-cpp0v5 libzbar0 tesseract-ocr libjpeg-dev
 
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v6
         with:
-          python-version: 3.12
+          python-version: 3.14
 
       - name: Install poetry
         run: python -m pip install poetry
@@ -93,15 +93,15 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install packages
-        run: sudo apt-get install libgl1 libpoppler-cpp-dev libpoppler-cpp0v5 libzbar0 tesseract-ocr
+        run: sudo apt-get install libgl1 libfuzzy-dev libpoppler-cpp-dev libpoppler-cpp0v5 libzbar0 tesseract-ocr libjpeg-dev
 
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v6
         with:
-          python-version: 3.12
+          python-version: 3.14
 
       - name: Install poetry
         run: python -m pip install poetry
@@ -113,7 +113,7 @@ jobs:
         run: poetry build
 
       - name: Upload package artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: python-package-distributions
           path: dist/
@@ -127,7 +127,7 @@ jobs:
 
     steps:
     - name: Download dist files
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         name: python-package-distributions
         path: dist/

.github/workflows/test-package.yml

@@ -15,15 +15,15 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install packages
-        run: sudo apt-get install libgl1 libpoppler-cpp-dev libpoppler-cpp0v5 libzbar0 tesseract-ocr
+        run: sudo apt-get install libgl1 libfuzzy-dev libpoppler-cpp-dev libpoppler-cpp0v5 libzbar0 tesseract-ocr libjpeg-dev
 
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v6
         with:
-          python-version: 3.12
+          python-version: 3.14
 
       - name: Install poetry
         run: python -m pip install poetry
@@ -37,18 +37,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install packages
-        run: sudo apt-get install libgl1 libpoppler-cpp-dev libpoppler-cpp0v5 libzbar0 tesseract-ocr
+        run: sudo apt-get install libgl1 libfuzzy-dev libpoppler-cpp-dev libpoppler-cpp0v5 libzbar0 tesseract-ocr libjpeg-dev
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -81,9 +81,9 @@ jobs:
         if: always()
         run: cat error.log
 
-      - name: Upload package artifcat
-        if: ${{ matrix.python-version == '3.12' }}
-        uses: actions/upload-artifact@v4
+      - name: Upload package artifact
+        if: ${{ matrix.python-version == '3.14' }}
+        uses: actions/upload-artifact@v7
         with:
           name: python-package-distributions
           path: dist/
@@ -97,7 +97,7 @@ jobs:
 
     steps:
     - name: Download dist files
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         name: python-package-distributions
         path: dist/

misp_modules/__main__.py

@@ -355,7 +355,7 @@ def main():
         ioloop.IOLoop.instance().start()
     finally:
         ioloop.IOLoop.instance().stop()
-        return 0
+    return 0
 
 
 if __name__ == "__main__":

misp_modules/modules/import_mod/taxii21.py

@@ -11,11 +11,15 @@
 import requests
 import taxii2client
 import taxii2client.exceptions
-from misp_stix_converter import ExternalSTIX2toMISPParser, InternalSTIX2toMISPParser, _is_stix2_from_misp
+from misp_stix_converter import ExternalSTIX2toMISPParser, InternalSTIX2toMISPParser
 from stix2.v20 import Bundle as Bundle_v20
 from stix2.v21 import Bundle as Bundle_v21
 
 
+_MISP_STIX_tags = ('misp:tool="MISP-STIX-Converter"', 'misp:tool="misp2stix2"')
+_STIX2_event_types = ('grouping', 'report')
+
+
 class ConfigError(Exception):
     """
     Represents an error in the config settings for one invocation of this
@@ -25,6 +29,16 @@ class ConfigError(Exception):
     pass
 
 
+def _is_stix2_from_misp(stix_objects: list):
+    for stix_object in stix_objects:
+        labels = stix_object.get('labels', [])
+        if stix_object['type'] not in _STIX2_event_types or not labels:
+            continue
+        if any(tag in labels for tag in _MISP_STIX_tags):
+            return True
+    return False
+
+
 misperrors = {"error": "Error"}
 
 moduleinfo = {