Merge remote-tracking branch 'upstream/main'

README.md

@@ -5,8 +5,9 @@
 This is a set of scripts to setup a Raspberry Pi as a DShield Sensor.
 
 Current design goals and prerequisites for using the automated installation procedure:
-- use of a __dedicated__ device (Raspberry Pi, any model as [per] (https://isc.sans.edu/diary/22680/))
-- current Raspberry Pi OS ("Lite" version will suffice)
+- use of a __dedicated__ device (Raspberry Pi 3 or later, n100 mini PC or a virtual machine work fine)
+- minimum of 1GB of RAM and 16GB of Disk (SD Card for Raspberry Pis). 4GB of RAM works better. Larger SD Cards (e.g. 64 GB) are recommended for longevity and to prevent logs from filling up the disk.
+- current Raspberry Pi OS ("Lite" version will suffice) or current version of Ubuntu Linux
 - easy installation / configuration (and therefore not that much configurable)
 - disposable (when something breaks (e.g. during upgrade): re-install from scratch)
 - minimize complexity and overhead (e.g. no virtualization like docker)
@@ -41,6 +42,8 @@ This script will:
 - if you get strange python / pip errors during installation / updates you may try the following commands as root:
 `pip freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip install -U`
 
+- Check our [Trouble Shooting Guide](https://github.com/DShield-ISC/dshield/blob/main/docs/general-guides/Troubleshooting.md) for help identifying issues.
+
 ## Updates
 
 ### Normal Updates

srv/isc-agent/plugins/tcp/http/models.py

@@ -224,4 +224,5 @@ def read_db_and_log(file_name=""):
         }
         with open(file_name, "a") as file:
             json.dump(log_data, file)
+            file.write("\n")
     return logs

srv/isc-agent/requirements.txt

@@ -1,8 +1,8 @@
 appdirs==1.4.4 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
-attrs==23.1.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
+attrs==23.2.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 automat==22.10.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
-bcrypt==4.0.1 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
-certifi==2023.11.17 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
+bcrypt==4.1.2 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
+certifi==2024.2.2 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 cffi==1.15.1 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 charset-normalizer==2.0.12 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 constantly==15.1.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
@@ -12,7 +12,7 @@ defusedxml==0.7.1 ; python_full_version >= "3.7.1" and python_full_version < "4.
 dnspython==2.3.0 ; python_full_version >= "3.7.1" and python_version < "4.0"
 email-validator==2.0.0.post2 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 exceptiongroup==1.2.0 ; python_full_version >= "3.7.1" and python_version < "3.11"
-greenlet==3.0.1 ; python_full_version >= "3.7.1" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_full_version < "4.0.0"
+greenlet==3.0.3 ; python_full_version >= "3.7.1" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_full_version < "4.0.0"
 h2==4.1.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 hpack==4.0.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 hyperframe==6.0.1 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
@@ -22,7 +22,7 @@ idna==3.6 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 importlib-metadata==6.7.0 ; python_full_version >= "3.7.1" and python_version < "3.8"
 incremental==22.10.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 jinja2==3.0.3 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
-markupsafe==2.1.3 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
+markupsafe==2.1.5 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 priority==1.3.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 pyasn1-modules==0.3.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 pyasn1==0.5.1 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
@@ -38,7 +38,7 @@ service-identity==21.1.0 ; python_full_version >= "3.7.1" and python_full_versio
 setuptools==68.0.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 six==1.16.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 sortedcontainers==2.4.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
-sqlalchemy==1.4.50 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
+sqlalchemy==1.4.51 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 twisted-iocpsupport==1.0.4 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0" and platform_system == "Windows"
 twisted[all-non-platform,http2]==22.10.0 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"
 typing-extensions==4.7.1 ; python_full_version >= "3.7.1" and python_full_version < "4.0.0"