Merge pull request #2663 from CactuseSecurity/develop

main v8.5 preparation
CactuseSecurity · Nov 13, 2024 · 9c1189f · 9c1189f
2 parents 6efbc2f + bc247c2
commit 9c1189f
Show file tree

Hide file tree

Showing 280 changed files with 7,614 additions and 1,594 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -101,15 +101,14 @@
                 "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
             },
             "args": [
-                "-m23",
+                "-m6",
                 "-d1",
                 "-f",
                 "-s",
-                //"-l66",
+                //"-l",
                 // "-c"
                 //"-l250"
                 //  41 - lab fortimanager
-                //"-nhttps://fwodemodata.cactus.de/demo07_dummyGw1.json"
                 //"-ihttps://fwodemodata.cactus.de/demo04_cpr8x.json",
                 //"-ihttps://fwodemodata.cactus.de/demo01_fortiMgrLab.json"
                 //"-ihttps://fwodemodata.cactus.de/demo05_fortiMgr2.json"

diff --git a/documentation/revision-history-develop.md b/documentation/revision-history-develop.md
@@ -227,4 +227,10 @@ bugfix release:
 - Added welcome message and settings
 
 # 8.4.1 - 15.10.24 DEVELOP
-- Add missing FK connection.proposed_app_id #2591
+- Add missing FK connection.proposed_app_id #2591
+
+# 8.4.2 - 17.10.2024 DEVELOP
+- external request
+
+# 8.4.3 - 05.11.2024 DEVELOP
+- extra parameters in modelling connection
diff --git a/documentation/revision-history-main.md b/documentation/revision-history-main.md
@@ -425,3 +425,13 @@ Fixes
 - importer 
   - check point - fix import of all VSX instances
   - fortinet - add hit counts and install on information
+
+# 8.5 - 13.11.24 MAIN
+Network Modelling feature update
+- modelling can be requested as firewall change via external ticketing tool
+- includes all approle handling
+- simple form of rule change request (always request all connections as rules)
+- api hasura upgrade to 2.44.0
+Fixes
+- various small UI fixes
+- importer (CP: handle None objects)
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
@@ -1,5 +1,5 @@
 ### general settings
-product_version: "8.4.1"
+product_version: "8.5"
 ansible_user: "{{ lookup('env', 'USER') }}"
 ansible_become_method: sudo
 ansible_python_interpreter: /usr/bin/python3

diff --git a/inventory/group_vars/apiserver.yml b/inventory/group_vars/apiserver.yml
@@ -8,7 +8,7 @@ api_hasura_admin_test_password: "not4production"
 api_user_email: "{{ api_user }}@{{ api_network_listening_ip_address }}"
 api_home: "{{ fworch_home }}/api"
 api_hasura_cli_bin: "{{ fworch_home }}/api/bin/hasura"
-api_hasura_version: "v2.43.0"
+api_hasura_version: "v2.44.0"
 api_project_name: api
 api_no_metadata: false
 api_rollback_is_running: false

diff --git a/inventory/group_vars/databaseserver.yml b/inventory/group_vars/databaseserver.yml
@@ -41,5 +41,8 @@ database_idempotent_files:
   - fworch-usr-import.sql
   - fworch-usr-refs.sql
   - fworch-views-changes.sql
-  - fworch-views-recert.sql
   - fworch-zone-import.sql
+
+
+  # - fworch-views-recert.sql 
+  # moved to creation because of materialized view taking too long during upgrades
diff --git a/roles/FWO.sln b/roles/FWO.sln
@@ -41,6 +41,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Basics", "lib\files\FWO
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Tufin.SecureChange", "lib\files\FWO.Tufin.SecureChange\FWO.Tufin.SecureChange.csproj", "{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Services", "lib\files\FWO.Services\FWO.Services.csproj", "{56021BEC-39E5-4EC7-B3DB-80834B57B2F0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -115,10 +117,10 @@ Global
 		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4D59426-224C-46B8-B2CA-E85011609C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4D59426-224C-46B8-B2CA-E85011609C80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4D59426-224C-46B8-B2CA-E85011609C80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4D59426-224C-46B8-B2CA-E85011609C80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56021BEC-39E5-4EC7-B3DB-80834B57B2F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56021BEC-39E5-4EC7-B3DB-80834B57B2F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56021BEC-39E5-4EC7-B3DB-80834B57B2F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56021BEC-39E5-4EC7-B3DB-80834B57B2F0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,7 +141,6 @@ Global
 		{6EBEBF57-3399-4008-BA10-0D21F6827244} = {B48F8BD5-1056-4670-BEFA-F4A260293B6F}
 		{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3} = {B48F8BD5-1056-4670-BEFA-F4A260293B6F}
 		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53} = {B48F8BD5-1056-4670-BEFA-F4A260293B6F}
-		{A4D59426-224C-46B8-B2CA-E85011609C80} = {B48F8BD5-1056-4670-BEFA-F4A260293B6F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {68364621-1011-4D44-9CF5-518F0DC3F459}