offlinesec-client 1.1.45__tar.gz → 1.1.47__tar.gz

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/PKG-INFO

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

offlinesec_client-1.1.47/offlinesec_client/__init__.py

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

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/offlinesec_client/agr_cfg_read.py

@@ -8,6 +8,9 @@ from offlinesec_client.sap_table import SAPTable
 from offlinesec_client.yaml_cfg_read import YamlCfgFile
 from offlinesec_client.masking import Masking, ROLE_MASK, SAPSID_MASK
 
+FF_MASK_KEY = "ff_mask"
+
+
 class RolesCfgFile:
     def __init__(self,
                  file_name,
@@ -26,15 +29,15 @@ class RolesCfgFile:
             yaml_file = YamlCfgFile(file_name=self.file_name)
 
             if not yaml_file.check_class_item():
-                print("\n".join(yaml_file.err_list))
+                self.err_list.extend(yaml_file.err_list)
                 self.err_flag = True
                 return
 
-            if "ff_masks" in yaml_file.content:
-                if isinstance(yaml_file.content["ff_masks"], list):
-                    self.ff_masks = yaml_file.content["ff_masks"]
+            if FF_MASK_KEY in yaml_file.content:
+                if isinstance(yaml_file.content[FF_MASK_KEY], list):
+                    self.ff_masks = yaml_file.content[FF_MASK_KEY]
                 else:
-                    self.ff_masks.append(yaml_file.content["ff_masks"])
+                    self.ff_masks.append(yaml_file.content[FF_MASK_KEY])
 
             outdict = dict()
             for system in yaml_file:
@@ -42,15 +45,15 @@ class RolesCfgFile:
 
                 agr_users = dict()
                 if "agr_users" in system:
-                    agr_users = RolesCfgFile.read_agr_users(system["agr_users"])
+                    agr_users = self.read_agr_users(system["agr_users"], sys_name=name)
 
                 usr02 = dict()
                 if "usr02" in system:
-                    usr02 = RolesCfgFile.read_usr02(system["usr02"])
+                    usr02 = self.read_usr02(system["usr02"], sys_name=name)
 
                 agr_1251 = dict()
                 if "agr_1251" in system:
-                    agr_1251 = RolesCfgFile.read_agr_1251(system["agr_1251"])
+                    agr_1251 = self.read_agr_1251(system["agr_1251"], sys_name=name)
 
                 if name not in outdict:
                     # add ff flag
@@ -59,12 +62,14 @@ class RolesCfgFile:
                                                 usr02=usr02,
                                                 agr_1251=agr_1251,
                                                 ff_masks=self.ff_masks
-                    )
+                                                )
                 else:
-                    print(" * [Warning] Duplicated name %s. Repeated definitions are ignored" % (name,))
+                    self.err_list.append(" * [WARNING] Duplicated name %s. Repeated definitions are ignored" % (name,))
+
+            if len(outdict):
+                #Exclude not assigned roles, ff roles
+                self.filter_roles(outdict)
 
-            #Exclude not assigned roles, ff roles
-            self.filter_roles(outdict)
             return outdict
 
     def filter_roles(self, outdict):
@@ -150,21 +155,59 @@ class RolesCfgFile:
                                                    assigned_to_active_npa_users)
         return temp_list
 
