Added the ability to insert escape hex (\x) character before each set…

… of hex bytes.

shellcode-cleaner.py

@@ -1,13 +1,14 @@
 #!/usr/bin/python
-import sys, getopt, argparse
-
+import sys, getopt, argparse, re
+#TODO: Implement "-o" flag to output results of cleaned shellcode to a text file.
 
 parser = argparse.ArgumentParser(prog='shellcode-cleaner', description='Takes pasted shellcode and cleans it however you like.', epilog="Default is to strip ALL of these characters. It'll strip spaces as well.")
 parser.add_argument('-n', action='store_true', help="strip newline (\\n) characters")
 parser.add_argument('-r', action='store_true', help="strip (\\r) characters")
 parser.add_argument('-q', action='store_true', help="strip quotation marks (\"\") AND single quotes")
 parser.add_argument('-x', action='store_true', help="strip (\\x) characters")
 parser.add_argument('-s', action='store_true', help="strip semicolons (;)")
+parser.add_argument('--addhex', action='store_true', help="prepend \"\\x\" to each of the hex bytes. EXPERIMENTAL.")
 args = parser.parse_args()
 print "Shellcode (Press Enter then Control+D to submit):"
 dirty_shellcode = sys.stdin.read() 
@@ -16,10 +17,12 @@
   "r": args.r,
   "q": args.q,
   "x": args.x,
-  "s": args.s
+  "s": args.s,
+  "addhex": args.addhex
 }
 #Clean up spacing first
 clean_shellcode = dirty_shellcode.replace(' ', '')
+#chomp and clean shellcode
 #This is for the "default option" to actually work. If any flag is set it will be set to false and the operation under the flags will proceed. If none are set, then the default operaiton to strip ALL the bad chars will occur.
 default_flag=True
 for key, value in args_dict.iteritems():
@@ -35,6 +38,15 @@
             clean_shellcode = clean_shellcode.replace('\\x', '')
         elif key == 's' :
             clean_shellcode = clean_shellcode.replace(';', '')
+	elif key == 'addhex' :
+	    #Adding the '\x'
+	    clean_shellcode = clean_shellcode.replace('\n', '')
+	    clean_shellcode = '\\x'.join([clean_shellcode[i:i+2] for i in range(0, len(clean_shellcode), 2)])
+	    #For some reason, first hex byte isn't given a "\x" with this method. This will fix that.
+	    clean_shellcode = '\\x' + clean_shellcode
+	    #Finally, we remove a trailing "\x" that gets added to our stirng.
+	    #re.sub(r'\\x$', '', repr(clean_shellcode))
+
 if default_flag == True:
     clean_shellcode = dirty_shellcode.replace('\n', '').replace('\r', '').replace('"', '').replace('\\x', '').replace(';', '').replace(' ', '')
 print clean_shellcode