Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator

Author: SolidProgramming

.github/workflows/test-install.yml

@@ -43,6 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+
     - name: do test install in case of merged pull request
       run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e force_install=true site.yml -K
 

.vscode/launch.json

@@ -145,7 +145,7 @@
             "name": "py-generate-tenant-data",
             "type": "debugpy",
             "request": "launch",
-            "program": "${workspaceFolder}/roles/test/files/tenant_networks/create_tenant_network_data.py",
+            "program": "${workspaceFolder}/roles/tests-unit/files/tenant_networks/create_tenant_network_data.py",
             "console": "integratedTerminal",
             "env": {
                 "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
@@ -352,7 +352,7 @@
             "args": [
                 "test"
             ],
-            "cwd": "${workspaceFolder}/roles/test/files/FWO.Test",
+            "cwd": "${workspaceFolder}/roles/tests-unit/files/FWO.Test",
             "stopAtEntry": false,
             "console": "integratedTerminal"
         },

documentation/developer-docs/csharp/wkhtmltopdf.md

@@ -75,8 +75,8 @@ Note that the following domains must be reachable through the proxy:
     postgresql.org
     microsoft.com     
     nuget.org
-    storage.googleapis.com
     googlechromelabs.github.io
+    storage.googleapis.com
 
   Only for the initial setup of python venv
 

documentation/installer/install-advanced.md

@@ -39,20 +39,27 @@ Set dotnet installation mode to "debug" as follows (default = Release)
 ```console
 ansible-playbook/ site.yml -e "dotnet_mode=Debug" -K
 ```
-## Running integration tests after installation/upgrade
 
-To only run tests (for an existing installation) use tags as follows:
+## Running unit tests after installation/upgrade
+
+To only run unit tests (for an existing installation only to be used in comination with installation_mode=upgrade) use tags as follows:
 
 ```console
-ansible-playbook site.yml --tags test -K
+ansible-playbook site.yml --tags unittests -K
 ```
 
-## Running unit tests only
+## Running integration tests after installation/upgrade
+
+To only run integration tests (for an existing installation only to be used in comination with installation_mode=upgrade) use tags as follows:
+
+```console
+ansible-playbook site.yml --tags integrationtests -K
+```
 
-To only run tests (for an existing installation, can only be combined with installation_mode=upgrade) use tags as follows:
+## Running installation without any tests
 
 ```console
-ansible-playbook site.yml --tags unittest -e "installation_mode=upgrade" -K
+ansible-playbook site.yml -K --skip-tags unittests,integrationtests
 ```
 
 ## Parameter "api_no_metadata" to prevent meta data import

documentation/installer/install-for-testing.md

@@ -138,7 +138,7 @@ wsgi_package_name: libapache2-mod-wsgi
 
 ############# wkhtmltopdf #########################
 
-wkhtmltopdf_version: "0.12.6.1-3"
+# wkhtmltopdf_version: "0.12.6.1-3"
 
 
 ################# testing #########################

inventory/group_vars/all.yml

@@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{CE55F125-0CD
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Middleware.Client", "lib\files\FWO.Middleware.Client\FWO.Middleware.Client.csproj", "{ECB165CE-BE81-4C5C-B27A-D73177D73E28}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Test", "test\files\FWO.Test\FWO.Test.csproj", "{9C66B86B-FFB2-44A9-A944-54B33D31D413}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Test", "tests-unit\files\FWO.Test\FWO.Test.csproj", "{9C66B86B-FFB2-44A9-A944-54B33D31D413}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Report", "lib\files\FWO.Report\FWO.Report.csproj", "{84CA4892-7C35-4F1F-AF25-2A379112DFCA}"
 EndProject

roles/FWO.sln

@@ -10581,6 +10581,28 @@
                 }
               ]
             },
+            {
+              "table": {
+                "name": "refresh_log",
+                "schema": "public"
+              },
+              "select_permissions": [
+                {
+                  "role": "middleware-server",
+                  "permission": {
+                    "columns": [
+                      "id",
+                      "status",
+                      "view_name",
+                      "refreshed_at"
+                    ],
+                    "filter": {},
+                    "allow_aggregations": true
+                  },
+                  "comment": ""
+                }
+              ]
+            },
             {
               "table": {
                 "name": "report",
@@ -25259,6 +25281,16 @@
                 "name": "recert_get_one_owner_one_mgm",
                 "schema": "public"
               }
+            },
+            {
+              "function": {
+                "name": "refresh_view_rule_with_owner",
+                "schema": "public"
+              },
+              "configuration": {
+                "custom_root_fields": {},
+                "exposed_as": "query"
+              }
             }
           ],
           "configuration": {

roles/api/files/replace_metadata.json

@@ -234,7 +234,7 @@ $$ LANGUAGE plpgsql;
 --     FOR EACH ROW
 --     EXECUTE PROCEDURE owner_network_change_triggered ();
 
--- -- LargeOwnerChange: uncomment to disable triggers (e.g. for large installations without recert needs)
--- -- ALTER TABLE owner DISABLE TRIGGER owner_change;
--- -- ALTER TABLE owner_network DISABLE TRIGGER owner_network_change;
+-- LargeOwnerChange: uncomment to disable triggers (e.g. for large installations without recert needs)
+-- ALTER TABLE owner DISABLE TRIGGER owner_change;
+-- ALTER TABLE owner_network DISABLE TRIGGER owner_network_change;
 

roles/database/files/sql/creation/fworch-create-triggers.sql

@@ -188,3 +188,39 @@ CREATE MATERIALIZED VIEW view_rule_with_owner AS
 -- execute procedure refresh_view_rule_with_owner();
 
 GRANT SELECT ON TABLE view_rule_with_owner TO GROUP secuadmins, reporters, configimporters;
+
+
+CREATE TABLE IF NOT EXISTS refresh_log (
+    id SERIAL PRIMARY KEY,
+    view_name TEXT NOT NULL,
+    refreshed_at TIMESTAMPTZ DEFAULT now(),
+    status TEXT
+);
+
+CREATE OR REPLACE FUNCTION refresh_view_rule_with_owner()
+RETURNS SETOF refresh_log AS $$
+DECLARE
+    status_message TEXT;
+BEGIN
+    -- Attempt to refresh the materialized view
+    BEGIN
+        REFRESH MATERIALIZED VIEW view_rule_with_owner;
+        status_message := 'Materialized view refreshed successfully';
+    EXCEPTION
+        WHEN OTHERS THEN
+            status_message := format('Failed to refresh view: %s', SQLERRM);
+    END;
+
+    -- Log the operation
+    INSERT INTO refresh_log (view_name, status)
+    VALUES ('view_rule_with_owner', status_message);
+
+    -- Return the log entry
+    RETURN QUERY SELECT * FROM refresh_log WHERE view_name = 'view_rule_with_owner' ORDER BY refreshed_at DESC LIMIT 1;
+END;
+$$ LANGUAGE plpgsql VOLATILE;
+
+
+-- Create indexes on the materialized view
+CREATE INDEX IF NOT EXISTS idx_view_rule_with_owner_rule_id ON view_rule_with_owner (rule_id);
+CREATE INDEX IF NOT EXISTS idx_view_rule_with_owner_owner_id ON view_rule_with_owner (owner_id);