-    @staticmethod
-    def read_agr_users(tables):
-        if not isinstance(tables,list):
+
+    def read_one_table(self, table_name, file_name, sys_name=None):
+        if not os.path.isfile(file_name):
+            if sys_name:
+                self.err_list.append(
+                    " * [WARNING] File %s not found (the %s table in %s)" % (file_name, table_name, sys_name))
+            else:
+                self.err_list.append(" * [WARNING] File %s not found (the %s table)" % (file_name, table_name))
+            return
+        try:
+            tbl = SAPTable(table_name=table_name,
+                           file_name=file_name,
+                           sys_name=sys_name)
+        except Exception as err:
+            if sys_name:
+                self.err_list.append(
+                    " * [WARNING] Can't read the table from file %s due to %s (the %s table in %s)" % (
+                    file_name, str(err), table_name, sys_name))
+            else:
+                self.err_list.append(" * [WARNING] Can't read the table from file %s due to %s (the %s table)" % (
+                file_name, str(err), table_name))
+            return
+        else:
+            if tbl is None:
+                if sys_name:
+                    self.err_list.append(
+                        " * [WARNING] Unknown error in the file %s (the %s table in %s)" % (file_name, table_name, sys_name))
+                else:
+                    self.err_list.append(" * [WARNING] Unknown error in the file %s (the %s table)" % (file_name, table_name))
+                return
+
+            if not tbl.check_columns():
+                self.err_list.extend(tbl.err_list)
+                return
+
+            return tbl
+
+    def read_agr_users(self, tables, sys_name=None):
+        AGR_USERS = "AGR_USERS"
+
+        if not isinstance(tables, list):
             new_item = tables
             tables = list()
             tables.append(new_item)
 
         temp_list = dict()
         for table in tables:
-            if not os.path.isfile(table):
-                print(" * [Warning] File %s not found" % (table,))
+            tbl = self.read_one_table(file_name=table,
+                                      table_name=AGR_USERS,
+                                      sys_name=sys_name)
+            if not tbl:
                 continue
 
-            tbl = SAPTable(table_name="AGR_USERS",
-                           file_name=table)
             tbl_content = list(filter(lambda x: len(x["AGR_NAME"]) > 1 and x["AGR_NAME"][0].upper() in ("Z", "Y"), tbl))
             cur_date = datetime.now()
             tbl_content = list(filter(lambda x: RolesCfgFile.compare_time_stamp(cur_date, x["FROM_DAT"], x["TO_DAT"]), tbl_content))
@@ -179,10 +222,12 @@ class RolesCfgFile:
                 user = item["UNAME"]
                 if user not in temp_list[mandt][role_name]:
                     temp_list[mandt][role_name].append(user)
+
         return temp_list
 
-    @staticmethod
-    def read_usr02(tables):
+
+    def read_usr02(self, tables, sys_name=None):
+        USR02 = "USR02"
         if not isinstance(tables,list):
             new_item = tables
             tables = list()
@@ -190,32 +235,36 @@ class RolesCfgFile:
 
         temp_list = dict()
         for table in tables:
-            if not os.path.isfile(table):
-                print(" * [Warning] File %s not found" % (table,))
+            tbl = self.read_one_table(file_name=table,
+                                      table_name=USR02,
+                                      sys_name=sys_name)
+            if not tbl:
                 continue
-            tbl = SAPTable(table_name="USR02",
-                           file_name=table)
+
             temp_list = dict()
             for item in tbl:
                 mandt = item["MANDT"]
                 if mandt not in temp_list:
                     temp_list[mandt] = dict()
                 user_name = item["BNAME"]
-                #valid from, valid to
+                cur_date = datetime.now()
                 uflag = item["UFLAG"]
-                active_user = True if (uflag.strip() == "0" or uflag.strip() == "") else False
+                validity = RolesCfgFile.compare_time_stamp(cur_date, item["GLTGB"], item["GLTGV"])
+                active_user = ((uflag.strip() == "0" or uflag.strip() == "") and validity)
                 ustyp = item["USTYP"]
                 dialog_user = True if (ustyp in ("A", "S")) else False
                 if user_name not in temp_list[mandt]:
                     temp_list[mandt][user_name] = (active_user, dialog_user)
+
         return temp_list
 
     @staticmethod
     def check_auth(line):
         return line["DELETED"].strip() != "X" and line["OBJECT"].startswith("S_")
 
-    @staticmethod
-    def read_agr_1251(tables):
+
+    def read_agr_1251(self, tables, sys_name=None):
+        AGR_1251 = "AGR_1251"
         if not isinstance(tables,list):
             new_item = tables
             tables = list()
@@ -223,13 +272,12 @@ class RolesCfgFile:
 
         temp_list = dict()
         for table in tables:
