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

Removed AuthenticationSchemeSelector.cs

Browse Source
This commit is contained in:
sta 2014-04-24 21:07:38 +09:00
parent 83bf1f8608
commit ad0e1ff03e
3 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
websocket-sharp/Net/AuthenticationSchemeSelector.cs
View File

@ -1,44 +0,0 @@
//
// AuthenticationSchemeSelector.cs
// Copied from System.Net.AuthenticationSchemeSelector.cs
//
// Author:
// Gonzalo Paniagua Javier <gonzalo@novell.com>
//
// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace WebSocketSharp.Net {
/// <summary>
/// Selects the authentication scheme for a <see cref="HttpListener"/> instance.
/// </summary>
/// <returns>
/// One of the <see cref="AuthenticationSchemes"/> values that indicates the scheme used to authenticate the specified client request.
/// </returns>
/// <param name="httpRequest">
/// A <see cref="HttpListenerRequest"/> that contains a client request information.
/// </param>
public delegate AuthenticationSchemes AuthenticationSchemeSelector (HttpListenerRequest httpRequest);
}

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

@ -55,7 +55,7 @@ namespace WebSocketSharp.Net
#region Private Fields
private AuthenticationSchemes _authSchemes;
private AuthenticationSchemeSelector _authSchemeSelector;
private Func<HttpListenerRequest, AuthenticationSchemes> _authSchemeSelector;
private string _certFolderPath;
private Dictionary<HttpConnection, HttpConnection> _connections;
private List<HttpListenerContext> _contextQueue;
@ -124,16 +124,27 @@ namespace WebSocketSharp.Net
}
/// <summary>
/// Gets or sets the delegate called to determine the scheme used to authenticate clients.
/// Gets or sets the delegate called to select the scheme used to authenticate the clients.
/// </summary>
/// <remarks>
/// <para>
/// If you set this property, the listener uses the authentication scheme selected by
/// the delegate for each request.
/// </para>
/// <para>
/// If you don't set, the listener uses the value of the <c>AuthenticationSchemes</c>
/// property as the authentication scheme for all requests.
/// </para>
/// </remarks>
/// <value>
/// A <see cref="AuthenticationSchemeSelector"/> delegate that invokes the method(s) used to
/// select an authentication scheme. The default value is <see langword="null"/>.
/// A <c>Func&lt;<see cref="HttpListenerRequest"/>, <see cref="AuthenticationSchemes"/>&gt;</c>
/// delegate that invokes the method(s) used to select an authentication scheme. The default
/// value is <see langword="null"/>.
/// </value>
/// <exception cref="ObjectDisposedException">
/// This listener has been closed.
/// </exception>
public AuthenticationSchemeSelector AuthenticationSchemeSelectorDelegate {
public Func<HttpListenerRequest, AuthenticationSchemes> AuthenticationSchemeSelector {
get {
CheckDisposed ();
return _authSchemeSelector;
@ -503,8 +514,8 @@ namespace WebSocketSharp.Net
internal AuthenticationSchemes SelectAuthenticationScheme (HttpListenerContext context)
{
return AuthenticationSchemeSelectorDelegate != null
? AuthenticationSchemeSelectorDelegate (context.Request)
return AuthenticationSchemeSelector != null
? AuthenticationSchemeSelector (context.Request)
: _authSchemes;
}

1
websocket-sharp/websocket-sharp.csproj
View File

@ -71,7 +71,6 @@
<Compile Include="Server\WebSocketServer.cs" />
<Compile Include="Server\WebSocketService.cs" />
<Compile Include="WsStream.cs" />
<Compile Include="Net\AuthenticationSchemeSelector.cs" />
<Compile Include="Net\AuthenticationSchemes.cs" />
<Compile Include="Net\ChunkStream.cs" />
<Compile Include="Net\ChunkedInputStream.cs" />