Bump misp-modules and backport fixes

core/Dockerfile

@@ -217,6 +217,7 @@ FROM php-base
 
     # Do an early chown to limit image size
     COPY --from=python-build --chown=www-data:www-data --chmod=0550 /var/www/MISP /var/www/MISP
+    COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/composer.lock /var/www/MISP/app/composer.lock
     COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Vendor /var/www/MISP/app/Vendor
     COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Plugin /var/www/MISP/app/Plugin
 

modules/Dockerfile

@@ -31,8 +31,6 @@ EOF
 
     WORKDIR /srv/misp-modules
     RUN pip install pipenv
-    COPY files/Pipfile Pipfile
-    COPY files/Pipfile.lock Pipfile.lock
     RUN pipenv requirements > requirements.txt
     RUN pip wheel -r requirements.txt --no-cache-dir -w /wheels/
 

modules/files/Pipfile

@@ -1,86 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[dev-packages]
-nose = "*"
-codecov = "*"
-pytest = "*"
-flake8 = "*"
-
-[packages]
-numpy = "<2.0.0"
-matplotlib = "*"
-sigmf = "*"
-pysafebrowsing = "*"
-dnspython = "*"
-requests = { extras = ["security"], version = "*" }
-urlarchiver = "*"
-passivetotal = "*"
-pypdns = "*"
-pypssl = "*"
-pyeupi = "*"
-pymisp = { extras = ["fileobjects,openioc,pdfexport,email,url"], version = "*" }
-pyonyphe = { git = "https://github.com/sebdraven/pyonyphe" }
-pydnstrails = { git = "https://github.com/sebdraven/pydnstrails" }
-pytesseract = "*"
-pygeoip = "*"
-beautifulsoup4 = "*"
-oauth2 = "*"
-yara-python = "==3.8.1"
-sigmatools = "*"
-stix2 = "*"
-stix2-patterns = "*"
-taxii2-client = "*"
-maclookup = "*"
-vulners = "*"
-blockchain = "*"
-reportlab = "*"
-pyintel471 = { git = "https://github.com/MISP/PyIntel471.git" }
-shodan = "*"
-Pillow = ">=8.2.0"
-Wand = "*"
-SPARQLWrapper = "*"
-domaintools_api = "*"
-misp-modules = { path = "." }
-pybgpranking = { git = "https://github.com/D4-project/BGP-Ranking.git/", subdirectory = "client", ref = "68de39f6c5196f796055c1ac34504054d688aa59" }
-pyipasnhistory = { git = "https://github.com/D4-project/IPASN-History.git/", subdirectory = "client", ref = "a2853c39265cecdd0c0d16850bd34621c0551b87" }
-backscatter = "*"
-pyzbar = "*"
-opencv-python = "*"
-np = "*"
-ODTReader = { git = "https://github.com/cartertemm/ODTReader.git/" }
-python-pptx = "*"
-python-docx = "*"
-ezodf = "*"
-pandas = "*"
-pandas_ods_reader = "*"
-pdftotext = "*"
-lxml = "*"
-xlrd = "*"
-jbxapi = "*"
-geoip2 = "*"
-apiosintDS = "*"
-assemblyline_client = "*"
-vt-graph-api = "*"
-trustar = { git = "https://github.com/SteveClement/trustar-python.git" }
-markdownify = "==0.5.3"
-socialscan = "==1.4"
-pycountry = "==22.3.5"
-dnsdb2 = "*"
-clamd = "*"
-aiohttp = ">=3.7.4"
-tau-clients = "*"
-vt-py = ">=0.7.1"
-crowdstrike-falconpy = "0.9.0"
-censys = "2.0.9"
-mwdblib = "3.4.1"
-ndjson = "0.3.1"
-Jinja2 = ">=3.1.2"
-mattermostdriver = "7.3.2"
-openpyxl = "*"
-slack-sdk = "3.27.1"
-
-[requires]
-python_version = "3.12"

template.env

@@ -3,7 +3,7 @@
 ##
 
 CORE_TAG=v2.4.194
-MODULES_TAG=v2.4.194
+MODULES_TAG=v2.4.195
 PHP_VER=20190902
 LIBFAUP_COMMIT=3a26d0a