-            if not os.path.isfile(table):
-                print(" * [Warning] File %s not found" % (table,))
+            tbl = self.read_one_table(file_name=table,
+                                      table_name=AGR_1251,
+                                      sys_name=sys_name)
+            if not tbl:
                 continue
 
-            tbl = SAPTable(table_name="AGR_1251",
-                           file_name=table)
-
             tbl_content = list(filter(lambda x: RolesCfgFile.check_auth(x), tbl))
             for line in tbl_content:
                 mandt = line["MANDT"]
@@ -245,42 +293,39 @@ class RolesCfgFile:
 
     @staticmethod
     def get_user_info(clientid, role_name, agr_users, usr02):
-        if agr_users and len(agr_users):
-            if usr02 and len(usr02):
-                if role_name in agr_users[clientid]:
-                    user_list = agr_users[clientid][role_name]
-                    if clientid in usr02:
-                        assigned_to_users = 0
-                        assigned_to_active_users = 0
-                        assigned_to_active_dialog_users = 0
-                        assigned_to_active_npa_users = 0
-                        for user in usr02[clientid]:
-                            if user in user_list:
-                                active, dialog = usr02[clientid][user]
-                                assigned_to_users += 1
-                                if active:
-                                    assigned_to_active_users += 1
-                                    if dialog:
-                                        assigned_to_active_dialog_users += 1
-                                    else:
-                                        assigned_to_active_npa_users += 1
-                        return (
-                            assigned_to_users,
-                            assigned_to_active_users,
-                            assigned_to_active_dialog_users,
-                            assigned_to_active_npa_users)
-
-                    else:
-                        return 0
-                else:
+        if agr_users and len(agr_users) and clientid in agr_users:
+            if usr02 and len(usr02) and clientid in usr02:
+                if role_name not in agr_users[clientid]:
                     return 0
+                if len(agr_users[clientid][role_name]) == 0:
+                    return 0, 0, 0, 0
+
+                user_list = agr_users[clientid][role_name]
+                assigned_to_users = 0
+                assigned_to_active_users = 0
+                assigned_to_active_dialog_users = 0
+                assigned_to_active_npa_users = 0
+
+                for user in usr02[clientid]:
+                    if user in user_list:
+                        active, dialog = usr02[clientid][user]
+                        assigned_to_users += 1
+                        if active:
+                            assigned_to_active_users += 1
+                            if dialog:
+                                assigned_to_active_dialog_users += 1
+                            else:
+                                assigned_to_active_npa_users += 1
+                return (
+                    assigned_to_users,
+                    assigned_to_active_users,
+                    assigned_to_active_dialog_users,
+                    assigned_to_active_npa_users)
             else:
-                if clientid in agr_users:
-                    if role_name in agr_users[clientid]:
-                        return len(agr_users[clientid][role_name])
-                    else:
-                        return 0
+                # only one value int
+                return len(agr_users[clientid][role_name]) if role_name in agr_users[clientid] else 0
         else:
+            # not defined
             return
 
     @staticmethod

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/offlinesec_client/func.py

@@ -160,7 +160,7 @@ def wait_5_minutes(seconds=300, every=5):
                 flag = True
                 break
     if not flag:
-        print(" * [Warning] The report isn't ready yet. Please try later with offlinesec_get_reports")
+        print(" * [WARNING] The report isn't ready yet. Please try later with offlinesec_get_reports")
     print("")
 
 

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/offlinesec_client/req_roles_report.py

@@ -25,8 +25,8 @@ def init_args():
                         help="The config file name (SAP systems (ABAP, JAVA, BO, ...) and role tables (AGR_1251, AGR_USERS, USR02) in YAML format)", required=True)
     parser.add_argument("-v", "--variant", action="store", type=check_variant,
                         help="Check Variant (numeric)", required=False)
