Migrate Example Scripts to Python3

.gitignore

@@ -8,6 +8,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+.venv
 build/
 develop-eggs/
 dist/

examples/default_sap_credentials

@@ -64,6 +64,24 @@ SAP*:Down1oad:000,001
 DEVELOPER:Down1oad:001
 BWDEVELOPER:Down1oad:001
 
+# SAP ABAP Cloud Developer Trial
+# 2023
+DDIC:ABAPtr2023#00:000,001
+SAP*:ABAPtr2023#00:000,001
+DEVELOPER:ABAPtr2023#00:000,001
+# 2022 SP1
+DDIC:ABAPtr2022#01:000,001
+SAP*:ABAPtr2022#01:000,001
+DEVELOPER:ABAPtr2022#01:000,001
+# 2022
+DDIC:ABAPtr2022#00:000,001
+SAP*:ABAPtr2022#00:000,001
+DEVELOPER:ABAPtr2022#00:000,001
+# 1909 SP1
+DDIC:Ldtf5432:000,001
+SAP*:Ldtf5432:000,001
+DEVELOPER:Ldtf5432:000,001
+
 # SAP CA Introscope Enterprise Manager
 # cemadmin password hash acef2c15bcd349db90dffece73e1256e881c4416fc1f2d3a4946418349d9a
 cemadmin:quality

examples/diag_capturer.py

@@ -68,15 +68,15 @@ def parse_packet(self, pkt):
             if key not in self.packets_metadata:
                 self.packets_metadata[key] = []
             self.packets_metadata[key].append((pkt[TCP].seq + pkt[TCP].ack,
-                                               str(pkt[Raw].load)))
+                                               bytes(pkt[Raw].load)))
 
     def reassemble(self):
         # Build a stream of packets for each connection
         streams = {}
         for key, value in list(self.packets_metadata.items()):
             value.sort()
             value = list(value for value, _ in itertools.groupby(value))
-            streams[key] = ''
+            streams[key] = b''
             for pkts in sorted(value):
                 streams[key] += pkts[1]
 
@@ -105,8 +105,10 @@ def parse_fields(self, pkt):
                 for atom in [atom for atom_item in atoms for atom in atom_item.item_value.items]:
                     if atom.etype in [121, 122, 123, 130, 131, 132]:
                         text = atom.field1_text or atom.field2_text
+                        if isinstance(text, bytes):
+                            text = text.decode("utf-8", errors="replace")
                         text = text.strip()
-                        if "@\Q" in text:
+                        if "@\\Q" in text:
                             parts = text.split("@")
                             try:
                                 text = "%s (hint: %s)" % (parts[2], parts[1])

examples/diag_interceptor.py

@@ -53,7 +53,9 @@ def filter_client(packet):
         print("[*] Input fields:")
         for atom in [atom for atom_item in atoms for atom in atom_item.item_value.items]:
             if atom.etype in [121, 122, 123, 130, 131, 132]:
-                text = atom.field1_text or atom.field2_text
+                text = atom.field1_text if atom.field1_text else atom.field2_text
+                if isinstance(text, bytes):
+                    text = text.decode("utf-8", errors="replace")
                 text = text.strip()
                 if atom.attr_DIAG_BSD_INVISIBLE and len(text) > 0:
                     # If the invisible flag was set, we're probably

examples/diag_login_brute_force.py

@@ -292,11 +292,15 @@ def main():
                     if len(line) == 0 or line.startswith("#"):
                         continue
 
-                    (username, password, clients) = line.split(':')
-                    if clients == "*":
+                    parts = line.split(':', 2)
+                    if len(parts) == 2:
+                        username, password = parts
                         clients = client_list
+                    elif len(parts) == 3:
+                        username, password, client_field = parts
+                        clients = client_list if client_field == "*" else client_field.split(',')
                     else:
-                        clients = clients.split(',')
+                        raise ValueError("Invalid line: %s" % line)
 
                     for client in clients:
                         testcases.append((username, password, client))

examples/diag_login_screen_info.py

@@ -145,10 +145,14 @@ def show_text_info(item):
         for it in items:
             var = it.getfieldval('name_text')
             value = it.getfieldval("field1_text")
-            if value is None:
+            if not value:
                 value = it.getfieldval("field2_text")
+            if isinstance(var, bytes):
+                var = var.decode("utf-8", errors="replace")
+            if isinstance(value, bytes):
+                value = value.decode("utf-8", errors="replace")
             key = '%s_%s' % (it.row, it.col)
-            if key not in dico.keys():
+            if key not in dico:
                 dico[key] = {'var': key, 'value': value}
             if value:
                 dico[key]['value'] = value.strip()