use getboolean() rather than get()

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

View File

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