-    parser.add_argument('-na', '--ignore_na_roles', action='store_true', help="Do not exclude notes marked as 'Not Relevant'")
-    parser.add_argument('-ff', '--ignore_ff', action='store_true', help="Do not exclude notes marked as 'Not Relevant'")
+    parser.add_argument('-na', '--ignore_na_roles', action='store_true', help="Exclude roles not assigned to any user")
+    parser.add_argument('-ff', '--ignore_ff', action='store_true', help="Exclude FF roles")
     parser.add_argument('--do-not-send', action='store_true', help="Don't upload data to the server (review first)")
     parser.parse_args()
 
@@ -41,6 +41,16 @@ def process_it(args):
         return
     cfg = RolesCfgFile(file_name, ignore_na_roles=ignore_na, ignore_ff_roles=ignore_ff)
     data = cfg.parse()
+
+    if len(cfg.err_list):
+        for err in cfg.err_list:
+            print(err)
+        if cfg.err_flag:
+            return
+        resp = input("There are some warning. Do you want to continue?" + " (y/N):").strip().lower()
+        if resp is None or resp == "" or resp[0].lower() == "n":
+            return
+
     new_data = RolesCfgFile.masking(data)
     zip_file_name = RolesCfgFile.save_and_zip(new_data)
 
@@ -63,9 +73,13 @@ def process_it(args):
         if key1 in args and args[key1] is not None:
             additional_keys[key1] = args[key1]
 
+    wait = True
+    do_not_wait = False
     offlinesec_client.func.send_file_to_server(file_name=zip_file_name,
                                                extras=additional_keys,
-                                               url=UPLOAD_URL)
+                                               url=UPLOAD_URL,
+                                               wait=wait,
+                                               do_not_wait=do_not_wait)
 
 def main():
     args = init_args()

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/offlinesec_client/resolve_report.py

@@ -4,9 +4,8 @@ import os
 import argparse
 from pathlib import Path
 
-from build.lib.offlinesec_client.masking import ROLE_MASK
 from offlinesec_client.const import SUBDIR, FILE
-from offlinesec_client.masking import Masking, SAPSID_MASK, USER_MASK,HOST_MASK, PATH_MASK, RFCDEST_MASK
+from offlinesec_client.masking import Masking, SAPSID_MASK, USER_MASK,HOST_MASK, PATH_MASK, RFCDEST_MASK, ROLE_MASK
 import offlinesec_client.func
 import json
 

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/offlinesec_client/sap_table.py

@@ -1,99 +1,8 @@
-
 # -*- coding: utf-8 -*-
 
 import os.path
 import openpyxl
