From af463a740c659e68ffa9407a9fb4c3a569f02c83 Mon Sep 17 00:00:00 2001
From: nanotube <nanotube>
Date: Mon, 12 Sep 2005 06:04:35 +0000
Subject: [PATCH] fixed filter of non-allowed characters from log filenames

---
 keylogger.pyw |  2 +-
 logwriter.py  | 70 +++++++++++++++++++++++++++++----------------------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/keylogger.pyw b/keylogger.pyw
index 8c660cf..a8c07c0 100644
--- a/keylogger.pyw
+++ b/keylogger.pyw
@@ -56,7 +56,7 @@ class KeyLogger:
     
     def ParseOptions(self):
         #usage = "usage: %prog [options] arg"
-        parser = OptionParser(version="%prog version 0.4.1")
+        parser = OptionParser(version="%prog version 0.4.2")
         parser.add_option("-f", "--file", action="store", dest="dirname", help="write log data to DIRNAME [default: %default]")
         parser.add_option("-k", "--keyboard", action="store_true", dest="hookKeyboard", help="log keyboard input [default: %default]")
         parser.add_option("-a", "--addlinefeed", action="store_true", dest="addLineFeed", help="add linefeed [\\n] character when carriage return [\\r] character is detected (for Notepad compatibility) [default: %default]")
diff --git a/logwriter.py b/logwriter.py
index 402d6ae..2a05ac7 100644
--- a/logwriter.py
+++ b/logwriter.py
@@ -21,36 +21,7 @@ class LogWriter:
                 print "OSError:", detail
         
         self.writeTarget = ""
-
-    def OpenLogFile(self, event):
-        
-        subDirName = self.GetProcessNameFromHwnd(event.Window)
-        subDirName = re.sub(r':?\\',r'__',subDirName)
-        
-        WindowName = re.sub(r':?\\',r'__',str(event.WindowName))
-        
-        try:
-            os.makedirs(os.path.join(self.rootLogDir, subDirName), 0777)
-        except OSError, detail:
-            if(detail.errno==17):  #if directory already exists, swallow the error
-                pass
-            else:
-                print "OSError:", detail
-    
-        filename = time.strftime('%Y%m%d') + "_" + str(event.Window) + "_" + WindowName + ".txt"
-
-        #we do this writetarget thing to make sure we dont keep opening and closing the log file when all inputs are going
-        #into the same log file. so, when our new writetarget is the same as the previous one, we just write to the same 
-        #already-opened file.
-        if self.writeTarget != os.path.join(self.rootLogDir, subDirName, filename): 
-            if self.writeTarget != "":
-                if self.debug: print "flushing and closing old log"
-                self.log.flush()
-                self.log.close()
-            self.writeTarget = os.path.join(self.rootLogDir, subDirName, filename)
-            if self.debug: print "writeTarget:",self.writeTarget
-
-            self.log = open(self.writeTarget, 'a')
+        self.systemlog = open(r"C:\Temp\logdir\systemlog.txt", 'a')
 
     def WriteToLogFile(self, event, options):
         self.OpenLogFile(event)
@@ -83,11 +54,50 @@ class LogWriter:
 
         if event.Key == options.flushKey:
             self.log.flush()
+            self.systemlog.flush()
+
+    def OpenLogFile(self, event):
+        
+        filter=r"[\\\/\:\*\?\"\<\>\|]+"     #regexp filter for the non-allowed characters in windows filenames.
+        
+        subDirName = self.GetProcessNameFromHwnd(event.Window)
+        #subDirName = re.sub(r':?\\',r'__',subDirName)
+        subDirName = re.sub(filter,r'__',subDirName)
+        
+        WindowName = re.sub(filter,r'__',str(event.WindowName))
+        
+        try:
+            os.makedirs(os.path.join(self.rootLogDir, subDirName), 0777)
+        except OSError, detail:
+            if(detail.errno==17):  #if directory already exists, swallow the error
+                pass
+            else:
+                print "OSError:", detail
+    
+        filename = time.strftime('%Y%m%d') + "_" + str(event.Window) + "_" + WindowName + ".txt"
+
+        #we do this writetarget thing to make sure we dont keep opening and closing the log file when all inputs are going
+        #into the same log file. so, when our new writetarget is the same as the previous one, we just write to the same 
+        #already-opened file.
+        if self.writeTarget != os.path.join(self.rootLogDir, subDirName, filename): 
+            if self.writeTarget != "":
+                if self.debug: 
+                    print "flushing and closing old log"
+                self.systemlog.write("flushing and closing old log\n")
+                self.log.flush()
+                self.log.close()
+            self.writeTarget = os.path.join(self.rootLogDir, subDirName, filename)
+            if self.debug: 
+                print "writeTarget:",self.writeTarget
+            self.systemlog.write("writeTarget: " + self.writeTarget + "\n")
+
+            self.log = open(self.writeTarget, 'a')
 
 
     def PrintStuff(self, stuff):
         if self.debug == False:
             self.log.write(stuff)
+            self.systemlog.write(stuff)
         else:
             sys.stdout.write(stuff)
 
-- 
2.45.1