restructure qmail-ext command emulation.

currently libexec/error traps the request and switch the context to
command process. FML::Process::QMail no more used.
FML::Command::QmailExt provides qmail-ext emulation functions.

2 files changed, 54 insertions, 126 deletions

diff --git a/fml/lib/FML/Process/Error.pm b/fml/lib/FML/Process/Error.pm
index 5c54366e..e6316a98 100644
--- a/fml/lib/FML/Process/Error.pm
+++ b/fml/lib/FML/Process/Error.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2002,2003,2004,2005,2006 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Error.pm,v 1.55 2005/11/30 23:50:19 fukachan Exp $
+# $FML: Error.pm,v 1.56 2006/02/15 13:44:04 fukachan Exp $
 #
 
 package FML::Process::Error;
@@ -158,6 +158,12 @@ sub run
     my $eval = $config->get_hook( 'error_mail_analyzer_run_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
+    if ($curproc->_is_qmail_extension_command()) {
+	$curproc->_execute_qmail_extension_command();
+	$pcb->set("qmail-ext", "found", 1);
+	goto END; # no more normal error handling process.
+    }
+
     $curproc->_forward_error_message();
 
     unless ($curproc->is_refused()) {
@@ -199,6 +205,7 @@ sub run
 	}
     }
 
+  END:
     $eval = $config->get_hook( 'error_mail_analyzer_run_end_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 }
@@ -283,6 +290,9 @@ sub finish
     if ($pcb->get("error", "found")) {
 	$curproc->log("error message found");
     }
+    elsif ($pcb->get("qmail-ext", "found")) {
+	$curproc->logdebug("qmail-ext found");
+    }
     else {
 	$curproc->logwarn("error message not found");
     }
@@ -335,6 +345,49 @@ sub _forward_error_message
 }
 
 
+=head1 QMAIL EXTENSION COMMAND TRAP
+
+In qmail environment, you can use the following address as a command:
+<elena-subscribe@domain> for subscribe request for elena@domain ML.
+
+To emulate this special command mail request, libexec/error need to
+check EXT environment variable and pass the control to
+FML::Process::Command if needed.
+
+=cut
+
+
+# Descriptions: we receive qmail extension command or not ?
+#    Arguments: OBJ($curproc)
+# Side Effects: none
+# Return Value: NUM
+sub _is_qmail_extension_command
+{
+    my ($curproc) = @_;
+
+    # environment variable EXT holds extention information.
+    # for example, a mail to ML-subscribe@VIRTUAL.DOMAIN is recognized as
+    # extension with "VIRTUAL.DOMAIN-ML-subscribe" in EXT variable.
+    use FML::Command::QmailExt;
+    my $extension = new FML::Command::QmailExt $curproc;
+    return $extension->match($ENV{EXT});
+}
+
+
+# Descriptions: execute qmail extension command emulation.
+#    Arguments: OBJ($curproc)
+# Side Effects: emulate command process if needed.
+# Return Value: none
+sub _execute_qmail_extension_command
+{
+    my ($curproc) = @_;
+
+    use FML::Command::QmailExt;
+    my $extension = new FML::Command::QmailExt $curproc;
+    $extension->execute($ENV{EXT});
+}
+
+
 =head1 CODING STYLE
 
 See C<http://www.fml.org/software/FNF/> on fml coding style guide.
diff --git a/fml/lib/FML/Process/QMail.pm b/fml/lib/FML/Process/QMail.pm
deleted file mode 100644
index b52e44a7..00000000
--- a/fml/lib/FML/Process/QMail.pm
+++ /dev/null
@@ -1,125 +0,0 @@
-#-*- perl -*-
-#
-#  Copyright (C) 2001,2002,2003,2004 Ken'ichi Fukamachi
-#   All rights reserved. This program is free software; you can
-#   redistribute it and/or modify it under the same terms as Perl itself.
-#
-# $FML: QMail.pm,v 1.21 2004/03/12 04:22:56 fukachan Exp $
-#
-
-package FML::Process::QMail;
-use strict;
-use Carp;
-use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
-
-
-# Descriptions: standard contructor
-#    Arguments: OBJ($self)
-# Side Effects: none
-# Return Value: OBJ
-sub new
-{
-    my ($self) = @_;
-    my ($type) = ref($self) || $self;
-    my $me     = {};
-    return bless $me, $type;
-}
-
-
-=head1 NAME
-
-FML::Process::QMail - emulate C<qmail-ext> address such as elena-subscribe@
-
-=head1 SYNOPSIS
-
-C<NOT YET IMPLERMENTED>.
-
-=head1 DESCRIPTION
-
-C<NOT YET IMPLERMENTED>.
-
-=head1 TODO
-
-   XXX
-   XXX MEMO on TODO
-   XXX
-
-   we should not use "# command" representation even though internally.
-
-   check $ext more restrictly.
-
-=head1 METHODS
-
-=cut
-
-#
-# XXX-TODO: NOT YET IMPLERMENTED.
-#
-
-
-# Descriptions: qmail style command extention
-#               elena-subscribe@domain implies
-#               "mail message body with subscribe to elena-ctl@domain"
-#    Arguments: OBJ($curproc)
-# Side Effects: none
-# Return Value: STR
-sub DotQmailExt
-{
-    my ($curproc) = @_;
-    my $config    = $curproc->config();
-
-    # get ?
-    my $ext = $ENV{'EXT'};
-
-    unless ($ext) {
-	$curproc->log("no extension address");
-	return;
-    }
-
-    &$curproc->log("dot-qmail-ext[0]: $ext");
-    my ($key)    = (split(/\@/, $config->{ article_post_address }))[0];
-    my ($keyctl) = (split(/\@/, $config->{ command_mail_address }))[0];
-
-    if ($ext =~ /^($key)$/i) {
-	return '';
-    }
-    elsif ($keyctl&& ($ext =~ /^($keyctl)$/i)) {
-	return '';
-    }
-
-    $curproc->log("dot-qmail-ext: $ext");
-    $ext =~ s/^$key//i;
-    $ext =~ s/\-\-/\@/i; # since @ cannot be used
-    $ext =~ s/\-/ /g;
-    $ext =~ s/\@/-/g;
-    $curproc->log("\$ext -> $ext");
-
-    # XXX: "# command" is internal represention
-    return sprintf("# %s", $ext);
-}
-
-
-=head1 CODING STYLE
-
-See C<http://www.fml.org/software/FNF/> on fml coding style guide.
-
-=head1 AUTHOR
-
-Ken'ichi Fukamachi
-
-=head1 COPYRIGHT
-
-Copyright (C) 2001,2002,2003,2004 Ken'ichi Fukamachi
-
-All rights reserved. This program is free software; you can
-redistribute it and/or modify it under the same terms as Perl itself.
-
-=head1 HISTORY
-
-FML::Process::QMail first appeared in fml8 mailing list driver package.
-See C<http://www.fml.org/> for more details.
-
-=cut
-
-
-1;