-
-COLUMN_REPLACEMENT = {
-    "RFCDES" : {
-        "RFCDEST": ["RFC Destination", "Destination", "RFC-Destination"],
-        "RFCTYPE": ["Connection Type", "Verbindungstyp"],
-        "RFCOPTIONS": ["Options", "Optionen"],
-        "RFCDOC1": ["Description", "Beschreibung"]
-    },
-
-    "UST04" : {
-        "MANDT": ["Client", "Mandant"],
-        "BNAME": ["User", "Benutzername"],
-        "PROFIL": ["Profile", "Profil"],
-    },
-
-    "USR02" : {
-        "MANDT": ["Client", "Mandant"],
-        "BNAME": ["User Name", "Benutzername"],
-        "USTYP": ["User Type", "Benutzertyp"],
-        "UFLAG": ["User Lock Status", "Status der Benutzersperre"],
-        "CLASS": ["User Master Maintenance: User Group", "Benutzerstammpflege: Benutzergruppe"],
-    },
-
-    "CWBNTCUST" : {
-        "NUMM" : ["Note number", "Hinweisnummer"],
-        "NTSTATUS" : ["Processing Status", "Proc. Status", "Bearb. Stat."],
-        "PRSTATUS" : ["Implementation State", "Impl. State", "Einbaustand", "Impl. Status"],
-        "CWBUSER" : ["User Name", "Benutzername"],
-        "REQID" : ["Request ID", "Request-Id"],
-        "IMPL_PROGRESS": ["Implementation Progress", "Impl."]
-    },
-    "CWBNTHEAD" : {
-        "NUMM" : ["Note number", "Hinweisnummer"],
-        "VERSNO": ["Version"],
-        "INCOMPLETE": ["TRUE"]
-    },
-
-    "JAVA_SOFTS" : {
-        "Version": [],
-        "Vendor": [],
-        "Name": [],
-        "Location": []
-    },
-
-    "AGR_USERS": {
-        "MANDT" : ["Client", "Mandant"],
-        "AGR_NAME": ["Role", "Rolle"],
-        "UNAME": ["User Name", "Benutzername"],
-        "FROM_DAT": ["Start date", "Beginndatum"],
-        "TO_DAT": ["End date", "Enddatum"],
-
-    },
-    "AGR_1251": {
-        "MANDT": ["Client", "Mandant"],
-        "AGR_NAME": ["Role", "Rolle"],
-        "OBJECT": ["Object", "Objekt"],
-        "AUTH": ["User Master Maint.: Authorization Name", "Benutzerstammpflege: Berechtigungsname"],
-        "FIELD": ["Field name", "Feldname"],
-        "LOW": ["Authorization value", "Berechtigungswert"],
-        "HIGH": ["Authorization value", "Berechtigungswert"],
-        "DELETED": ["ID whether object is deleted", "Kennzeichen, ob Objekt gelöscht"]
-    },
-
-    "RSPARAM": {
-        "Parameter Name": ["Parametername"],
-        "User-Defined Value": ["Benutzerdefinierter Wert"],
-        "System Default Value": ["System-Defaultwert"],
-        "System Default Value(Unsubstituted Form)": ["System-Defaultwert (Unsubst.Form)"],
-        "Comment": ["Kommentar"]
-    }
-}
-
-DATA_REPLACEMENT = {
-    "CWBNTCUST" : {
-        "NTSTATUS" : {
-            "A" : ["Finished","erledigt"],
-            "N" : ["new", "neu"],
-            "R" : ["Not Relevant", "nicht relevant"],
-            "I" : ["In Process", "in Bearbeitung"]
-        },
-        "PRSTATUS" : {
-            "N" : ["Can be implemented", "einbaubar"],
-            "E" : ["Completely implemented", "vollständig eingebaut"],
-            "O" : ["Obsolete", "obsolet"],
-            "-" : ["Cannot be implemented", "nicht einbaubar"],
-            ""  : ["Undefined Implementation State", "unbestimmter Einbauzustand"],
-            "U" : ["Incompletely implemented", "unvollständig eingebaut"],
-            "V" : ["Obsolete version implemented", "veraltete Version eingebaut"],
-        },
-    }
-}
+from offlinesec_client.sap_table_def import COLUMN_REPLACEMENT, DATA_REPLACEMENT
 
 
 class SAP_Table_SE16:
@@ -255,22 +164,25 @@ class XLSX_SE16_Table(SAP_Table_SE16):
 
 
 class SAPTable:
-    def __init__(self, table_name, file_name):
+    def __init__(self, table_name, file_name, sys_name=None):
         classmap = {
             "SAP_Table_SE16": SAP_Table_SE16,
             "HANA_SAP_Table": HANA_SAP_Table,
             "XLSX_SE16_Table": XLSX_SE16_Table,
         }
+
         self.table_name = table_name
+        self.file_name = file_name
+        self.sys_name = sys_name
 
         created_object = None
-        err_list = list()
+        self.err_list = list()
         for class_name in classmap:
             try:
                 created_object = classmap[class_name](table_name, file_name)
                 self.class_name = class_name
             except ValueError as err:
-                err_list.append(class_name + ": " + str(err))
+                self.err_list.append(class_name + ": " + str(err))
             else:
                 break
 
@@ -278,10 +190,10 @@ class SAPTable:
             self.tbl = created_object
             self.columns = self.tbl.columns
             self.data = self.tbl.data
+
         else:
-            print(err_list)
-            raise ValueError("* [WARNING] Unsupported file format: %s. Supported files: HANA STUDIO, SE16-Unconverted, SE16-Spreadsheet" %
-                             (file_name,))
+            raise ValueError("Unsupported file format")
+
 
     def __iter__(self):
         for row in self.tbl.data:
