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

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

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

offlinesec_client-1.1.45/offlinesec_client/__init__.py

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

{offlinesec_client-1.1.43 → offlinesec_client-1.1.45}/offlinesec_client/abap_system.py

@@ -44,6 +44,12 @@ class ABAPSystem (SAPSystem):
         if "sla" in args:
             self.parse_sla(args["sla"], root_dir)
 
+        # versions
+        if "cwbnthead" in args.keys() and args["cwbnthead"] is not None:
+            self.parse_cwbnthead(args["cwbnthead"], root_dir)
+        else:
+            self.cwbnthead = dict()
+
         self.exclude = ABAPSystem.parse_exclude_file(args["exclude"], root_dir, self.system_name) \
             if "exclude" in args.keys() and args["exclude"] is not None and args["exclude"] != ""else list()
 
@@ -134,6 +140,36 @@ class ABAPSystem (SAPSystem):
         tbl = SAPTable(table_name="CWBNTCUST", file_name=path)
         self.dev_cwbntcust = ABAPSystem.parse_cwbntcust_data_new(tbl)
 
+
+    def parse_cwbnthead(self, cwbnthead_file, root_dir):
+        if root_dir:
+            path = os.path.join(root_dir, cwbnthead_file)
+        else:
+            path = cwbnthead_file
+        if not os.path.exists(path):
+            raise FileNotFoundError("File %s not found" % (cwbnthead_file,))
+
+        if not (cwbnthead_file.upper().endswith(".TXT") or cwbnthead_file.upper().endswith(".XLSX")):
+            raise ValueError("File {} has wrong extension. Only TXT or XLSX files supported".format(cwbnthead_file))
+
+        tbl = SAPTable(table_name="CWBNTHEAD", file_name=path)
+
+        outdict = dict()
+        for line in tbl:
+            if "NUMM" in line and "VERSNO" in line:
+                if ("INCOMPLETE" in line and line["INCOMPLETE"] != "X") or "INCOMPLETE" not in line:
+                    try:
+                        note_id = line["NUMM"].lstrip("0")
+                        vers = int(line["VERSNO"])
+                    except:
+                        continue
+                    else:
+                        if note_id not in outdict:
+                            outdict[note_id] = vers
+                        elif note_id in outdict and outdict[note_id] < vers:
+                            outdict[note_id] = vers
+        self.cwbnthead = outdict
+
     @staticmethod
     def parse_cwbntcust_data(cwbntcust_table):
         notes = list()

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

@@ -4,6 +4,7 @@ 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
 import offlinesec_client.func
@@ -99,7 +100,61 @@ def do_rfc_transform(file_name, sheet_name="Parameters"):
     wb.save(fullFilename=file_name)
     wb.close()
 
+def do_roles_transform(file_name, sheet_name="Parameters"):
+    wb = editpyxl.Workbook()
+    source_filename = file_name
+
+    wb.open(source_filename)
 
+    if not sheet_name in wb.sheetnames:
+        wb.close()
+        return
+
+    ws = wb[sheet_name]
+
+    masking = {
+        SAPSID_MASK: Masking(SAPSID_MASK),
+        ROLE_MASK: Masking(ROLE_MASK)
+    }
+
+    column_map = {
+        "System Name": SAPSID_MASK,
+        "Role Name": ROLE_MASK
+    }
+
+    max_masking = 20
+    columns = list()
+    for i in range(1, max_masking + 1):
+        try:
+            column_name = ws.cell(row=1, column=i).value
+            if column_name is None or column_name.strip() == "":
+                break
+            if column_name in column_map:
+                columns.append(column_map[column_name])
+            else:
+                columns.append(None)
+                continue
+        except IndexError as err:
+            break
+
+    max_lines = 10000
+    for i, column in enumerate(columns):
+        for k in range(2, max_lines + 1):
+            if column is not None:
+                try:
+                    cell = ws.cell(row=k, column=i + 1).value
+
+                except IndexError as err:
+                    break
+                else:
+                    if cell is not None and cell.strip() != "":
+                        new_value = masking[column].do_unmask(cell)
+                        ws.cell(row=k, column=i + 1).value = new_value
+                    else:
+                        break
+
+    wb.save(fullFilename=file_name)
+    wb.close()
 
 def do_secnotes_transform(file_name):
     wb = editpyxl.Workbook()
@@ -129,35 +184,16 @@ def do_secnotes_transform(file_name):
     wb.save(fullFilename=file_name)
     wb.close()
 
-
 def read_file(file):
-    flag = False
-    if os.path.basename(file).startswith("roles_"):
-        flag = True
-    elif os.path.basename(file).startswith("rfc_") and os.path.basename(file).endswith(".xlsx"):
-        do_rfc_transform(file)
-    elif os.path.basename(file).startswith("secnotes_") and os.path.basename(file).endswith(".xlsx"):
-        do_secnotes_transform(file)
-    elif os.path.basename(file).startswith("params_") and os.path.basename(file).endswith(".xlsx"):
-        do_secnotes_transform(file)
-
-    if not flag:
-        return
-    wb = openpyxl.load_workbook(file)
-    ws = wb.worksheets[0]
-    title = ws['B1'].value
-
-    if title.startswith("Critical Authorizations"):
-        roles = read_dict_file()
-        resolve_roles_page1(ws, roles)
-        ws = wb.worksheets[1]
-        resolve_roles_page2(ws, roles)
-
-
-        wb.save(file)
-        print(" * Roles in file %s have been converted" % (os.path.basename(file),))
-
-
+    if os.path.basename(file).endswith(".xlsx"):
+        if os.path.basename(file).startswith("roles_"):
+            do_roles_transform(file)
+        elif os.path.basename(file).startswith("rfc_"):
+            do_rfc_transform(file)
+        elif os.path.basename(file).startswith("secnotes_"):
+            do_secnotes_transform(file)
+        elif os.path.basename(file).startswith("params_"):
+            do_secnotes_transform(file)
 
 def resolve_roles_page1(ws, roles):
     max_row = ws.max_row

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

@@ -34,6 +34,11 @@ COLUMN_REPLACEMENT = {
         "REQID" : ["Request ID", "Request-Id"],
         "IMPL_PROGRESS": ["Implementation Progress", "Impl."]
     },
+    "CWBNTHEAD" : {
+        "NUMM" : ["Note number", "Hinweisnummer"],
+        "VERSNO": ["Version"],
+        "INCOMPLETE": ["TRUE"]
+    },
 
     "JAVA_SOFTS" : {
         "Version": [],

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

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

offlinesec_client-1.1.43/offlinesec_client/__init__.py

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