Merge pull request #1613 from CactuseSecurity/develop

Develop merge into main v5.6.6

Author: tpurschke

.vscode/launch.json

@@ -50,12 +50,12 @@
                 "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
             },
             "args": [
-                "-m4",
-                "-d0",
+                "-m32",
+                "-d4",
                 //"-f",
                 //"-c",
                 //  41 - lab fortimanager
-                "-i/home/tim/tmp/configs/mgm_id_53_config_native.json.8.anon",
+                //"-i/home/tim/tmp/configs/mgm_id_53_config_native.json.8.anon",
                 //"-i/home/tim/tmp/configs/mgm_id_56_config_native.json.anon", // all rules, all objs local mgm_id 4
                 // "-i/home/tim/tmp/configs/mgm_id_56_config_native.json.anon", // 30k rules, local mgm_id 45
                 //"-i/home/tim/tmp/configs/mgm_id_52_config_native.json.anon", // many gateways, local mgm_id 49
@@ -67,6 +67,9 @@
                 //"-i/home/tim/tmp/configs/mgm_id_12_config_native.json",
                 // "-i/home/tim/tmp/configs/m56_1sthalf.json", // half of 30k rules, local mgm_id 45
                 //"-i/home/tim/tmp/configs/mgm_id_1176_config_native.json.anon_error_in_fprs100-s999-rz99-xxx-PolicyNetwork.anon",
+                //"-i/home/tim/tmp/configs/mgm_id_60_config_native.json.anon",
+                //"-i/home/tim/tmp/configs/mgm_id_60_config_native-with-error.json.anon",
+                //"-i/home/tim/tmp/configs/mgm_id_54_config_native.json.anon",
                 //"-i/home/tim/tmp/configs/mgm_id_1176_config_native.json.anon_error_in_fprs100-s999-rz99-xxx-PolicyNetwork.anon-with-broken-svc",
                 "-l250"
             ]

documentation/revision-history.md

@@ -190,8 +190,13 @@ adding report template format fk and permissions
 - migrated api import-loop to a single python script without any sys executes of ext. scripts
 - minor but fixes and vip nat for fortimanager
 
-### 5.6.5 - 2022
+### 5.6.5 - 11.02.2022
 - next planned release
 - fixing migration scripts
 - splitting import_config into chunks to enable import of big managements
 - introducing fw-admin role (device admin without delete & auto-discovery rights)
+- working fortinet src hide nat behind interface
+
+### 5.6.6 - 2022
+- allow for users in rule destination (CP)
+- monitoring

inventory/group_vars/all.yml

@@ -1,5 +1,5 @@
 ### general settings
-product_version: "5.6.5"
+product_version: "5.6.6"
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=no'
 product_name: fworch

inventory/group_vars/apiserver.yml

@@ -8,8 +8,7 @@ api_hasura_admin_test_password: "not4production"
 api_user_email: "{{ api_user }}@{{ api_ip_address }}"
 api_home: "{{ fworch_home }}/api"
 api_hasura_cli_bin: "/usr/local/bin/hasura"
-# api_hasura_version: "v2.1.1"
-api_hasura_version: "v2.2.0"
+api_hasura_version: "v2.3.0"
 api_project_name: api
 api_no_metadata: false
 # debug > info > warn > error