diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 36669755..ce6ed314 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,6 +9,9 @@ repos: - id: check-ast - id: check-docstring-first - id: end-of-file-fixer + - id: check-builtin-literals + - id: debug-statements + - id: forbid-new-submodules - repo: https://github.com/asottile/pyupgrade rev: v3.1.0 hooks: diff --git a/CheckPointObjects/CP_KnownServiceGroups.csv b/CheckPointObjects/CP_KnownServiceGroups.csv index 6a55c730..1b53c828 100644 --- a/CheckPointObjects/CP_KnownServiceGroups.csv +++ b/CheckPointObjects/CP_KnownServiceGroups.csv @@ -49,4 +49,4 @@ "time" "Trojan_Services" "Yahoo_Messenger" -"Mail" \ No newline at end of file +"Mail" diff --git a/CheckPointObjects/CheckPointObjects.cs b/CheckPointObjects/CheckPointObjects.cs index 9f123aaa..d342e783 100644 --- a/CheckPointObjects/CheckPointObjects.cs +++ b/CheckPointObjects/CheckPointObjects.cs @@ -1106,4 +1106,3 @@ public int TotalRules() } } } - diff --git a/CheckPointObjects/CheckPointObjects.csproj b/CheckPointObjects/CheckPointObjects.csproj index fe8d2079..ca47a738 100644 --- a/CheckPointObjects/CheckPointObjects.csproj +++ b/CheckPointObjects/CheckPointObjects.csproj @@ -80,4 +80,4 @@ --> - \ No newline at end of file + diff --git a/CiscoMigration/CiscoAnalizStatistic.cs b/CiscoMigration/CiscoAnalizStatistic.cs index 53b123ee..fb6e2689 100644 --- a/CiscoMigration/CiscoAnalizStatistic.cs +++ b/CiscoMigration/CiscoAnalizStatistic.cs @@ -188,4 +188,4 @@ public override void CalculateServices(List _cpTcpService } } -} \ No newline at end of file +} diff --git a/CiscoMigration/CiscoMigration.csproj b/CiscoMigration/CiscoMigration.csproj index bd039e70..117f5b7c 100644 --- a/CiscoMigration/CiscoMigration.csproj +++ b/CiscoMigration/CiscoMigration.csproj @@ -82,4 +82,4 @@ --> - \ No newline at end of file + diff --git a/CommonUtils/CommonUtils.csproj b/CommonUtils/CommonUtils.csproj index 6dd5c64e..387ab315 100644 --- a/CommonUtils/CommonUtils.csproj +++ b/CommonUtils/CommonUtils.csproj @@ -62,4 +62,4 @@ --> - \ No newline at end of file + diff --git a/FortinetMigration/FortiGateConverter.cs b/FortinetMigration/FortiGateConverter.cs index c78e4f83..9a8942a2 100644 --- a/FortinetMigration/FortiGateConverter.cs +++ b/FortinetMigration/FortiGateConverter.cs @@ -5816,4 +5816,4 @@ public void CalculateCorrectAll(List _cpNetworks, count = _nestedServicesGroupsCountAll = vs.Count; _nestedServicesGroupsCount = count - vs.Distinct().Count(); } -} \ No newline at end of file +} diff --git a/FortinetMigration/FortiGateMigration.csproj b/FortinetMigration/FortiGateMigration.csproj index 093837f7..d39024bd 100644 --- a/FortinetMigration/FortiGateMigration.csproj +++ b/FortinetMigration/FortiGateMigration.csproj @@ -73,4 +73,4 @@ --> - \ No newline at end of file + diff --git a/JuniperMigration/JuniperMigration.csproj b/JuniperMigration/JuniperMigration.csproj index acd9c9df..5cc4f160 100644 --- a/JuniperMigration/JuniperMigration.csproj +++ b/JuniperMigration/JuniperMigration.csproj @@ -91,4 +91,4 @@ --> - \ No newline at end of file + diff --git a/JuniperMigration/junos-defaults.xml b/JuniperMigration/junos-defaults.xml index 4092ccb7..c99b67e8 100644 --- a/JuniperMigration/junos-defaults.xml +++ b/JuniperMigration/junos-defaults.xml @@ -2126,4 +2126,4 @@ [edit] - \ No newline at end of file + diff --git a/MigrationBase/MigrationBase.csproj b/MigrationBase/MigrationBase.csproj index 92b12cb4..8d673289 100644 --- a/MigrationBase/MigrationBase.csproj +++ b/MigrationBase/MigrationBase.csproj @@ -67,4 +67,4 @@ --> - \ No newline at end of file + diff --git a/NetScreenMigration/NetScreenMigration.csproj b/NetScreenMigration/NetScreenMigration.csproj index e99caf9c..5313d19e 100644 --- a/NetScreenMigration/NetScreenMigration.csproj +++ b/NetScreenMigration/NetScreenMigration.csproj @@ -88,4 +88,4 @@ --> - \ No newline at end of file + diff --git a/NetScreenMigration/ScreenOSPredefinedGroupServiceCPMap.csv b/NetScreenMigration/ScreenOSPredefinedGroupServiceCPMap.csv index 9c69a288..ad035a85 100644 --- a/NetScreenMigration/ScreenOSPredefinedGroupServiceCPMap.csv +++ b/NetScreenMigration/ScreenOSPredefinedGroupServiceCPMap.csv @@ -1,4 +1,4 @@ DISCARD,discard ECHO,echo GNUTELLA,GNUtella -NTP,ntp \ No newline at end of file +NTP,ntp diff --git a/NetScreenMigration/ScreenOSPredefinedServiceGroups.csv b/NetScreenMigration/ScreenOSPredefinedServiceGroups.csv index 1f169ff8..d1385392 100644 --- a/NetScreenMigration/ScreenOSPredefinedServiceGroups.csv +++ b/NetScreenMigration/ScreenOSPredefinedServiceGroups.csv @@ -3,4 +3,4 @@ MGCP,MGCP-CA,MGCP-UA MS-AD,MS-AD-BR,MS-AD-DRSUAPI,MS-AD-DSROLE,MS-AD-DSSETUP MS-EXCHANGE,MS-EXCHANGE-DATABASE,MS-EXCHANGE-DIRECTORY,MS-EXCHANGE-INFO-STORE,MS-EXCHANGE-MTA,MS-EXCHANGE-STORE,MS-EXCHANGE-SYSATD MS-IIS,MS-IIS-COM,MS-IIS-IMAP4,MS-IIS-INETINFO,MS-IIS-NNTP,MS-IIS-POP3,MS-IIS-SMTP -VOIP,H.323,MGCP-CA,MGCP-UA,SCCP,SIP \ No newline at end of file +VOIP,H.323,MGCP-CA,MGCP-UA,SCCP,SIP diff --git a/PaloAltoMigration/PA_Apps_CP.csv b/PaloAltoMigration/PA_Apps_CP.csv index d7ac6197..205ca6aa 100644 --- a/PaloAltoMigration/PA_Apps_CP.csv +++ b/PaloAltoMigration/PA_Apps_CP.csv @@ -2857,4 +2857,4 @@ zumodrive;ZumoDrive; zwiki-editing;; zynga-games;Zynga Games; unknown-tcp;Unknown Traffic; -unknown-udp;Unknown Traffic; \ No newline at end of file +unknown-udp;Unknown Traffic; diff --git a/PaloAltoMigration/PaloAltoMigration.csproj b/PaloAltoMigration/PaloAltoMigration.csproj index df207d88..58dc29d2 100644 --- a/PaloAltoMigration/PaloAltoMigration.csproj +++ b/PaloAltoMigration/PaloAltoMigration.csproj @@ -85,4 +85,4 @@ --> - \ No newline at end of file + diff --git a/PaloAltoMigration/PanoramaAnalizStatistic.cs b/PaloAltoMigration/PanoramaAnalizStatistic.cs index e6278da1..2c32a44b 100644 --- a/PaloAltoMigration/PanoramaAnalizStatistic.cs +++ b/PaloAltoMigration/PanoramaAnalizStatistic.cs @@ -140,4 +140,4 @@ public override void CalculateServices(List _cpTcpService _unusedServicesObjectsCount = vs.Count(); } } -} \ No newline at end of file +} diff --git a/README.md b/README.md index 90674c6b..3694a453 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # SmartMove Check Point SmartMove tool enables you to convert 3rd party database with firewall security policy and NAT to Check Point database. -At the moment, the tool parses Cisco ASA, FirePower with ASA syntax, Juniper JunosOS/ScreenOS, Fortinet FortiOS, PaloAlto PAN-OS and PaloAlto Panorama configurations and converts the objects, NAT and firewall policy to a Check Point R80.10 compliant policy. The tool is planned to support additional vendors and security configurations in the future. +At the moment, the tool parses Cisco ASA, FirePower with ASA syntax, Juniper JunosOS/ScreenOS, Fortinet FortiOS, PaloAlto PAN-OS and PaloAlto Panorama configurations and converts the objects, NAT and firewall policy to a Check Point R80.40+ compliant policy. The tool is planned to support additional vendors and security configurations in the future. -The tool generates bash scripts by utilizing Check Point Management API's command line interface, to migrate the converted policy into a R80.10 Management (or Multi-Domain) server. +The tool generates python package by utilizing Check Point Management API's command line interface, to migrate the converted policy into a R80.40+ Management (or Multi-Domain) server. For SmartMove tool release notes and latest updates, please refer to Check Point [sk115416](https://supportcenter.checkpoint.com/supportcenter/portal?eventSubmit_doGoviewsolutiondetails=&solutionid=sk115416) diff --git a/SmartMove/App.config b/SmartMove/App.config index bc3672db..486e3ea0 100644 --- a/SmartMove/App.config +++ b/SmartMove/App.config @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/SmartMove/CommonResources.xaml b/SmartMove/CommonResources.xaml index e6a282a5..b117d0a5 100644 --- a/SmartMove/CommonResources.xaml +++ b/SmartMove/CommonResources.xaml @@ -388,4 +388,4 @@ - \ No newline at end of file + diff --git a/SmartMove/Properties/Resources.resx b/SmartMove/Properties/Resources.resx index 9c90483a..ea9cbcdb 100644 --- a/SmartMove/Properties/Resources.resx +++ b/SmartMove/Properties/Resources.resx @@ -114,4 +114,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/SmartMove/Properties/Settings.settings b/SmartMove/Properties/Settings.settings index 033d7a5e..c2dbd5ca 100644 --- a/SmartMove/Properties/Settings.settings +++ b/SmartMove/Properties/Settings.settings @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/SmartMove/SmartConnector/smartconnector.py b/SmartMove/SmartConnector/smartconnector.py index 153c6ce8..62daabc8 100644 --- a/SmartMove/SmartConnector/smartconnector.py +++ b/SmartMove/SmartConnector/smartconnector.py @@ -1383,7 +1383,7 @@ def processNatRules(client, addedPackage, userNatRules, mergedNetworkObjectsMap, login_res = client.login_with_api_key(args.key, domain=args.domain) if login_res.success is False: - printStatus(None, "Login failed: {}".format(login_res.error_message)) + printStatus(None, f"Login failed: {login_res.error_message}") else: printStatus(None, "") mergedNetworkObjectsMap = {} @@ -1409,4 +1409,4 @@ def processNatRules(client, addedPackage, userNatRules, mergedNetworkObjectsMap, processNatRules(client, addedPackage, userNatRules, mergedNetworkObjectsMap, mergedServicesObjectsMap) printStatus(None, "==========") file_log.close() -# END \ No newline at end of file +# END diff --git a/SmartMove/SmartMove Tool Legal.rtf b/SmartMove/SmartMove Tool Legal.rtf index d46d7a5c..da084179 100644 Binary files a/SmartMove/SmartMove Tool Legal.rtf and b/SmartMove/SmartMove Tool Legal.rtf differ diff --git a/SmartMove/SmartMove.csproj b/SmartMove/SmartMove.csproj index be95f113..e2c0a24c 100644 --- a/SmartMove/SmartMove.csproj +++ b/SmartMove/SmartMove.csproj @@ -254,4 +254,4 @@ --> - \ No newline at end of file + diff --git a/SmartMove/packages.config b/SmartMove/packages.config index 78de1fe0..40fdc0d1 100644 --- a/SmartMove/packages.config +++ b/SmartMove/packages.config @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/packages/IPNetwork2.2.0.3/lib/net40/LICENSE.txt b/packages/IPNetwork2.2.0.3/lib/net40/LICENSE.txt index 64b1b053..6012301c 100644 --- a/packages/IPNetwork2.2.0.3/lib/net40/LICENSE.txt +++ b/packages/IPNetwork2.2.0.3/lib/net40/LICENSE.txt @@ -20,4 +20,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/Newtonsoft.Json.8.0.3/lib/net45/LICENSE.txt b/packages/Newtonsoft.Json.8.0.3/lib/net45/LICENSE.txt index 0fecee79..dfaadbe4 100644 --- a/packages/Newtonsoft.Json.8.0.3/lib/net45/LICENSE.txt +++ b/packages/Newtonsoft.Json.8.0.3/lib/net45/LICENSE.txt @@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.