From 2957d00bd874d187798f32e9f73cf47595c4224a Mon Sep 17 00:00:00 2001 From: HonigBij Date: Wed, 18 Mar 2015 15:44:13 +0100 Subject: [PATCH] Retrieve client IP address (src_ip) directly in HoneyPotSSHUserAuthServer --- kippo/core/ssh.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kippo/core/ssh.py b/kippo/core/ssh.py index ee79545d..06c64643 100644 --- a/kippo/core/ssh.py +++ b/kippo/core/ssh.py @@ -70,7 +70,8 @@ class HoneyPotSSHUserAuthServer(userauth.SSHUserAuthServer): transport.DISCONNECT_PROTOCOL_ERROR, "only one keyboard interactive attempt at a time") return defer.fail(error.IgnoreAuthentication()) - c = auth.PluggableAuthenticationModulesIP(self.user, self._pamConv, self.transport.src_ip) + src_ip=self.transport.getPeer().address.host + c = auth.PluggableAuthenticationModulesIP(self.user, self._pamConv, src_ip) return self.portal.login(c, None, conchinterfaces.IConchUser) # As implemented by Kojoney @@ -202,8 +203,6 @@ class HoneyPotTransport(sshserver.KippoSSHServerTransport): def connectionMade(self): self.transportId = uuid.uuid4().hex[:8] self.interactors = [] - # store src_ip to use in HoneyPotSSHUserAuthServer - self.src_ip=self.transport.getPeer().host log.msg( eventid='KIPP0001', format='New connection: %(src_ip)s:%(src_port)s (%(dst_ip)s:%(dst_port)s) [session: %(sessionno)s]',