refactor: print to logging, and other small stuff

.gitignore

@@ -10,3 +10,4 @@ stuff/
 app/upload/**
 app/examples/**
 doc/todo.txt
+doc/notes/**

app/views.py

@@ -102,7 +102,7 @@ def examples_list():
 
         outcome, fileInfo, errStr = getFileData(filepath)
         if errStr is not None:
-            print("Err: {} {}".format(example, errStr))
+            logging.error("Err: {} {}".format(example, errStr))
             continue
 
         outcomes.append(outcome)
@@ -154,7 +154,7 @@ def getFileData(filepath):
 
     # Main file (exe, docx etc.)
     if not os.path.isfile(filepath):
-        print("File does not exist: " + filepath)
+        logging.error("File does not exist: " + filepath)
         return None, None, 'File not found: ' + filepath
 
     # log file

config.py

@@ -11,7 +11,6 @@ def load(self):
         with open(CONFIG_FILE) as jsonfile:
             try:
                 self.data = yaml.safe_load(jsonfile)
-                print(str(self.data))
             except ValueError as e:
                 print('Decoding {} as failed with: {}'.format(CONFIG_FILE, e))
                 quit()

pcodedmp/disasm.py

@@ -40,7 +40,7 @@ def dumpLine(moduleData, modulename, lineStart, lineLength, endian, vbaVer, is64
         translatedOpcode = translateOpcode(opcode, vbaVer, is64bit)
         if not translatedOpcode in opcodes:
             disasmEntry += myPrint('Unrecognized opcode 0x{:04X} at offset 0x{:08X}.'.format(opcode, offset), file=output_file)
-            print(disasmEntry)
+            # print(disasmEntry)
             return
         instruction = opcodes[translatedOpcode]
         mnemonic = instruction['mnem']

plugins/outflank_pe.py

@@ -69,8 +69,8 @@ def outflankPe(
     ret = []
     data: Data = filePe.DataCopy()
     for patch in results:
-        print("Match {} offset {}: {} <-> {}   ({})".format(
-            patch.matchIdx,  hex(patch.offset), patch.asmOne.disasm, patch.asmTwo.disasm, patch.info))
+        #print("Match {} offset {}: {} <-> {}   ({})".format(
+        #    patch.matchIdx,  hex(patch.offset), patch.asmOne.disasm, patch.asmTwo.disasm, patch.info))
         data.patchData(patch.offset, patch.replaceBytes)
         ret.append(patch)
         if not scanner.scannerDetectsBytes(data.getBytes(), filePe.filename):

scanner.py

@@ -19,8 +19,8 @@ def scannerDetectsBytes(self, data: bytes, filename: str):
         jsonRes = res.json()
 
         if res.status_code != 200:
-            print("Err: " + str(res.status_code))
-            print("Err: " + str(res.text))
+            logging.error("Err: " + str(res.status_code))
+            logging.error("Err: " + str(res.text))
 
         ret_value = jsonRes['detected']
         return ret_value

tests/test_pe.py

@@ -95,7 +95,7 @@ def test_pe4(self):
 
         matches, _ = analyzeFileExe(filePe, scanner)
         # A: [Interval(29808, 29864), Interval(30816, 30844), Interval(31824, 31880), Interval(33140, 33168)]
-        self.assertTrue(len(matches) == 4)
+        self.assertEqual(len(matches), 4)
 
 
     def test_disasm(self):

tools/patchfile.py

@@ -3,9 +3,14 @@
 
 fname = sys.argv[1]
 pos = int(sys.argv[2], 0)
-data = str.encode(sys.argv[3])
 
-print( f"Writing {data} to file {fname} at position {pos} ")
+#data = str.encode(sys.argv[3])
+data = bytes.fromhex(sys.argv[3])
+#len = int(sys.argv[3])
+
+#data = b"A" * len
+
+print( f"Writing {len} bytes to file {fname} at position {pos} ")
 
 fp = open(fname, "r+b")