move ssh files to ssh directory

cowrie/core/avatar.py

@@ -14,9 +14,9 @@ from twisted.conch.ssh import filetransfer as conchfiletransfer
 from twisted.python import log, components
 
 from cowrie.core import pwd
-from cowrie.core import session
+from cowrie.ssh import session
-from cowrie.core import filetransfer
+from cowrie.ssh import filetransfer
-from cowrie.core import forwarding
+from cowrie.ssh import forwarding
 
 
 @implementer(IConchUser)

cowrie/core/fs.py

@@ -42,6 +42,7 @@ class TooManyLevels(Exception):
 
 class FileNotFound(Exception):
     """
+    raise OSError(errno.ENOENT, os.strerror(errno.ENOENT))
     """
     pass
 

cowrie/ssh/transport.py

@@ -17,8 +17,8 @@ from twisted.conch.openssh_compat import primes
 from twisted.conch.ssh.common import getNS
 from twisted.protocols.policies import TimeoutMixin
 
-from cowrie.core import connection
+from cowrie.ssh import connection
-from cowrie.core import userauth
+from cowrie.ssh import userauth
 from cowrie.core import keys as cowriekeys
 
 

twisted/plugins/cowrie_plugin.py

@@ -45,10 +45,11 @@ from twisted.cred import portal
 
 from cowrie.core.config import readConfigFile
 from cowrie import core
-import cowrie.core.transport
 import cowrie.core.realm
 import cowrie.core.checkers
 
+import cowrie.ssh.transport
+
 class Options(usage.Options):
     """
     FIXME: Docstring
@@ -93,7 +94,7 @@ class CowrieServiceMaker(object):
         else:
             listen_port = 2222
 
-        factory = core.transport.HoneyPotSSHFactory(cfg)
+        factory = cowrie.ssh.transport.HoneyPotSSHFactory(cfg)
         factory.portal = portal.Portal(core.realm.HoneyPotRealm(cfg))
         factory.portal.registerChecker(
             core.checkers.HoneypotPublicKeyChecker())