Merge pull request CactuseSecurity#2465 from CactuseSecurity/develop

Develop to main v8.3
NilsPur · Jun 25, 2024 · 70bdcd3 · 70bdcd3
2 parents 09b9c42 + 762a5b9
commit 70bdcd3
Show file tree

Hide file tree

Showing 209 changed files with 6,024 additions and 2,766 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,6 +1,25 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": ".NET Core SSH Attach ubu20",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickRemoteProcess}",
+            "pipeTransport": {
+                "pipeProgram": "ssh",
+                "pipeArgs": [ "-T", "-p 22006", "tim@localhost" ],
+                "debuggerPath": "~/vsdbg-root/vsdbg",
+                "pipeCwd": "${workspaceRoot}",
+                "quoteArgs": true
+            },
+            "sourceFileMap": {
+                "/home/tim/firewall-orchestrator/roles": "${workspaceRoot}"
+            },
+            "logging": {
+              "logging.diagnosticsLog.protocolMessages": true
+            }
+        },
         {
             "name": "c#-MiddlewareServer",
             "type": "coreclr",
@@ -82,7 +101,7 @@
                 "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
             },
             "args": [
-                "-m5",
+                "-m23",
                 "-d1",
                 "-f",
                 "-s",

diff --git a/documentation/developer-docs/visual-studio/readme.md b/documentation/developer-docs/visual-studio/readme.md
@@ -12,7 +12,7 @@ Useful for Blazor/C# testing. Works on Windows, MacOS and Linux.
 
 ## Add VS Code Extensions from Marketplace
 recommended:
-- C#
+- C# --> make sure to activate OmniSharp Support in settings
 - Razor+
 - Debugger for Firefox
 - GitHub Pull Requests and Issues, see <https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github>

diff --git a/documentation/revision-history-develop.md b/documentation/revision-history-develop.md
@@ -203,5 +203,17 @@ bugfix release:
 - upgrade to dotnet 8.0
 - adding all imported modelling users to uiuser
 
-# 8.2.1 - xx.05.2024 DEVELOP
+# 8.2.1 - 03.05.2024 DEVELOP
 - fix misleading login error message when authorisation is missing
+
+# 8.2.2 - 14.05.2024 DEVELOP
+- fix email credential decryption
+- start of Tufin SecureChange integration
+
+# 8.2.3 - 26.05.2024 DEVELOP
+- remove cascading delete for used interfaces 
+- new properties field in connections
+
+# 8.2.4 - 19.06.2024 DEVELOP
+- owner-filtering for new report type
+- new setting for email recipients
diff --git a/documentation/revision-history-main.md b/documentation/revision-history-main.md
@@ -381,3 +381,13 @@ adding report template format fk and permissions
 - encrypt emailPassword in config
 - fixes:
   - demo managements (change import from deactivated to activated - does not affect test managements)
+
+# 8.3 - 25.06.2024 MAIN
+Maintenance release
+- fix misleading login error message when authorisation is missing
+- fix email credential decryption
+- start of Tufin SecureChange integration
+- remove cascading delete for used interfaces 
+- owner-filtering for new report type
+- new setting for email recipients
+- owner-import custom script improvements#
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
@@ -1,5 +1,5 @@
 ### general settings
-product_version: "8.2.1"
+product_version: "8.3"
 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.38.1"
+api_hasura_version: "v2.40.0"
 api_project_name: api
 api_no_metadata: false
 api_rollback_is_running: false

diff --git a/roles/FWO.sln b/roles/FWO.sln
@@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FWO.Encryption", "lib\files
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FWO.GlobalConstants", "lib\files\FWO.GlobalConstants\FWO.GlobalConstants.csproj", "{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FWO.Tufin.SecureChange", "lib\files\FWO.Tufin.SecureChange\FWO.Tufin.SecureChange.csproj", "{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -113,6 +115,10 @@ Global
 		{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -132,6 +138,7 @@ Global
 		{B48F8BD5-1056-4670-BEFA-F4A260293B6F} = {CE55F125-0CD2-4789-A3C1-045DEF33ABA5}
 		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {68364621-1011-4D44-9CF5-518F0DC3F459}