Added better documentation for the local sender check and user-delimiter

Also improved the local sender check a little by moving it to a new function.

Author: Joe Eaves

docs/plugins/jme.rcpt_to.aliases.md

@@ -2,8 +2,8 @@ jme.rcpt_to.aliases
 ========
 
 This is a simple aliases plugin that allows chaining.
-There is no wildcard matching at this time, the aliases will match
-exactly as they are written.
+Aliases allow a single wildcard character '+', to fall
+in line with standard user-delimiter practice.
 
 * Note: The 'official' aliases plugin has a warning about using it with the 'queue/smtp\_proxy' plugin.
     I haven't tested this plugin with that one, so lets assume it doesn't work either.

docs/plugins/jme.rcpt_to.mailboxes.md

@@ -9,6 +9,11 @@ before the queue. They **DO NOT** work together.
 There is no wildcard matching for the accounts, other plugins must catch
 aliases/wildcards for you before the email gets here.
 
+This plugin also deals with local senders. If the remote_ip of the connection
+matches '::' or '127.0.0.1', it will set the relaying flag. This allows Haraka
+to be used as a local SMTP for less configurable programs (like cron), that
+just talk directly to localhost:25 with no authentication.
+
 Configuration
 -------------
 

plugins/jme.rcpt_to.mailboxes.js

@@ -26,6 +26,18 @@ var hostInConfig = function(plugin, connection, config, host) {
 	}
 };
 
+var checkLocalSender = function(connection) {
+	if ((connection.remote_ip == "127.0.0.1") ||
+		(connection.remote_ip == "::"))
+	{
+		connection.relaying = true;
+		connection.logdebug(this, "Forwarding allowed for " +
+			connection.remote_ip + " (to " + address + ")");
+		return true;
+	}
+	return false;
+}
+
 var checkValidMailbox = function(next, connection, params) {
 	var rcpt        = params[0];
 	var address     = rcpt.address();
@@ -36,28 +48,25 @@ var checkValidMailbox = function(next, connection, params) {
 	var config		= loadConfig(this, connection);
 	var returnValue;
 
-	if(config && !connection.transaction.notes.pipe) {
-		if(hostInConfig(this, connection, config, host)) {
-			config = config[host];
-			connection.loginfo(this, "Checking account for: " + address);
+	if(!checkLocalSender(connection)) {
+		if(config && !connection.transaction.notes.pipe) {
+			if(hostInConfig(this, connection, config, host)) {
+				config = config[host];
+				connection.loginfo(this, "Checking account for: " + address);
 
-			if (config[user]) {
-				connection.logdebug(this, "User " + address + " exists");
+				if (config[user]) {
+					connection.logdebug(this, "User " + address + " exists");
+				} else {
+					// Maybe we should bounce instead?
+					connection.logdebug(this, "User " + address + " does not exist");
+					returnValue = "User does not exist!";
+				}
 			} else {
-				// Maybe we should bounce instead?
-				connection.logdebug(this, "User " + address + " does not exist");
-				returnValue = "User does not exist!";
+				returnValue = "Forwarding not enabled for " + host;
 			}
-		} else if ((connection.remote_ip == "127.0.0.1") ||
-				(connection.remote_ip == "::")) {
-			connection.relaying = true;
-			connection.logdebug(this, "Forwarding allowed for " +
-				connection.remote_ip + " (to " + address + ")");
 		} else {
-			returnValue = "Forwarding not enabled for " + host;
+			connection.transaction.notes.discard = true;
 		}
-	} else {
-		connection.transaction.notes.discard = true;
 	}
 
 	if(returnValue) {