From 79bfc390f374c8f5e3ccd8c93c799c41d178e7b2 Mon Sep 17 00:00:00 2001
From: loudej <none@none>
Date: Wed, 6 Jan 2010 04:49:55 +0000
Subject: [PATCH] Logging access denied events. Renaming DevTools _Package.txt
 to disable it by default.

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045028
---
 .../Orchard.DevTools/Orchard.DevTools.csproj  |  2 +-
 .../{Package.txt => _Package.txt}             |  0
 .../Controllers/AccountController.cs          | 19 +++++++++++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
 rename src/Orchard.Web/Packages/Orchard.DevTools/{Package.txt => _Package.txt} (100%)

diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj b/src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj
index 2bdd2d61d..5ffbd0c96 100644
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj
@@ -76,7 +76,7 @@
     <Compile Include="ViewModels\ContentDetailsViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Package.txt" />
+    <Content Include="_Package.txt" />
     <Content Include="Views\Content\Details.aspx" />
     <Content Include="Views\Content\Index.aspx" />
     <Content Include="Views\Home\Index.aspx" />
diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Package.txt b/src/Orchard.Web/Packages/Orchard.DevTools/_Package.txt
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.DevTools/Package.txt
rename to src/Orchard.Web/Packages/Orchard.DevTools/_Package.txt
diff --git a/src/Orchard.Web/Packages/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Packages/Orchard.Users/Controllers/AccountController.cs
index 15c6121af..6b12454aa 100644
--- a/src/Orchard.Web/Packages/Orchard.Users/Controllers/AccountController.cs
+++ b/src/Orchard.Web/Packages/Orchard.Users/Controllers/AccountController.cs
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Security.Principal;
 using System.Web.Mvc;
 using System.Web.Security;
+using Orchard.Logging;
 using Orchard.Mvc.ViewModels;
 using Orchard.Security;
 using Orchard.Users.ViewModels;
@@ -15,15 +16,25 @@ namespace Orchard.Users.Controllers {
         private readonly IMembershipService _membershipService;
 
 
-        public AccountController(IAuthenticationService authenticationService, IMembershipService membershipService) {
+        public AccountController(
+            IAuthenticationService authenticationService, 
+            IMembershipService membershipService) {
             _authenticationService = authenticationService;
             _membershipService = membershipService;
+            Logger = NullLogger.Instance;
         }
 
-        public ActionResult AccessDenied(string returnUrl) {
-            if (_authenticationService.GetAuthenticatedUser() == null)
-                return View("LogOn", new LogOnViewModel { Title = "Access Denied", ReturnUrl = returnUrl });
+        public ILogger Logger { get; set; }
 
+        public ActionResult AccessDenied(string returnUrl) {
+            var currentUser = _authenticationService.GetAuthenticatedUser();
+
+            if (currentUser == null) {
+                Logger.Information("Access denied to anonymous request on {0}", returnUrl);
+                return View("LogOn", new LogOnViewModel { Title = "Access Denied", ReturnUrl = returnUrl });
+            }
+
+            Logger.Information("Access denied to user #{0} '{1}' on {2}", currentUser.Id, currentUser.UserName, returnUrl);
             return View(new BaseViewModel());
         }