DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified HTTP auth for HttpListener class

Browse Source
This commit is contained in:
sta 2014-11-14 15:49:14 +09:00
parent b596c05179
commit 9c79e28f22
3 changed files with 54 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
websocket-sharp/Net/HttpListener.cs
View File

@ -669,18 +669,7 @@ namespace WebSocketSharp.Net
if (!ares.IsCompleted)
ares.AsyncWaitHandle.WaitOne ();
lock (_waitQueueSync) {
var i = _waitQueue.IndexOf (ares);
if (i >= 0)
_waitQueue.RemoveAt (i);
}
var ctx = ares.GetContext ();
var schm = SelectAuthenticationScheme (ctx);
if (schm != AuthenticationSchemes.Anonymous)
ctx.SetUser (schm, Realm, UserCredentialsFinder);
return ctx; // This will throw on error.
return ares.GetContext (); // This will throw on error.
}
/// <summary>

78
websocket-sharp/Net/ListenerAsyncResult.cs
View File

@ -107,6 +107,57 @@ namespace WebSocketSharp.Net
#region Private Methods
private static bool authenticate (HttpListenerContext context)
{
var listener = context.Listener;
var schm = listener.SelectAuthenticationScheme (context);
if (schm == AuthenticationSchemes.Anonymous)
return true;
if (schm == AuthenticationSchemes.None) {
context.Response.Close (HttpStatusCode.Forbidden);
return false;
}
var req = context.Request;
var authRes = req.Headers["Authorization"];
if (schm == AuthenticationSchemes.Basic) {
if (authRes == null || !authRes.StartsWith ("basic", StringComparison.OrdinalIgnoreCase)) {
context.Response.CloseWithAuthChallenge (
AuthenticationChallenge.CreateBasicChallenge (listener.Realm).ToBasicString ());
return false;
}
}
else if (schm == AuthenticationSchemes.Digest) {
if (authRes == null || !authRes.StartsWith ("digest", StringComparison.OrdinalIgnoreCase)) {
context.Response.CloseWithAuthChallenge (
AuthenticationChallenge.CreateDigestChallenge (listener.Realm).ToDigestString ());
return false;
}
}
else {
context.Response.Close (HttpStatusCode.Forbidden);
return false;
}
var realm = listener.Realm;
context.SetUser (schm, realm, listener.UserCredentialsFinder);
if (req.IsAuthenticated)
return true;
if (schm == AuthenticationSchemes.Basic)
context.Response.CloseWithAuthChallenge (
AuthenticationChallenge.CreateBasicChallenge (realm).ToBasicString ());
if (schm == AuthenticationSchemes.Digest)
context.Response.CloseWithAuthChallenge (
AuthenticationChallenge.CreateDigestChallenge (realm).ToDigestString ());
return false;
}
private static void complete (ListenerAsyncResult asyncResult)
{
asyncResult._completed = true;
@ -149,31 +200,8 @@ namespace WebSocketSharp.Net
internal void Complete (HttpListenerContext context, bool syncCompleted)
{
var listener = context.Listener;
var schm = listener.SelectAuthenticationScheme (context);
if (schm == AuthenticationSchemes.None) {
context.Response.Close (HttpStatusCode.Forbidden);
listener.BeginGetContext (this);
return;
}
var res = context.Request.Headers["Authorization"];
if (schm == AuthenticationSchemes.Basic &&
(res == null || !res.StartsWith ("basic", StringComparison.OrdinalIgnoreCase))) {
context.Response.CloseWithAuthChallenge (
AuthenticationChallenge.CreateBasicChallenge (listener.Realm).ToBasicString ());
listener.BeginGetContext (this);
return;
}
if (schm == AuthenticationSchemes.Digest &&
(res == null || !res.StartsWith ("digest", StringComparison.OrdinalIgnoreCase))) {
context.Response.CloseWithAuthChallenge (
AuthenticationChallenge.CreateDigestChallenge (listener.Realm).ToDigestString ());
listener.BeginGetContext (this);
if (!authenticate (context)) {
context.Listener.BeginGetContext (this);
return;
}

22
websocket-sharp/Server/HttpServer.cs
View File

@ -486,23 +486,6 @@ namespace WebSocketSharp.Server
_state = ServerState.Stop;
}
private bool authenticateRequest (AuthenticationSchemes scheme, HttpListenerContext context)
{
if (context.Request.IsAuthenticated)
return true;
if (scheme == AuthenticationSchemes.Basic)
context.Response.CloseWithAuthChallenge (
AuthenticationChallenge.CreateBasicChallenge (_listener.Realm).ToBasicString ());
else if (scheme == AuthenticationSchemes.Digest)
context.Response.CloseWithAuthChallenge (
AuthenticationChallenge.CreateDigestChallenge (_listener.Realm).ToDigestString ());
else
context.Response.Close (HttpStatusCode.Forbidden);
return false;
}
private string checkIfCertificateExists ()
{
if (!_secure)
@ -570,11 +553,6 @@ namespace WebSocketSharp.Server
ThreadPool.QueueUserWorkItem (
state => {
try {
var schm = _listener.SelectAuthenticationScheme (ctx);
if (schm != AuthenticationSchemes.Anonymous &&
!authenticateRequest (schm, ctx))
return;
if (ctx.Request.IsUpgradeTo ("websocket")) {
processWebSocketRequest (ctx.AcceptWebSocket (null, _logger));
return;