CheckPointSW · chkp-ofirs · Oct 18, 2022 · Oct 18, 2022 · Oct 18, 2022 · Oct 18, 2022
diff --git 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
@@ -49,4 +49,4 @@
 "time"
 "Trojan_Services"
 "Yahoo_Messenger"
-"Mail"
+"Mail"
diff --git 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
@@ -80,4 +80,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/CiscoMigration/CiscoAnalizStatistic.cs b/CiscoMigration/CiscoAnalizStatistic.cs
@@ -188,4 +188,4 @@ public override void CalculateServices(List<CheckPoint_TcpService> _cpTcpService
         }
     }
 
-}
+}
diff --git a/CiscoMigration/CiscoMigration.csproj b/CiscoMigration/CiscoMigration.csproj
@@ -82,4 +82,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/CommonUtils/CommonUtils.csproj b/CommonUtils/CommonUtils.csproj
@@ -62,4 +62,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/FortinetMigration/FortiGateConverter.cs b/FortinetMigration/FortiGateConverter.cs
@@ -5816,4 +5816,4 @@ public void CalculateCorrectAll(List<CheckPoint_Network> _cpNetworks,
         count = _nestedServicesGroupsCountAll = vs.Count;
         _nestedServicesGroupsCount = count - vs.Distinct().Count();
     }
-}
+}
diff --git a/FortinetMigration/FortiGateMigration.csproj b/FortinetMigration/FortiGateMigration.csproj
@@ -73,4 +73,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/JuniperMigration/JuniperMigration.csproj b/JuniperMigration/JuniperMigration.csproj
@@ -91,4 +91,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/JuniperMigration/junos-defaults.xml b/JuniperMigration/junos-defaults.xml
@@ -2126,4 +2126,4 @@
     <cli>
         <banner>[edit]</banner>
     </cli>
-</rpc-reply>
+</rpc-reply>
diff --git a/MigrationBase/MigrationBase.csproj b/MigrationBase/MigrationBase.csproj
@@ -67,4 +67,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/NetScreenMigration/NetScreenMigration.csproj b/NetScreenMigration/NetScreenMigration.csproj
@@ -88,4 +88,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/NetScreenMigration/ScreenOSPredefinedGroupServiceCPMap.csv b/NetScreenMigration/ScreenOSPredefinedGroupServiceCPMap.csv
@@ -1,4 +1,4 @@
 DISCARD,discard
 ECHO,echo
 GNUTELLA,GNUtella
-NTP,ntp
+NTP,ntp
diff --git 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
+VOIP,H.323,MGCP-CA,MGCP-UA,SCCP,SIP
diff --git 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;
+unknown-udp;Unknown Traffic;
diff --git a/PaloAltoMigration/PaloAltoMigration.csproj b/PaloAltoMigration/PaloAltoMigration.csproj
@@ -85,4 +85,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/PaloAltoMigration/PanoramaAnalizStatistic.cs b/PaloAltoMigration/PanoramaAnalizStatistic.cs
@@ -140,4 +140,4 @@ public override void CalculateServices(List<CheckPoint_TcpService> _cpTcpService
             _unusedServicesObjectsCount = vs.Count();
         }
     }
-}
+}
diff --git 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
@@ -3,4 +3,4 @@
     <startup>
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
-</configuration>
+</configuration>
diff --git a/SmartMove/CommonResources.xaml b/SmartMove/CommonResources.xaml
@@ -388,4 +388,4 @@
         </BulletDecorator>
     </ControlTemplate>
 
-</ResourceDictionary>
+</ResourceDictionary>
diff --git a/SmartMove/Properties/Resources.resx b/SmartMove/Properties/Resources.resx
@@ -114,4 +114,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-</root>
+</root>
diff --git a/SmartMove/Properties/Settings.settings b/SmartMove/Properties/Settings.settings
@@ -4,4 +4,4 @@
     <Profile Name="(Default)" />
   </Profiles>
   <Settings />
-</SettingsFile>
+</SettingsFile>
diff --git 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
+# END
diff --git a/SmartMove/SmartMove Tool Legal.rtf b/SmartMove/SmartMove Tool Legal.rtf
diff --git a/SmartMove/SmartMove.csproj b/SmartMove/SmartMove.csproj
@@ -254,4 +254,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/SmartMove/packages.config b/SmartMove/packages.config
@@ -2,4 +2,4 @@
 <packages>
   <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net45" />
   <package id="System.Runtime.Serialization.Json" version="4.3.0" targetFramework="net45" />
-</packages>
+</packages>
diff --git 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.
+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
@@ -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.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,4 +49,4 @@ @@
     "time"
     "Trojan_Services"
     "Yahoo_Messenger"
-    "Mail"
+    "Mail"