aljaz/cowrie
1
0
Fork 0
mirror of https://github.com/aljazceru/cowrie.git synced 2025-12-17 22:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

use getboolean() rather than get()

Browse Source
This commit is contained in:
Michel Oosterhof
2016-09-19 11:32:13 +04:00
parent 8cd1df882f
commit 54f13c6467
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cowrie/core/avatar.py
View File

@@ -44,11 +44,11 @@ class CowrieUser(avatar.ConchUser):
self.gid = 1001 self.gid = 1001
self.home = '/home' self.home = '/home'
# Sftp support enabled only when option is explicitly set # SFTP support enabled only when option is explicitly set
try: try:
if (self.cfg.get('honeypot', 'sftp_enabled') == "true"): if self.cfg.getboolean('honeypot', 'sftp_enabled') == True:
self.subsystemLookup['sftp'] = conchfiletransfer.FileTransferServer self.subsystemLookup['sftp'] = conchfiletransfer.FileTransferServer
except: except ValueError as e:
pass pass

2
cowrie/core/dblog.py
View File

@@ -47,7 +47,7 @@ class DBLogger(object):
self.report_public_ip = False self.report_public_ip = False
if self.cfg.has_option('honeypot', 'report_public_ip'): if self.cfg.has_option('honeypot', 'report_public_ip'):
if cfg.get('honeypot', 'report_public_ip') == "true" or cfg.get('honeypot', 'report_public_ip') == "1": if cfg.getboolean('honeypot', 'report_public_ip') == True:
self.report_public_ip = True self.report_public_ip = True
import urllib import urllib
self.public_ip = urllib.urlopen('http://myip.threatstream.com').readline() self.public_ip = urllib.urlopen('http://myip.threatstream.com').readline()

2
cowrie/dblog/xmpp.py
View File

@@ -78,7 +78,7 @@ class DBLogger(dblog.DBLogger):
self.xmppclient = XMPPClient(JID(jidstr), password) self.xmppclient = XMPPClient(JID(jidstr), password)
if self.cfg.has_option('database_xmpp', 'debug') and \ if self.cfg.has_option('database_xmpp', 'debug') and \
self.cfg.get('database_xmpp', 'debug') in ('1', 'true', 'yes'): self.cfg.getboolean('database_xmpp', 'debug') == True:
self.xmppclient.logTraffic = True # DEBUG HERE self.xmppclient.logTraffic = True # DEBUG HERE
(user, host, resource) = jid.parse(jidstr) (user, host, resource) = jid.parse(jidstr)
self.muc = XMPPLoggerProtocol( self.muc = XMPPLoggerProtocol(

4
cowrie/ssh/forwarding.py
View File

@@ -23,11 +23,11 @@ def cowrieOpenConnectForwardingClient(remoteWindow, remoteMaxPacket, data, avata
cfg = avatar.cfg cfg = avatar.cfg
try: try:
if cfg.get('honeypot', 'ssh_forward_redirect') == "true": if cfg.getboolean('honeypot', 'ssh_forward_redirect') == True:
redirectEnabled = True redirectEnabled = True
else: else:
redirectEnabled = False redirectEnabled = False
except: except ValueError as e:
redirectEnabled = False redirectEnabled = False
if redirectEnabled: if redirectEnabled:

13
twisted/plugins/cowrie_plugin.py
View File

@@ -95,8 +95,7 @@ class CowrieServiceMaker(object):
core.checkers.HoneypotPasswordChecker(cfg)) core.checkers.HoneypotPasswordChecker(cfg))
if cfg.has_option('honeypot', 'auth_none_enabled') and \ if cfg.has_option('honeypot', 'auth_none_enabled') and \
cfg.get('honeypot', 'auth_none_enabled').lower() in \ cfg.getboolean('honeypot', 'auth_none_enabled') == True:
('yes', 'true', 'on'):
factory.portal.registerChecker( factory.portal.registerChecker(
core.checkers.HoneypotNoneChecker()) core.checkers.HoneypotNoneChecker())
@@ -123,8 +122,7 @@ class CowrieServiceMaker(object):
svc.setServiceParent(topService) svc.setServiceParent(topService)
if cfg.has_option('telnet', 'enabled') and \ if cfg.has_option('telnet', 'enabled') and \
cfg.get('telnet', 'enabled').lower() in \ cfg.getboolean('telnet', 'enabled') == True:
('yes', 'true', 'on'):
if cfg.has_option('telnet', 'listen_addr'): if cfg.has_option('telnet', 'listen_addr'):
listen_telnet_addr = cfg.get('telnet', 'listen_addr') listen_telnet_addr = cfg.get('telnet', 'listen_addr')
@@ -140,18 +138,13 @@ class CowrieServiceMaker(object):
f = cowrie.telnet.transport.HoneyPotTelnetFactory(cfg) f = cowrie.telnet.transport.HoneyPotTelnetFactory(cfg)
f.portal = portal.Portal(core.realm.HoneyPotRealm(cfg)) f.portal = portal.Portal(core.realm.HoneyPotRealm(cfg))
f.portal.registerChecker(core.checkers.HoneypotPasswordChecker(cfg)) f.portal.registerChecker(core.checkers.HoneypotPasswordChecker(cfg))
if cfg.has_option('honeypot', 'auth_none_enabled') and \
cfg.get('honeypot', 'auth_none_enabled').lower() in \
('yes', 'true', 'on'):
f.portal.registerChecker(core.checkers.HoneypotNoneChecker())
for i in listen_telnet_addr.split(): for i in listen_telnet_addr.split():
tsvc = internet.TCPServer(listen_telnet_port, f, interface=i) tsvc = internet.TCPServer(listen_telnet_port, f, interface=i)
# FIXME: Use addService on topService ? # FIXME: Use addService on topService ?
tsvc.setServiceParent(topService) tsvc.setServiceParent(topService)
if cfg.has_option('honeypot', 'interact_enabled') and \ if cfg.has_option('honeypot', 'interact_enabled') and \
cfg.get('honeypot', 'interact_enabled').lower() in \ cfg.getboolean('honeypot', 'interact_enabled') == True:
('yes', 'true', 'on'):
iport = int(cfg.get('honeypot', 'interact_port')) iport = int(cfg.get('honeypot', 'interact_port'))
# FIXME this doesn't support checking both Telnet and SSH sessions # FIXME this doesn't support checking both Telnet and SSH sessions
from cowrie.core import interact from cowrie.core import interact