better escaping.

This commit is contained in:
Michel Oosterhof
2016-07-11 18:48:53 +04:00
parent 483032b459
commit 456fab8835
7 changed files with 9 additions and 9 deletions

View File

@ -166,9 +166,9 @@ pages for more information and options.
def do_moo(self): def do_moo(self):
self.write(' (__)\n') self.write(' (__)\n')
self.write(' (oo)\n') self.write(' (oo)\n')
self.write(' /------\/\n') self.write(' /------\\/\n')
self.write(' / | ||\n') self.write(' / | ||\n')
self.write(' * /\---/\ \n') self.write(' * /\\---/\\ \n')
self.write(' ~~ ~~\n') self.write(' ~~ ~~\n')
self.write('...."Have you mooed today?"...\n') self.write('...."Have you mooed today?"...\n')
self.exit() self.exit()

View File

@ -39,7 +39,7 @@ class command_perl(HoneyPotCommand):
output = ( output = (
'', '',
'Usage: perl [switches] [--] [programfile] [arguments]', 'Usage: perl [switches] [--] [programfile] [arguments]',
' -0[octal] specify record separator (\0, if no argument)', ' -0[octal] specify record separator (\\0, if no argument)',
' -a autosplit mode with -n or -p (splits $_ into @F)', ' -a autosplit mode with -n or -p (splits $_ into @F)',
' -C[number/list] enables the listed Unicode features', ' -C[number/list] enables the listed Unicode features',
' -c check syntax only (runs BEGIN and CHECK blocks)', ' -c check syntax only (runs BEGIN and CHECK blocks)',

View File

@ -94,7 +94,7 @@ def formatCef(logentry):
cefList = [] cefList = []
for key in cefExtensions.keys(): for key in cefExtensions.keys():
value = str(cefExtensions[key]).replace(' ', '\ ') value = str(cefExtensions[key]).replace(' ', r'\ ')
cefList.append(key+"="+value) cefList.append(key+"="+value)
cefExtension = ' '.join(cefList) cefExtension = ' '.join(cefList)

View File

@ -21,7 +21,7 @@ class DBLogger(object):
self.ttylogs = {} self.ttylogs = {}
#:* Handles ipv6 #:* Handles ipv6
self.re_sessionlog = re.compile( self.re_sessionlog = re.compile(
'.*HoneyPotTransport,([0-9]+),[:a-f0-9.]+$') r'.*HoneyPotTransport,([0-9]+),[:a-f0-9.]+$')
# cowrie.session.connect is special since it kicks off new logging session, # cowrie.session.connect is special since it kicks off new logging session,
# and is not handled here # and is not handled here

View File

@ -184,7 +184,7 @@ class HoneyPotShell(object):
elif tok == '$?': elif tok == '$?':
tok = "0" tok = "0"
elif tok[0] == '$': elif tok[0] == '$':
env_rex = re.compile('^\$([_a-zA-Z0-9]+)$') env_rex = re.compile(r'^\$([_a-zA-Z0-9]+)$')
env_search = env_rex.search(tok) env_search = env_rex.search(tok)
if env_search != None: if env_search != None:
env_match = env_search.group(1) env_match = env_search.group(1)
@ -192,7 +192,7 @@ class HoneyPotShell(object):
tok = self.environ[env_match] tok = self.environ[env_match]
else: else:
continue continue
env_rex = re.compile('^\${([_a-zA-Z0-9]+)}$') env_rex = re.compile(r'^\${([_a-zA-Z0-9]+)}$')
env_search = env_rex.search(tok) env_search = env_rex.search(tok)
if env_search != None: if env_search != None:
env_match = env_search.group(1) env_match = env_search.group(1)

View File

@ -25,7 +25,7 @@ class Interact(telnet.Telnet):
# Someone tell me if i'm doing this wrong? # Someone tell me if i'm doing this wrong?
d = self.do(telnet.LINEMODE) d = self.do(telnet.LINEMODE)
self.requestNegotiation(telnet.LINEMODE, telnet.LINEMODE_EDIT + '\0') self.requestNegotiation(telnet.LINEMODE, telnet.LINEMODE_EDIT + '\x00')
self.will(telnet.ECHO) self.will(telnet.ECHO)
self.transport.write('*** cowrie session management console ***\r\n') self.transport.write('*** cowrie session management console ***\r\n')

View File

@ -176,7 +176,7 @@ class HoneyPotTransport(transport.SSHServerTransport, TimeoutMixin):
self.transportId = uuid.uuid4().hex[:8] self.transportId = uuid.uuid4().hex[:8]
src_ip = self.transport.getPeer().host src_ip = self.transport.getPeer().host
ipv4rex = re.compile( '^::ffff:(\d+\.\d+\.\d+\.\d+)$') ipv4rex = re.compile(r'^::ffff:(\d+\.\d+\.\d+\.\d+)$')
ipv4_search = ipv4rex.search(src_ip) ipv4_search = ipv4rex.search(src_ip)
if ipv4_search != None: if ipv4_search != None:
src_ip = ipv4_search.group(1) src_ip = ipv4_search.group(1)