- added hello message with client ip and user@host trace message

[controller.git] / opendaylight / netconf / netconf-ssh / src / main / java / org / opendaylight / controller / netconf / ssh / threads / SocketThread.java

diff --git a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java
index 95fdd48bfe31d6e83b1082eefedbfe7da06842a5..15d99a44ee4db4a7b31bd0ee2fd6abd25476079c 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java
+++ b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java
@@ -28,6 +28,8 @@ public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
     private static final Logger logger =  LoggerFactory.getLogger(SocketThread.class);
     private ServerConnection conn = null;
     private long sessionId;
     private static final Logger logger =  LoggerFactory.getLogger(SocketThread.class);
     private ServerConnection conn = null;
     private long sessionId;

+    private String currentUser;
+    private final String remoteAddressWithPort;

 
 
     public static void start(Socket socket, InetSocketAddress clientAddress, long sessionId) throws IOException{
 
 
     public static void start(Socket socket, InetSocketAddress clientAddress, long sessionId) throws IOException{


@@ -40,6 +42,7 @@ public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
         this.socket = socket;
         this.clientAddress = clientAddress;
         this.sessionId = sessionId;
         this.socket = socket;
         this.clientAddress = clientAddress;
         this.sessionId = sessionId;

+        this.remoteAddressWithPort = socket.getRemoteSocketAddress().toString().replaceFirst("/","");

 
     }
 
 
     }
 


@@ -81,7 +84,8 @@ public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
                                 netconf_ssh_input.start();
 
                                 logger.trace("starting netconf_ssh_output thread");
                                 netconf_ssh_input.start();
 
                                 logger.trace("starting netconf_ssh_output thread");

-                                netconf_ssh_output = new IOThread(ss.getStdout(),echoSocket.getOutputStream(),"output_thread_"+sessionId,ss,conn);
+                                final String customHeader = "["+currentUser+";"+remoteAddressWithPort+";ssh;;;;;;]\n";
+                                netconf_ssh_output = new IOThread(ss.getStdout(),echoSocket.getOutputStream(),"output_thread_"+sessionId,ss,conn,customHeader);

                                 netconf_ssh_output.setDaemon(false);
                                 netconf_ssh_output.start();
 
                                 netconf_ssh_output.setDaemon(false);
                                 netconf_ssh_output.start();
 


@@ -146,7 +150,8 @@ public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
 
     public String initAuthentication(ServerConnection sc)
     {
 
     public String initAuthentication(ServerConnection sc)
     {

-        return "";
+        logger.trace("Established connection with host {}",remoteAddressWithPort);
+        return "Established connection with host "+remoteAddressWithPort+"\r\n";

     }
 
     public String[] getRemainingAuthMethods(ServerConnection sc)
     }
 
     public String[] getRemainingAuthMethods(ServerConnection sc)


@@ -161,8 +166,12 @@ public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
 
     public AuthenticationResult authenticateWithPassword(ServerConnection sc, String username, String password)
     {
 
     public AuthenticationResult authenticateWithPassword(ServerConnection sc, String username, String password)
     {

-        if (USER.equals(username) && PASSWORD.equals(password))
+        if (USER.equals(username) && PASSWORD.equals(password)){
+            currentUser = username;
+            logger.trace("user {}@{} authenticated",currentUser,remoteAddressWithPort);

             return AuthenticationResult.SUCCESS;
             return AuthenticationResult.SUCCESS;

+        }
+

 
         return AuthenticationResult.FAILURE;
     }
 
         return AuthenticationResult.FAILURE;
     }