From b4bf14b43d4db22f59abb71e189cceca640c5153 Mon Sep 17 00:00:00 2001
From: Olivier Bilodeau <obilodeau@gosecure.ca>
Date: Tue, 2 Feb 2016 10:40:13 -0500
Subject: [PATCH] Achieved maximum compatibility with nc like clients

Will figure out how to make it work with both Telnet and nc later.
---
 cowrie/telnet/transport.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/cowrie/telnet/transport.py b/cowrie/telnet/transport.py
index 03e834b..983330c 100644
--- a/cowrie/telnet/transport.py
+++ b/cowrie/telnet/transport.py
@@ -12,7 +12,7 @@ from twisted.python import log
 from twisted.internet import protocol
 from twisted.conch.telnet import AuthenticatingTelnetProtocol, ECHO, \
                                  ITelnetProtocol, ProtocolTransportMixin, \
-                                 TelnetTransport
+                                 SGA, TelnetTransport
 from twisted.protocols.policies import TimeoutMixin
 
 from cowrie.core.credentials import UsernamePasswordIP
@@ -114,8 +114,8 @@ class HoneyPotTelnetAuthProtocol(AuthenticatingTelnetProtocol, TimeoutMixin):
            dst_ip=self.transport.getHost().host, dst_port=self.transport.getHost().port,
            session=self.transportId, sessionno=sessionno)
 
-        self.transport.write(self.factory.banner)
-        self.transport.write("User Access Verification\n\nUsername: ")
+        self.transport.write(self.factory.banner.replace('\n', '\r\r\n'))
+        self.transport.write("User Access Verification\n\nUsername: ".replace('\n', '\r\r\n'))
 
         # Enable some Telnet options for proper output and echo
         # This supports both smart Telnet clients and raw bytes sending
@@ -124,7 +124,7 @@ class HoneyPotTelnetAuthProtocol(AuthenticatingTelnetProtocol, TimeoutMixin):
         #     check how I should negotiate
         #self.transport.do(ECHO)
         #self.transport.will(SGA)
-        self.transport.will(ECHO)
+        #self.transport.will(ECHO)
 
         self.setTimeout(120)
 
@@ -187,6 +187,21 @@ class HoneyPotTelnetAuthProtocol(AuthenticatingTelnetProtocol, TimeoutMixin):
         protocol.makeConnection(self.transport)
         self.transport.protocol = protocol
 
+    def enableLocal(self, opt):
+        if opt == ECHO:
+            return True
+        elif opt == SGA:
+            return True
+        else:
+            return False
+
+    def enableRemote(self, opt):
+        if opt == SGA:
+            return True
+        else:
+            return False
+
+
 class StripCrTelnetTransport(TelnetTransport):
     """Sole purpose is to override write() and fix a CRLF nesting bug"""