Merge branch 'importer-rework' into develop

Author: tpurschke

.editorconfig

@@ -10,3 +10,7 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = false
 insert_final_newline = true
+
+[*.razor]
+indent_style = space
+indent_size = 4

.vscode/launch.json

@@ -1,5 +1,14 @@
 {
     "version": "0.2.0",
+    "compounds": [
+        {
+            "name": "Launch MW and UI",
+            "configurations": [
+                "c#-MiddlewareServer",
+                "c#-Blazor UI"
+            ]
+        }
+    ],
     "configurations": [
         {
             "name": ".NET Core SSH Attach ubu20",
@@ -8,7 +17,11 @@
             "processId": "${command:pickRemoteProcess}",
             "pipeTransport": {
                 "pipeProgram": "ssh",
-                "pipeArgs": [ "-T", "-p 22006", "tim@localhost" ],
+                "pipeArgs": [
+                    "-T",
+                    "-p 22006",
+                    "tim@localhost"
+                ],
                 "debuggerPath": "~/vsdbg-root/vsdbg",
                 "pipeCwd": "${workspaceRoot}",
                 "quoteArgs": true
@@ -17,7 +30,7 @@
                 "/home/tim/firewall-orchestrator/roles": "${workspaceRoot}"
             },
             "logging": {
-              "logging.diagnosticsLog.protocolMessages": true
+                "logging.diagnosticsLog.protocolMessages": true
             }
         },
         {
@@ -101,20 +114,56 @@
                 "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
             },
             "args": [
-                "-m7",
+                "-m1",
                 "-d1",
                 "-f",
                 "-s",
-                //"-l",
-                // "-c"
-                //"-l250"
+                // "-c",
+                // "-ifile:///home/tim/tmp/mgm_id_12_config_normalized_with_links.json",
+                // "-ifile:///home/tim/tmp/mgm_id_16_config_normalized_links_only.json",
+                // "-ifile:///home/tim/tmp/mgm_id_16_config_normalized_links_changed.json",
+                // "-ifile:///home/tim/tmp/mgm_id_16_config_normalized_links_src_negated.json",
+                // "-ifile:///home/tim/tmp/mgm_id_3_config_normalized.json",
+                // "-ifile:///home/tim/tmp/mgm_id_1_config_normalized.json",
+                // "-ifile:///home/tim/tmp/sting_1_norm.json",
+                // "-ifile:///home/tim/tmp/sting_2_plus_one_nwobj_norm.json",
+                "-ifile:///home/tim/tmp/sting_3_plus_one_rule_norm.json",
+                //"-l66",
+                // "-l500",
                 //  41 - lab fortimanager
-                //"-ihttps://fwodemodata.cactus.de/demo04_cpr8x.json",
+                //"-nhttps://fwodemodata.cactus.de/demo07_dummyGw1.json"
+                // "-ihttps://fwodemodata.cactus.de/demo11-r82_v9.json",
+                // "-ihttps://fwodemodata.cactus.de/demo04_cpr8x.json",
                 //"-ihttps://fwodemodata.cactus.de/demo01_fortiMgrLab.json"
-                //"-ihttps://fwodemodata.cactus.de/demo05_fortiMgr2.json"
+                // "-ihttps://fwodemodata.cactus.de/demo05_fortiMgr2.json"
                 //"-ihttps://fwodemodata.cactus.de/big/xxx.json",
             ]
         },
+        {
+            "name": "py-test-ruleorder",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/roles/importer/files/test/ruleorder.py",
+            "console": "integratedTerminal",
+            "env": {
+                "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
+            },
+            "args": []
+        },
+        {
+            "name": "py-kimport",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/scripts/Python-nsPYm-v2/get_all_firewall_data.py",
+            "console": "integratedTerminal",
+            "env": {
+                "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
+            },
+            "args": [
+                "itsecorg",
+                "st8chel"
+            ]
+        },
         {
             "name": "py-customize-FWO-sample",
             "type": "debugpy",
@@ -310,24 +359,24 @@
                 "-i/tmp/fworch-config.graphql"
             ]
         },
-        {
-            "name": "py-cpr8x-autodiscovery",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/auto-discover.py",
-            "console": "integratedTerminal",
-            "cwd": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x",
-            "env": {
-                "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
-            },
-            "args": [
-                "-a192.168.100.110",
-                "-w/home/tim/secrets/cp_apiuser_pwd",
-                "-uitsecorg",
-                "-d4",
-                "-fjson"
-            ]
-        },
+        // {
+        //     "name": "py-cpr8x-autodiscovery",
+        //     "type": "debugpy",
+        //     "request": "launch",
+        //     "program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/auto-discover.py",
+        //     "console": "integratedTerminal",
+        //     "cwd": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x",
+        //     "env": {
+        //         "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
+        //     },
+        //     "args": [
+        //         "-a192.168.100.111",
+        //         "-w/home/tim/secrets/cp_apiuser_pwd",
+        //         "-uitsecorg",
+        //         "-d4",
+        //         "-fjson"
+        //     ]
+        // },
         {
             "name": "py-import-main-loop",
             "type": "debugpy",
@@ -363,4 +412,4 @@
             "processId": "${command:pickProcess}"
         }
     ]
-}
+}

.vscode/settings.json

@@ -3,5 +3,8 @@
     "editor.formatOnSave": false,
     "[csharp]": {
         "editor.defaultFormatter": "ms-dotnettools.csharp"
+    },
+    "[razor]": {
+      "editor.defaultFormatter": "ms-dotnettools.csharp"
     }
-}
+}

ansible.cfg

@@ -4,7 +4,7 @@ inventory = inventory
 # interpreter_python = ~/.local/bin/ansible
 # timeout = 60
 force_handlers = True
-stdout_callback = yaml
+# stdout_callback = yaml
 
 # gathering = smart
 # gather_subset = !hardware,!facter,!ohai

documentation/certificates.md

@@ -12,7 +12,8 @@ After the change restart apache2
  sudo systemctl restart apache2
 ```
 
-## Change Root Certificate
+
+## Change Roor Certificate
 
 Copy root cert to
 

documentation/developer-docs/UI/csharp/data-filtering.md

@@ -5,7 +5,7 @@ first version:
 ```csharp
 <CascadingValue Value="collapseSidebarRule">
     <ObjectGroupCollection FetchObjects="FetchContent" Type="30" StartContentDetailed="true" StartCollapsed="false" InputDataType="Rule" Data="selectedItemsRuleReportTable"
-                           NameExtractor=@(rule => $"{rule.DeviceName} - Rule {rule.Id} {rule.Name}")
+                           NameExtractor=@(rule => $"{rule.RulebaseName} - Rule {rule.Id} {rule.Name}")
                            NetworkObjectExtractor="rule => Array.ConvertAll(rule.Froms.Concat(rule.Tos).GroupBy(x => x.Object?.Id).Select(x => x.FirstOrDefault()).ToArray(), location => location.Object)"
                            NetworkServiceExtractor="rule => Array.ConvertAll(rule.Services, wrapper => wrapper.Content)"
                            NetworkUserExtractor="rule => Array.FindAll(Array.ConvertAll(rule.Froms.Concat(rule.Tos).GroupBy(x => x.User?.Id).Select(x => x.FirstOrDefault()).ToArray(), location => location.User), user => user != null)" />