Added email challenge

--HG--
branch : dev

src/Orchard.Web/Core/Messaging/Services/DefaultMessageManager.cs

@@ -26,7 +26,7 @@ namespace Orchard.Core.Messaging.Services {
             _channels = channels;
         }
 
-        public void Send(ContentItemRecord recipient, string type, string service = null) {
+        public void Send(ContentItemRecord recipient, string type, string service = null, Dictionary<string, string> properties = null) {
             if ( !HasChannels() )
                 return;
 
@@ -40,7 +40,7 @@ namespace Orchard.Core.Messaging.Services {
             try {
 
                 // if the service is not explicit, use the default one, as per settings configuration
-                if ( String.IsNullOrWhiteSpace(service) ) {
+                if (String.IsNullOrWhiteSpace(service)) {
                     service = messageSettings.DefaultChannelService;
                 }
 
@@ -50,6 +50,11 @@ namespace Orchard.Core.Messaging.Services {
                     Service = service
                 };
 
+                if ( properties != null ) {
+                    foreach (var key in properties.Keys)
+                        context.Properties.Add(key, properties[key]);
+                }
+
                 _messageEventHandler.Sending(context);
 
                 foreach ( var channel in _channels ) {

src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs

@@ -116,10 +116,16 @@ namespace Orchard.Users.Controllers {
 
             if (ValidateRegistration(userName, email, password, confirmPassword)) {
                 // Attempt to register the user
-                var user = _membershipService.CreateUser(new CreateUserParams(userName, password, email, null, null, true));
+                var user = _membershipService.CreateUser(new CreateUserParams(userName, password, email, null, null, false));
-
 
                 if (user != null) {
+                    if ( user.As<UserPart>().EmailStatus == UserStatus.Pending ) {
+                        string challengeToken = _membershipService.GetEncryptedChallengeToken(user.As<UserPart>());
+                        _membershipService.SendChallengeEmail(user.As<UserPart>(), Url.AbsoluteAction(() => Url.Action("ChallengeEmail", "Account", new { Area = "Orchard.Users", token = challengeToken })));
+
+                        return RedirectToAction("ChallengeEmailSent");
+                    }
+
                     _authenticationService.SignIn(user, false /* createPersistentCookie */);
                     return Redirect("~/");
                 }
@@ -173,6 +179,21 @@ namespace Orchard.Users.Controllers {
             return View(new BaseViewModel());
         }
 
+        public ActionResult ChallengeEmailSent() {
+            return View(new BaseViewModel());
+        }
+
+        public ActionResult ChallengeEmail(string token) {
+            var user = _membershipService.ValidateChallengeToken(token);
+
+            if ( user != null ) {
+                _authenticationService.SignIn(user, false /* createPersistentCookie */);
+                return View("ChallengeEmailSuccess");
+            }
+
+            return View("ChallengeEmailFail");
+        }
+
         protected override void OnActionExecuting(ActionExecutingContext filterContext) {
             if (filterContext.HttpContext.User.Identity is WindowsIdentity) {
                 throw new InvalidOperationException("Windows authentication is not supported.");

src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs

@@ -10,6 +10,7 @@ using Orchard.Users.Drivers;
 using Orchard.Users.Models;
 using Orchard.Users.Services;
 using Orchard.Users.ViewModels;
+using Orchard.Mvc.Extensions;
 
 namespace Orchard.Users.Controllers {
     [ValidateInput(false)]

src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs

@@ -24,7 +24,8 @@ namespace Orchard.Users.DataMigrations {
             // Adds registration fields to previous versions
             SchemaBuilder
                 .AlterTable("UserPartRecord", table => table.AddColumn<string>("RegistrationStatus", c => c.WithDefault("'Approved'")))
-                .AlterTable("UserPartRecord", table => table.AddColumn<string>("EmailStatus", c => c.WithDefault("'Approved'")));
+                .AlterTable("UserPartRecord", table => table.AddColumn<string>("EmailStatus", c => c.WithDefault("'Approved'")))
+                .AlterTable("UserPartRecord", table => table.AddColumn<string>("EmailChallengeToken"));
 
             // Site Settings record
             SchemaBuilder.CreateTable("RegistrationSettingsPartRecord", table => table

src/Orchard.Web/Modules/Orchard.Users/Handlers/ModerationMessageAlteration.cs

@@ -27,7 +27,7 @@ namespace Orchard.Users.Handlers {
 
             if ( context.Type == MessageTypes.Validation ) {
                 context.MailMessage.Subject = "User account validation";
-                context.MailMessage.Body = string.Format("Dear {0}, please click on the folowwing link to validate you email address: {1}", recipient.UserName, "http://foo");
+                context.MailMessage.Body = string.Format("Dear {0}, please <a href=\"{1}\">click here</a> to validate you email address.", recipient.UserName, context.Properties["ChallengeUrl"]);
             }
 
         }

src/Orchard.Web/Modules/Orchard.Users/Models/UserPartRecord.cs

@@ -14,5 +14,6 @@ namespace Orchard.Users.Models {
 
         public virtual UserStatus RegistrationStatus { get; set; }
         public virtual UserStatus EmailStatus { get; set; }
+        public virtual string EmailChallengeToken { get; set; }
     }
 }

src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj

@@ -45,6 +45,7 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Security" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
@@ -98,6 +99,9 @@
     <Content Include="Views\Account\ChangePassword.ascx" />
     <Content Include="Views\Account\ChangePasswordSuccess.ascx" />
     <Content Include="Views\Account\AccessDenied.ascx" />
+    <Content Include="Views\Account\ChallengeEmailSuccess.ascx" />
+    <Content Include="Views\Account\ChallengeEmailSent.ascx" />
+    <Content Include="Views\Account\ChallengeEmailFail.ascx" />
     <Content Include="Views\Account\LogOn.ascx" />
     <Content Include="Views\Account\Register.ascx" />
     <Content Include="Views\Admin\Edit.aspx" />

src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Globalization;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Web.Security;
+using System.Xml.Linq;
 using JetBrains.Annotations;
 using Orchard.Data;
 using Orchard.Logging;
@@ -13,12 +15,13 @@ using Orchard.Users.Events;
 using Orchard.Users.Models;
 using Orchard.Settings;
 using Orchard.Messaging.Services;
-using System.Collections;
 using System.Collections.Generic;
+using System.Web.Mvc;
 
 namespace Orchard.Users.Services {
     [UsedImplicitly]
     public class MembershipService : IMembershipService {
+        private static readonly TimeSpan DelayToValidate = new TimeSpan(7, 0, 0, 0); // one week to validate email
         private readonly IContentManager _contentManager;
         private readonly IMessageManager _messageManager;
         private readonly IEnumerable<IUserEventHandler> _userEventHandlers;
@@ -53,8 +56,8 @@ namespace Orchard.Users.Services {
             user.Record.NormalizedUserName = createUserParams.Username.ToLower();
             user.Record.HashAlgorithm = "SHA1";
             SetPassword(user.Record, createUserParams.Password);
-            user.Record.RegistrationStatus = registrationSettings.UsersAreModerated ? UserStatus.Pending : UserStatus.Approved;
+            user.Record.RegistrationStatus = registrationSettings.UsersAreModerated && !createUserParams.IsApproved ? UserStatus.Pending : UserStatus.Approved;
-            user.Record.EmailStatus = registrationSettings.UsersMustValidateEmail ? UserStatus.Pending : UserStatus.Approved;
+            user.Record.EmailStatus = registrationSettings.UsersMustValidateEmail && !createUserParams.IsApproved ? UserStatus.Pending : UserStatus.Approved;
 
             var userContext = new UserContext {User = user, Cancel = false};
             foreach(var userEventHandler in _userEventHandlers) {
@@ -71,11 +74,7 @@ namespace Orchard.Users.Services {
                 userEventHandler.Created(userContext);
             }
 
-            if ( registrationSettings.UsersMustValidateEmail ) {
+            if ( registrationSettings.UsersAreModerated && registrationSettings.NotifyModeration && !createUserParams.IsApproved ) {
-                SendEmailValidationMessage(user);
-            }
-
-            if ( registrationSettings.UsersAreModerated && registrationSettings.NotifyModeration ) {
                 var superUser = GetUser(CurrentSite.SuperUser);
                 if(superUser != null)
                     _messageManager.Send(superUser.ContentItem.Record, MessageTypes.Moderation);
@@ -84,8 +83,52 @@ namespace Orchard.Users.Services {
             return user;
         }
 
-        public void SendEmailValidationMessage(IUser user) {
+        public void SendChallengeEmail(UserPart user, string url) {
-            _messageManager.Send(user.ContentItem.Record, MessageTypes.Validation);
+            _messageManager.Send(user.ContentItem.Record, MessageTypes.Validation, "Email", new Dictionary<string, string> { { "ChallengeUrl", url } });
+        }
+
+        public IUser ValidateChallengeToken(string challengeToken) {
+            string username;
+            DateTime validateByUtc;
+
+            if(!DecryptChallengeToken(challengeToken, out username, out validateByUtc)) {
+                return null;
+            }
+
+            if ( validateByUtc < DateTime.UtcNow )
+                return null;
+
+            var user = GetUser(username);
+            if ( user == null )
+                return null;
+
+            user.As<UserPart>().EmailStatus = UserStatus.Approved;
+
+            return user;
+        }
+
+        public string GetEncryptedChallengeToken(UserPart user) {
+            var challengeToken = new XElement("Token", new XAttribute("username", user.UserName), new XAttribute("validate-by-utc", DateTime.UtcNow.Add(DelayToValidate).ToString(CultureInfo.InvariantCulture))).ToString();
+            var data = Encoding.UTF8.GetBytes(challengeToken);
+            return MachineKey.Encode(data, MachineKeyProtection.All);
+        }
+
+        private static bool DecryptChallengeToken(string challengeToken, out string username, out DateTime validateByUtc) {
+            username = null;
+            validateByUtc = DateTime.UtcNow;
+
+            try {
+                var data = MachineKey.Decode(challengeToken, MachineKeyProtection.All);
+                var xml = Encoding.UTF8.GetString(data);
+                var element = XElement.Parse(xml);
+                username = element.Attribute("username").Value;
+                validateByUtc = DateTime.Parse(element.Attribute("validate-by-utc").Value, CultureInfo.InvariantCulture);
+                return true;
+            }
+            catch {
+                return false;
+            }
+
         }
 
         public IUser GetUser(string username) {
@@ -143,7 +186,7 @@ namespace Orchard.Users.Services {
             }
         }
 
-        private bool ValidatePassword(UserPartRecord partRecord, string password) {
+        private static bool ValidatePassword(UserPartRecord partRecord, string password) {
             // Note - the password format stored with the record is used
             // otherwise changing the password format on the site would invalidate
             // all logins
@@ -197,7 +240,7 @@ namespace Orchard.Users.Services {
 
             var hashAlgorithm = HashAlgorithm.Create(partRecord.HashAlgorithm);
             var hashBytes = hashAlgorithm.ComputeHash(combinedBytes);
-
+            
             return partRecord.Password == Convert.ToBase64String(hashBytes);
         }
 
@@ -208,5 +251,6 @@ namespace Orchard.Users.Services {
         private static bool ValidatePasswordEncrypted(UserPartRecord partRecord, string password) {
             throw new NotImplementedException();
         }
+
     }
 }

src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChallengeEmailFail.ascx

@@ -0,0 +1,3 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<bool>" %>
+<h1><%: Html.TitleForPage(T("Challenge Email").ToString()) %></h1>
+<p><%: T("Your email address could not be validated.") %></p>

src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChallengeEmailSent.ascx

@@ -0,0 +1,3 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
+<h1><%: Html.TitleForPage(T("Challenge Email Sent").ToString()) %></h1>
+<p><%: T("An email has been sent to you. Please click on the link it contains in order to have access on this site.") %></p>

src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChallengeEmailSuccess.ascx

@@ -0,0 +1,3 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<bool>" %>
+<h1><%: Html.TitleForPage(T("Challenge Email").ToString()) %></h1>
+<p><%: T("Your email address has been validated.") %></p>

src/Orchard.Web/Web.config

@@ -19,6 +19,10 @@
     <defaultSettings timeout="00:30:00"/>
   </system.transactions>
   <system.web>
+    <machineKey validationKey="00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" 
+                decryptionKey="0000000000000000000000000000000000000000000000000000000000000000" 
+                validation="SHA1" 
+                decryption="AES" />
     <httpRuntime requestValidationMode="2.0" />
     <!-- 
             Set compilation debug="true" to insert debugging 
@@ -45,33 +49,6 @@
     <authentication mode="Forms">
       <forms loginUrl="~/Users/Account/AccessDenied" timeout="2880"/>
     </authentication>
-    <membership defaultProvider="OrchardMembershipProvider">
-      <providers>
-        <clear/>
-        <!--<add name="AspNetSqlMembershipProvider"
-             type="System.Web.Security.SqlMembershipProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
-             connectionStringName="ApplicationServices"
-             enablePasswordRetrieval="false"
-             enablePasswordReset="true"
-             requiresQuestionAndAnswer="false"
-             requiresUniqueEmail="false"
-             passwordFormat="Hashed"
-             maxInvalidPasswordAttempts="5"
-             minRequiredPasswordLength="6"
-             minRequiredNonalphanumericCharacters="0"
-             passwordAttemptWindow="10"
-             passwordStrengthRegularExpression=""
-             applicationName="/"
-                />-->
-        <add name="OrchardMembershipProvider" type="Orchard.Security.Providers.OrchardMembershipProvider, Orchard.Framework" applicationName="/"/>
-      </providers>
-    </membership>
-    <profile>
-      <providers>
-        <clear/>
-        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="ApplicationServices" applicationName="/"/>
-      </providers>
-    </profile>
     <roleManager enabled="false">
       <providers>
         <clear/>

src/Orchard/Messaging/Services/IMessageManager.cs

@@ -6,7 +6,7 @@ namespace Orchard.Messaging.Services {
         /// <summary>
         /// Sends a message to a channel
         /// </summary>
-        void Send(ContentItemRecord recipient, string type, string service = null);
+        void Send(ContentItemRecord recipient, string type, string service = null, Dictionary<string, string> properties = null);
 
         /// <summary>
         /// Wether at least one channel is active on the current site

src/Orchard/Orchard.Framework.csproj

@@ -93,6 +93,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\linqnhibernate\NHibernate.Linq.dll</HintPath>
     </Reference>
+    <Reference Include="Orchard.Users">
+      <HintPath>..\Orchard.Web\Modules\Orchard.Email\Bin\Orchard.Users.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -746,7 +749,6 @@
     <Compile Include="Security\IUser.cs" />
     <Compile Include="Security\Permissions\IPermissionProvider.cs" />
     <Compile Include="Security\Permissions\Permission.cs" />
-    <Compile Include="Security\Providers\OrchardMembershipProvider.cs" />
     <Compile Include="Security\Providers\OrchardRoleProvider.cs" />
     <Compile Include="Services\Clock.cs" />
     <Compile Include="FileSystems\Media\FileSystemStorageProvider.cs" />

src/Orchard/Security/IMembershipService.cs

@@ -1,4 +1,6 @@
-namespace Orchard.Security {
+using Orchard.Users.Models;
+
+namespace Orchard.Security {
     public interface IMembershipService : IDependency {
         MembershipSettings GetSettings();
 
@@ -7,5 +9,9 @@
 
         IUser ValidateUser(string userNameOrEmail, string password);
         void SetPassword(IUser user, string password);
+
+        IUser ValidateChallengeToken(string challengeToken);
+        void SendChallengeEmail(UserPart user, string url);
+        string GetEncryptedChallengeToken(UserPart user);
     }
 }

src/Orchard/Security/Providers/OrchardMembershipProvider.cs

@@ -1,127 +0,0 @@
-using System;
-using System.Web.Security;
-using Orchard.Environment;
-
-namespace Orchard.Security.Providers {
-    public class OrchardMembershipProvider : MembershipProvider {
-
-        static IMembershipService GetService() {
-            throw new NotImplementedException("The OrchardMemberShipProvider is not supported anymore. Use the IMembershipService interface instead.");
-        }
-
-        static MembershipSettings GetSettings() {
-            return GetService().GetSettings();
-        }
-
-        private MembershipUser BuildMembershipUser(IUser user) {
-            return new MembershipUser(Name,
-                user.UserName,
-                user.Id,
-                user.Email,
-                null,
-                null,
-                true,
-                false,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow);
-        }
-
-        public override MembershipUser CreateUser(string username, string password, string email, string passwordQuestion, string passwordAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status) {
-            var user = GetService().CreateUser(new CreateUserParams(username, password, email, passwordQuestion, passwordAnswer, isApproved));
-
-            if (user == null) {
-                status = MembershipCreateStatus.ProviderError;
-                return null;
-            }
-
-            status = MembershipCreateStatus.Success;
-            return BuildMembershipUser(user);
-        }
-
-
-        public override bool ChangePasswordQuestionAndAnswer(string username, string password, string newPasswordQuestion, string newPasswordAnswer) {
-            throw new NotImplementedException();
-        }
-
-        public override string GetPassword(string username, string answer) {
-            throw new NotImplementedException();
-        }
-
-        public override bool ChangePassword(string username, string oldPassword, string newPassword) {
-            var service = GetService();
-            var user = service.ValidateUser(username, oldPassword);
-            if (user == null)
-                return false;
-
-            service.SetPassword(user, newPassword);
-            return true;
-        }
-
-        public override string ResetPassword(string username, string answer) {
-            throw new NotImplementedException();
-        }
-
-        public override void UpdateUser(MembershipUser user) {
-            throw new NotImplementedException();
-        }
-
-        public override bool ValidateUser(string username, string password) {
-            return (GetService().ValidateUser(username, password) != null);
-        }
-
-        public override bool UnlockUser(string userName) {
-            throw new NotImplementedException();
-        }
-
-        public override MembershipUser GetUser(object providerUserKey, bool userIsOnline) {
-            throw new NotImplementedException();
-        }
-
-        public override MembershipUser GetUser(string username, bool userIsOnline) {
-            throw new NotImplementedException();
-        }
-
-        public override string GetUserNameByEmail(string email) {
-            throw new NotImplementedException();
-        }
-
-        public override bool DeleteUser(string username, bool deleteAllRelatedData) {
-            throw new NotImplementedException();
-        }
-
-        public override MembershipUserCollection GetAllUsers(int pageIndex, int pageSize, out int totalRecords) {
-            throw new NotImplementedException();
-        }
-
-        public override int GetNumberOfUsersOnline() {
-            throw new NotImplementedException();
-        }
-
-        public override MembershipUserCollection FindUsersByName(string usernameToMatch, int pageIndex, int pageSize, out int totalRecords) {
-            throw new NotImplementedException();
-        }
-
-        public override MembershipUserCollection FindUsersByEmail(string emailToMatch, int pageIndex, int pageSize, out int totalRecords) {
-            throw new NotImplementedException();
-        }
-
-        public override string ApplicationName {
-            get { throw new NotImplementedException(); }
-            set { throw new NotImplementedException(); }
-        }
-
-        public override bool EnablePasswordRetrieval { get { return GetSettings().EnablePasswordRetrieval; } }
-        public override bool EnablePasswordReset { get { return GetSettings().EnablePasswordReset; } }
-        public override bool RequiresQuestionAndAnswer { get { return GetSettings().RequiresQuestionAndAnswer; } }
-        public override int MaxInvalidPasswordAttempts { get { return GetSettings().MaxInvalidPasswordAttempts; } }
-        public override int PasswordAttemptWindow { get { return GetSettings().PasswordAttemptWindow; } }
-        public override bool RequiresUniqueEmail { get { return GetSettings().RequiresUniqueEmail; } }
-        public override MembershipPasswordFormat PasswordFormat { get { return GetSettings().PasswordFormat; } }
-        public override int MinRequiredPasswordLength { get { return GetSettings().MinRequiredPasswordLength; } }
-        public override int MinRequiredNonAlphanumericCharacters { get { return GetSettings().MinRequiredNonAlphanumericCharacters; } }
-        public override string PasswordStrengthRegularExpression { get { return GetSettings().PasswordStrengthRegularExpression; } }
-    }
-}