From c0398c5bc141c9e0b1a52c6e120994fa14b31129 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Fri, 27 Apr 2018 19:21:56 +0900
Subject: [PATCH] [Modify] Polish them

---
 .../Net/WebSockets/TcpListenerWebSocketContext.cs    | 12 +-----------
 websocket-sharp/Server/WebSocketServer.cs            |  8 +++++---
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
index 34adf0c4..e26d99cb 100644
--- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
@@ -438,14 +438,6 @@ namespace WebSocketSharp.Net.WebSockets
       Func<IIdentity, NetworkCredential> credentialsFinder
     )
     {
-      if (scheme == AuthenticationSchemes.Anonymous)
-        return true;
-
-      if (scheme == AuthenticationSchemes.None) {
-        Close (HttpStatusCode.Forbidden);
-        return false;
-      }
-
       var chal = new AuthenticationChallenge (scheme, realm).ToString ();
 
       var retry = -1;
@@ -453,10 +445,8 @@ namespace WebSocketSharp.Net.WebSockets
       auth =
         () => {
           retry++;
-          if (retry > 99) {
-            Close (HttpStatusCode.Forbidden);
+          if (retry > 99)
             return false;
-          }
 
           var user = HttpUtility.CreateUser (
                        _request.Headers["Authorization"],
diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs
index 1b91aed9..ce89d739 100644
--- a/websocket-sharp/Server/WebSocketServer.cs
+++ b/websocket-sharp/Server/WebSocketServer.cs
@@ -806,6 +806,11 @@ namespace WebSocketSharp.Server
 
     private void processRequest (TcpListenerWebSocketContext context)
     {
+      if (!authenticateClient (context)) {
+        context.Close (HttpStatusCode.Forbidden);
+        return;
+      }
+
       var uri = context.RequestUri;
       if (uri == null) {
         context.Close (HttpStatusCode.BadRequest);
@@ -846,9 +851,6 @@ namespace WebSocketSharp.Server
                             cl, null, _secure, _sslConfigInUse, _log
                           );
 
-                if (!ctx.Authenticate (_authSchemes, _realmInUse, _userCredFinder))
-                  return;
-
                 processRequest (ctx);
               }
               catch (Exception ex) {