Changeset 184

Timestamp:

Sep 9, 2014, 9:52:41 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/src/NetConnections/Servers/Telnet/Telnet.cs (modified) (1 diff)
• 7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs (modified) (3 diffs)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/7dtd-server-fixes_version.txt (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Telnet/Telnet.cs

@@ -39 +39 @@
                 }
 
+                public void FailedLogins ()
+                {
+                }
+
                 private void AcceptClient (IAsyncResult asyncResult)
                 {
                         if (listener.Server.IsBound) {
-                                TelnetConnection c = new TelnetConnection (listener.EndAcceptTcpClient (asyncResult), authEnabled);
+                                TelnetConnection c = new TelnetConnection (this, listener.EndAcceptTcpClient (asyncResult), authEnabled);
                                 connections.Add (c);
                                 listener.BeginAcceptTcpClient (new AsyncCallback (AcceptClient), null);

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs

@@ -11 +11 @@
         public class TelnetConnection : IConnection
         {
-                BlockingQueue<string> toClientQueue = new BlockingQueue<string> ();
-                private Thread receiveThread = null;
-                private Thread sendThread = null;
+                private readonly BlockingQueue<string> toClientQueue = new BlockingQueue<string> ();
+                private readonly Telnet owner;
+                private readonly Thread receiveThread = null;
+                private readonly Thread sendThread = null;
+                private int authTries = 0;
                 private bool authenticated = false;
-                private bool authEnabled;
+                private readonly bool authEnabled;
                 private TcpClient client;
-                private NetworkStream stream;
-                private EndPoint endpoint;
+                private readonly NetworkStream stream;
+                private readonly EndPoint endpoint;
+                private readonly int endpointAddressHash;
 
-                public TelnetConnection (TcpClient client, bool authEnabled)
+                public TelnetConnection (Telnet owner, TcpClient client, bool authEnabled)
                 {
+                        this.owner = owner;
                         this.authEnabled = authEnabled;
                         this.client = client;
@@ -33 +37 @@
                         sendThread = ThreadMaster.Create ("TelnetClientSend", new ThreadStart (SendThread));
                         sendThread.Start ();
+
+                        if (endpoint is IPEndPoint) {
+                                endpointAddressHash = ((IPEndPoint)endpoint).Address.GetHashCode();
+                                Log.Out ("Hash: " + endpointAddressHash);
+                        } else {
+                                Log.Out ("EndPoint is not an IPEndPoint but: " + endpoint.GetType().ToString());
+                        }
 
                         if (authEnabled) {
@@ -80 +91 @@
                                                                         LoginMessage ();
                                                                 } else {
-                                                                        WriteLine ("Password incorrect, please enter password:");
+                                                                        authTries++;
+                                                                        // TODO: check if IP has more login attempts by now
+                                                                        if (authTries < 3) {
+                                                                                WriteLine ("Password incorrect, please enter password:");
+                                                                        } else {
+                                                                                WriteLine ("Too many failed login attempts!");
+                                                                                Log.Out ("Telnet connection closed for too many login attempts: " + endpoint);
+                                                                                //TODO: owner.FailedLogins();
+                                                                                Close ();
+                                                                                break;
+                                                                        }
                                                                 }
                                                         } else {

binary-improvements/bin/Release/7dtd-server-fixes_version.txt

@@ -1 @@
-Version:       0.93.5365.36355
+Version:       0.93.5365.37264