offlinesec-client 1.1.4__tar.gz → 1.1.5__tar.gz

{offlinesec_client-1.1.4 → offlinesec_client-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: offlinesec_client
-Version: 1.1.4
+Version: 1.1.5
 Summary: Offline Security Client
 Home-page: https://offlinesec.com
 Author: Offline Security

offlinesec_client-1.1.5/offlinesec_client/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.1.5"

{offlinesec_client-1.1.4 → offlinesec_client-1.1.5}/offlinesec_client/abap_system.py

@@ -4,6 +4,12 @@ import os
 import re
 
 ABAP = "ABAP"
+KRNL_VERSION = "krnl_version"
+KRNL_PATCH = "krnl_patch"
+ABAP_SOFTS = "softs"
+CWBNTCUST = "cwbntcust"
+EXCLUDE_NOTES = "exclude"
+ABAP_NAME = "name"
 
 
 class ABAPSystem (SAPSystem):
@@ -12,17 +18,24 @@ class ABAPSystem (SAPSystem):
         self.type = ABAP
         root_dir = args["root_dir"] if "root_dir" in args else None
 
-        self.kernel_version = ABAPSystem.check_kernel_version(args["krnl_version"]) if "krnl_version" in args.keys() \
-            else ""
-        self.kernel_patch = ABAPSystem.check_kernel_patch(args["krnl_patch"]) if "krnl_patch" in args.keys() else ""
-        self.softs = ABAPSystem.parse_softs_file(args["softs"], root_dir) if "softs" in args.keys() else list()
-        if self.kernel_version == "" or len(self.softs) == 0:
-            raise ValueError("[ERROR] System '{}' you must specify 'soft' or 'krnl_version' keys"
+        self.kernel_version = ABAPSystem.check_kernel_version(args["krnl_version"]) \
+            if ("krnl_version" in args.keys() and args["krnl_version"] is not None and args["krnl_version"] != "") else ""
+
+        self.kernel_patch = ABAPSystem.check_kernel_patch(args["krnl_patch"]) \
+            if "krnl_patch" in args.keys() and args["krnl_patch"] is not None and args["krnl_patch"] != ""else ""
+
+        self.softs = ABAPSystem.parse_softs_file(args["softs"], root_dir) \
+            if "softs" in args.keys() else list()
+
+        if self.kernel_version == "" and len(self.softs) == 0:
+            raise ValueError("[ERROR] System '{}' you must specify 'softs' or 'krnl_version' keys"
                              .format(self.system_name))
+
         self.cwbntcust = ABAPSystem.parse_cwbntcust_file(args["cwbntcust"], root_dir, self.system_name) \
-            if "cwbntcust" in args.keys() else list()
+            if "cwbntcust" in args.keys() and args["cwbntcust"] is not None and args["cwbntcust"] != ""else list()
+
         self.exclude = ABAPSystem.parse_exclude_file(args["exclude"], root_dir, self.system_name) \
-            if "exclude" in args.keys() else list()
+            if "exclude" in args.keys() and args["exclude"] is not None and args["exclude"] != ""else list()
 
     @staticmethod
     def check_kernel_version(kernel_version):
@@ -40,7 +53,7 @@ class ABAPSystem (SAPSystem):
         try:
             return int(kernel_patch)
         except ValueError:
-            raise ValueError("Kernel Version must be numeric. For example: 1100.")
+            raise ValueError("Kernel Patch Level must be numeric. For example: 1100.")
 
     @staticmethod
     def parse_softs_file(softs_file, root_dir):
@@ -53,7 +66,6 @@ class ABAPSystem (SAPSystem):
 
         if not softs_file.upper().endswith(".TXT"):
             raise ValueError("File {} has wrong extension. Only TXT files supported".format(softs_file))
-
         softs = list()
         with open(path, 'r', encoding="utf-8") as f:
             num = 0
@@ -76,6 +88,7 @@ class ABAPSystem (SAPSystem):
 
         if not len(softs):
             raise ValueError("File {} has wrong format".format(softs_file))
+
         return softs
 
     @staticmethod

{offlinesec_client-1.1.4 → offlinesec_client-1.1.5}/offlinesec_client/func.py

@@ -16,11 +16,11 @@ def check_server():
     try:
         result = sock.connect_ex((conn.split(":")[0], int(conn.split(":")[1])))
     except:
-        print("The Server %s not available now. Please try later" % (conn,))
+        print("The Offline Security Server %s not available now. Please try later" % (conn,))
         return False
 
     if result != 0:
-        print("The Server %s not available now. Please try later" % (conn,))
+        print("The Offline Security Server %s not available now. Please try later" % (conn,))
         return False
 
     sock.close()

{offlinesec_client-1.1.4 → offlinesec_client-1.1.5}/offlinesec_client/get_reports.py

@@ -64,7 +64,7 @@ def get_statuses():
         for error in response["errors"]:
             print(" * " + error)
 
-    print("%s report(s) are available to download from server" % (response["files_num"],))
+    print("%s report(s) are available to download from the server" % (response["files_num"],))
 
     i = 0
     for file in response["files"]:

{offlinesec_client-1.1.4 → offlinesec_client-1.1.5}/offlinesec_client/req_notes_report.py

@@ -4,10 +4,11 @@ import os
 import sys
 import offlinesec_client.func
 from offlinesec_client.const import ERR_MESSAGE, FILE, SYSTEM_NAME, KRNL_PL, KRNL_VER, CWBNTCUST
+import abap_system
 import json
 import time
 
-UPLOAD_URL = "/file-upload"
+UPLOAD_URL = "/sec-notes"
 
 
 def check_version(s):
@@ -41,40 +42,39 @@ def init_args():
     parser.add_argument("-p", "--%s" % (KRNL_PL,), action="store", type=check_patch_level,
                         help="Kernel Patch Level (for instance 1200)", required=False)
     parser.add_argument("-c", "--%s" % (CWBNTCUST,), action="store", type=check_cwbntcust,
-                        help="SAP System Name (max 20 characters)", required=False)
+                        help="CWBNTCUST table (txt or xlsx)", required=False)
     parser.add_argument("-e", "--exclude", action="store",
                         help='Exclude SAP security notes ("1111111, 2222222, 3333333")', required=False)
-    parser.add_argument('--wait', action='store_true', help="Wait 5 minutes and download the report")
+    parser.add_argument('-w', '--wait', action='store_true', help="Wait 5 minutes and download the report")
     parser.add_argument('--guiscript', action='store_true', help="Run GUI script to prepare the input data")
     parser.parse_args()
     return vars(parser.parse_args())
 
 
+def convert_to_dict(**args):
+    system_list = list()
+    new_abap_system = abap_system.ABAPSystem(args)
+    if new_abap_system is not None:
+        system_list.append(system_list)
+
+
 def send_file(file, system_name="", kernel_version="", kernel_patch="", cwbntcust="", exclude=""):
-    url = offlinesec_client.func.get_connection_str(UPLOAD_URL)
-    data = offlinesec_client.func.get_base_json(system_name=system_name,
-                                                kernel_version=kernel_version,
-                                                kernel_patch=kernel_patch,
-                                                cwbntcust=cwbntcust,
-                                                exclude=exclude)
-
-    files = {
-        'json': ('description', json.dumps(data), 'application/json'),
-        'file': (os.path.basename(file), open(file, 'rb'), 'application/octet-stream')
-    }
-    print("Uploading file %s" % (os.path.basename(file)))
-    r = requests.post(url, files=files)
-
-    if r.content:
-        try:
-            response = json.loads(r.content)
-            if ERR_MESSAGE in response:
-                print(" * " + response[ERR_MESSAGE])
-                return
-        except:
-            pass
-
-    print("No response from server. Please try later")
+    additional_keys = dict()
+    system_list = list()
+
+    if system_name is None or system_name == "":
+        system_name = "ABAP System"
+
+    new_abap_system = abap_system.ABAPSystem(krnl_version=kernel_version,
+                                             krnl_patch=kernel_patch,
+                                             cwbntcust=cwbntcust,
+                                             exclude=exclude,
+                                             name=system_name,
+                                             softs=file)
+    if new_abap_system is not None:
+        system_list.append(new_abap_system)
+
+    offlinesec_client.func.send_to_server(system_list, UPLOAD_URL, additional_keys)
 
 
 def process_it(file, system_name="", kernel_version="", kernel_patch="", cwbntcust="", guiscript=False, wait=False, exclude=""):
@@ -87,7 +87,7 @@ def process_it(file, system_name="", kernel_version="", kernel_patch="", cwbntcu
             from offlinesec_client.sap_gui import SAPConnection
             conn = SAPConnection.sap_notes_report(system_name=system_name, wait=wait)
         else:
-            print("SAP GUI Scripting not supported on this platform")
+            print("SAP GUI Scripting not supported on this platform. Run SAP Gui Scripting only on Windows platform")
         return
 
     send_file(file, system_name, kernel_version, kernel_patch, cwbntcust, exclude)
@@ -98,6 +98,7 @@ def process_it(file, system_name="", kernel_version="", kernel_patch="", cwbntcu
             sys.stdout.write("{:2d} seconds remaining.".format(remaining))
             sys.stdout.flush()
             time.sleep(1)
+        print("")
         os.system("offlinesec_get_reports")
 
 

{offlinesec_client-1.1.4 → offlinesec_client-1.1.5}/offlinesec_client/sap_gui.py

@@ -10,7 +10,7 @@ from pathlib import Path
 
 class SAPConnection:
     @staticmethod
-    def sap_notes_report(system_name=None, wait=False):
+    def sap_notes_report(system_name=None, wait=False, exclude=None):
         try:
             sap_sessions = SAPExistedSession.get_multi_sap_session_with_info()
         except RuntimeError as error:
@@ -61,7 +61,7 @@ class SAPConnection:
                         print(" * The CWBNTCUST table +")
 
                 if len(out_dict):
-                    SAPConnection.send_it_to_server(out_dict,system_name,wait)
+                    SAPConnection.send_it_to_server(out_dict, system_name, wait)
 
     @staticmethod
     def load_software_components(sap_session):

{offlinesec_client-1.1.4 → offlinesec_client-1.1.5}/offlinesec_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: offlinesec-client
-Version: 1.1.4
+Version: 1.1.5
 Summary: Offline Security Client
 Home-page: https://offlinesec.com
 Author: Offline Security

offlinesec_client-1.1.4/offlinesec_client/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.1.4"