From 8b7415cb1bdbb943ff01e7b7ba4bf41d4fa37ba7 Mon Sep 17 00:00:00 2001 From: Michel Oosterhof Date: Thu, 20 Jun 2019 11:33:38 +0400 Subject: [PATCH] Move `auth_none` and `auth_keyboard_interactive_enabled` to [ssh] config section (#1153) --- docs/CHANGELOG.rst | 3 +++ etc/cowrie.cfg.dist | 24 +++++++++++++----------- src/twisted/plugins/cowrie_plugin.py | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 7327120f..caa71fea 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -1,3 +1,6 @@ + +* 2019-06-20 Move `auth_none` and `auth_keyboard_interactive_enabled` to [ssh] config section + Release 1.6.0 ============= diff --git a/etc/cowrie.cfg.dist b/etc/cowrie.cfg.dist index 0cd0a16d..c63e550c 100644 --- a/etc/cowrie.cfg.dist +++ b/etc/cowrie.cfg.dist @@ -183,17 +183,6 @@ auth_class = UserDB #auth_class_parameters = 2, 5, 10 -# No authentication checking at all -# enabling 'auth_none' will enable the ssh2 'auth_none' authentication method -# this allows the requested user in without any verification at all -# -# (default: false) -#auth_none_enabled = false - -# Configure keyboard-interactive login -auth_keyboard_interactive_enabled = false - - # ============================================================================ # Historical SSH Specific Options # historical options in [honeypot] that have not yet been moved to [ssh] @@ -465,6 +454,19 @@ forward_tunnel = false # forward_tunnel_443 = 127.0.0.1:3128 +# No authentication checking at all +# enabling 'auth_none' will enable the ssh2 'auth_none' authentication method +# this allows the requested user in without any verification at all +# +# (default: false) +#auth_none_enabled = false + + +# Configure keyboard-interactive login +auth_keyboard_interactive_enabled = false + + + # ============================================================================ # Telnet Specific Options # ============================================================================ diff --git a/src/twisted/plugins/cowrie_plugin.py b/src/twisted/plugins/cowrie_plugin.py index 55d4ef7d..10974474 100644 --- a/src/twisted/plugins/cowrie_plugin.py +++ b/src/twisted/plugins/cowrie_plugin.py @@ -153,7 +153,7 @@ Makes a Cowrie SSH/Telnet honeypot. factory.portal.registerChecker( core.checkers.HoneypotPasswordChecker()) - if CowrieConfig().getboolean('honeypot', 'auth_none_enabled', fallback=False) is True: + if CowrieConfig().getboolean('ssh', 'auth_none_enabled', fallback=False) is True: factory.portal.registerChecker( core.checkers.HoneypotNoneChecker())