Thread: [Nmailserver-commits] SF.net SVN: nmailserver: [43] NMail/trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 43
Author:   tmyroadctfig
Date:     2006-06-06 05:55:52 -0700 (Tue, 06 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/nmailserver/?rev=43&view=rev

Log Message:
-----------
Merged in changes from development branch.

Modified Paths:
--------------
    NMail/trunk/NMail/Authentication/IAuthenticationProvider.cs
    NMail/trunk/NMail/DataTypes/ACLs/GenericAce.cs
    NMail/trunk/NMail/DataTypes/ACLs/GenericAcl.cs
    NMail/trunk/NMail/DataTypes/ACLs/StoreFolderAcl.cs
    NMail/trunk/NMail/DataTypes/Folder.cs
    NMail/trunk/NMail/DataTypes/LocalStore/MailDomain.cs
    NMail/trunk/NMail/DataTypes/LocalStoreGroup.cs
    NMail/trunk/NMail/DataTypes/StoreFolder.cs
    NMail/trunk/NMail/ILocalStore.cs
    NMail/trunk/NMail/ILocalStoreData.cs
    NMail/trunk/NMail/ILocalStoreDeliveryAction.cs
    NMail/trunk/NMail/ILocalStoreRecipientValidator.cs
    NMail/trunk/NMail/IO/TcpChannel.cs
    NMail/trunk/NMail/IO/TcpClientChannel.cs
    NMail/trunk/NMail/IO/TcpClientTransportSink.cs
    NMail/trunk/NMail/IO/TcpClientTransportSinkProvider.cs
    NMail/trunk/NMail/IO/TcpServerChannel.cs
    NMail/trunk/NMail/IO/TcpServerTransportSink.cs
    NMail/trunk/NMail/NMail.csproj
    NMail/trunk/NMail.Administration.Console/Context/LocalStoreContext.cs
    NMail/trunk/NMail.Administration.Console/Context/TopLevelContext.cs
    NMail/trunk/NMail.Administration.Console/NMail.Administration.Console.csproj
    NMail/trunk/NMail.ImapService/Response/AclResponse.cs
    NMail/trunk/NMail.ImapService/State/AuthenticatedState.cs
    NMail/trunk/NMail.LocalStore/DeliveryActions/ClamAvScanner.cs
    NMail/trunk/NMail.LocalStore/DeliveryActions/Copy.cs
    NMail/trunk/NMail.LocalStore/DeliveryActions/ManageWhiteList.cs
    NMail/trunk/NMail.LocalStore/DeliveryActions/Move.cs
    NMail/trunk/NMail.LocalStore/LocalStore.cs
    NMail/trunk/NMail.LocalStore/NMail.LocalStore.csproj
    NMail/trunk/NMail.LocalStore/Validators/AddressDate.cs
    NMail/trunk/NMail.LocalStore/Validators/AddressKeyword.cs
    NMail/trunk/NMail.LocalStore/Validators/AddressSender.cs
    NMail/trunk/NMail.LocalStore/Validators/OnWhiteList.cs
    NMail/trunk/NMail.LocalStore/Validators/OrdbBlackList.cs
    NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStore.sql
    NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStoreData.cs
    NMail/trunk/NMail.Server/NMail.Server.csproj
    NMail/trunk/NMail.Server/NMailServer.cs
    NMail/trunk/NMail.Server/RemoteAdministration.cs
    NMail/trunk/NMail.Server.Console/NMail.Server.Console.csproj
    NMail/trunk/NMail.Server.Console/NMailConsoleServer.cs

Added Paths:
-----------
    NMail/trunk/NDns/NDns.xml
    NMail/trunk/NMail/DataTypes/ACLs/SystemPrivilege.cs
    NMail/trunk/NMail/DataTypes/ACLs/UserGroupAdminPrivilege.cs
    NMail/trunk/NMail.Administration.Console/Command/AddMailDomainCommand.cs
    NMail/trunk/NMail.Administration.Console/Command/AddUserToMailDomainCommand.cs
    NMail/trunk/NMail.Administration.Console/Command/RemoveUserFromMailDomainCommand.cs
    NMail/trunk/NMail.Administration.Web/
    NMail/trunk/NMail.Administration.Web/App_Code/
    NMail/trunk/NMail.Administration.Web/App_Code/FolderDataSource.cs
    NMail/trunk/NMail.Administration.Web/App_Code/MailDomainDataSource.cs
    NMail/trunk/NMail.Administration.Web/App_Code/UserDataSource.cs
    NMail/trunk/NMail.Administration.Web/App_Data/
    NMail/trunk/NMail.Administration.Web/Bin/
    NMail/trunk/NMail.Administration.Web/CreateFolder.aspx
    NMail/trunk/NMail.Administration.Web/CreateFolder.aspx.cs
    NMail/trunk/NMail.Administration.Web/CreateUser.aspx
    NMail/trunk/NMail.Administration.Web/CreateUser.aspx.cs
    NMail/trunk/NMail.Administration.Web/Default.aspx
    NMail/trunk/NMail.Administration.Web/FolderDetails.aspx
    NMail/trunk/NMail.Administration.Web/FolderDetails.aspx.cs
    NMail/trunk/NMail.Administration.Web/Global.asax
    NMail/trunk/NMail.Administration.Web/Images/
    NMail/trunk/NMail.Administration.Web/Images/nmail-logo.png
    NMail/trunk/NMail.Administration.Web/Login.aspx
    NMail/trunk/NMail.Administration.Web/Login.aspx.cs
    NMail/trunk/NMail.Administration.Web/MailDomainDetails.aspx
    NMail/trunk/NMail.Administration.Web/MailDomainDetails.aspx.cs
    NMail/trunk/NMail.Administration.Web/MasterPage.master
    NMail/trunk/NMail.Administration.Web/StyleSheet.css
    NMail/trunk/NMail.Administration.Web/UserDetails.aspx
    NMail/trunk/NMail.Administration.Web/UserDetails.aspx.cs
    NMail/trunk/NMail.Administration.Web/ViewFolders.aspx
    NMail/trunk/NMail.Administration.Web/ViewFolders.aspx.cs
    NMail/trunk/NMail.Administration.Web/ViewMailDomains.aspx
    NMail/trunk/NMail.Administration.Web/ViewMailDomains.aspx.cs
    NMail/trunk/NMail.Administration.Web/ViewUsers.aspx
    NMail/trunk/NMail.Administration.Web/Web.sitemap
    NMail/trunk/NMail.Administration.Web/web.config
    NMail/trunk/NMail.Administration.Web.sln

Removed Paths:
-------------
    NMail/trunk/NMail/DataTypes/ACLs/StoreFolderAce.cs
Added: NMail/trunk/NDns/NDns.xml
===================================================================

--- NMail/trunk/NDns/NDns.xml	                        (rev 0)
+++ NMail/trunk/NDns/NDns.xml	2006-06-06 12:55:52 UTC (rev 43)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>NDns</name>
+    </assembly>
+    <members>
+    </members>
+</doc>

Modified: NMail/trunk/NMail/Authentication/IAuthenticationProvider.cs
===================================================================
--- NMail/trunk/NMail/Authentication/IAuthenticationProvider.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/Authentication/IAuthenticationProvider.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -17,6 +17,8 @@
 
 using System;
 
+using NMail.DataTypes.ACLs;
+
 namespace NMail.Authentication {
 	/// <summary>
 	/// The interface for an authentication provider that operates on username and 

Modified: NMail/trunk/NMail/DataTypes/ACLs/GenericAce.cs
===================================================================
--- NMail/trunk/NMail/DataTypes/ACLs/GenericAce.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/DataTypes/ACLs/GenericAce.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -23,14 +23,16 @@
 	/// <summary>
 	/// A generic access control entry for an ACL.
 	/// </summary>
-	public class GenericAce {
+	public class GenericAce<PrivilegeType> {
 		/// <summary>
 		/// Creates a new access control entry.
 		/// </summary>
 		/// <param name="identifier">The identifier to associated the ACE with.</param>
+		/// <param name="privilege">The privileges.</param>
 		/// <param name="acePrivilegeType">Whether to allow or deny the privileges.</param>
-		public GenericAce(string identifier, AcePrivilegeType acePrivilegeType) {
+		public GenericAce(string identifier, PrivilegeType privilege, AcePrivilegeType acePrivilegeType) {
 			this.identifier = identifier;
+			this.privilege = privilege;
 			this.acePrivilegeType = acePrivilegeType;
 		}
 
@@ -48,6 +50,20 @@
 			}
 		}
 
+		private PrivilegeType privilege;
+
+		/// <summary>
+		/// The privilege associated with this ACE.
+		/// </summary>
+		public PrivilegeType Privilege {
+			get {
+				return this.privilege;
+			}
+			set {
+				this.privilege = value;
+			}
+		}
+
 		private AcePrivilegeType acePrivilegeType;
 
 		/// <summary>

Modified: NMail/trunk/NMail/DataTypes/ACLs/GenericAcl.cs
===================================================================
--- NMail/trunk/NMail/DataTypes/ACLs/GenericAcl.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/DataTypes/ACLs/GenericAcl.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -23,40 +23,23 @@
 	/// <summary>
 	/// A list of access control entries.
 	/// </summary>
-	public class GenericAcl<AceType> where AceType : GenericAce {
+	public class GenericAcl<PrivilegeType> {
 		/// <summary>
 		/// A map of identifiers to access control entries.
 		/// </summary>
-		protected Dictionary<string, AceType> entries = new Dictionary<string, AceType>(StringComparer.InvariantCultureIgnoreCase);
+		protected Dictionary<string, GenericAce<PrivilegeType>> entries = new Dictionary<string, GenericAce<PrivilegeType>>(StringComparer.InvariantCultureIgnoreCase);
 
 		/// <summary>
-		/// Creates a new ACL for the given resource name.
+		/// Creates a new ACL.
 		/// </summary>
-		/// <param name="resourceName">The name of the resource this ACL is for.</param>
-		public GenericAcl(string resourceName) {
-			this.resourceName = resourceName;
-		}
+		public GenericAcl() {}
 
-		private string resourceName;
-
 		/// <summary>
-		/// The name of the resource this ACL is associated wtih.
-		/// </summary>
-		public string ResourceName {
-			get {
-				return this.resourceName;
-			}
-			set {
-				this.resourceName = value;
-			}
-		}
-
-		/// <summary>
 		/// Replaces the existing ACE for the associated identifier. If no ACE exists
 		/// for the given identifer the new ACE is simply added.
 		/// </summary>
 		/// <param name="ace">The ACE to set.</param>
-		public void SetAce(AceType ace) {
+		public void SetAce(GenericAce<PrivilegeType> ace) {
 			lock (this) {
 				if (this.entries.ContainsKey(ace.Identifier)) {
 					this.entries.Remove(ace.Identifier);
@@ -90,7 +73,7 @@
 		/// </summary>
 		/// <param name="identifier">The identifier to look up.</param>
 		/// <returns>The identifier or null if non is found.</returns>
-		public AceType this[string identifier] {
+		public GenericAce<PrivilegeType> this[string identifier] {
 			get {
 				lock (this) {
 					if (this.entries.ContainsKey(identifier)) {

Deleted: NMail/trunk/NMail/DataTypes/ACLs/StoreFolderAce.cs
===================================================================
--- NMail/trunk/NMail/DataTypes/ACLs/StoreFolderAce.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/DataTypes/ACLs/StoreFolderAce.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -1,53 +0,0 @@
-/*
- * Copyright 2004-2006 Luke Quinane and Daniel Frampton
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NMail.DataTypes.ACLs {
-	/// <summary>
-	/// An access control entry for a store folder ACL.
-	/// </summary>
-	public class StoreFolderAce : GenericAce {
-		/// <summary>
-		/// Creates a new access control entry.
-		/// </summary>
-		/// <param name="identifier">The identifier to associated the ACE with.</param>
-		/// <param name="privilege">The privileges.</param>
-		/// <param name="aceType">Whether to allow or deny the privileges.</param>
-		public StoreFolderAce(string identifier, StoreFolderPrivilege privilege, AcePrivilegeType aceType)
-			: base(identifier, aceType) {
-
-			this.privilege = privilege;
-		}
-
-		private StoreFolderPrivilege privilege;
-
-		/// <summary>
-		/// The privilege associated with this ACE.
-		/// </summary>
-		public StoreFolderPrivilege Privilege {
-			get {
-				return this.privilege;
-			}
-			set {
-				this.privilege = value;
-			}
-		}
-	}
-}

Modified: NMail/trunk/NMail/DataTypes/ACLs/StoreFolderAcl.cs
===================================================================
--- NMail/trunk/NMail/DataTypes/ACLs/StoreFolderAcl.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/DataTypes/ACLs/StoreFolderAcl.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -21,14 +21,14 @@
 
 namespace NMail.DataTypes.ACLs {
 	/// <summary>
-	/// A list of access control entries.
+	/// A list of access control entries for a folder.
 	/// </summary>
-	public class StoreFolderAcl : GenericAcl<StoreFolderAce> {
+	public class StoreFolderAcl : GenericAcl<StoreFolderPrivilege> {
 		/// <summary>
 		/// Creates a new ACL for the given folder.
 		/// </summary>
 		/// <param name="folder">The folder associated with the ACL.</param>
-		public StoreFolderAcl(StoreFolder folder) : base(folder.FolderId.ToString()) {
+		public StoreFolderAcl(StoreFolder folder) : base() {
 			this.folder = folder;
 		}
 

Copied: NMail/trunk/NMail/DataTypes/ACLs/SystemPrivilege.cs (from rev 42, NMail/branches/luke-dev/NMail/DataTypes/ACLs/SystemPrivilege.cs)
===================================================================
--- NMail/trunk/NMail/DataTypes/ACLs/SystemPrivilege.cs	                        (rev 0)
+++ NMail/trunk/NMail/DataTypes/ACLs/SystemPrivilege.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NMail.DataTypes.ACLs {
+	/// <summary>
+	/// The possible privileges a user or group can have on the NMail system.
+	/// </summary>
+	[FlagsAttribute]
+	public enum SystemPrivilege : uint {
+		/// <summary>
+		/// No rights are granted.
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// The right to view the system privilege ACL.
+		/// </summary>
+		ViewSystemPrivileges = 1,
+		
+		/// <summary>
+		/// The right to modify the system privilege ACL.
+		/// </summary>
+		ModifySystemPrivileges = 2,
+
+		/// <summary>
+		/// The right to edit any ACLs.
+		/// </summary>
+		EditAllAcls = 4,
+
+		/// <summary>
+		/// The right to create a new mail domain.
+		/// </summary>
+		CreateMailDomain = 8
+	}
+}

Copied: NMail/trunk/NMail/DataTypes/ACLs/UserGroupAdminPrivilege.cs (from rev 42, NMail/branches/luke-dev/NMail/DataTypes/ACLs/UserGroupAdminPrivilege.cs)
===================================================================
--- NMail/trunk/NMail/DataTypes/ACLs/UserGroupAdminPrivilege.cs	                        (rev 0)
+++ NMail/trunk/NMail/DataTypes/ACLs/UserGroupAdminPrivilege.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NMail.DataTypes.ACLs {
+	/// <summary>
+	/// The possible privileges a user or group can have for editing other users and
+	/// groups.
+	/// </summary>
+	[FlagsAttribute]
+	public enum UserGroupAdminPrivilege : uint {
+		/// <summary>
+		/// No rights are granted.
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// The right to view all users in the system.
+		/// </summary>
+		ViewAllUsers = 1,
+
+		/// <summary>
+		/// The right to create new users.
+		/// </summary>
+		CreateUsers = 2,
+
+		/// <summary>
+		/// The right to edit existing users.
+		/// </summary>
+		EditUsers = 4,
+
+		/// <summary>
+		/// The right to delete existing users.
+		/// </summary>
+		DeleteUsers = 8,
+
+		/// <summary>
+		/// The right to view all groups in the system.
+		/// </summary>
+		ViewAllGroups = 16,
+
+		/// <summary>
+		/// The right to create new groups.
+		/// </summary>
+		CreateGroups = 32,
+
+		/// <summary>
+		/// The right to edit existing groups.
+		/// </summary>
+		EditGroups = 64,
+
+		/// <summary>
+		/// The right to delete existing groups.
+		/// </summary>
+		DeleteGroups = 128
+	}
+}

Modified: NMail/trunk/NMail/DataTypes/Folder.cs
===================================================================
--- NMail/trunk/NMail/DataTypes/Folder.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/DataTypes/Folder.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -23,6 +23,7 @@
 	/// <summary>
 	/// Represents a folder in the local store.
 	/// </summary>
+	[Serializable]
 	public class Folder {
 		#region Constructors
 		/// <summary>

Modified: NMail/trunk/NMail/DataTypes/LocalStore/MailDomain.cs
===================================================================
--- NMail/trunk/NMail/DataTypes/LocalStore/MailDomain.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/DataTypes/LocalStore/MailDomain.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -20,6 +20,7 @@
 using System.Text;
 
 using NMail;
+using NMail.Authentication;
 using NMail.DataTypes;
 
 namespace NMail.DataTypes.LocalStore {
@@ -27,6 +28,7 @@
 	/// A mail domain maps users and administrators to a set of hosts that the store
 	/// accepts mail for.
 	/// </summary>
+    [Serializable]
 	public class MailDomain {
 		public MailDomain(int mailDomainId, Host primaryHost) {
 			this.mailDomainId = mailDomainId;
@@ -61,76 +63,147 @@
 			}
 		}
 
-		WildcardHost[] additionalHosts;
+		private List<WildcardHost> additionalHosts = new List<WildcardHost>();
 
 		/// <summary>
 		/// Other hosts that this domain accepts mail for.
 		/// </summary>
 		public WildcardHost[] AdditionalHosts {
 			get {
-				return this.additionalHosts;
+				return this.additionalHosts.ToArray();
 			}
 			set {
-				this.additionalHosts = value;
+                this.additionalHosts.Clear();
+                this.additionalHosts.AddRange(value);
 			}
 		}
 
-		private ILocalStoreUserMap[] mailboxMappings;
+		private List<ILocalStoreUserMap> mailboxMappings = new List<ILocalStoreUserMap>();
 
 		/// <summary>
 		/// Gets the mailbox mappings for this domain.
 		/// </summary>
 		public ILocalStoreUserMap[] MailboxMappings {
 			get {
-				return this.mailboxMappings;
+				return this.mailboxMappings.ToArray();
 			}
 			set {
-				this.mailboxMappings = value;
+				this.mailboxMappings.Clear();
+                this.mailboxMappings.AddRange(value);
 			}
 		}
 
-		private ILocalStoreDeliveryAction[] allowedActions;
+		private List<ILocalStoreDeliveryAction> allowedActions = new List<ILocalStoreDeliveryAction>();
 
 		/// <summary>
 		/// The actions that user's of this domain are allowed to use.
 		/// </summary>
 		public ILocalStoreDeliveryAction[] AllowedActions {
 			get {
-				return this.allowedActions;
+				return this.allowedActions.ToArray();
 			}
-			set {
-				this.allowedActions = value;
-			}
+            set {
+                this.allowedActions.Clear();
+                this.allowedActions.AddRange(value);
+            }
 		}
 
-		private ILocalStoreRecipientValidator[] allowedValidators;
+		private List<ILocalStoreRecipientValidator> allowedValidators = new List<ILocalStoreRecipientValidator>();
 
 		/// <summary>
 		/// The validators that user's of this domain are allowed to use.
 		/// </summary>
 		public ILocalStoreRecipientValidator[] AllowedValidators {
 			get {
-				return this.allowedValidators;
+				return this.allowedValidators.ToArray();
 			}
 			set {
-				this.allowedValidators = value;
+				this.allowedValidators.Clear();
+                this.allowedValidators.AddRange(value);
 			}
 		}
 
-		private ILocalStoreDeliveryAction[] defaultActions;
+		private List<ILocalStoreDeliveryAction> defaultActions = new List<ILocalStoreDeliveryAction>();
 
 		/// <summary>
 		/// The default set of actions to apply to incoming messages.
 		/// </summary>
 		public ILocalStoreDeliveryAction[] DefaultActions {
 			get {
-				return this.defaultActions;
+				return this.defaultActions.ToArray();
 			}
 			set {
-				this.defaultActions = value;
+				this.defaultActions.Clear();
+                this.defaultActions.AddRange(value);
 			}
 		}
 
 		// TODO: add in a recipient validator tree here
+
+
+        /// <summary>
+        /// Maps a given mailbox to a user.
+        /// </summary>
+        /// <param name="mailbox">The mailbox to lookup.</param>
+        /// <returns>The username or null.</returns>
+        public string MapMailboxToUser(string mailbox) {
+            string result = null;
+
+            // Search for a valid mapping for the mailbox
+            for (int i = 0; result == null && i < this.mailboxMappings.Count; i++) {
+                result = this.mailboxMappings[i].MapMailboxToUser(mailbox);
+            }
+
+            return result;
+        }
+
+        public ILocalStoreRecipientValidator GetRecipientValidator(string name) {
+            name = name.Trim().ToLower();
+
+            foreach (ILocalStoreRecipientValidator validator in this.allowedValidators) {
+                if (validator.Name.Trim().ToLower() == name) {
+                    return validator;
+                }
+            }
+
+            return null;
+        }
+
+
+        public ILocalStoreDeliveryAction GetDeliveryAction(string name) {
+            name = name.Trim().ToLower();
+
+            foreach (ILocalStoreDeliveryAction action in this.allowedActions) {
+                if (action.Name.Trim().ToLower() == name) {
+                    return action;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Processes the incomming message against the list of delivery actions.
+        /// </summary>
+        /// <param name="delivery">The delivery in progress.</param>
+        /// <param name="username">The associated username.</param>
+        /// <returns>The result of the delivery attempt.</returns>
+        public DeliveryResult ProcessDelivery(LocalStoreDelivery delivery, IAuthenticationToken username) {
+            for (int i = 0; i < this.defaultActions.Count; i++) {
+                string name = this.defaultActions[i].Name;
+                string data = null;
+                if (delivery.Recipient != null) {
+                    data = delivery.Recipient.Mailbox.GetDataPairValue(name);
+                }
+
+                DeliveryResult result = this.defaultActions[i].ProcessDelivery(delivery, username, data);
+
+                if (result.Type != DeliveryResultType.Success) {
+                    return result;
+                }
+            }
+
+            return new DeliveryResult(DeliveryResultType.Success, null);
+        }
 	}
 }

Modified: NMail/trunk/NMail/DataTypes/LocalStoreGroup.cs
===================================================================
--- NMail/trunk/NMail/DataTypes/LocalStoreGroup.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/DataTypes/LocalStoreGroup.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -35,6 +35,8 @@
         public LocalStoreGroup(string name, int groupId, int[] userIds, int[] groupIds) {
             this.name = name;
             this.groupId = groupId;
+			this.userIds = userIds;
+			this.groupIds = groupIds;
         }
 
         private string name;

Modified: NMail/trunk/NMail/DataTypes/StoreFolder.cs
===================================================================
--- NMail/trunk/NMail/DataTypes/StoreFolder.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/DataTypes/StoreFolder.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -23,6 +23,7 @@
 	/// <summary>
 	/// A folder that has been obtained from the local store.
 	/// </summary>
+	[Serializable]
 	public class StoreFolder : Folder {	
 		/// <summary>
 		/// Creates a new store folder.

Modified: NMail/trunk/NMail/ILocalStore.cs
===================================================================
--- NMail/trunk/NMail/ILocalStore.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/ILocalStore.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -83,6 +83,14 @@
 		StoreFolder GetStoreFolder(IAuthenticationToken authToken, string folder);
 
 		/// <summary>
+		/// Gets the store folder from the given folder Id.
+		/// </summary>
+		/// <param name="authToken">The authentication credentials.</param>
+		/// <param name="folderId">The Id of the folder to lookup.</param>
+		/// <returns>The store folder or null if the folder Id is invalid.</returns>
+		StoreFolder GetStoreFolder(IAuthenticationToken authToken, int folderId);
+
+		/// <summary>
 		/// Creates a new folder.
 		/// </summary>
 		/// <remarks>
@@ -97,9 +105,9 @@
 		/// Deletes an existing folder.
 		/// </summary>
 		/// <param name="authToken">The authentication credentials.</param>
-		/// <param name="folder">The folder to delete.</param>
+		/// <param name="folderId">The Id of the folder to delete.</param>
 		/// <returns>The result of the delete attempt.</returns>
-		LocalStoreFolderResult DeleteFolder(IAuthenticationToken authToken, StoreFolder folder);
+		LocalStoreFolderResult DeleteFolder(IAuthenticationToken authToken, int folderId);
 
 		/// <summary>
 		/// Renames an existing folder in the local store.
@@ -132,6 +140,13 @@
 		/// <param name="parent">The parent to get the children from.</param>
 		/// <returns>The list of folders.</returns>
 		StoreFolder[] GetChildren(IAuthenticationToken authToken, StoreFolder parent);
+
+		/// <summary>
+		/// Gets a list of all folders
+		/// </summary>
+		/// <param name="authToken">The authentication credentials.</param>
+		/// <returns>The list of folders.</returns>
+		StoreFolder[] GetFolders(IAuthenticationToken authToken);
 		#endregion
 
 		#region Folder Subscription
@@ -302,7 +317,7 @@
 		/// <param name="authToken">The authentication credentials.</param>
 		/// <param name="folder">The folder to set the ACE on.</param>
 		/// <param name="ace">The privileges and the identifier to put.</param>
-		void SetStoreFolderAce(IAuthenticationToken authToken, StoreFolder folder, StoreFolderAce ace);
+		void SetStoreFolderAce(IAuthenticationToken authToken, StoreFolder folder, GenericAce<StoreFolderPrivilege> ace);
 
 		/// <summary>
 		/// Removes any ACE associated with the given user.
@@ -420,7 +435,8 @@
 		/// <param name="authToken">The authentication credentials.</param>
 		/// <param name="userId">The Id of the user to add.</param>
 		/// <param name="mailDomainId">The Id of the mail domain to add the user to.</param>
-		void AddUserToMailDomain(IAuthenticationToken authToken, int userId, int mailDomainId);
+		/// <returns>The result of the attempt to add the user to the mail domain.</returns>
+		LocalStoreUserResult AddUserToMailDomain(IAuthenticationToken authToken, int userId, int mailDomainId);
 
 		/// <summary>
 		/// Removes user from the given mail domain.
@@ -428,7 +444,16 @@
 		/// <param name="authToken">The authentication credentials.</param>
 		/// <param name="userId">The Id of the user to remove.</param>
 		/// <param name="mailDomainId">The Id of the mail domain to revome the user from.</param>
-		void RemoveUserFromMailDomain(IAuthenticationToken authToken, int userId, int mailDomainId);
+		/// <returns>The result of the attempt to remove the user from the mail domain.</returns>
+		LocalStoreUserResult RemoveUserFromMailDomain(IAuthenticationToken authToken, int userId, int mailDomainId);
+
+		/// <summary>
+		/// Gets a list of folder that belong to the user with the given user Id.
+		/// </summary>
+		/// <param name="authToken">The authentication credentials.</param>
+		/// <param name="userId">The Id of the user to get the folder for.</param>
+		/// <returns>The list of folders or null if the user Id is invalid or unauthorized.</returns>
+		StoreFolder[] GetUserFolders(IAuthenticationToken authToken, int userId);
         #endregion
 
 		#region Group Management
@@ -471,21 +496,40 @@
 		/// <returns>The result of the attempt to delete a group.</returns>
 		LocalStoreGroupResult DeleteGroup(IAuthenticationToken authToken, int groupId);
 
-		/// <summary>
-		/// Updates the any changes to the group into the local store.
-		/// </summary>
-		/// <param name="authToken">The authentication credentials.</param>
-		/// <param name="group">The group details to update.</param>
-		/// <returns>The result of the attempt to update the group.</returns>
-		LocalStoreGroupResult UpdateGroup(IAuthenticationToken authToken, LocalStoreGroup group);
+        /// <summary>
+        /// Renames the group.
+        /// </summary>
+        /// <param name="authToken">The authentication credentials.</param>
+        /// <param name="groupId">The Id of the group to delete.</param>
+        /// <param name="newName">The new name for the group.</param>
+        /// <returns>The result of the attempt to rename the group.</returns>
+        LocalStoreGroupResult RenameGroup(IAuthenticationToken authToken, LocalStoreGroup group);
 
+        /// <summary>
+        /// Adds a child group to the given group.
+        /// </summary>
+        /// <param name="authToken">The authentication credentials.</param>
+        /// <param name="groupId">The child group to add.</param>
+        /// <param name="parentId">The group to add the child to.</param>
+        /// <returns>The result of the attempt to add.</returns>
+        LocalStoreGroupResult AddGroupToGroup(IAuthenticationToken authToken, int parentId, int groupId);
+
+        /// <summary>
+        /// Removes a child group from the given group.
+        /// </summary>
+        /// <param name="authToken">The authentication credentials.</param>
+        /// <param name="groupId">The child group to remove.</param>
+        /// <param name="parentId">The group to remove the child from.</param>
+        /// <returns>The result of the attempt to remove.</returns>
+        LocalStoreGroupResult RemoveGroupFromGroup(IAuthenticationToken authToken, int parentId, int groupId);
+
 		/// <summary>
 		/// Adds a group to the given mail domain.
 		/// </summary>
 		/// <param name="authToken">The authentication credentials.</param>
 		/// <param name="groupId">The Id of the group to add.</param>
 		/// <param name="mailDomainId">The Id of the mail domain to add the group to.</param>
-		void AddGroupToMailDomain(IAuthenticationToken authToken, int groupId, int mailDomainId);
+		LocalStoreGroupResult AddGroupToMailDomain(IAuthenticationToken authToken, int groupId, int mailDomainId);
 
 		/// <summary>
 		/// Removes group from the given mail domain.
@@ -493,7 +537,7 @@
 		/// <param name="authToken">The authentication credentials.</param>
 		/// <param name="groupId">The Id of the group to remove.</param>
 		/// <param name="mailDomainId">The Id of the mail domain to revome the group from.</param>
-		void RemoveGroupFromMailDomain(IAuthenticationToken authToken, int groupId, int mailDomainId);
+		LocalStoreGroupResult RemoveGroupFromMailDomain(IAuthenticationToken authToken, int groupId, int mailDomainId);
 		#endregion
 
 		#region Mail Domain Management
@@ -504,13 +548,13 @@
 		/// <returns>The mail domains.</returns>
 		MailDomain[] GetMailDomains(IAuthenticationToken authToken);
 
-		/// <summary>
-		/// Creates a new mail domain.
-		/// </summary>
-		/// <param name="authToken">The authentication credentials.</param>
-		/// <param name="primaryHost">The primary host for the mail domain.</param>
-		/// <returns>The result of the attempt to create the mail domain.</returns>
-		LocalStoreMailDomainResult CreateMailDomain(IAuthenticationToken authToken, Host primaryHost);
+        /// <summary>
+        /// Adds a new mail domain.
+        /// </summary>
+        /// <param name="authToken">The authentication credentials.</param>
+        /// <param name="mailDomain">The mail domain to add.</param>
+        /// <returns>The result of the attempt to add the mail domain.</returns>
+        LocalStoreMailDomainResult AddMailDomain(IAuthenticationToken authToken, MailDomain mailDomain);
 
 		/// <summary>
 		/// Deletes a mail domain from the local store.
@@ -546,6 +590,54 @@
 		/// <returns>The list of user Ids.</returns>
 		int[] GetMailDomainUsers(IAuthenticationToken authToken, int mailDomainId);
 		#endregion
+
+		#region System ACL
+		/// <summary>
+		/// Sets the system privileges for the associated identifier. If no ACE exists for
+		/// the associated identifier one is added.
+		/// </summary>
+		/// <param name="authToken">The authentication credentials.</param>
+		/// <param name="ace">The privileges and the identifier to put.</param>
+		void SetSystemPrivilegeAce(IAuthenticationToken authToken, GenericAce<SystemPrivilege> ace);
+		
+		/// <summary>
+		/// Removes any ACE associated with the given identifier.
+		/// </summary>
+		/// <param name="authToken">The authentication credentials.</param>
+		/// <param name="identifier">The identifier to remove from the ACL.</param>
+		void RemoveSystemPrivilegeAce(IAuthenticationToken authToken, string identifier);
+
+		/// <summary>
+		/// Gets the system ACL.
+		/// </summary>
+		/// <param name="authToken">The authentication credentials.</param>
+		/// <returns>The system ACL or null if insufficient privileges.</returns>
+		GenericAcl<SystemPrivilege> GetSystemPrivilegeAcl(IAuthenticationToken authToken);
+		#endregion
+		
+		#region User and Group Administration
+		/// <summary>
+		/// Get the ACL that lists user's privileges for user and group administration.
+		/// </summary>
+		/// <param name="user">The user trying to get the admin ACL.</param>
+		/// <returns>The ACL or null if insufficient privileges.</returns>
+		GenericAcl<UserGroupAdminPrivilege> GetAdministrationAcl(IAuthenticationToken user);
+
+		/// <summary>
+		/// Sets the administration privileges for the associated identifier.
+		/// If no ACE exists for the associated identifier one is added.
+		/// </summary>
+		/// <param name="authToken">The authentication credentials.</param>
+		/// <param name="ace">The privileges and the identifier to put.</param>
+		void SetAdministrationAce(IAuthenticationToken authToken, GenericAce<SystemPrivilege> ace);
+
+		/// <summary>
+		/// Removes any ACE associated with the given identifier.
+		/// </summary>
+		/// <param name="authToken">The authentication credentials.</param>
+		/// <param name="identifier">The identifier to remove from the ACL.</param>
+		void RemoveAdministrationAce(IAuthenticationToken authToken, string identifier);
+		#endregion
 	}
 
 	/// <summary>
@@ -555,29 +647,29 @@
 		/// <summary>
 		/// The operation was completed successfully.
 		/// </summary>
-		OkSuccessful,
+		OkSuccessful = 0,
 
 		/// <summary>
 		/// The create or rename failed because a folder with the same name already existed.
 		/// </summary>
-		AlreadyExists,
+		AlreadyExists = 1,
 
 		/// <summary>
 		/// The folder was not deleted because it contained child folders.
 		/// </summary>
-		HasChildren,
+		HasChildren = 2,
 
 		/// <summary>
 		/// The operation failed because the source folder was not found on the server.
 		/// If the operation is on a subfolder that the user can't see due to permissions
 		/// this will be returned.
 		/// </summary>
-		NonExistent,
+		NonExistent = 3,
 
 		/// <summary>
 		/// The user is not permitted to perform the operation.
 		/// </summary>
-		NotPermitted
+		NotPermitted = 4
 	}
 
 	/// <summary>
@@ -587,27 +679,42 @@
 		/// <summary>
 		/// The operation completed successfully.
 		/// </summary>
-		OkSuccessful,
+		OkSuccessful = 0,
 
 		/// <summary>
 		/// A user with the same name already exists.
 		/// </summary>
-		AlreadyExists,
+		AlreadyExists = 1,
 
 		/// <summary>
 		/// No matching user exists in the local store.
 		/// </summary>
-		NoSuchUser,
+		NoSuchUser = 2,
 
 		/// <summary>
+		/// Cannot add or remove the user from the mail domain because it doens't exist.
+		/// </summary>
+		NoSuchMailDomain = 3,
+
+		/// <summary>
 		/// The user cannot be deleted because they still own folders.
 		/// </summary>
-		UserStillHasFolders,
+		UserStillHasFolders = 4,
 
 		/// <summary>
 		/// The user is not permitted to perform the operation.
 		/// </summary>
-		NotPermitted
+		NotPermitted = 5,
+
+        /// <summary>
+        /// The user cannot be created because there is existing folders with the same details.
+        /// </summary>
+        FoldersAlreadyExist = 6,
+
+        /// <summary>
+        /// An unknown error occurred trying to perform the operation.
+        /// </summary>
+        UnkownError = 7
 	}
 
 	/// <summary>
@@ -617,22 +724,27 @@
 		/// <summary>
 		/// The operation completed successfully.
 		/// </summary>
-		OkSuccessful,
+		OkSuccessful = 0,
 
 		/// <summary>
 		/// A group with the same name already exists.
 		/// </summary>
-		AlreadyExists,
+		AlreadyExists = 1,
 
 		/// <summary>
 		/// No matching group exists in the local store.
 		/// </summary>
-		NoSuchUser,
+		NoSuchGroup = 2,
 
 		/// <summary>
+		/// Cannot add or remove the group from the mail domain because it doens't exist.
+		/// </summary>
+		NoSuchMailDomain = 3,
+
+		/// <summary>
 		/// The user is not permitted to perform the operation.
 		/// </summary>
-		NotPermitted
+		NotPermitted = 4
 	}
 
 	/// <summary>
@@ -642,21 +754,21 @@
 		/// <summary>
 		/// The operation completed successfully.
 		/// </summary>
-		OkSuccessful,
+		OkSuccessful = 0,
 
 		/// <summary>
 		/// A mail domain with the same primary host already exists.
 		/// </summary>
-		AlreadyExists,
+		AlreadyExists = 1,
 
 		/// <summary>
 		/// No matching mail domain exists in the local store.
 		/// </summary>
-		NoSuchMailDomain,
+		NoSuchMailDomain = 2,
 
 		/// <summary>
 		/// The user is not permitted to perform the operation.
 		/// </summary>
-		NotPermitted
+		NotPermitted = 3
 	}
 }

Modified: NMail/trunk/NMail/ILocalStoreData.cs
===================================================================
--- NMail/trunk/NMail/ILocalStoreData.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/ILocalStoreData.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -58,6 +58,13 @@
 		StoreFolder GetStoreFolder(Folder folder);
 
 		/// <summary>
+		/// Gets the store folder from the given folder Id.
+		/// </summary>
+		/// <param name="folderId">The Id of the folder to lookup.</param>
+		/// <returns>The store folder or null if the folder Id is invalid.</returns>
+		StoreFolder GetStoreFolder(int folderId);
+
+		/// <summary>
 		/// Gets the parent folder for the given folder.
 		/// </summary>
 		/// <param name="folder">The folder to lookup the parent of.</param>
@@ -71,15 +78,15 @@
 		/// It is a requirement of the local store that each new folder get an incremented Id number.
 		/// </remarks>
 		/// <param name="newFolder">The folder to create.</param>
-        /// <returns>The newly created folder details.</returns>
-		StoreFolder CreateFolder(string userName, StoreFolder parent, Folder newFolder);
+        /// <returns>The result of the attempt to create the folder.</returns>
+        LocalStoreFolderResult CreateFolder(int userId, StoreFolder parent, Folder newFolder);
 
 		/// <summary>
 		/// Deletes an existing folder.
 		/// </summary>
-		/// <param name="folder">The folder to delete.</param>
+		/// <param name="folderId">The Id of the folder to delete.</param>
 		/// <returns>The result of the delete attempt.</returns>
-		LocalStoreFolderResult DeleteFolder(StoreFolder folder);
+		LocalStoreFolderResult DeleteFolder(int folderId);
 
 		/// <summary>
 		/// Renames an existing folder in the local store.
@@ -102,6 +109,12 @@
 		/// <param name="parent">The parent to get the children from.</param>
 		/// <returns>The list of folders.</returns>
 		StoreFolder[] GetChildren(StoreFolder parent);
+
+		/// <summary>
+		/// Gets a list of all folders
+		/// </summary>
+		/// <returns>The list of folders.</returns>
+		StoreFolder[] GetFolders();
 		#endregion
 
 		#region Folder Subscription
@@ -267,7 +280,7 @@
 		/// </summary>
 		/// <param name="folder">The folder to set the ACE on.</param>
 		/// <param name="ace">The privileges and the identifier to put.</param>
-		void SetStoreFolderAce(StoreFolder folder, StoreFolderAce ace);
+		void SetStoreFolderAce(StoreFolder folder, GenericAce<StoreFolderPrivilege> ace);
 
 		/// <summary>
 		/// Removes any ACE associated with the given user.
@@ -317,7 +330,7 @@
 		/// </summary>
 		/// <param name="username">The username to lookup.</param>
 		/// <returns>The user Id or null if non is found.</returns>
-        int GetUserId(string username);
+        int? GetUserId(string username);
 
         /// <summary>
         /// Creates a new user in the local store and creates an initial folder.
@@ -347,14 +360,21 @@
 		/// </summary>
 		/// <param name="userId">The Id of the user to add.</param>
 		/// <param name="mailDomainId">The Id of the mail domain to add the user to.</param>
-		void AddUserToMailDomain(int userId, int mailDomainId);
+		LocalStoreUserResult AddUserToMailDomain(int userId, int mailDomainId);
 
 		/// <summary>
 		/// Removes user from the given mail domain.
 		/// </summary>
 		/// <param name="userId">The Id of the user to remove.</param>
 		/// <param name="mailDomainId">The Id of the mail domain to revome the user from.</param>
-		void RemoveUserFromMailDomain(int userId, int mailDomainId);
+		LocalStoreUserResult RemoveUserFromMailDomain(int userId, int mailDomainId);
+		
+		/// <summary>
+		/// Gets a list of folder that belong to the user with the given user Id.
+		/// </summary>
+		/// <param name="userId">The Id of the user to get the folder for.</param>
+		/// <returns>The list of folders or null if the user Id is invalid.</returns>
+		StoreFolder[] GetUserFolders(int userId);
         #endregion
 
 		#region Group Management
@@ -393,25 +413,44 @@
 		LocalStoreGroupResult DeleteGroup(int groupId);
 
 		/// <summary>
-		/// Updates the any changes to the group into the local store.
-		/// </summary>
-		/// <param name="group">The group details to update.</param>
-		/// <returns>The result of the attempt to update the group.</returns>
-		LocalStoreGroupResult UpdateGroup(LocalStoreGroup group);
+		/// Renames the group.
+        /// </summary>
+        /// <param name="groupId">The Id of the group to delete.</param>
+        /// <param name="newName">The new name for the group.</param>
+		/// <returns>The result of the attempt to rename the group.</returns>
+        LocalStoreGroupResult RenameGroup(int groupId, string newName);
+
+        /// <summary>
+        /// Adds a child group to the given group.
+        /// </summary>
+        /// <param name="groupId">The child group to add.</param>
+        /// <param name="parentId">The group to add the child to.</param>
+        /// <returns>The result of the attempt to add.</returns>
+        LocalStoreGroupResult AddGroupToGroup(int parentId, int groupId);
+
+        /// <summary>
+        /// Removes a child group from the given group.
+        /// </summary>
+        /// <param name="groupId">The child group to remove.</param>
+        /// <param name="parentId">The group to remove the child from.</param>
+        /// <returns>The result of the attempt to remove.</returns>
+        LocalStoreGroupResult RemoveGroupFromGroup(int parentId, int groupId);
 		
 		/// <summary>
 		/// Adds a group to the given mail domain.
 		/// </summary>
 		/// <param name="groupId">The Id of the group to add.</param>
 		/// <param name="mailDomainId">The Id of the mail domain to add the group to.</param>
-		void AddGroupToMailDomain(int groupId, int mailDomainId);
+        /// <returns>The result of the attempt to add.</returns>
+		LocalStoreGroupResult AddGroupToMailDomain(int groupId, int mailDomainId);
 
 		/// <summary>
 		/// Removes group from the given mail domain.
 		/// </summary>
 		/// <param name="groupId">The Id of the group to remove.</param>
-		/// <param name="mailDomainId">The Id of the mail domain to revome the group from.</param>
-		void RemoveGroupFromMailDomain(int groupId, int mailDomainId);
+        /// <param name="mailDomainId">The Id of the mail domain to revome the group from.</param>
+        /// <returns>The result of the attempt to remove.</returns>
+		LocalStoreGroupResult RemoveGroupFromMailDomain(int groupId, int mailDomainId);
 		#endregion
 
 		#region Mail Domain Management
@@ -422,11 +461,11 @@
 		MailDomain[] GetMailDomains();
 
 		/// <summary>
-		/// Creates a new mail domain.
+		/// Adds a new mail domain.
 		/// </summary>
-		/// <param name="primaryHost">The primary host for the mail domain.</param>
-		/// <returns>The result of the attempt to create the mail domain.</returns>
-		LocalStoreMailDomainResult CreateMailDomain(Host primaryHost);
+		/// <param name="mailDomain">The mail domain to add.</param>
+		/// <returns>The result of the attempt to add the mail domain.</returns>
+		LocalStoreMailDomainResult AddMailDomain(MailDomain mailDomain);
 
 		/// <summary>
 		/// Deletes a mail domain from the local store.
@@ -458,5 +497,26 @@
 		/// <returns>The list of user Ids.</returns>
 		int[] GetMailDomainUsers(int mailDomainId);
 		#endregion
+
+		#region System ACL
+		/// <summary>
+		/// Sets the system privileges for the associated identifier. If no ACE exists for
+		/// the associated identifier one is added.
+		/// </summary>
+		/// <param name="ace">The privileges and the identifier to put.</param>
+		void SetSystemPrivilegeAce(GenericAce<SystemPrivilege> ace);
+
+		/// <summary>
+		/// Removes any ACE associated with the given identifier.
+		/// </summary>
+		/// <param name="identifier">The identifier to remove from the ACL.</param>
+		void RemoveSystemPrivilegeAce(string identifier);
+
+		/// <summary>
+		/// Gets the system ACL.
+		/// </summary>
+		/// <returns>The system ACL.</returns>
+		GenericAcl<SystemPrivilege> GetSystemPrivilegeAcl();
+		#endregion
     }
 }

Modified: NMail/trunk/NMail/ILocalStoreDeliveryAction.cs
===================================================================
--- NMail/trunk/NMail/ILocalStoreDeliveryAction.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/ILocalStoreDeliveryAction.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -26,12 +26,11 @@
 	/// An action that can occur during delivery into the local store.
 	/// </summary>
 	public interface ILocalStoreDeliveryAction {
-		/// <summary>
-		/// Sets up the instance of the action using the configuration in the XML node.
-		/// </summary>
-		/// <remarks>This will only be called if the validator is part of the default validator.</remarks>
-		/// <param name="node">The configuration node.</param>
-		void Create(XmlNode node);
+        /// <summary>
+        /// The name of the delivery action. E.g. "move" or "copy".
+        /// </summary>
+        /// <remarks>This is the key used to lookup data in the mailbox part of an address.</remarks>
+        string Name { get; }
 		
 		/// <summary>
 		/// Passes the local store delivery data through this action.

Modified: NMail/trunk/NMail/ILocalStoreRecipientValidator.cs
===================================================================
--- NMail/trunk/NMail/ILocalStoreRecipientValidator.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/ILocalStoreRecipientValidator.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -26,12 +26,11 @@
 	/// A validation that can be performed on a recipient before accepting delivery.
 	/// </summary>
 	public interface ILocalStoreRecipientValidator {
-		/// <summary>
-		/// Sets up the instance of the validator using the configuration in the XML node.
-		/// </summary>
-		/// <remarks>This will only be called if the validator is part of the default validator.</remarks>
-		/// <param name="node">The configuration node.</param>
-		void Create(XmlNode node);
+        /// <summary>
+        /// The name of the validator. E.g. "date" or "sender".
+        /// </summary>
+        /// <remarks>This is the key used to lookup data in the mailbox part of an address.</remarks>
+        string Name { get; }
 
 		/// <summary>
 		/// Checks if the given recipient will be accepted for delivery.

Modified: NMail/trunk/NMail/IO/TcpChannel.cs
===================================================================
--- NMail/trunk/NMail/IO/TcpChannel.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/IO/TcpChannel.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -39,6 +39,12 @@
 		private TcpServerChannel serverChannel;
 
 		public TcpChannel(IDictionary properties, IClientChannelSinkProvider clientSinkProvider, IServerChannelSinkProvider serverSinkProvider) {
+            // Parse common properties
+            bool useTls = true;
+            if (properties.Contains("useTls")) {
+                useTls = (bool) properties["useTls"];
+            }
+
 			// Create the client sink provider if needed
 			if (clientSinkProvider == null) {
 				clientSinkProvider = new BinaryClientFormatterSinkProvider();
@@ -52,7 +58,8 @@
 			this.clientChannel = new TcpClientChannel(clientSinkProvider,
 				getAuthDetailsCallback,
 				certValidationCallback,
-				authCompleteCallback);
+				authCompleteCallback,
+                useTls);
 
 			if (properties["isServer"] != null && ((string) properties["isServer"]) == "yes") {
 				// Create the server sink provider if needed
@@ -68,7 +75,8 @@
 				this.serverChannel = new TcpServerChannel(port,
 					certificate,
 					authProvider,
-					serverSinkProvider);
+					serverSinkProvider,
+                    useTls);
 			}
 		}
 

Modified: NMail/trunk/NMail/IO/TcpClientChannel.cs
===================================================================
--- NMail/trunk/NMail/IO/TcpClientChannel.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/IO/TcpClientChannel.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -48,21 +48,11 @@
 		/// Creates a new client channel with the given provider.
 		/// </summary>
 		/// <param name="clientSinkProvider">The provider to use.</param>
-		public TcpClientChannel(IClientChannelSinkProvider clientSinkProvider, GetAuthDetailsDelegate getAuthDetailsCallback, ChannelAuthComplete authCompleteCallback) {
-			this.clientSinkProvider = clientSinkProvider;
-
-			this.transportSinkProvider = new TcpClientTransportSinkProvider(getAuthDetailsCallback, null, authCompleteCallback);
-		}
-
-		/// <summary>
-		/// Creates a new client channel with the given provider.
-		/// </summary>
-		/// <param name="clientSinkProvider">The provider to use.</param>
 		/// <param name="certValidationCallback">The certificate to use to validate the remote server's certificate.</param>
-		public TcpClientChannel(IClientChannelSinkProvider clientSinkProvider, GetAuthDetailsDelegate getAuthDetailsCallback, RemoteCertificateValidationCallback certValidationCallback, ChannelAuthComplete authCompleteCallback) {
+		public TcpClientChannel(IClientChannelSinkProvider clientSinkProvider, GetAuthDetailsDelegate getAuthDetailsCallback, RemoteCertificateValidationCallback certValidationCallback, ChannelAuthComplete authCompleteCallback, bool useTls) {
 			this.clientSinkProvider = clientSinkProvider;
 
-			this.transportSinkProvider = new TcpClientTransportSinkProvider(getAuthDetailsCallback, certValidationCallback, authCompleteCallback);
+			this.transportSinkProvider = new TcpClientTransportSinkProvider(getAuthDetailsCallback, certValidationCallback, authCompleteCallback, useTls);
 
 			if (this.clientSinkProvider == null) {
 				this.clientSinkProvider = new BinaryClientFormatterSinkProvider();

Modified: NMail/trunk/NMail/IO/TcpClientTransportSink.cs
===================================================================
--- NMail/trunk/NMail/IO/TcpClientTransportSink.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/IO/TcpClientTransportSink.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -62,16 +62,19 @@
 
 		ChannelAuthComplete authCompleteCallback;
 
+        private bool useTls;
+
 		/// <summary>
 		/// Creates a new sink with the given url.
 		/// </summary>
 		/// <param name="url">The URL to connect to.</param>
 		/// <param name="remoteChannelData">Channel data optionally containing the URL.</param>
 		/// <param name="certValidationCallback">The callback to use to validate the remote certificate.</param>
-		public TcpClientTransportSink(string url, object remoteChannelData, GetAuthDetailsDelegate getAuthDetailsCallback, RemoteCertificateValidationCallback certValidationCallback, ChannelAuthComplete authCompleteCallback) {
+		public TcpClientTransportSink(string url, object remoteChannelData, GetAuthDetailsDelegate getAuthDetailsCallback, RemoteCertificateValidationCallback certValidationCallback, ChannelAuthComplete authCompleteCallback, bool useTls) {
 			this.getAuthDetailsCallback = getAuthDetailsCallback;
 			this.certValidationCallback = certValidationCallback;
 			this.authCompleteCallback = authCompleteCallback;
+            this.useTls = useTls;
 
 			if (TcpChannel.ValidUrl(url)) {
 				string objectURI;
@@ -225,33 +228,39 @@
 					if (response.Trim().ToLower() == "nmail remoting channel") {
 						this.connection.WriteLine("OK");
 
-						// Go encrypted...
-						if (this.certValidationCallback == null) {
-							this.connection.StartTlsAsClient(this.host.ToString());
-						} else {
-							this.connection.StartTlsAsClient(this.host.ToString(), this.certValidationCallback);
-						}
+                        if (this.useTls)
+                        {
+                            // Go encrypted...
+                            if (this.certValidationCallback == null)
+                            {
+                                this.connection.StartTlsAsClient(this.host.ToString());
+                            }
+                            else
+                            {
+                                this.connection.StartTlsAsClient(this.host.ToString(), this.certValidationCallback);
+                            }
 
-						if (this.connection.Encrypted) {
-							while (this.connection.Connected && this.authToken == null) {
-								// Get the auth details
-								TcpUserPasswordPair authDetails = this.getAuthDetailsCallback(this);
-								
-								// Send them to the server
-								this.connection.Write(authDetails);
-								this.authToken = (IAuthenticationToken) this.connection.Read();
-							}
+                            if (!this.connection.Encrypted)
+                            {
+                                throw new InvalidOperationException("Failed to establish a secure connection to the server.");
+                            }
+                        }
 
-							if (this.authToken == null) {
-								throw new InvalidOperationException("Failed to authenticated to the server.");
-							}
+						while (this.connection.Connected && this.authToken == null) {
+							// Get the auth details
+							TcpUserPasswordPair authDetails = this.getAuthDetailsCallback(this);
+							
+							// Send them to the server
+							this.connection.Write(authDetails);
+							this.authToken = (IAuthenticationToken) this.connection.Read();
+						}
 
-							// Notify the caller that the auth token has arrived
-							this.authCompleteCallback(authToken);
+						if (this.authToken == null) {
+							throw new InvalidOperationException("Failed to authenticated to the server.");
+						}
 
-						} else {
-							throw new InvalidOperationException("Failed to establish a secure connection to the server.");
-						}
+						// Notify the caller that the auth token has arrived
+						this.authCompleteCallback(authToken);
 					}
 				}
 			}

Modified: NMail/trunk/NMail/IO/TcpClientTransportSinkProvider.cs
===================================================================
--- NMail/trunk/NMail/IO/TcpClientTransportSinkProvider.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/IO/TcpClientTransportSinkProvider.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -44,14 +44,17 @@
 
 		private ChannelAuthComplete authCompleteCallback;
 
+        private bool useTls;
+
 		/// <summary>
 		/// Creates a new provider with the given certificate validation callback.
 		/// </summary>
 		/// <param name="certValidationCallback">The callback to use to validation teh remote server's certificate null for the default.</param>
-		public TcpClientTransportSinkProvider(GetAuthDetailsDelegate getAuthDetailsCallback, RemoteCertificateValidationCallback certValidationCallback, ChannelAuthComplete authCompleteCallback) {
+		public TcpClientTransportSinkProvider(GetAuthDetailsDelegate getAuthDetailsCallback, RemoteCertificateValidationCallback certValidationCallback, ChannelAuthComplete authCompleteCallback, bool useTls) {
 			this.getAuthDetailsCallback = getAuthDetailsCallback;
 			this.certValidationCallback = certValidationCallback;
 			this.authCompleteCallback = authCompleteCallback;
+            this.useTls = useTls;
 		}
 
 		#region IClientChannelSinkProvider Members
@@ -91,7 +94,7 @@
 
 				// Create a transport if needed
 				if (!sinkMap.ContainsKey(key)) {
-					this.sinkMap.Add(key, new TcpClientTransportSink(url, remoteChannelData, this.getAuthDetailsCallback, this.certValidationCallback, this.authCompleteCallback));
+					this.sinkMap.Add(key, new TcpClientTransportSink(url, remoteChannelData, this.getAuthDetailsCallback, this.certValidationCallback, this.authCompleteCallback, this.useTls));
 				}
 
 				return this.sinkMap[key];

Modified: NMail/trunk/NMail/IO/TcpServerChannel.cs
===================================================================
--- NMail/trunk/NMail/IO/TcpServerChannel.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/IO/TcpServerChannel.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -68,16 +68,19 @@
 		/// </summary>
 		private IServerChannelSink nextSink;
 
+        private bool useTls;
+
 		/// <summary>
 		/// Creates a new server channel with the given details.
 		/// </summary>
 		/// <param name="port">The port to listen on.</param>
 		/// <param name="certificate">The certificate to use for SSL.</param>
 		/// <param name="serverSinkProvider">The provider.</param>
-		public TcpServerChannel(int port, X509Certificate2 certificate, IAuthenticationProvider authProvider, IServerChannelSinkProvider serverSinkProvider) {
+		public TcpServerChannel(int port, X509Certificate2 certificate, IAuthenticationProvider authProvider, IServerChannelSinkProvider serverSinkProvider, bool useTls) {
 			this.port = port;
 			this.certificate = certificate;
 			this.authProvider = authProvider;
+            this.useTls = useTls;
 
 			// This is needed to report a valid IP to clients asking for channel data
 			IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName());
@@ -238,7 +241,7 @@
 
 				while (true) {
 					Socket client = socket.AcceptSocket();
-					new TcpServerTransportSink(this.nextSink, this.certificate, this.authProvider, client);
+					new TcpServerTransportSink(this.nextSink, this.certificate, this.authProvider, client, this.useTls);
 				}
 			} catch (SocketException e) {
 				// Ignore interrupted exception during shutdown

Modified: NMail/trunk/NMail/IO/TcpServerTransportSink.cs
===================================================================
--- NMail/trunk/NMail/IO/TcpServerTransportSink.cs	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/IO/TcpServerTransportSink.cs	2006-06-06 12:55:52 UTC (rev 43)
@@ -54,17 +54,20 @@
 
 		protected IAuthenticationProvider authProvider;
 
+        private bool useTls;
+
 		/// <summary>
 		/// Creates a new transport sink with the given details.
 		/// </summary>
 		/// <param name="nextSink">The next sink in the chain.</param>
 		/// <param name="certificate">The certificate to use in SSL.</param>
 		/// <param name="client">The socket to the remote client.</param>
-		public TcpServerTransportSink(IServerChannelSink nextSink, X509Certificate2 certificate, IAuthenticationProvider authProvider, Socket client) {
+		public TcpServerTransportSink(IServerChannelSink nextSink, X509Certificate2 certificate, IAuthenticationProvider authProvider, Socket client, bool useTls) {
 			this.nextSink = nextSink;
 			this.connection.Create(client);
 			this.connection.Certificate = certificate;
 			this.authProvider = authProvider;
+            this.useTls = useTls;
 			
 			// Create a new thread to read requests with
 			ThreadHelper th = new ThreadHelper(new WaitCallback(processConnection), null);
@@ -90,8 +93,11 @@
 					this.connection.Close();
 				}
 
-				// Go encrypted...
-				this.connection.StartTlsAsServer();
+                if (this.useTls)
+                {
+                    // Go encrypted...
+                    this.connection.StartTlsAsServer();
+                }
 
 				int authAttempts = 0;
 				bool authenticated = false;

Modified: NMail/trunk/NMail/NMail.csproj
===================================================================
--- NMail/trunk/NMail/NMail.csproj	2006-06-06 11:44:08 UTC (rev 42)
+++ NMail/trunk/NMail/NMail.csproj	2006-06-06 12:55:52 UTC (rev 43)
@@ -122,12 +122,13 @@
     <Compile Include="Configuration\ObjectConfigurationElement.cs" />
     <Compile Include="Configuration\ObjectConfigurationElementCollection.cs" />
     <Compile Include="Configuration\WildcardHostElementCollection.cs" />
+    <Compile Include="DataTypes\ACLs\SystemPrivilege.cs" />
     <Compile Include="DataTypes\ACLs\GenericAce.cs" />
     <Compile Include="DataTypes\ACLs\GenericAcl.cs" />
     <Compile Include="DataTypes\ACLs\MailDomainPrivilege.cs" />
-    <Compile Include="DataTypes\ACLs\StoreFolderAce.cs" />
     <Compile Include="DataTypes\ACLs\StoreFolderAcl.cs" />
     <Compile Include="DataTypes\ACLs\StoreFolderPrivilege.cs" />
+    <Compile Include="DataTypes\ACLs\UserGroupAdminPrivilege.cs" />
     <Compile Include="DataTypes\LocalStoreGro...
 
[truncated message content]

Thread: [Nmailserver-commits] SF.net SVN: nmailserver: [43] NMail/trunk

nmailserver-commits