Merge branch 'white/dev' into white/staging

Diego Nadares · Diego Nadares · commit dd15816c4e16 · 2024-03-12T17:08:44.000-03:00
diff --git a/CHANGELOG/5.2.0/community.md b/CHANGELOG/5.2.0/community.md
@@ -0,0 +1,3 @@
+ * [FIX] Fix hosts stats when bulk delete is applied to vulns. #7676
+ * [FIX] The server was not updating the agents status on restart. #7677
+ * [MOD] Remove websockets port from docker-compose. #7679
diff --git a/CHANGELOG/5.2.0/date.md b/CHANGELOG/5.2.0/date.md
@@ -0,0 +1 @@
+Mar 12th, 2024
diff --git a/CHANGELOG/current/7676.json b/CHANGELOG/current/7676.json
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,6 +1,12 @@
 New features in the latest update
 =====================================
 
+5.2.0 [Mar 12th, 2024]:
+---
+ * [FIX] Fix hosts stats when bulk delete is applied to vulns. #7676
+ * [FIX] Fix agents status from database. We were not updating the agents status on faraday-server restarts. #7677
+ * [MOD] Remove websockets port from docker-compose. #7679
+
 5.1.1 [Feb 9th, 2024]:
 ---
  * [FIX] Improve of host view performance.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -35,7 +35,6 @@ services:
      - redis
     ports:
      - "5985:5985"
-     - "9000:9000"
 volumes:
   db:
     driver: local
diff --git a/faraday/__init__.py b/faraday/__init__.py
@@ -4,5 +4,5 @@
 See the file 'doc/LICENSE' for the license information
 """
 
-__version__ = '5.1.1'
+__version__ = '5.2.0'
 __license_version__ = __version__
diff --git a/faraday/openapi/faraday_swagger.json b/faraday/openapi/faraday_swagger.json
@@ -1,7 +1,7 @@
 {
     "info": {
         "description": "The Faraday REST API enables you to interact with [our server](https://github.com/infobyte/faraday).\nUse this API to interact or integrate with Faraday server. This page documents the REST API, with HTTP response codes and example requests and responses.",
-        "title": "Faraday 5.1.0 API",
+        "title": "Faraday 5.2.0 API",
         "version": "v3"
     },
     "security": {
diff --git a/faraday/server/app.py b/faraday/server/app.py
@@ -521,7 +521,7 @@ def index(ex):
     app.view_functions['agent_api.AgentView:post'].is_public = True
 
     # Remove agents that where registered
-    if testing is False:
+    if not testing:
         with app.app_context():
             remove_sid()
 
diff --git a/pynixify/packages/faraday-agent-parameters-types/default.nix b/pynixify/packages/faraday-agent-parameters-types/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "faraday-agent-parameters-types";
-  version = "1.4.0";
+  version = "1.5.1";
 
   src = fetchPypi {
     inherit version;
     pname = "faraday_agent_parameters_types";
-    sha256 = "1czn8p7f4g9h1rkkzn1hkh7gdvhfh51iw824chk7yfaanpvxxsd5";
+    sha256 = "16wbvmc9sddwm71wmahfnx4la75qddz449b1kh2aw4clhz86q786";
   };
 
   buildInputs = [ pytest-runner ];
diff --git a/pynixify/packages/faraday-plugins/default.nix b/pynixify/packages/faraday-plugins/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "faraday-plugins";
-  version = "1.16.0";
+  version = "1.17.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dn92mj3anzh9fvfqs9vd2wixah2py3vy9ihxr36wyljphi2jl5y";
+    sha256 = "10pkd8ycdwv8a5mqhzdv19i4hrnv48vzmakgd1fx0lbwvfqish8n";
   };
 
   propagatedBuildInputs = [
diff --git a/pynixify/packages/faradaysec/default.nix b/pynixify/packages/faradaysec/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "faradaysec";
-  version = "5.1.0";
+  version = "5.2.0";
 
   src = lib.cleanSource ../../..;
 
diff --git a/requirements.txt b/requirements.txt
@@ -35,7 +35,7 @@ syslog-rfc5424-formatter>=1.1.1
 simplekv>=0.13.0
 Flask-KVSession-fork>=0.6.4
 distro>=1.4.0
-faraday-plugins>=1.16.0,<2.0.0
+faraday-plugins>=1.17.0,<2.0.0
 apispec>=6.3.0
 apispec-webframeworks<=0.5.2
 pyyaml
@@ -44,7 +44,7 @@ Flask-SocketIO>=5.0.1
 pyotp>=2.6.0
 Flask-Limiter>=1.3.1,<1.4.0
 Flask-Mail
-faraday-agent-parameters-types>=1.4.0
+faraday-agent-parameters-types>=1.5.0
 cvss>=2.5
 celery>=5.2.7
 gevent>=22.10.2

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ * [FIX] Fix hosts stats when bulk delete is applied to vulns. #7676`
	`2`	`+ * [FIX] The server was not updating the agents status on restart. #7677`
	`3`	`+ * [MOD] Remove websockets port from docker-compose. #7679`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"info": {`
`3`	`3`	`"description": "The Faraday REST API enables you to interact with [our server](https://github.com/infobyte/faraday).\nUse this API to interact or integrate with Faraday server. This page documents the REST API, with HTTP response codes and example requests and responses.",`
`4`		`- "title": "Faraday 5.1.0 API",`
	`4`	`+ "title": "Faraday 5.2.0 API",`
`5`	`5`	`"version": "v3"`
`6`	`6`	`},`
`7`	`7`	`"security": {`