Avoid locking in WireupAutomaticEvents

[mono.git] / mcs / class / System.Web / System.Web.Security / DefaultAuthenticationModule.cs

diff --git a/mcs/class/System.Web/System.Web.Security/DefaultAuthenticationModule.cs b/mcs/class/System.Web/System.Web.Security/DefaultAuthenticationModule.cs
index b799e35ad8567556bfc1ecde47d9130f87cf9bdc..ba58d6bca46285d5199e6829f96ea5a8d8de8d5f 100644 (file)
--- a/mcs/class/System.Web/System.Web.Security/DefaultAuthenticationModule.cs
+++ b/mcs/class/System.Web/System.Web.Security/DefaultAuthenticationModule.cs
@@ -5,8 +5,7 @@
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2002 Ximian, Inc (http://www.ximian.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
@@ -28,16 +27,33 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System.Web;
+using System.ComponentModel;
+using System.Security.Permissions;
 using System.Security.Principal;
+using System.Threading;
 
+// more info on the workings of this class can be found in Shackow, p. 55
+//
 namespace System.Web.Security
 {
+       // CAS - no InheritanceDemand here as the class is sealed
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        public sealed class DefaultAuthenticationModule : IHttpModule
        {
+               static readonly object authenticateEvent = new object ();
                static GenericIdentity defaultIdentity = new GenericIdentity ("", "");
 
-               public event DefaultAuthenticationEventHandler Authenticate;
+               EventHandlerList events = new EventHandlerList ();
+               
+               public event DefaultAuthenticationEventHandler Authenticate {
+                       add { events.AddHandler (authenticateEvent, value); }
+                       remove { events.RemoveHandler (authenticateEvent, value); }
+               }
+               
+               [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
+               public DefaultAuthenticationModule ()
+               {
+               }
 
                public void Dispose ()
                {
@@ -53,11 +69,14 @@ namespace System.Web.Security
                        HttpApplication app = (HttpApplication) sender;
                        HttpContext context = app.Context;
 
-                       if (context.User == null && Authenticate != null)
-                               Authenticate (this, new DefaultAuthenticationEventArgs (context));
+                       DefaultAuthenticationEventHandler eh = events [authenticateEvent] as DefaultAuthenticationEventHandler;
+                       if (context.User == null && eh != null)
+                               eh (this, new DefaultAuthenticationEventArgs (context));
 
                        if (context.User == null)
                                context.User = new GenericPrincipal (defaultIdentity, new string [0]);
+
+                       Thread.CurrentPrincipal = context.User;
                }
        }
 }