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

Author: Diego Nadares

CHANGELOG/5.12.0/community.md

@@ -0,0 +1,3 @@
+ * [ADD] Added update in bulk mode for workspaces. #7830
+ * [ADD] Added endpoint to count agent schedulers. #7905
+ * [FIX] Fixed session timeout setting not working on numbers less than 1. #7874

CHANGELOG/5.12.0/date.md

@@ -0,0 +1 @@
+Mar 13th, 2025

CHANGELOG/RELEASE.md

@@ -194,4 +194,4 @@ check out the documentation [here](https://api.faradaysec.com/).
 * Issue tracker and feedback: [Github issue tracker](https://github.com/infobyte/faraday/issues)
 * Frequently Asked Questions: [FaradaySEC FAQ](https://docs.faradaysec.com/FAQ/)
 * Twitter: [@faradaysec](https://twitter.com/faradaysec)
-* Try one of our [Demos](https://demo101.faradaysec.com/#/login)
+* Try one of our [Demos](https://cloud.faradaysec.com/cloud/trial/request)

README.md

@@ -1,6 +1,12 @@
 New features in the latest update
 =====================================
 
+5.12.0 [Mar 13th, 2025]:
+---
+ * [ADD] Added update in bulk mode for workspaces. #7830
+ * [ADD] Added endpoint to count agent schedulers. #7905
+ * [FIX] Fixed session timeout setting not working on numbers less than 1. #7874
+
 5.11.0 [Jan 30th, 2025]:
 ---
  * [ADD] Attachment descriptions can now be updated. #7868

RELEASE.md

@@ -4,4 +4,4 @@
 See the file 'doc/LICENSE' for the license information
 """
 
-__version__ = '5.11.0'
+__version__ = '5.12.0'

faraday/__init__.py

@@ -0,0 +1,33 @@
+"""on delete cascade reports workspaces table
+
+Revision ID: 293724cb146d
+Revises: 618a59151523
+Create Date: 2025-01-06 18:59:52.064483+00:00
+
+"""
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = '293724cb146d'
+down_revision = '618a59151523'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('executive_report_workspace_table_workspace_id_fkey', 'executive_report_workspace_table', type_='foreignkey')
+    op.drop_constraint('executive_report_workspace_table_executive_report_id_fkey', 'executive_report_workspace_table', type_='foreignkey')
+    op.create_foreign_key('executive_report_workspace_table_workspace_id_fkey', 'executive_report_workspace_table', 'workspace', ['workspace_id'], ['id'], ondelete='CASCADE')
+    op.create_foreign_key('executive_report_workspace_table_executive_report_id_fkey', 'executive_report_workspace_table', 'executive_report', ['executive_report_id'], ['id'], ondelete='CASCADE')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('executive_report_workspace_table_workspace_id_fkey', 'executive_report_workspace_table', type_='foreignkey')
+    op.drop_constraint('executive_report_workspace_table_executive_report_id_fkey', 'executive_report_workspace_table', type_='foreignkey')
+    op.create_foreign_key('executive_report_workspace_table_executive_report_id_fkey', 'executive_report_workspace_table', 'executive_report', ['executive_report_id'], ['id'])
+    op.create_foreign_key('executive_report_workspace_table_workspace_id_fkey', 'executive_report_workspace_table', 'workspace', ['workspace_id'], ['id'])
+    # ### end Alembic commands ###

faraday/migrations/versions/293724cb146d_on_delete_cascade_reports_workspaces_.py

@@ -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.11.0 API",
+        "title": "Faraday 5.12.0 API",
         "version": "v3"
     },
     "security": [
@@ -3916,6 +3916,19 @@
                 }
             }
         },
+        "/_api/v3/ws/bulk_update": {
+            "patch": {
+                "tags": [
+                    "Workspace"
+                ],
+                "summary": "Update a group of Workspace records by ids.",
+                "responses": {
+                    "204": {
+                        "description": "Ok"
+                    }
+                }
+            }
+        },
         "/_api/v3/ws/{workspace_id}/change_readonly/": {
             "put": {
                 "tags": [
@@ -5462,6 +5475,32 @@
                 }
             ]
         },
+        "/_api/v3/agents_schedule/count_schedulers": {
+            "get": {
+                "tags": [
+                    "Scheduler"
+                ],
+                "summary": "Counts schedulers by type",
+                "responses": {
+                    "200": {
+                        "description": "Counts of schedulers by type",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "properties": {
+                                        "agent_schedulers": {
+                                            "type": "integer",
+                                            "description": "Count of Agent Schedulers"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "/_api/v3/agents_schedule/{object_id}": {
             "delete": {
                 "tags": [
@@ -9008,6 +9047,9 @@
         {
             "name": "Pipeline"
         },
+        {
+            "name": "Scheduler"
+        },
         {
             "name": "SearchFilter"
         },

faraday/openapi/faraday_swagger.json

@@ -32,6 +32,7 @@
 from marshmallow_sqlalchemy import ModelConverter
 from marshmallow_sqlalchemy.schema import SQLAlchemyAutoSchemaMeta, SQLAlchemyAutoSchemaOpts
 from sqlalchemy import and_, asc, desc, func, update as sqlalchemy_update
+from sqlalchemy.engine import ResultProxy
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.inspection import inspect
 from sqlalchemy.orm import joinedload, undefer, with_expression
@@ -360,6 +361,13 @@ def _get_objects(self, object_ids, eagerload=False, **kwargs):
             query = self._get_base_query(**kwargs)
         try:
             obj = query.filter(self._get_lookup_field().in_(object_ids)).all()
+        except AttributeError:
+            # Handle the case where `query` is a ResultProxy, this comes from Workspace query_object_with_count
+            if isinstance(query, ResultProxy):
+                res = db.session.query(self.model_class).filter(self.model_class.name.in_(object_ids)).all()
+                return res
+            # If it's another AttributeError, re-raise
+            raise
         except NoResultFound:
             return []
         return obj

faraday/server/api/base.py

@@ -276,5 +276,42 @@ def run_schedule(self, schedule_id):
             'commands_id': [command.id for command in commands],
         })
 
+    @route('/count_schedulers', methods=['GET'])
+    def count_schedulers(self):
+        """
+        ---
+        get:
+          tags: ["Scheduler"]
+          summary: Counts schedulers by type
+          responses:
+            200:
+              description: Counts of schedulers by type
+              content:
+                application/json:
+                  schema:
+                    type: object
+                    properties:
+                      agent_schedulers:
+                        type: integer
+                        description: Count of Agent Schedulers
+        """
+        #  ONLY FOR COMMUNITY
+        counts = db.session.query(
+            AgentsSchedule.type,
+            db.func.count(AgentsSchedule.id).label('count')
+        ).group_by(AgentsSchedule.type).all()
+
+        result = {
+            'agent_schedulers': 0,
+        }
+
+        for scheduler_type, count in counts:
+            if scheduler_type == 'cloud_agent':
+                continue
+            if scheduler_type == 'agent':
+                result['agent_schedulers'] = count
+
+        return flask.jsonify(result)
+
 
 AgentsScheduleView.register(agents_schedule_api)