Some cleanup + small fixes #2058

abarz722 · 2023-05-09T13:49:42Z

check for spaces + some docu pieces -> importer FortiOS v7.x ssh import issues #2054
warning color to yellow -> UI - settings - managements - warning should be displayed in yellow not red #2044
some missing translations
converge css class determination
cleanup + renaming

tpurschke · 2023-05-09T15:03:57Z

roles/database/files/sql/idempotent/fworch-texts.sql

@@ -2905,21 +2917,25 @@ INSERT INTO txt VALUES ('H5102', 'English', 'The following firewall products can
    </ul>
 ');
 INSERT INTO txt VALUES ('H5103', 'German',  'F&uuml;r Firewallgateways ohne separates Management oder im Falle, dass das zentrale Management nicht in den Firewall Orchestrator eingebunden werden kann,
-    werden die Details des Gateways als Management und gleichzeitig auch als Gateway eingetragen.
+    werden die Details des Gateways als Management und gleichzeitig auch als Gateway eingetragen.<br>
+    Im Falle Fortigate: Um einen vollst&auml;ndigen Datenimport zu gew&auml;hrleisten, bitte in der Fortigate config den Seitenumbruch deaktivieren, damit beim Kommando "show full-configuration" die komplette Config zu ausgegeben wird.


tpurschke · 2023-05-09T15:08:31Z

roles/database/files/sql/idempotent/fworch-texts.sql

@@ -2928,11 +2944,11 @@ INSERT INTO txt VALUES ('H5113', 'German',  'Ger&auml;tetyp*: bitte das korrekte
 INSERT INTO txt VALUES ('H5113', 'English', 'Device Type*: Select correct product from a list of available types, see above.');
 INSERT INTO txt VALUES ('H5114', 'German',  'Hostname*: Adresse des Hosts (entweder IP-Addresse oder aufl&ouml;sbarer Name). 
    F&uuml;r Check Point R8x MDS Installationen die Addresse des MDS-Servers f&uuml;r alle Domains benutzen.<br>
-    F&uuml;r Fortinet, Barradua, Juniper muss die IP vom aufl&ouml;sbaren Namen des Firewallgateways spezifiziert werden.
+    F&uuml;r Fortinet, Barracuda, Juniper muss die IP vom aufl&ouml;sbaren Namen des Firewallgateways spezifiziert werden.


Für alle übrigen Firewall-Plattformen, bei denen es es kein separates Management gibt, muss die IP oder der auflösbare Name des Firewallgateways spezifiziert werden

tpurschke · 2023-05-09T15:11:15Z

roles/database/files/sql/idempotent/fworch-texts.sql

 ');
 INSERT INTO txt VALUES ('H5114', 'English', 'Hostname*: Address of the host (either IP address or resolvable name). 
    For Check Point R8x MDS installations use the address of the MDS server for all domains.<br>
-    For Fortinet, Barradua, Juniper you need to specify the IP or resolvable name of the firewall gateway.
+    For Fortinet, Barracuda, Juniper you need to specify the IP or resolvable name of the firewall gateway.


For all other firewall platforms which do not possess a separate management, use the IP address or the resolvable name of the firewall gateway.

tpurschke · 2023-05-09T15:13:45Z

roles/database/files/sql/idempotent/fworch-texts.sql

-INSERT INTO txt VALUES ('H5133', 'German',  'Privater Schl&uuml;ssel* / Passwort*: F&uuml;r den ssh-Zugang hier den privaten ssh-Schl&uuml;ssel hinterlegen (Schl&uuml;ssel muss unverschl&uuml;sselt und ohne Passphrase sein)<br>
-    F&uuml;r den API-Zugang ist dies das Passwort des API-Nutzers.
+INSERT INTO txt VALUES ('H5133', 'German',  'Privater Schl&uuml;ssel* / Passwort*: F&uuml;r den ssh-Zugang hier den privaten ssh-Schl&uuml;ssel hinterlegen (Schl&uuml;ssel muss unverschl&uuml;sselt und ohne Passphrase sein).
+    Bitte kein RSA benutzen, da zumindest FortiGate ein Problem mit RSA-Schl&uuml;sseln zu haben scheint.<br>


Bitte für ssh-basierten legacy FortiGate Zugriff kein RSA benutzen, da es hier ein Problem mit RSA-Schlüsseln zu geben scheint.

tpurschke · 2023-05-09T15:15:35Z

roles/database/files/sql/idempotent/fworch-texts.sql

-INSERT INTO txt VALUES ('H5133', 'English', 'Login Secret* / Password*: For ssh access enter the private ssh key (key needs to be unencrypted without passphrase)<br>
-    For API access this is the password of the API user.
+INSERT INTO txt VALUES ('H5133', 'English', 'Login Secret* / Password*: For ssh access enter the private ssh key (key needs to be unencrypted without passphrase).
+    Please do not use RSA as at least FortiGate seems to have a problem with RSA keys.<br>


For legacy ssh based FortiGate, do not use RSA as there seems to be a problem with RSA keys.

tpurschke · 2023-05-09T15:21:39Z

roles/ui/files/FWO.UI/wwwroot/css/bootstrap/bootstrap.min.css

@@ -9,4 +9,4 @@
 * Copyright 2011-2020 The Bootstrap Authors


why/how was the bootstrap.css file changed?

changed the color of alert-warning: did an override in side.css instead now

sounds good - but in this case there should not be any changes to the boostrap.css at all, right?

tpurschke · 2023-05-10T17:17:54Z

roles/database/files/sql/idempotent/fworch-texts.sql

@@ -2944,11 +2944,13 @@ INSERT INTO txt VALUES ('H5113', 'German',  'Ger&auml;tetyp*: bitte das korrekte
 INSERT INTO txt VALUES ('H5113', 'English', 'Device Type*: Select correct product from a list of available types, see above.');
 INSERT INTO txt VALUES ('H5114', 'German',  'Hostname*: Adresse des Hosts (entweder IP-Addresse oder aufl&ouml;sbarer Name). 
    F&uuml;r Check Point R8x MDS Installationen die Addresse des MDS-Servers f&uuml;r alle Domains benutzen.<br>
-    F&uuml;r Fortinet, Barracuda, Juniper muss die IP vom aufl&ouml;sbaren Namen des Firewallgateways spezifiziert werden.
+    F&uuml;r Fortinet, Barracuda, Juniper muss die IP vom aufl&ouml;sbaren Namen des Firewallgateways spezifiziert werden.<br>


Für alle Firewall-Plattformen, die kein separates Management-System besitzen, muss die IP oder der auflösbare Name des Firewallgateways spezifiziert werden.

tpurschke · 2023-05-10T17:18:11Z

roles/database/files/sql/idempotent/fworch-texts.sql

@@ -2944,11 +2944,13 @@ INSERT INTO txt VALUES ('H5113', 'German',  'Ger&auml;tetyp*: bitte das korrekte
 INSERT INTO txt VALUES ('H5113', 'English', 'Device Type*: Select correct product from a list of available types, see above.');
 INSERT INTO txt VALUES ('H5114', 'German',  'Hostname*: Adresse des Hosts (entweder IP-Addresse oder aufl&ouml;sbarer Name). 
    F&uuml;r Check Point R8x MDS Installationen die Addresse des MDS-Servers f&uuml;r alle Domains benutzen.<br>
-    F&uuml;r Fortinet, Barracuda, Juniper muss die IP vom aufl&ouml;sbaren Namen des Firewallgateways spezifiziert werden.
+    F&uuml;r Fortinet, Barracuda, Juniper muss die IP vom aufl&ouml;sbaren Namen des Firewallgateways spezifiziert werden.<br>
+    F&uuml;r alle &uuml;brigen Firewall-Plattformen, bei denen es es kein separates Management gibt, muss die IP oder der aufl&ouml;sbare Name des Firewallgateways spezifiziert werden.


can be removed

tpurschke · 2023-05-10T17:18:30Z

roles/database/files/sql/idempotent/fworch-texts.sql

 ');
 INSERT INTO txt VALUES ('H5114', 'English', 'Hostname*: Address of the host (either IP address or resolvable name). 
    For Check Point R8x MDS installations use the address of the MDS server for all domains.<br>
-    For Fortinet, Barracuda, Juniper you need to specify the IP or resolvable name of the firewall gateway.
+    For Fortinet, Barracuda, Juniper you need to specify the IP or resolvable name of the firewall gateway.<br>


remove this sentence

tpurschke · 2023-05-10T17:18:48Z

roles/database/files/sql/idempotent/fworch-texts.sql

 ');
 INSERT INTO txt VALUES ('H5114', 'English', 'Hostname*: Address of the host (either IP address or resolvable name). 
    For Check Point R8x MDS installations use the address of the MDS server for all domains.<br>
-    For Fortinet, Barracuda, Juniper you need to specify the IP or resolvable name of the firewall gateway.
+    For Fortinet, Barracuda, Juniper you need to specify the IP or resolvable name of the firewall gateway.<br>
+    For all other firewall platforms which do not possess a separate management, use the IP address or the resolvable name of the firewall gateway.


For all firewall platforms which do not possess a separate management, use the IP address or the resolvable name of the firewall gateway.

tpurschke · 2023-05-10T17:20:29Z

roles/ui/files/FWO.UI/wwwroot/css/bootstrap/bootstrap.min.css

@@ -9,4 +9,4 @@
 * Copyright 2011-2020 The Bootstrap Authors


sounds good - but in this case there should not be any changes to the boostrap.css at all, right?

abarz722 added 4 commits May 7, 2023 12:32

a bit docu + small fixes

d0f5571

missing translation

41f6ff7

some cleanup

abf174e

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

b7262c8

…-orchestrator into develop

abarz722 requested a review from tpurschke May 9, 2023 13:50

tpurschke requested changes May 9, 2023

View reviewed changes

review fixes

e26d979

tpurschke requested changes May 10, 2023

View reviewed changes

fix

b80608f

tpurschke approved these changes May 11, 2023

View reviewed changes

tpurschke merged commit c54bb64 into CactuseSecurity:develop May 11, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Some cleanup + small fixes #2058

Some cleanup + small fixes #2058

abarz722 commented May 9, 2023

tpurschke May 9, 2023

tpurschke May 9, 2023

tpurschke May 9, 2023

tpurschke May 9, 2023

tpurschke May 9, 2023

tpurschke May 9, 2023

abarz722 May 10, 2023

tpurschke May 10, 2023

tpurschke May 10, 2023

tpurschke May 10, 2023

tpurschke May 10, 2023

tpurschke May 10, 2023

tpurschke May 10, 2023

Some cleanup + small fixes #2058

Some cleanup + small fixes #2058

Conversation

abarz722 commented May 9, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment