From b168923d5f8880c64e0b08663ccd64fcc28b6a98 Mon Sep 17 00:00:00 2001
From: Darren Ferguson <df@darren-ferguson.com>
Date: Sun, 29 May 2016 15:46:42 +0100
Subject: [PATCH 1/2] http://issues.umbraco.org/issue/U4-7032 : Include a
 password checker for Active Directory - as ability to authenticate via AD was
 removed in 7.3

---
 ...eDirectoryBackOfficeUserPasswordChecker.cs | 25 +++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 src/Umbraco.Core/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs

diff --git a/src/Umbraco.Core/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs b/src/Umbraco.Core/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
new file mode 100644
index 0000000000..aef4f3dc76
--- /dev/null
+++ b/src/Umbraco.Core/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
@@ -0,0 +1,25 @@
+using System.Configuration;
+using System.DirectoryServices.AccountManagement;
+using System.Threading.Tasks;
+using Umbraco.Core.Models.Identity;
+
+namespace Umbraco.Core.Security
+{
+    public class ActiveDirectoryBackOfficeUserPasswordChecker : IBackOfficeUserPasswordChecker
+    {
+        public Task<BackOfficeUserPasswordCheckerResult> CheckPasswordAsync(BackOfficeIdentityUser user, string password)
+        {
+            bool isValid;
+            using (var pc = new PrincipalContext(ContextType.Domain, ConfigurationManager.AppSettings["ActiveDirectoryDomain"]))
+            {
+                isValid = pc.ValidateCredentials(user.UserName, password);
+            }
+
+            var result = isValid
+                ? BackOfficeUserPasswordCheckerResult.ValidCredentials
+                : BackOfficeUserPasswordCheckerResult.InvalidCredentials;
+
+            return Task.FromResult(result);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 141622687e..72bf9ddd42 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -110,6 +110,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
     </Reference>
+    <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
@@ -485,6 +486,7 @@
     <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
     <Compile Include="Publishing\UnPublishedStatusType.cs" />
     <Compile Include="Publishing\UnPublishStatus.cs" />
+    <Compile Include="Security\ActiveDirectoryBackOfficeUserPasswordChecker.cs" />
     <Compile Include="Security\BackOfficeClaimsIdentityFactory.cs" />
     <Compile Include="Security\BackOfficeCookieAuthenticationProvider.cs" />
     <Compile Include="Security\BackOfficeSignInManager.cs" />

From def690b8c368f784094e5f4c98b75a28f639eb47 Mon Sep 17 00:00:00 2001
From: Darren Ferguson <df@darren-ferguson.com>
Date: Mon, 30 May 2016 11:15:03 +0100
Subject: [PATCH 2/2] Fix U4-8532 - No built in Active Directory authentication
 in Umbraco 7.3+

---
 .../ActiveDirectoryBackOfficeUserPasswordChecker.cs       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs b/src/Umbraco.Core/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
index aef4f3dc76..819fa87a56 100644
--- a/src/Umbraco.Core/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
+++ b/src/Umbraco.Core/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
@@ -7,10 +7,16 @@ namespace Umbraco.Core.Security
 {
     public class ActiveDirectoryBackOfficeUserPasswordChecker : IBackOfficeUserPasswordChecker
     {
+        public virtual string ActiveDirectoryDomain {
+            get {
+                return ConfigurationManager.AppSettings["ActiveDirectoryDomain"];
+            }
+        }
+
         public Task<BackOfficeUserPasswordCheckerResult> CheckPasswordAsync(BackOfficeIdentityUser user, string password)
         {
             bool isValid;
-            using (var pc = new PrincipalContext(ContextType.Domain, ConfigurationManager.AppSettings["ActiveDirectoryDomain"]))
+            using (var pc = new PrincipalContext(ContextType.Domain, ActiveDirectoryDomain))
             {
                 isValid = pc.ValidateCredentials(user.UserName, password);
             }