Merge branch 'refs/heads/white/dev' into white/staging

infobyte · Jul 17, 2024 · 06e1817 · 06e1817
2 parents 780d52b + b1b935d
commit 06e1817
Show file tree

Hide file tree

Showing 18 changed files with 83 additions and 45 deletions.
diff --git a/CHANGELOG/5.4.0/community.md b/CHANGELOG/5.4.0/community.md
@@ -0,0 +1,8 @@
+ * [ADD] Implemented Elasticsearch vulnerability ingest from Faraday for comprehensive statistical analysis. #7723
+ * [ADD] Implemented workspace update functionality for changes to vulnerabilities, assets, and services. Introduced debouncer logic to prevent redundant updates to the database.#7688
+ * [ADD] Added ping timeout, ping interval and logger parameters on faraday server config. #7740
+ * [MOD] Changed session_timeout in config to float to allow for fractions of hours. #7737
+ * [FIX] Improved SID logic to prevent inconsistencies when the server resets. Also fixed a bug where SIDs were removed using faraday-manage. #7744
+ * [FIX] Improved workspaces performance. #7756
+ * [FIX] Fix filtering numerical Custom Attributes with some operators. #7759
+ * [DEL] Delete unnecessary websocket_port number for default server.ini configuration files. #7729
diff --git a/CHANGELOG/5.4.0/date.md b/CHANGELOG/5.4.0/date.md
@@ -0,0 +1 @@
+Jun 17th, 2024
diff --git a/CHANGELOG/current/7688.json b/CHANGELOG/current/7688.json
diff --git a/CHANGELOG/current/7709.json b/CHANGELOG/current/7709.json
diff --git a/CHANGELOG/current/7723.json b/CHANGELOG/current/7723.json
diff --git a/CHANGELOG/current/7729.json b/CHANGELOG/current/7729.json
diff --git a/CHANGELOG/current/7737.json b/CHANGELOG/current/7737.json
diff --git a/CHANGELOG/current/7740.json b/CHANGELOG/current/7740.json
diff --git a/CHANGELOG/current/7744.json b/CHANGELOG/current/7744.json
diff --git a/CHANGELOG/current/7756.json b/CHANGELOG/current/7756.json
diff --git a/CHANGELOG/current/7759.json b/CHANGELOG/current/7759.json
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,6 +1,17 @@
 New features in the latest update
 =====================================
 
+5.4.0 [Jun 17th, 2024]:
+---
+ * [ADD] Implemented Elasticsearch vulnerability ingest from Faraday for comprehensive statistical analysis. #7723
+ * [ADD] Implemented workspace update functionality for changes to vulnerabilities, assets, and services. Introduced debouncer logic to prevent redundant updates to the database.#7688
+ * [ADD] Added ping timeout, ping interval and logger parameters on faraday server config. #7740
+ * [MOD] Changed session_timeout in config to float to allow for fractions of hours. #7737
+ * [FIX] Improved SID logic to prevent inconsistencies when the server resets. Also fixed a bug where SIDs were removed using faraday-manage. #7744
+ * [FIX] Improved workspaces performance. #7756
+ * [FIX] Fix filtering numerical Custom Attributes with some operators. #7759
+ * [DEL] Delete unnecessary websocket_port number for default server.ini configuration files. #7729
+
 5.3.0 [May 23rd, 2024]:
 ---
  * [ADD] Add vulnerability endpoint that retrieves all the objects that the users has access to. #7521

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.3.0'
+__version__ = '5.4.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.3.0 API",
+        "title": "Faraday 5.4.0 API",
         "version": "v3"
     },
     "security": [
@@ -5392,6 +5392,60 @@
                 }
             }
         },
+        "/_api/v3/settings/elk": {
+            "get": {
+                "tags": [
+                    "settings"
+                ],
+                "summary": "Retrieves settings of {route_base}",
+                "responses": {
+                    "200": {
+                        "description": "Ok",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "schema_class": null
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Admin user required"
+                    }
+                }
+            },
+            "patch": {
+                "tags": [
+                    "settings"
+                ],
+                "summary": "Creates/Updates settings of {route_base}",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "schema_class": null
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "Created",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "schema_class": null
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Admin user required"
+                    }
+                }
+            }
+        },
         "/_api/v3/swagger": {
             "get": {
                 "summary": "Get the swagger documentation.",

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.6.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit version;
     pname = "faraday_agent_parameters_types";
-    sha256 = "038bq2c3bs00w8izz5cb5ppmhfl85k80iz975ncdaqsz33bjw3nb";
+    sha256 = "03b8s649gvl25wrhx7wz4n1fhr2v8yxgfsijky1a1zi1r8xd6nn4";
   };
 
   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.18.0";
+  version = "1.18.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1n9yfc6bskl6j564ggkinqxw9bmg4ihwshzq2jc1rqng17vk397a";
+    sha256 = "0vqqp494m67a5p0fr6lv3n899hryhrj6w06r6kv82wm4958xhcqn";
   };
 
   propagatedBuildInputs = [

diff --git a/pynixify/packages/faradaysec/default.nix b/pynixify/packages/faradaysec/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "faradaysec";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = lib.cleanSource ../../..;
 

diff --git a/requirements.txt b/requirements.txt
@@ -36,7 +36,7 @@ syslog-rfc5424-formatter>=1.1.1
 simplekv>=0.13.0
 Flask-KVSession-fork>=0.6.4
 distro>=1.4.0
-faraday-plugins>=1.18.0,<2.0.0
+faraday-plugins>=1.18.1,<2.0.0
 apispec>=6.3.0
 apispec-webframeworks<=0.5.2
 pyyaml
@@ -45,7 +45,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.6.0
+faraday-agent-parameters-types>=1.7.0
 cvss>=2.5
 celery>=5.2.7
 gevent>=22.10.2