Matt Simerson
d80a347afe
SMTP.pm, add missing ; and remove useless if
2012-05-06 15:50:57 -07:00
Matt Simerson
d9a42d1774
confine SMTP.pm duplicate logging to LOGDEBUG
2012-05-06 15:50:23 -07:00
Matt Simerson
049d34ee55
improve readability in SMTP::auth_parse_respond
2012-05-06 15:50:07 -07:00
Hanno Hecker
33d8825ecf
Fix for plugins returning DONE from HELO/EHLO
...
We have to return something true, else the client gets an additional
451 Internal error - try again later - command 'helo' failed unexpectedly
after the plugin's ->respond() message.
2010-09-17 15:25:20 +08:00
jaredj
5c3bd220aa
Run hook_reset_transaction after all connections
...
This makes hook_reset_transaction a bit more useful by running it on
disconnections. It also ensures that hook_disconnect runs when the
client disconnects without QUITing.
2010-09-15 14:32:53 +08:00
jaredj
d4edf3acc6
Whitespace cleanups
...
Remove some trailing spaces and replace some tabs with spaces
2009-03-02 12:53:56 -08:00
Robert
e5507f9672
data_headers_end does not work in async mode
2009-02-12 00:29:56 -08:00
Karl Y. Pradene
059771d31d
End of headers hook: data_headers_end
...
Hook after receiving all headers lines. Defaults to nothing,
just continue processing. At this step, sender does not wait for a reply,
but we can stop him from sending remaining data by disconnecting.
(Cleaned up by Robert for english and coding style.)
Signed-off-by: Ask Bjørn Hansen <ask@develooper.com>
Signed-off-by: Robert Spier <robert@perl.org>
2009-02-10 02:49:38 -05:00
Matt Sergeant
14314f3f10
Lower log level of rcpt/from addresses
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@949 958fd67b-6ff1-0310-b445-bb7760255be9
2008-09-30 03:22:34 +00:00
Hanno Hecker
a64742cc7c
prefork, forkserver: restart on SIGHUP: * reset to defaults * clear config cache * reload all plugins (includes compiling, register()/init())
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@927 958fd67b-6ff1-0310-b445-bb7760255be9
2008-06-15 09:28:02 +00:00
Matt Sergeant
d0d7412f22
Fix auth and tls in light of globalised hooks
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@874 958fd67b-6ff1-0310-b445-bb7760255be9
2008-04-08 10:34:25 +00:00
Hanno Hecker
2f3a326e11
Pluggable hook "noop" with example plugin (noop_counter) and doc update.
...
... now check_earlytalker can be expanded to VRFY and NOOP (see RFC 1854, #2.1)
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@836 958fd67b-6ff1-0310-b445-bb7760255be9
2008-01-24 18:43:34 +00:00
Hanno Hecker
bf88f1ee99
Pluggable help, based on patch by Jose Luis Martinez
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@825 958fd67b-6ff1-0310-b445-bb7760255be9
2007-12-07 09:12:15 +00:00
Hanno Hecker
7d4605fdbc
remove the connection / transaction id feature for 0.42 release
...
- add back in after 0.42 is out? if yes: start implementing in -prefork
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@809 958fd67b-6ff1-0310-b445-bb7760255be9
2007-10-09 12:00:43 +00:00
Peter J. Holzer
af82701fff
New id scheme: Start with a unique id for the Qpsmtpd::SMTP object,
...
then derive ids for connections and transactions from that via
simple counters.
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@785 958fd67b-6ff1-0310-b445-bb7760255be9
2007-09-02 10:50:23 +00:00
Matt Sergeant
bf5d011d85
Update id generator again
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@777 958fd67b-6ff1-0310-b445-bb7760255be9
2007-08-29 21:37:33 +00:00
Matt Sergeant
a7914ac0dc
Support for $transaction->id to get a unique id for this transaction
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@775 958fd67b-6ff1-0310-b445-bb7760255be9
2007-08-28 18:42:01 +00:00
Hanno Hecker
ff34740823
make the documented DENY{,SOFT}_DISCONNECT work in the data-post hook
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@771 958fd67b-6ff1-0310-b445-bb7760255be9
2007-08-15 16:11:36 +00:00
Matt Sergeant
afed08ebcd
Argh. Fixed cut & paste error
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@765 958fd67b-6ff1-0310-b445-bb7760255be9
2007-08-03 20:17:25 +00:00
Matt Sergeant
521a6f3f9e
Fix bug which breaks queue plugins that implement continuations
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@764 958fd67b-6ff1-0310-b445-bb7760255be9
2007-08-03 20:16:01 +00:00
John Peacock
542db781a2
Always initialize variables if setting them is conditional.
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@746 958fd67b-6ff1-0310-b445-bb7760255be9
2007-05-30 15:49:54 +00:00
Ask Bjørn Hansen
0a1cabf806
Fix logging when dropping a mail due to size (m. allan noah /
...
kitno455, issue #13 )
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@741 958fd67b-6ff1-0310-b445-bb7760255be9
2007-05-17 22:28:28 +00:00
Matt Sergeant
c2e2f29878
Work around splitting up of return values in hooks
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@733 958fd67b-6ff1-0310-b445-bb7760255be9
2007-04-10 18:08:55 +00:00
Matt Sergeant
062e73b7bf
Support for pluggable received headers
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@731 958fd67b-6ff1-0310-b445-bb7760255be9
2007-04-09 14:45:11 +00:00
Matt Sergeant
b1c9101bfa
A few pollserver bug fixes
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@726 958fd67b-6ff1-0310-b445-bb7760255be9
2007-03-19 21:13:17 +00:00
Ask Bjørn Hansen
e6ee4c486b
Correct header parsing of "space only" lines (Joerg Meyer)
...
(issue #11 - http://code.google.com/p/smtpd/issues/detail?id=11 )
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@722 958fd67b-6ff1-0310-b445-bb7760255be9
2007-03-15 06:13:18 +00:00
Robert Spier
02edd1a32a
mct noticed that we weren't properly testing for ESMTP.
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@704 958fd67b-6ff1-0310-b445-bb7760255be9
2007-01-06 20:22:01 +00:00
Robert Spier
a30506e9b6
RFC3848 support for ESMTP.
...
Heavily based on:
From: Nick Leverton <nj@leverton.org>
To: qpsmtpd@perl.org
Subject: SMTPA
Date: Thu, 4 Jan 2007 12:08:16 +0000
Message-Id: <200701041208.17018@leverton.icritical.com>
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@703 958fd67b-6ff1-0310-b445-bb7760255be9
2007-01-06 06:58:08 +00:00
Hanno Hecker
6eefa97016
some fixes from Michael C. Toren:
...
- Treat DENY(|SOFT)_DISCONNECT from connect hooks the same as DENY(|SOFT)
- only append ESMTP to smtpgreeting if it's not already in there
- Qpsmtpd::SMTP::fault(): parsing now unambigous and just first "word" of $0
see also http://www.nntp.perl.org/group/perl.qpsmtpd/5905
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@699 958fd67b-6ff1-0310-b445-bb7760255be9
2006-12-25 10:12:54 +00:00
Matt Sergeant
2b709d664c
Async qpsmtpd (still entirely compatible with non-async version)
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@679 958fd67b-6ff1-0310-b445-bb7760255be9
2006-12-08 19:46:18 +00:00
John Peacock
a7a3031440
OK, really, this time the capitalization for AUTH mechanisms is correct.
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@662 958fd67b-6ff1-0310-b445-bb7760255be9
2006-09-24 14:55:48 +00:00
John Peacock
9028958307
Fix careless capitalization error
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@661 958fd67b-6ff1-0310-b445-bb7760255be9
2006-09-24 00:53:01 +00:00
John Peacock
d218bfea82
Correctly handle the case where a given AUTH mechanism is requested by a
...
[stupid] MUA, but isn't implemented with existing auth plugins. Based on
patch from Brian Szymanski.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@660 958fd67b-6ff1-0310-b445-bb7760255be9
2006-09-22 15:31:28 +00:00
John Peacock
25d9fe85a8
Two patches from Robin Johnson:
...
Add SSL encryption method to FROM: header line.
Add new tls_before_auth configuration to hide AUTH until TLS is established.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@645 958fd67b-6ff1-0310-b445-bb7760255be9
2006-06-22 14:48:48 +00:00
Ask Bjørn Hansen
b3bc12e587
r3599@embla: ask | 2006-06-15 17:15:06 -0700
...
Fix "help" command when there's no "smtpgreeting" configured (the default)
(Thanks to Thomas Ogrisegg)
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@642 958fd67b-6ff1-0310-b445-bb7760255be9
2006-06-16 00:15:03 +00:00
John Peacock
8fcb46177b
Add Qpsmtpd::Command to gather all parsing logic in one place (Hanno
...
Hecker)
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@631 958fd67b-6ff1-0310-b445-bb7760255be9
2006-04-07 18:58:02 +00:00
John Peacock
b89a6d9e4c
* plugins/queue/smtp-forward
...
s/register/init/ to match new plugin style (jpeacock)
* lib/Qpsmtpd/Address.pm
t/qpsmtpd-address.t
Ill-formed addresses should return null not partial garbage.
Resolves https://rt.perl.org/rt3/Ticket/Display.html?id=38746
Patch by Hanno Hecker.
* plugins/virus/clamav
Clamav alternate config file.
Resolves https://rt.perl.org/rt3/Ticket/Display.html?id=38736
Patch by Robin Bowes.
* lib/Qpsmtpd/SMTP.pm
lib/Qpsmtpd.pm
Return multiline responses from plugins.
Resolves https://rt.perl.org/rt3/Ticket/Display.html?id=38741
Patch by Charlie Brady.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@630 958fd67b-6ff1-0310-b445-bb7760255be9
2006-03-20 16:47:05 +00:00
John Peacock
3aa64debd8
remove way too agressive blocking of DENY'd servers
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@628 958fd67b-6ff1-0310-b445-bb7760255be9
2006-03-06 21:33:46 +00:00
John Peacock
bd19ded5a2
Need to cover situation where there are *no* hooks. Should we actually return
...
OK from run_hooks() in the case where no hooks are there to fire?
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@627 958fd67b-6ff1-0310-b445-bb7760255be9
2006-03-01 17:25:51 +00:00
John Peacock
82a32ed558
Automatically disconnect DENY'd server if it doesn't go willingly.
...
Implement queue_pre and queue_post hooks.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@626 958fd67b-6ff1-0310-b445-bb7760255be9
2006-03-01 16:46:55 +00:00
John Peacock
5959cc1c32
* lib/Qpsmtpd/Auth.pm
...
lib/Qpsmtpd/SMTP.pm
Take the AUTH method and put it in SMTP.pm where it belongs.
* lib/Qpsmtpd.pm
lib/Qpsmtpd/Plugin.pm
Expose the auth_user/auth_mechanism property to plugin writers.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@556 958fd67b-6ff1-0310-b445-bb7760255be9
2005-10-31 17:12:37 +00:00
John Peacock
58f7129ada
[merge from trunk] Use qmail/control/smtpdgreeting if it exists, otherwise
...
show the original qpsmtpd greeting (with version information).
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@518 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-19 14:20:05 +00:00
Matt Sergeant
8c018d75ac
Pass args to unrecognized_command
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@494 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-11 12:24:26 +00:00
Matt Sergeant
8a3c3c40b0
tls support
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@489 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-08 16:50:24 +00:00
Ask Bjørn Hansen
254b4fd2b2
return 500 rather than 521 for DENY in the unrecognized_command hook
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@478 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-06 22:22:29 +00:00
Matt Sergeant
c3562e256d
Allow DENY to be returned from unrecognised_command again
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@476 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-06 22:16:08 +00:00
Ask Bjørn Hansen
4f0c4d94a1
The unrecognized_command hook now understands the DENY_DISCONNECT return
...
and the DENY return is deprecated.
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@473 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-06 21:52:45 +00:00
Matt Sergeant
d48cd2e37e
No idea what that was doing in there...
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@472 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-06 20:36:02 +00:00
Matt Sergeant
71f6fc1dff
Fix plugin docs to reflect reality
...
Re-order plugin docs to appear in the order things generally get called
Fix SMTP.pm to reflect what's documented in README.plugins :-)
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@471 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-06 20:30:14 +00:00
Ask Bjørn Hansen
df5a2e9d95
bump version to 0.31-dev
...
From: hjp@hjp.at
Subject: PATCH: Return 421 if we are going to disconnect
Date: July 3, 2005 1:23:21 PM PDT
To: qpsmtpd@perl.org
RFC 2821 says we should return 421, if we disconnect, not 450 or 451.
hp
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@459 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-04 14:39:29 +00:00