2010-03-03 Atsushi Enomoto <atsushi@ximian.com>

* HttpListenerContext.cs, HttpListener.cs : support AuthenticationSchemeSelectorDelegate. svn path=/trunk/mcs/; revision=152922
mono · Mar 3, 2010 · f334e6d · f334e6d
1 parent 0e5761c
commit f334e6d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-03  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* HttpListenerContext.cs, HttpListener.cs :
+	  support AuthenticationSchemeSelectorDelegate.
+
 2010-03-01  Miguel de Icaza  <miguel@novell.com>
 
 	* WebHeaderCollection.cs: Apply 2 year old patch from Yves Bastide
@@ -23,7 +28,7 @@
 
 	* IPEndPoint.cs: When throwing an ArgumentException in Create()
 	because of a mismatch in the address family, use a more informative
-	message. Patch by Juho Vähä-Herttu<juhovh@iki.fi>.
+	message. Patch by Juho Vaha-Herttu<juhovh@iki.fi>.
 	Fixes #505105.
 
 2010-01-21  Sebastien Pouliot  <sebastien@ximian.com>
@@ -286,7 +291,7 @@
 	Clear the ip_to_endpoints hashtable if there are no more prefixes
 	listening on that address.
 
-2009-06-16 Andrés G. Aragoneses <aaragoneses@novell.com>
+2009-06-16 Andres G. Aragoneses <aaragoneses@novell.com>
 
 	* WebConnection.cs: propagate the exception to the request.
 	* WebException.cs: new internal ctor.

diff --git a/mcs/class/System/System.Net/HttpListener.cs b/mcs/class/System/System.Net/HttpListener.cs
@@ -64,7 +64,6 @@ public AuthenticationSchemes AuthenticationSchemes {
 			}
 		}
 
-		//TODO: when is this called?
 		public AuthenticationSchemeSelector AuthenticationSchemeSelectorDelegate {
 			get { return auth_selector; }
 			set {
@@ -217,9 +216,10 @@ public HttpListenerContext EndGetContext (IAsyncResult asyncResult)
 			}
 
 			HttpListenerContext context = ares.GetContext ();
-			if (auth_schemes != AuthenticationSchemes.Anonymous) {
-				context.ParseAuthentication ();
-			}
+			if (AuthenticationSchemeSelectorDelegate != null)
+				context.ParseAuthentication (AuthenticationSchemeSelectorDelegate (context.Request));
+			else if (auth_schemes != AuthenticationSchemes.Anonymous)
+				context.ParseAuthentication (auth_schemes);
 			return context; // This will throw on error.
 		}
 

diff --git a/mcs/class/System/System.Net/HttpListenerContext.cs b/mcs/class/System/System.Net/HttpListenerContext.cs
@@ -79,7 +79,9 @@ public IPrincipal User {
 			get { return user; }
 		}
 
-		internal void ParseAuthentication () {
+		internal void ParseAuthentication (AuthenticationSchemes expectedSchemes) {
+			if (expectedSchemes == AuthenticationSchemes.Anonymous)
+				return;
 			// TODO: Handle NTLM/Digest modes
 			string header = request.Headers ["Authorization"];