@@ -289,3 +201,17 @@ class SAPTable:
             for num, column in enumerate(self.tbl.columns):
                 out_row[column] = row[num]
             yield out_row
+
+    def check_columns(self):
+        if self.table_name in COLUMN_REPLACEMENT:
+            for column in COLUMN_REPLACEMENT[self.table_name]:
+                if column not in self.columns:
+                    if self.sys_name:
+                        self.err_list.append(" * [WARNING] The %s column not found in the %s file (the %s table in %s)" % (
+                            column, self.file_name, self.table_name, self.sys_name))
+                    else:
+                        self.err_list.append(" * [WARNING] The %s column not found in the %s file (the %s table)" % (
+                            column, self.file_name, self.table_name))
+                    return False
+
+        return True

offlinesec_client-1.1.47/offlinesec_client/sap_table_def.py

@@ -0,0 +1,91 @@
+COLUMN_REPLACEMENT = {
+    "RFCDES" : {
+        "RFCDEST": ["RFC Destination", "Destination", "RFC-Destination"],
+        "RFCTYPE": ["Connection Type", "Verbindungstyp"],
+        "RFCOPTIONS": ["Options", "Optionen"],
+        "RFCDOC1": ["Description", "Beschreibung"]
+    },
+
+    "UST04" : {
+        "MANDT": ["Client", "Mandant", "Cl."],
+        "BNAME": ["User", "Benutzername"],
+        "PROFIL": ["Profile", "Profil"],
+    },
+
+    "USR02" : {
+        "MANDT": ["Client", "Mandant", "Cl."],
+        "BNAME": ["User Name", "Benutzername"],
+        "GLTGB": [],
+        "GLTGV": [],
+        "USTYP": ["User Type", "Benutzertyp"],
+        "UFLAG": ["User Lock Status", "Status der Benutzersperre"],
+        "CLASS": ["User Master Maintenance: User Group", "Benutzerstammpflege: Benutzergruppe"],
+    },
+
+    "CWBNTCUST" : {
+        "NUMM" : ["Note number", "Hinweisnummer"],
+        "NTSTATUS" : ["Processing Status", "Proc. Status", "Bearb. Stat."],
+        "PRSTATUS" : ["Implementation State", "Impl. State", "Einbaustand", "Impl. Status"],
+        "IMPL_PROGRESS": ["Implementation Progress", "Impl."]
+    },
+
+    "CWBNTHEAD" : {
+        "NUMM" : ["Note number", "Hinweisnummer"],
+        "VERSNO": ["Version"],
+        "INCOMPLETE": ["TRUE"]
+    },
+
+    "JAVA_SOFTS" : {
+        "Version": [],
+        "Vendor": [],
+        "Name": [],
+        "Location": []
+    },
+
+    "AGR_USERS": {
+        "MANDT" : ["Client", "Mandant", "Cl."],
+        "AGR_NAME": ["Role", "Rolle"],
+        "UNAME": ["User Name", "Benutzername"],
+        "FROM_DAT": ["Start date", "Beginndatum"],
+        "TO_DAT": ["End date", "Enddatum"],
+
+    },
+    "AGR_1251": {
+        "MANDT": ["Client", "Mandant", "Cl."],
+        "AGR_NAME": ["Role", "Rolle"],
+        "OBJECT": ["Object", "Objekt"],
+        "AUTH": ["User Master Maint.: Authorization Name", "Benutzerstammpflege: Berechtigungsname"],
+        "FIELD": ["Field name", "Feldname"],
+        "LOW": ["Authorization value", "Berechtigungswert"],
+        "HIGH": ["Authorization value", "Berechtigungswert"],
+        "DELETED": ["ID whether object is deleted", "Kennzeichen, ob Objekt gelöscht"]
+    },
+
+    "RSPARAM": {
+        "Parameter Name": ["Parametername"],
+        "User-Defined Value": ["Benutzerdefinierter Wert"],
+        "System Default Value": ["System-Defaultwert"],
+        "System Default Value(Unsubstituted Form)": ["System-Defaultwert (Unsubst.Form)"],
+        "Comment": ["Kommentar"]
+    }
+}
+
+DATA_REPLACEMENT = {
+    "CWBNTCUST" : {
+        "NTSTATUS" : {
+            "A" : ["Finished","erledigt"],
+            "N" : ["new", "neu"],
+            "R" : ["Not Relevant", "nicht relevant"],
+            "I" : ["In Process", "in Bearbeitung"]
+        },
+        "PRSTATUS" : {
+            "N" : ["Can be implemented", "einbaubar"],
+            "E" : ["Completely implemented", "vollständig eingebaut"],
+            "O" : ["Obsolete", "obsolet"],
+            "-" : ["Cannot be implemented", "nicht einbaubar"],
+            ""  : ["Undefined Implementation State", "unbestimmter Einbauzustand"],
+            "U" : ["Incompletely implemented", "unvollständig eingebaut"],
+            "V" : ["Obsolete version implemented", "veraltete Version eingebaut"],
+        },
+    }
+}

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/offlinesec_client/yaml_cfg_read.py

@@ -3,6 +3,7 @@ import yaml
 
 ADD_ROOT_DIR_KEYS = ["agr_users", "usr02", "agr_1251"]
 SAP_SYSTEMS_KEY = "sap_systems"
+ROOT_DIR_KEY = "root_dir"
 DEF_SYSTEM_NAME = "System %s"
 
 class YamlCfgFile:
@@ -11,13 +12,14 @@ class YamlCfgFile:
         self.file_name = file_name
 
         self.check_file()
-        if not len(self.err_list):
+        self.content = None
+        if self.check_class_item():
             self.read_file()
             self.get_root_dir()
 
     def check_file(self):
         if not self.file_name:
-            self.err_list.append("YAML filename not defined")
+            self.err_list.append(" [ERROR] YAML filename not defined")
             return
 
         if not os.path.isfile(self.file_name):
@@ -35,15 +37,18 @@ class YamlCfgFile:
             with open(self.file_name, 'r', encoding="utf-8") as f:
                 self.content = yaml.safe_load(f)
         except Exception as err:
-            self.err_list.append("* [ERROR] " + str(err))
+            self.err_list.append("* [ERROR] Can't read the file %s due to %s" % (self.file_name, str(err)))
+        else:
+            if "sap_systems" not in self.content:
+                self.err_list.append("* [ERROR] The required key 'sap_systems' not found in file %s" % (self.file_name, ))
 
     def get_root_dir(self):
         self.root_dir = None
         if not self.content:
             return
-        key_root_dir = "root_dir"
-        if key_root_dir in self.content:
-            self.root_dir = self.content[key_root_dir]
+
+        if ROOT_DIR_KEY in self.content:
+            self.root_dir = self.content[ROOT_DIR_KEY]
 
     def __iter__(self):
         if not self.content:

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/offlinesec_client/yaml_cfg_rfc.py

@@ -23,11 +23,6 @@ class YamlCfgRfc:
         self.ust04_list = dict()
         self.usr02_list = dict()
         self.sid_list = dict()
-
-        if not os.path.isfile(file_name):
-            self.err_list.append("* [ERROR] File %s not found" % (file_name,))
-            return
-
         self.file_name = file_name
 
     def read_file(self):

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/offlinesec_client.egg-info/PKG-INFO

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

{offlinesec_client-1.1.45 → offlinesec_client-1.1.47}/offlinesec_client.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ offlinesec_client/rsparam.py
 offlinesec_client/sap_gui.py
 offlinesec_client/sap_system.py
 offlinesec_client/sap_table.py
+offlinesec_client/sap_table_def.py
 offlinesec_client/yaml_cfg_read.py
 offlinesec_client/yaml_cfg_rfc.py
 offlinesec_client.egg-info/PKG-INFO

offlinesec_client-1.1.45/offlinesec_client/__init__.py

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