From d37e3dc1da31141e469d1ae735f33ef4b51fc401 Mon Sep 17 00:00:00 2001 From: Graeme Walker Date: Sun, 7 Sep 2003 12:00:00 +0000 Subject: [PATCH] v1.1.2 --- ChangeLog | 9 + acinclude.m4 | 40 +++- aclocal.m4 | 40 +++- bin/emailrelay-test.sh_ | 3 +- bin/emailrelay.sh_ | 2 + bin/expand.sh_ | 5 +- config.h.in | 3 + configure | 73 +++++++- configure.ac | 3 +- doc/Makefile.am | 4 +- doc/Makefile.in | 4 +- doc/developer.txt | 56 ++++-- doc/emailrelay-man.html | 2 +- doc/emailrelay.css | 14 ++ doc/gnet-client.png | Bin 0 -> 11116 bytes doc/gsmtp-scannerclient.png | Bin 0 -> 10361 bytes doc/gsmtp-serverprotocol.png | Bin 0 -> 7470 bytes doc/index.html | 2 +- doc/reference.txt | 13 +- doc/sequence-1.png | Bin 0 -> 3409 bytes doc/sequence-2.png | Bin 0 -> 4485 bytes doc/sequence-3.png | Bin 0 -> 3319 bytes doc/sequence-4.png | Bin 0 -> 4332 bytes doc/userguide.txt | 2 +- doc/windows.txt | 12 +- emailrelay.spec | 4 +- install-sh | 36 ++-- missing | 69 ++++++- mkinstalldirs | 73 +++++++- src/glib/garg.cpp | 44 ++++- src/glib/garg.h | 3 + src/glib/gdef.h | 57 +++--- src/glib/gprocess.h | 4 + src/glib/gprocess_unix.cpp | 16 +- src/glib/gprocess_win32.cpp | 184 ++++++++++++++----- src/glib/groot.cpp | 1 + src/glib/md5.h | 19 -- src/glib/md5c.c | 20 -- src/gnet/gclient.cpp | 15 +- src/gnet/gclient.h | 24 ++- src/gnet/gserver.cpp | 11 ++ src/gnet/gserver.h | 5 + src/gnet/gsocket.h | 10 +- src/gnet/gsocket_unix.cpp | 11 +- src/gnet/gsocket_win32.cpp | 6 + src/gsmtp/Makefile.am | 4 + src/gsmtp/Makefile.in | 20 +- src/gsmtp/gclientprotocol.cpp | 13 +- src/gsmtp/gclientprotocol.h | 9 +- src/gsmtp/gnewfile.cpp | 48 ++++- src/gsmtp/gnewfile.h | 8 +- src/gsmtp/gprotocolmessage.h | 14 ++ src/gsmtp/gprotocolmessageforward.cpp | 44 ++++- src/gsmtp/gprotocolmessageforward.h | 18 +- src/gsmtp/gprotocolmessagescanner.cpp | 101 ++++++++++ src/gsmtp/gprotocolmessagescanner.h | 94 ++++++++++ src/gsmtp/gprotocolmessagestore.cpp | 15 +- src/gsmtp/gprotocolmessagestore.h | 9 +- src/gsmtp/gscannerclient.cpp | 255 ++++++++++++++++++++++++++ src/gsmtp/gscannerclient.h | 124 +++++++++++++ src/gsmtp/gserverprotocol.cpp | 61 +++++- src/gsmtp/gserverprotocol.h | 5 + src/gsmtp/gsmtpserver.cpp | 51 ++++-- src/gsmtp/gsmtpserver.h | 21 ++- src/gsmtp/gverifier.cpp | 4 +- src/main/commandline.cpp | 6 + src/main/common.dsp | 8 + src/main/configuration.cpp | 16 +- src/main/configuration.h | 9 + src/main/doxygen.cfg | 2 +- src/main/doxygen.h | 17 +- src/main/run.cpp | 49 ++++- src/main/run.h | 2 + 73 files changed, 1621 insertions(+), 305 deletions(-) mode change 100755 => 100644 configure.ac create mode 100644 doc/gnet-client.png create mode 100644 doc/gsmtp-scannerclient.png create mode 100644 doc/gsmtp-serverprotocol.png create mode 100644 doc/sequence-1.png create mode 100644 doc/sequence-2.png create mode 100644 doc/sequence-3.png create mode 100644 doc/sequence-4.png create mode 100644 src/gsmtp/gprotocolmessagescanner.cpp create mode 100644 src/gsmtp/gprotocolmessagescanner.h create mode 100644 src/gsmtp/gscannerclient.cpp create mode 100644 src/gsmtp/gscannerclient.h mode change 100755 => 100644 src/main/doxygen.cfg mode change 100755 => 100644 src/main/run.cpp diff --git a/ChangeLog b/ChangeLog index 9d10e94..be35ad3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,15 @@ E-MailRelay Change Log ====================== +1.1.1 -> 1.1.2 +-------------- +* Earlier check for un-bindable ports on startup, and later fork()ing [bug-id 776972]. +* Resolved the file-descriptor kludge for "--verifier" on Windows. +* Less strict about failing eight bit messages sent to servers with no "8BITMIME" extension. +* Supplementary group memberships revoked at startup if root or suid. +* Pre-processor ("--filter") program's standard output searched for a failure reason string. +* Undocumented "--scanner" switch added for asynchronous processing by a separate network server. + 1.1.0 -> 1.1.1 -------------- * Restored the fix for building with gcc2.96. diff --git a/acinclude.m4 b/acinclude.m4 index 6a47654..b271b63 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,18 +23,38 @@ dnl AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T, [AC_CACHE_CHECK([for socklen_t], aclocal_cv_type_socklen_t, [ - AC_TRY_COMPILE( - [#include + AC_TRY_COMPILE( + [#include #include ], - [socklen_t len = 42; return len;], - aclocal_cv_type_socklen_t=yes, - aclocal_cv_type_socklen_t=no) + [socklen_t len = 42; return len;], + aclocal_cv_type_socklen_t=yes, + aclocal_cv_type_socklen_t=no ) ]) - if test $aclocal_cv_type_socklen_t = yes; then - AC_DEFINE(HAVE_SOCKLEN_T, 1,[Define if socklen_t type definition in sys/socket.h]) - else - AC_DEFINE(HAVE_SOCKLEN_T, 0,[Define if socklen_t type definition in sys/socket.h]) - fi + if test $aclocal_cv_type_socklen_t = yes; then + AC_DEFINE(HAVE_SOCKLEN_T, 1,[Define if socklen_t type definition in sys/socket.h]) + else + AC_DEFINE(HAVE_SOCKLEN_T, 0,[Define if socklen_t type definition in sys/socket.h]) + fi +]) + +dnl setgroups +dnl +AC_DEFUN([ACLOCAL_CHECK_SETGROUPS], +[AC_CACHE_CHECK([for setgroups], aclocal_cv_setgroups, +[ + AC_TRY_COMPILE( + [#include +#include +#include ], + [setgroups(0,0) ;], + aclocal_cv_setgroups=yes , + aclocal_cv_setgroups=no ) +]) + if test $aclocal_cv_setgroups = yes; then + AC_DEFINE(HAVE_SETGROUPS,1,[Define if setgroups is available]) + else + AC_DEFINE(HAVE_SETGROUPS,0,[Define if setgroups is available]) + fi ]) dnl gmtime_r diff --git a/aclocal.m4 b/aclocal.m4 index ba3a761..6189133 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -36,18 +36,38 @@ dnl AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T, [AC_CACHE_CHECK([for socklen_t], aclocal_cv_type_socklen_t, [ - AC_TRY_COMPILE( - [#include + AC_TRY_COMPILE( + [#include #include ], - [socklen_t len = 42; return len;], - aclocal_cv_type_socklen_t=yes, - aclocal_cv_type_socklen_t=no) + [socklen_t len = 42; return len;], + aclocal_cv_type_socklen_t=yes, + aclocal_cv_type_socklen_t=no ) ]) - if test $aclocal_cv_type_socklen_t = yes; then - AC_DEFINE(HAVE_SOCKLEN_T, 1,[Define if socklen_t type definition in sys/socket.h]) - else - AC_DEFINE(HAVE_SOCKLEN_T, 0,[Define if socklen_t type definition in sys/socket.h]) - fi + if test $aclocal_cv_type_socklen_t = yes; then + AC_DEFINE(HAVE_SOCKLEN_T, 1,[Define if socklen_t type definition in sys/socket.h]) + else + AC_DEFINE(HAVE_SOCKLEN_T, 0,[Define if socklen_t type definition in sys/socket.h]) + fi +]) + +dnl setgroups +dnl +AC_DEFUN([ACLOCAL_CHECK_SETGROUPS], +[AC_CACHE_CHECK([for setgroups], aclocal_cv_setgroups, +[ + AC_TRY_COMPILE( + [#include +#include +#include ], + [setgroups(0,0) ;], + aclocal_cv_setgroups=yes , + aclocal_cv_setgroups=no ) +]) + if test $aclocal_cv_setgroups = yes; then + AC_DEFINE(HAVE_SETGROUPS,1,[Define if setgroups is available]) + else + AC_DEFINE(HAVE_SETGROUPS,0,[Define if setgroups is available]) + fi ]) dnl gmtime_r diff --git a/bin/emailrelay-test.sh_ b/bin/emailrelay-test.sh_ index bd9cc30..edcf557 100644 --- a/bin/emailrelay-test.sh_ +++ b/bin/emailrelay-test.sh_ @@ -60,7 +60,8 @@ base_dir="/tmp/`basename $0`.$$.tmp" summary_log="/tmp/`basename $0`.out" exit_code="1" watchdog_pid="" -export MALLOC_CHECK_="2" +MALLOC_CHECK_="2" +export MALLOC_CHECK_ ulimit -c 1000000 if test "${use_valgrind}" -eq 1 then diff --git a/bin/emailrelay.sh_ b/bin/emailrelay.sh_ index bf6202f..bf87fa8 100644 --- a/bin/emailrelay.sh_ +++ b/bin/emailrelay.sh_ @@ -176,6 +176,7 @@ redhat_cmd_start() redhat_errno="$?" #touch /var/lock/subsys/emailrelay if test "${redhat_errno}" -eq 0 ; then success ; else failure ; fi + echo } redhat_cmd_stop() @@ -185,6 +186,7 @@ redhat_cmd_stop() redhat_errno="$?" #rm -f /var/lock/subsys/emailrelay if test "${redhat_errno}" -eq 0 ; then success ; else failure ; fi + echo } redhat_cmd_restarted() diff --git a/bin/expand.sh_ b/bin/expand.sh_ index 64e5e31..f2f1917 100644 --- a/bin/expand.sh_ +++ b/bin/expand.sh_ @@ -29,8 +29,9 @@ # The "-t" switch can be used to suppress expansion where the included # file has an extension of ".html". # -# In edit mode (--edit) the exit value is 0 (shell true) if the file is -# modified. This allows for recursive expansion using a shell while loop. +# In edit mode (--edit) the specified file is modified in-place. With this +# switch the exit value is 0 (shell true) if the file is modified in any +# way. This allows for recursive expansion using a shell while loop. # # usage: expand.sh [-a ] [-t] { --edit | [ ...] } # diff --git a/config.h.in b/config.h.in index 4c0e47f..152d8a1 100644 --- a/config.h.in +++ b/config.h.in @@ -25,6 +25,9 @@ /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H +/* Define if setgroups is available */ +#undef HAVE_SETGROUPS + /* Define if socklen_t type definition in sys/socket.h */ #undef HAVE_SOCKLEN_T diff --git a/configure b/configure index 0f936c0..7b28a7f 100755 --- a/configure +++ b/configure @@ -1459,7 +1459,7 @@ fi # Define the identity of the package. PACKAGE=emailrelay - VERSION=1.1.1 + VERSION=1.1.2 cat >>confdefs.h <<_ACEOF @@ -4565,7 +4565,7 @@ if test "${aclocal_cv_type_socklen_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" #include @@ -4607,19 +4607,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $aclocal_cv_type_socklen_t" >&5 echo "${ECHO_T}$aclocal_cv_type_socklen_t" >&6 - if test $aclocal_cv_type_socklen_t = yes; then + if test $aclocal_cv_type_socklen_t = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKLEN_T 1 _ACEOF - else + else cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKLEN_T 0 _ACEOF - fi + fi echo "$as_me:$LINENO: checking for buggy ctime" >&5 echo $ECHO_N "checking for buggy ctime... $ECHO_C" >&6 @@ -4805,6 +4805,69 @@ _ACEOF fi +echo "$as_me:$LINENO: checking for setgroups" >&5 +echo $ECHO_N "checking for setgroups... $ECHO_C" >&6 +if test "${aclocal_cv_setgroups+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +#include +#include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +setgroups(0,0) ; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + aclocal_cv_setgroups=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +aclocal_cv_setgroups=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $aclocal_cv_setgroups" >&5 +echo "${ECHO_T}$aclocal_cv_setgroups" >&6 + if test $aclocal_cv_setgroups = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SETGROUPS 1 +_ACEOF + + else + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SETGROUPS 0 +_ACEOF + + fi + # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then diff --git a/configure.ac b/configure.ac old mode 100755 new mode 100644 index 0637957..c13c4aa --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure script. dnl AC_INIT(src/gsmtp/gsmtp.h) -AM_INIT_AUTOMAKE(emailrelay,1.1.1) +AM_INIT_AUTOMAKE(emailrelay,1.1.2) AM_CONFIG_HEADER(config.h) dnl === @@ -60,6 +60,7 @@ ACLOCAL_TYPE_SOCKLEN_T ACLOCAL_CHECK_BUGGY_CTIME ACLOCAL_CHECK_GMTIME_R ACLOCAL_CHECK_LOCALTIME_R +ACLOCAL_CHECK_SETGROUPS dnl === dnl "--enable-debug" diff --git a/doc/Makefile.am b/doc/Makefile.am index d9694d8..0a40f26 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -25,12 +25,12 @@ man_files_out=emailrelay.1.gz emailrelay-passwd.1.gz emailrelay-poke.1.gz emailr html_files_in=doxygen_header.html html_files_thru=index.html emailrelay-man.html $(stylesheet) html_files_out=readme.html developer.html reference.html userguide.html windows.html changelog.html -png_files=gsmtp-classes.png gnet-classes.png +png_files=gsmtp-classes.png gnet-classes.png sequence-1.png sequence-2.png sequence-3.png sequence-4.png gnet-client.png gsmtp-serverprotocol.png gsmtp-scannerclient.png EXTRA_DIST = $(man_files_in) $(txt_files) $(html_files_in) $(html_files_thru) $(png_files) noinst_SCRIPTS = .dox e_man1_DATA = $(man_files_out) -e_doc_DATA = $(txt_files) $(html_files_out) $(html_files_thru) +e_doc_DATA = $(txt_files) $(html_files_out) $(html_files_thru) $(png_files) CLEANFILES = $(noinst_SCRIPTS) $(man_files_out) $(html_files_out) doxygen/* SUFFIXES = .txt .html diff --git a/doc/Makefile.in b/doc/Makefile.in index 1caf7e0..636d33f 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -100,12 +100,12 @@ man_files_out = emailrelay.1.gz emailrelay-passwd.1.gz emailrelay-poke.1.gz emai html_files_in = doxygen_header.html html_files_thru = index.html emailrelay-man.html $(stylesheet) html_files_out = readme.html developer.html reference.html userguide.html windows.html changelog.html -png_files = gsmtp-classes.png gnet-classes.png +png_files = gsmtp-classes.png gnet-classes.png sequence-1.png sequence-2.png sequence-3.png sequence-4.png gnet-client.png gsmtp-serverprotocol.png gsmtp-scannerclient.png EXTRA_DIST = $(man_files_in) $(txt_files) $(html_files_in) $(html_files_thru) $(png_files) noinst_SCRIPTS = .dox e_man1_DATA = $(man_files_out) -e_doc_DATA = $(txt_files) $(html_files_out) $(html_files_thru) +e_doc_DATA = $(txt_files) $(html_files_out) $(html_files_thru) $(png_files) CLEANFILES = $(noinst_SCRIPTS) $(man_files_out) $(html_files_out) doxygen/* SUFFIXES = .txt .html diff --git a/doc/developer.txt b/doc/developer.txt index dd6d513..dc0d0e4 100644 --- a/doc/developer.txt +++ b/doc/developer.txt @@ -1,5 +1,5 @@ -E-MailRelay Developer guide -=========================== +E-MailRelay Design and implementation +===================================== Module structure ---------------- @@ -27,8 +27,8 @@ reading and extracting messages from the store. The concrete implementation classes based on these interfaces are respectively "FileStore", "NewFile" and "StoredFile". -The interaction betweeen the server protocol class and the message store is -mediated by the "ProtocolMessage" interface. Two implementations of this +The interaction between the server protocol class and the message store is +mediated by the "ProtocolMessage" interface. Two main implementations of this interface are supplied: one for normal spooling ("ProtocolMessageStore"), and another for immediate forwarding ("ProtocolMessageForward"). @@ -78,19 +78,32 @@ Directory structure Standard headers which are missing (or broken) in msvc6.0 -Tour ----- -For a quick bottom-up tour of the code take a look at the following headers: -* src/glib/gpath.h -* src/glib/gstr.h -* lib/gcc2.95/sstream -* src/gnet/gevent.h -* src/gnet/gaddress.h -* src/gnet/gsocket.h -* src/gnet/gserver.h -* src/smtp/gmessagestore.h -* src/smtp/gserverprotocol.h -* src/smtp/gsmtpserver.h +Event model +----------- +The E-MailRelay server uses non-blocking socket i/o, with a select() event loop. +This event model means that the server can handle multiple clients simultaneously +from a single thread. The only significant blocking occurs when external programs +are executed (see "--filter" and "--verifier"). + +At higher levels the slot/signal design pattern is used to propagate events +between objects. + +Diagrams +-------- +Class diagrams: +* *GNet namespace* [gnet-classes.png] +* *GSmtp namespace* [gsmtp-classes.png] + +State transition diagrams: +* *GNet::Client* [gnet-client.png] +* *GSmtp::ServerProtocol* [gsmtp-serverprotocol.png] +* *GSmtp::ScannerClient* [gsmtp-scannerclient.png] + +Sequence diagrams: +* *Proxy mode forwarding* [sequence-3.png] +* *Scanning* [sequence-4.png] +* *ProtocolMessage::prepare() returns false* [sequence-1.png] +* *ProtocolMessage::prepare() returns true* [sequence-2.png] Portability ----------- @@ -139,7 +152,7 @@ these cases there are three source files per header. For example, "gsocket.cpp", Compile-time features --------------------- -The following features are available to source-code hackers: +The following compile-time features can be enabled with some effort: # IPv6 @@ -162,8 +175,11 @@ The following features are available to source-code hackers: Windows build ------------- -A simple project file "emailrelay.dsp" for msvc6.0 is provided in the "src/main" -directory. +Simple MSVC project files are provided in the "src/main" directory, bundled into +the "emailrelay.dws" workspace. + +Makefiles for the *MinGW* [http://www.mingw.org/] system (gcc on Windows) are also +provided. Style ----- diff --git a/doc/emailrelay-man.html b/doc/emailrelay-man.html index 18255f6..07c36f3 100644 --- a/doc/emailrelay-man.html +++ b/doc/emailrelay-man.html @@ -428,7 +428,7 @@ Graeme Walker, mailto:graem This document was created by man2html, using the manual pages.
-Time: 12:51:06 GMT, July 05, 2003 +Time: 14:14:01 GMT, September 07, 2003 diff --git a/doc/emailrelay.css b/doc/emailrelay.css index be33ca6..7e003ac 100644 --- a/doc/emailrelay.css +++ b/doc/emailrelay.css @@ -102,6 +102,20 @@ a.a-toc:hover background-color: #ccc ; } +a.a-toc-expander +{ + color: #09c ; + background-color: inherit ; + text-decoration: none ; + font-size: smaller ; +} + +a.a-toc-expander:hover +{ + color: #09c ; + background-color: #ccc ; +} + a.a-header { text-decoration:none ; diff --git a/doc/gnet-client.png b/doc/gnet-client.png new file mode 100644 index 0000000000000000000000000000000000000000..2b87a37a0f68ae8ba5b70a7254e5cc25917b35a7 GIT binary patch literal 11116 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 literal 0 HcmV?d00001 diff --git a/doc/gsmtp-scannerclient.png b/doc/gsmtp-scannerclient.png new file mode 100644 index 0000000000000000000000000000000000000000..aa5aedc91e04fe9dee8bbadb268463a3963de405 GIT binary patch literal 10361 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 literal 0 HcmV?d00001 diff --git a/doc/index.html b/doc/index.html index a0f05c9..297b3b2 100644 --- a/doc/index.html +++ b/doc/index.html @@ -13,7 +13,7 @@
  • User guide
  • Reference
  • Windows installation guide
    • -
  • Notes for developers
    • +
  • Design and implementation
  • Source code documentation (generated by doxygen, if available)
  • Man page (generated by man2html, if available)
  • Web site
    • diff --git a/doc/reference.txt b/doc/reference.txt index b358066..c3fd397 100644 --- a/doc/reference.txt +++ b/doc/reference.txt @@ -251,11 +251,16 @@ success, or a value between 1 and 99 to indicate failure. Exit codes between further processing of the message, and 103 has the effect of immediately expiring any "--poll" timer. +If the pre-processor program terminates with a non-zero exit code then the first +few thousand characters of the standard output stream are searched for a line +starting with "<<" followed by ">>". The text inbetween is taken as a failure +reason, and passed back to the SMTP client. + The pre-processor program can edit any part of the message's envelope file or content file: E-MailRelay remembers nothing about the message while the pre-processor is running, except the filename. But if the message is deleted -by the pre-processor then E-MailRelay will be upset, unless the exit code -is 100. +by the pre-processor then E-MailRelay will be upset, so to avoid the +error message use an exit code of 100. If the pre-processor program creates new messages in the spool directory then they may not be processed immediately, or they may be completely ignored. To get @@ -381,8 +386,8 @@ following precautions are taken: # execution environment The mail pre-processor runs with an almost empty set of environment variables - ("PATH" and "IFS"), and with no open file descriptors other than "stdin"/"stdout"/"stderr" - open onto "/dev/null". + ("PATH" and "IFS"), and with no open file descriptors other than "stdin" and + "stderr" open onto "/dev/null", and "stdout" open onto a pipe. # configuration diff --git a/doc/sequence-1.png b/doc/sequence-1.png new file mode 100644 index 0000000000000000000000000000000000000000..89f259f5493956ec1d43a88ba297f092e56ca2e4 GIT binary patch literal 3409 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 GTmJ^tTFfZ` literal 0 HcmV?d00001 diff --git a/doc/sequence-2.png b/doc/sequence-2.png new file mode 100644 index 0000000000000000000000000000000000000000..04669a586d37a2254f52f842a07114a5ef83b4d6 GIT binary patch literal 4485 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 OaF`ieU9B{7jrtb?izrY4 literal 0 HcmV?d00001 diff --git a/doc/sequence-3.png b/doc/sequence-3.png new file mode 100644 index 0000000000000000000000000000000000000000..283193c3c6ed8d1e482257cde5bc1c5576072059 GIT binary patch literal 3319 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 TKC|(Pp>pw@vwh`v*Y5lez(fa7 literal 0 HcmV?d00001 diff --git a/doc/userguide.txt b/doc/userguide.txt index 3442ae9..38d5f6c 100644 --- a/doc/userguide.txt +++ b/doc/userguide.txt @@ -12,7 +12,7 @@ the outside world, using the SMTP protocol. As soon as an e-mail message is received it is forwarded on to the next SMTP server for onward delivery. This becomes more useful when you add in your own message processing: as each message is received it can be passed one of your programs for editing, -filtering, encypting etc. +filtering, encrypting etc. When used as a store-and-forward transfer agent E-MailRelay runs in two modes: the storage daemon part, and the forwarding agent. The storage daemon diff --git a/doc/windows.txt b/doc/windows.txt index 731d24e..29b58ef 100644 --- a/doc/windows.txt +++ b/doc/windows.txt @@ -1,5 +1,5 @@ -E-MailRelay for Windows -======================= +E-MailRelay Windows installation +================================ Introduction ------------ @@ -92,14 +92,6 @@ Finally you will need to configure your e-mail client program to use the local E-MailRelay server for outgoing mail. Where it asks for the name of the SMTP server for outgoing mail you should tell it to use "localhost" or "127.0.0.1". -COM registration ----------------- -The server can be optionally registered as a COM component by running the -executable with the "-regserver" command line switch. The COM interface may -allow stored messages to be forwarded to any remote server, so consider the -security implications before doing the COM registration. Refer to the reference -guide for more details. - Uninstall --------- If you have ever registered the executable as a COM component, then deregister it diff --git a/emailrelay.spec b/emailrelay.spec index 986a3ce..c20de07 100644 --- a/emailrelay.spec +++ b/emailrelay.spec @@ -1,10 +1,10 @@ Summary: Simple e-mail message transfer agent using SMTP Name: emailrelay -Version: 1.1.1 +Version: 1.1.2 Release: 1 Copyright: GPL Group: System Environment/Daemons -Source: http://emailrelay.sourceforge.net/.../emailrelay-src-1.1.1.tar.gz +Source: http://emailrelay.sourceforge.net/.../emailrelay-src-1.1.2.tar.gz BuildRoot: /tmp/emailrelay-install %define prefix /usr diff --git a/install-sh b/install-sh index e9de238..11870f1 100755 --- a/install-sh +++ b/install-sh @@ -109,7 +109,7 @@ then echo "install: no input file specified" exit 1 else - true + : fi if [ x"$dir_arg" != x ]; then @@ -120,7 +120,7 @@ if [ x"$dir_arg" != x ]; then instcmd=: chmodcmd="" else - instcmd=mkdir + instcmd=$mkdirprog fi else @@ -128,9 +128,9 @@ else # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. - if [ -f $src -o -d $src ] + if [ -f "$src" ] || [ -d "$src" ] then - true + : else echo "install: $src does not exist" exit 1 @@ -141,7 +141,7 @@ else echo "install: no destination specified" exit 1 else - true + : fi # If destination is a directory, append the input filename; if your system @@ -151,7 +151,7 @@ else then dst="$dst"/`basename $src` else - true + : fi fi @@ -163,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then -defaultIFS=' -' +defaultIFS=' + ' IFS="${IFS-${defaultIFS}}" oIFS="${IFS}" @@ -183,7 +183,7 @@ while [ $# -ne 0 ] ; do then $mkdirprog "${pathcomp}" else - true + : fi pathcomp="${pathcomp}/" @@ -194,10 +194,10 @@ if [ x"$dir_arg" != x ] then $doit $instcmd $dst && - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi else # If we're going to rename the final executable, determine the name now. @@ -216,7 +216,7 @@ else then dstfile=`basename $dst` else - true + : fi # Make a temp file name in the proper directory. @@ -235,10 +235,10 @@ else # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && # Now rename the file to the real destination. diff --git a/missing b/missing index 0a7fb5a..6a37006 100755 --- a/missing +++ b/missing @@ -1,6 +1,6 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -78,7 +78,7 @@ Supported PROGRAM values: ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.3 - GNU automake" + echo "missing 0.4 - GNU automake" ;; -*) @@ -87,7 +87,12 @@ Supported PROGRAM values: exit 1 ;; - aclocal) + aclocal*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want @@ -97,6 +102,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; autoconf) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -106,6 +116,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; autoheader) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -124,7 +139,12 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $touch_files ;; - automake) + automake*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. @@ -135,6 +155,34 @@ WARNING: \`$1' is missing on your system. You should only need it if while read f; do touch "$f"; done ;; + autom4te) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is needed, and you do not seem to have it handy on your + system. You might have modified some files without having the + proper tools for further handling them. + You can get \`$1Help2man' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + bison|yacc) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if @@ -189,6 +237,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; help2man) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified a dependency of a manual page. You may need the @@ -240,23 +293,23 @@ WARNING: \`$1' is missing on your system. You should only need it if # Look for gnutar/gtar before invocation to avoid ugly error # messages. if (gnutar --version > /dev/null 2>&1); then - gnutar ${1+"$@"} && exit 0 + gnutar "$@" && exit 0 fi if (gtar --version > /dev/null 2>&1); then - gtar ${1+"$@"} && exit 0 + gtar "$@" && exit 0 fi firstarg="$1" if shift; then case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" ${1+"$@"} && exit 0 + tar "$firstarg" "$@" && exit 0 ;; esac case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" ${1+"$@"} && exit 0 + tar "$firstarg" "$@" && exit 0 ;; esac fi diff --git a/mkinstalldirs b/mkinstalldirs index 4f58503..8ab885e 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -4,9 +4,53 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ - errstatus=0 +dirmode="" + +usage="\ +Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." + +# process command line arguments +while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) # -h for help + echo "${usage}" 1>&2; exit 0 ;; + -m ) # -m PERM arg + shift + test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } + dirmode="${1}" + shift ;; + -- ) shift; break ;; # stop option processing + -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option + * ) break ;; # first non-opt arg + esac +done + +for file +do + if test -d "$file"; then + shift + else + break + fi +done + +case $# in +0) exit 0 ;; +esac + +case $dirmode in +'') + if mkdir -p -- . 2>/dev/null; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + fi ;; +*) + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + fi ;; +esac for file do @@ -22,13 +66,24 @@ do esac if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" + echo "mkdir $pathcomp" - mkdir "$pathcomp" || lasterr=$? + mkdir "$pathcomp" || lasterr=$? - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi fi pathcomp="$pathcomp/" @@ -37,4 +92,8 @@ done exit $errstatus +# Local Variables: +# mode: shell-script +# sh-indentation: 3 +# End: # mkinstalldirs ends here diff --git a/src/glib/garg.cpp b/src/glib/garg.cpp index 6d13d35..2c42f90 100644 --- a/src/glib/garg.cpp +++ b/src/glib/garg.cpp @@ -73,15 +73,51 @@ void G::Arg::setPrefix() void G::Arg::parse( HINSTANCE hinstance , const std::string & command_line ) { m_array.push_back( moduleName(hinstance) ) ; - G::Str::splitIntoTokens( command_line , m_array , " \t" ) ; + parseCore( command_line ) ; setPrefix() ; } void G::Arg::reparse( const std::string & command_line ) { - while( m_array.size() > 1U ) - m_array.pop_back() ; - G::Str::splitIntoTokens( command_line , m_array , " \t" ) ; + while( m_array.size() > 1U ) m_array.pop_back() ; + parseCore( command_line ) ; +} + +void G::Arg::parseCore( const std::string & command_line ) +{ + std::string s( command_line ) ; + protect( s ) ; + G::Str::splitIntoTokens( s , m_array , " " ) ; + unprotect( m_array ) ; +} + +void G::Arg::protect( std::string & s ) +{ + // replace all quoted spaces with a replacement + // (could do better: escaped quotes, tabs, single quotes) + G_DEBUG( "protect: before: " << Str::toPrintableAscii(s) ) ; + bool in_quote = false ; + const char quote = '"' ; + const char space = ' ' ; + const char replacement = '\0' ; + for( size_t pos = 0U ; pos < s.length() ; pos++ ) + { + if( s.at(pos) == quote ) in_quote = ! in_quote ; + if( in_quote && s.at(pos) == space ) s[pos] = replacement ; + } + G_DEBUG( "protect: after: " << Str::toPrintableAscii(s) ) ; +} + +void G::Arg::unprotect( StringArray & array ) +{ + // restore replacements to spaces + const char space = ' ' ; + const char replacement = '\0' ; + for( StringArray::iterator p = array.begin() ; p != array.end() ; ++p ) + { + std::string & s = *p ; + G::Str::replaceAll( s , std::string(1U,replacement) , std::string(1U,space) ) ; + } } bool G::Arg::contains( const std::string & sw , size_t sw_args , bool cs ) const diff --git a/src/glib/garg.h b/src/glib/garg.h index 2fe750b..9d6e9d8 100644 --- a/src/glib/garg.h +++ b/src/glib/garg.h @@ -120,6 +120,9 @@ private: bool find( bool , const std::string & , size_t , size_t * ) const ; void setPrefix() ; static bool match( bool , const std::string & , const std::string & ) ; + void parseCore( const std::string & ) ; + void protect( std::string & ) ; + void unprotect( StringArray & ) ; private: StringArray m_array ; diff --git a/src/glib/gdef.h b/src/glib/gdef.h index b007518..8468ba7 100644 --- a/src/glib/gdef.h +++ b/src/glib/gdef.h @@ -32,9 +32,13 @@ #ifndef G_DEF_H #define G_DEF_H - // Autoconf stuff + // Autoconf, part 1 // - #if defined(HAVE_CONFIG_H) + #if defined( HAVE_CONFIG_H ) + + #if ! defined( G_UNIX ) + #define G_UNIX + #endif #include @@ -47,29 +51,10 @@ #include #endif - #if ! HAVE_GMTIME_R - inline std::tm * gmtime_r( const std::time_t * tp , std::tm * tm_p ) - { - * tm_p = * std::gmtime( tp ) ; - return tm_p ; - } - #endif - - #if ! HAVE_LOCALTIME_R - inline std::tm * localtime_r( const std::time_t * tp , std::tm * tm_p ) - { - * tm_p = * std::localtime( tp ) ; - return tm_p ; - } - #endif - #if ! HAVE_SOCKLEN_T typedef int socklen_t ; #endif - #if ! defined( G_UNIX ) - #define G_UNIX - #endif #endif // Check operating-system switches @@ -111,6 +96,9 @@ #else #include #include + #if ! defined( HAVE_CONFIG_H ) + #include + #endif #endif // Define Windows-style types (only used for @@ -178,5 +166,32 @@ #define G_IGNORE (void) #endif + // Autoconf, part 2 + // + #if defined( HAVE_CONFIG_H ) + #if ! HAVE_GMTIME_R + inline std::tm * gmtime_r( const std::time_t * tp , std::tm * tm_p ) + { + * tm_p = * std::gmtime( tp ) ; + return tm_p ; + } + #endif + #if ! HAVE_LOCALTIME_R + inline std::tm * localtime_r( const std::time_t * tp , std::tm * tm_p ) + { + * tm_p = * std::localtime( tp ) ; + return tm_p ; + } + #endif + #if HAVE_SETGROUPS + #include + #else + inline int setgroups( size_t , const gid_t * ) + { + return 0 ; + } + #endif + #endif + #endif diff --git a/src/glib/gprocess.h b/src/glib/gprocess.h index ca672a2..a68b741 100644 --- a/src/glib/gprocess.h +++ b/src/glib/gprocess.h @@ -115,6 +115,10 @@ public: static int errno_() ; // Returns the process's current 'errno' value. + static void revokeExtraGroups() ; + // Revokes secondary group memberships if really root + // or if suid. + static Identity beOrdinary( Identity nobody , bool change_group = true ) ; // Revokes special privileges (root or suid). // diff --git a/src/glib/gprocess_unix.cpp b/src/glib/gprocess_unix.cpp index 703b9ed..acb2fb6 100644 --- a/src/glib/gprocess_unix.cpp +++ b/src/glib/gprocess_unix.cpp @@ -292,6 +292,15 @@ void G::Process::beSpecial( Identity identity , bool change_group ) if( change_group) setEffectiveGroupTo( identity , do_throw ) ; } +void G::Process::revokeExtraGroups() +{ + if( Identity::real().isRoot() || Identity::effective() != Identity::real() ) + { + gid_t dummy ; + G_IGNORE ::setgroups( 0U , &dummy ) ; // (only works for root, so ignore the return code) + } +} + G::Identity G::Process::beOrdinary( Identity nobody , bool change_group ) { Identity special_identity( Identity::effective() ) ; @@ -337,8 +346,11 @@ G::Process::Id::Id( const char * path ) : { // reentrant implementation suitable for a signal handler... int fd = ::open( path ? path : "" , O_RDONLY ) ; - char buffer[10] ; - ssize_t rc = ::read( fd , buffer , sizeof(buffer) ) ; + const size_t buffer_size = 11U ; + char buffer[buffer_size] ; + buffer[0U] = '\0' ; + ssize_t rc = ::read( fd , buffer , buffer_size - 1U ) ; + ::close( fd ) ; for( const char * p = buffer ; rc > 0 && *p >= '0' && *p <= '9' ; p++ , rc-- ) { m_pid *= 10 ; diff --git a/src/glib/gprocess_win32.cpp b/src/glib/gprocess_win32.cpp index a7ed3ae..9329022 100644 --- a/src/glib/gprocess_win32.cpp +++ b/src/glib/gprocess_win32.cpp @@ -36,6 +36,7 @@ namespace G { const int g_stderr_fileno = 2 ; const int g_sc_open_max = 256 ; // 32 in limits.h !? + const HANDLE HNULL = INVALID_HANDLE_VALUE ; class Pipe ; } ; @@ -43,14 +44,17 @@ class G::Pipe { public: G_EXCEPTION( Error , "pipe error" ) ; - explicit Pipe( bool active ) ; + explicit Pipe( bool active , bool do_throw = true ) ; ~Pipe() ; - int fd() const ; - std::string read() ; + HANDLE h() const ; + std::string read( bool do_throw = true ) ; +private: + static HANDLE create( HANDLE & h_write , bool do_throw ) ; + static HANDLE duplicate( HANDLE h , bool do_throw ) ; private: bool m_active ; - int m_fds[2] ; - int m_fd_writer ; + HANDLE m_read ; + HANDLE m_write ; } ; class G::Process::IdImp @@ -61,18 +65,20 @@ public: // === -G::Pipe::Pipe( bool active ) : +G::Pipe::Pipe( bool active , bool do_throw ) : m_active(active) , - m_fd_writer(-1) + m_read(HNULL) , + m_write(HNULL) { - m_fds[0] = m_fds[1] = -1 ; if( m_active ) { - int rc = ::_pipe( m_fds , 256 , _O_BINARY | _O_NOINHERIT ) ; - if( rc < 0 ) throw Error() ; - m_fd_writer = ::_dup( m_fds[1] ) ; // inherited - ::_close( m_fds[1] ) ; - m_fds[1] = -1 ; + const bool do_throw = true ; + HANDLE h = create( m_write , do_throw ) ; + if( h != HNULL ) + { + // dont let child processes inherit the read end + m_read = duplicate( h , do_throw ) ; + } } } @@ -80,25 +86,76 @@ G::Pipe::~Pipe() { if( m_active ) { - ::_close( m_fds[0] ) ; - ::_close( m_fds[1] ) ; - ::_close( m_fd_writer ) ; + if( m_read != HNULL ) ::CloseHandle( m_read ) ; + if( m_write != HNULL ) ::CloseHandle( m_write ) ; } } -int G::Pipe::fd() const +//static +HANDLE G::Pipe::create( HANDLE & h_write , bool do_throw ) { - return m_fd_writer ; + static SECURITY_ATTRIBUTES zero_attributes ; + SECURITY_ATTRIBUTES attributes( zero_attributes ) ; + attributes.nLength = sizeof(attributes) ; + attributes.lpSecurityDescriptor = NULL ; + attributes.bInheritHandle = TRUE ; + + HANDLE h_read = HNULL ; + h_write = HNULL ; + BOOL rc = ::CreatePipe( &h_read , &h_write , &attributes , 0 ) ; + if( rc == 0 ) + { + DWORD error = ::GetLastError() ; + G_ERROR( "G::Pipe::create: pipe error: create: " << error ) ; + if( do_throw ) throw Error( "create" ) ; + h_read = h_write = HNULL ; + } + return h_read ; } -std::string G::Pipe::read() +//static +HANDLE G::Pipe::duplicate( HANDLE h , bool do_throw ) +{ + HANDLE result = HNULL ; + BOOL rc = ::DuplicateHandle( GetCurrentProcess() , h , GetCurrentProcess() , + &result , 0 , FALSE , DUPLICATE_SAME_ACCESS ) ; + if( rc == 0 || result == HNULL ) + { + DWORD error = ::GetLastError() ; + ::CloseHandle( h ) ; + G_ERROR( "G::Pipe::duplicate: pipe error: dup: " << error ) ; + if( do_throw ) throw Error( "dup" ) ; + result = HNULL ; + } + ::CloseHandle( h ) ; + return result ; +} + +HANDLE G::Pipe::h() const +{ + return m_write ; +} + +std::string G::Pipe::read( bool do_throw ) { if( ! m_active ) return std::string() ; - ::_close( m_fd_writer ) ; + ::CloseHandle( m_write ) ; m_write = HNULL ; char buffer[4096] ; - int rc = m_fds[0] == -1 ? 0 : ::_read( m_fds[0] , buffer , sizeof(buffer) ) ; - if( rc < 0 ) throw Error() ; - return std::string( buffer , rc ) ; + DWORD n = sizeof(buffer) ; + DWORD m = 0UL ; + BOOL rc = ::ReadFile( m_read , buffer , n , &m , NULL ) ; + DWORD error = ::GetLastError() ; + ::CloseHandle( m_read ) ; m_read = HNULL ; + if( !rc ) + { + G_DEBUG( "G::Pipe::read: error: " << m << " byte(s): error=" << error ) ; + if( error != ERROR_BROKEN_PIPE ) + { + G_ERROR( "G::Pipe::read: pipe read error: " << error ) ; + if( do_throw ) throw Error( "read" ) ; + } + } + return std::string( buffer , m ) ; } // === @@ -173,38 +230,64 @@ int G::Process::errno_() return errno ; } -int G::Process::spawn( Identity , const Path & exe , const Strings & args_ , +int G::Process::spawn( Identity , const Path & exe , const Strings & args , std::string * pipe_result_p , int error_return ) { - // open file descriptors are inherited across ::_spawn() -- - // no fcntl() is available to set close-on-exec -- but see - // also ::CreateProcess() - - Strings args( args_ ) ; // non-const copy - Pipe pipe( pipe_result_p != NULL ) ; - if( pipe_result_p != NULL ) - args.push_front( Str::fromInt(pipe.fd()) ) ; // kludge -- child must write on fd passed as argv[1] - G_DEBUG( "G::Process::spawn: \"" << exe << "\": \"" << Str::join(args,"\",\"") << "\"" ) ; - char ** argv = new char* [ args.size() + 2U ] ; - argv[0U] = const_cast( exe.pathCstr() ) ; - unsigned int argc = 1U ; - for( Strings::const_iterator arg_p = args.begin() ; arg_p != args.end() ; ++arg_p , argc++ ) - argv[argc] = const_cast(arg_p->c_str()) ; - argv[argc] = NULL ; + std::string command_line = std::string("\"") + exe.str() + "\"" ; + for( Strings::const_iterator arg_p = args.begin() ; arg_p != args.end() ; ++arg_p ) + { + std::string arg = *arg_p ; + if( arg.find(" ") != std::string::npos && arg.find("\"") != 0U ) + arg = std::string("\"") + arg + "\"" ; + command_line += ( std::string(" ") + arg ) ; + } - const int mode = _P_WAIT ; - ::_flushall() ; - int rc = ::_spawnv( mode , exe.str().c_str() , argv ) ; - int error = errno_() ; - delete [] argv ; - G_DEBUG( "G::Process::spawn: _spawnv(): rc=" << rc << ": errno=" << error ) ; + Pipe pipe( pipe_result_p != NULL ) ; - if( pipe_result_p != NULL ) - *pipe_result_p = pipe.read() ; + SECURITY_ATTRIBUTES * process_attributes = NULL ; + SECURITY_ATTRIBUTES * thread_attributes = NULL ; + BOOL inherit = TRUE ; + DWORD flags = CREATE_NO_WINDOW ; + LPVOID env = NULL ; + LPCTSTR cwd = NULL ; + static STARTUPINFO zero_start ; + STARTUPINFO start(zero_start) ; + start.cb = sizeof(start) ; + start.dwFlags = STARTF_USESTDHANDLES ; + start.hStdInput = HNULL ; + start.hStdOutput = pipe.h() ; + start.hStdError = HNULL ; + PROCESS_INFORMATION info ; + char * command_line_p = const_cast(command_line.c_str()) ; + BOOL rc = ::CreateProcess( exe.str().c_str() , command_line_p , + process_attributes , thread_attributes , inherit , + flags , env , cwd , &start , &info ) ; - return rc < 0 ? error_return : rc ; + bool ok = !!rc ; + DWORD exit_code = error_return ; + if( !ok ) + { + DWORD e = ::GetLastError() ; + G_ERROR( "G::Process::spawn: create-process error " << e << ": " << command_line ) ; + } + else + { + DWORD timeout_ms = 30000UL ; + if( WAIT_TIMEOUT == ::WaitForSingleObject( info.hProcess , timeout_ms ) ) + { + G_ERROR( "G::Process::spawn: child process has not terminated: still waiting" ) ; + ::WaitForSingleObject( info.hProcess , INFINITE ) ; + } + ::GetExitCodeProcess( info.hProcess , &exit_code ) ; + G_LOG( "G::Process::spawn: exit " << exit_code << " from \"" << exe << "\": " << exit_code ) ; + + if( pipe_result_p != NULL ) + *pipe_result_p = pipe.read(false) ; + } + + return exit_code ; } G::Identity G::Process::beOrdinary( Identity identity , bool ) @@ -218,6 +301,11 @@ void G::Process::beSpecial( Identity , bool ) // not implemented } +void G::Process::revokeExtraGroups() +{ + // not implemented +} + // not implemented... // Who G::Process::fork() {} // Who G::Process::fork( Id & child ) {} diff --git a/src/glib/groot.cpp b/src/glib/groot.cpp index 24edb91..52a8b39 100644 --- a/src/glib/groot.cpp +++ b/src/glib/groot.cpp @@ -63,6 +63,7 @@ G::Root::~Root() //static void G::Root::init( const std::string & nobody ) { + Process::revokeExtraGroups() ; m_nobody = nobody.empty() ? Identity::invalid() : Identity(nobody) ; m_special = Process::beOrdinary( m_nobody ) ; } diff --git a/src/glib/md5.h b/src/glib/md5.h index ba24f1a..fa13f22 100644 --- a/src/glib/md5.h +++ b/src/glib/md5.h @@ -1,22 +1,3 @@ -// -// Copyright (C) 2001-2003 Graeme Walker -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later -// version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// -// === /* MD5.H - header file for MD5C.C */ diff --git a/src/glib/md5c.c b/src/glib/md5c.c index 77a628b..8cd102b 100644 --- a/src/glib/md5c.c +++ b/src/glib/md5c.c @@ -1,23 +1,3 @@ -/* - Copyright (C) 2001-2003 Graeme Walker - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later - version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm */ diff --git a/src/gnet/gclient.cpp b/src/gnet/gclient.cpp index 1fd2201..e4974a3 100644 --- a/src/gnet/gclient.cpp +++ b/src/gnet/gclient.cpp @@ -39,6 +39,7 @@ namespace const int c_retries = 10 ; // number of retries when using a priviledged local port number const int c_port_start = 512 ; const int c_port_end = 1024 ; + const std::string c_cannot_connect_to( "cannot connect to " ) ; } namespace GNet @@ -73,7 +74,7 @@ GNet::ClientResolver::ClientResolver( ClientImp & imp ) : // === // Class: GNet::ClientImp -// Description: A pimple-pattern implementation class for GClient. +// Description: A pimple-pattern implementation class for GNet::Client. // class GNet::ClientImp : public GNet::EventHandler { @@ -174,6 +175,12 @@ std::string GNet::Client::peerName() const return m_imp->peerName() ; } +//static +bool GNet::Client::canRetry( const std::string & error ) +{ + return error.find( c_cannot_connect_to ) == 0U ; +} + // === bool GNet::ClientImp::m_first = true ; @@ -269,7 +276,7 @@ bool GNet::ClientImp::connect( std::string host , std::string service , } if( immediate ) { - G_WARNING( "GNet::Client::connect: immediate connection" ) ; // delete soon + G_DEBUG( "GNet::Client::connect: immediate connection" ) ; // delete soon s().addReadHandler( *this ) ; s().addExceptionHandler( *this ) ; setState( Connected ) ; @@ -392,7 +399,7 @@ GNet::ClientImp::Status GNet::ClientImp::connectCore( Address remote_address , if( !s().connect( remote_address , &immediate ) ) { G_DEBUG( "GNet::ClientImp::connect: immediate failure" ) ; - error = "cannot connect to " ; + error = c_cannot_connect_to ; error.append( remote_address.displayString().c_str() ) ; // we should return Failure here, but Microsoft's stack @@ -433,7 +440,7 @@ void GNet::ClientImp::writeEvent() } else if( m_state == Connecting ) { - std::string message( "cannot connect to " ) ; + std::string message( c_cannot_connect_to ) ; message.append( m_address.displayString().c_str() ) ; setState( Failed ) ; close() ; diff --git a/src/gnet/gclient.h b/src/gnet/gclient.h index 98ee608..98fb3f5 100644 --- a/src/gnet/gclient.h +++ b/src/gnet/gclient.h @@ -100,24 +100,44 @@ public: // Returns the peer's canonical name if available. // Returns the empty string if not. + static bool canRetry( const std::string & error_string ) ; + // Parses the error string from onError(), retuning true + // if it might be temporary. In practice it returns + // true iff Socket::connect() failed. + protected: friend class ClientImp ; virtual void onConnect( Socket & socket ) = 0 ; // Called once connected. May (unfortunately) be // called from within connect(). + // + // Precondition: !connected() + // Postcondition: connected() virtual void onDisconnect() = 0 ; // Called when disconnected by the peer. + // + // Precondition: connected() + // Postcondition: !connected() virtual void onData( const char * data , size_t size ) = 0 ; // Called on receipt of data. + // + // Precondition: connected() + // Postcondition: connected() - virtual void onError( const std::string &error ) = 0 ; - // Called when an asyncronous, and fatal, error occurs. + virtual void onError( const std::string & error ) = 0 ; + // Called when a connect request fails. + // + // Precondition: !connected() + // Postcondition: !connected() virtual void onWriteable() = 0 ; // Called when a blocked connection become writeable. + // + // Precondition: connected() + // Postcondition: connected() private: Client( const Client& ) ; // Copy constructor. Not implemented. diff --git a/src/gnet/gserver.cpp b/src/gnet/gserver.cpp index 5461265..b938716 100644 --- a/src/gnet/gserver.cpp +++ b/src/gnet/gserver.cpp @@ -144,6 +144,17 @@ void GNet::Server::init( const Address & listening_address ) m_socket->addReadHandler( *this ) ; } +//static +bool GNet::Server::canBind( const Address & address , bool do_throw ) +{ + G::Root claim_root ; + StreamSocket s ; + bool ok = s.canBindHint( address ) ; + if( !ok && do_throw ) + throw CannotBind( address.displayString() ) ; + return ok ; +} + GNet::Server::~Server() { serverCleanup() ; diff --git a/src/gnet/gserver.h b/src/gnet/gserver.h index 0a966bc..cc87232 100644 --- a/src/gnet/gserver.h +++ b/src/gnet/gserver.h @@ -92,6 +92,11 @@ public: PeerInfo() ; } ; + static bool canBind( const Address & listening_address , bool do_throw ) ; + // Checks that the specified address can be + // bound. Throws CannotBind if the address cannot + // be bound and 'do_throw' is true. + explicit Server( unsigned int listening_port ) ; // Constructor taking a port number. The server // listens on all local interfaces. diff --git a/src/gnet/gsocket.h b/src/gnet/gsocket.h index d281979..2614972 100644 --- a/src/gnet/gsocket.h +++ b/src/gnet/gsocket.h @@ -94,11 +94,19 @@ public: // address. This is used for listening // sockets. - bool bind(); + bool bind() ; // Binds the socket with an INADDR_ANY network address // and a zero port number. This is used to // initialise the socket prior to connect(). + bool canBindHint( const Address & address ) ; + // Returns true if the socket can probably be + // bound with the given address. Some + // implementations will always return + // true. This method should be used on a + // temporary socket of the correct dynamic + // type. + bool connect( const Address &addr , bool *done = NULL ) ; // Initiates a connection to (or association // with) the given address. Returns false on diff --git a/src/gnet/gsocket_unix.cpp b/src/gnet/gsocket_unix.cpp index 26389ea..7d02f35 100644 --- a/src/gnet/gsocket_unix.cpp +++ b/src/gnet/gsocket_unix.cpp @@ -18,7 +18,7 @@ // // === // -// gsocket_unix.cc +// gsocket_unix.cpp // #include "gdef.h" @@ -59,7 +59,7 @@ int GNet::Socket::reason() void GNet::Socket::doClose() { G_ASSERT( valid() ) ; - ::close( m_socket ); + ::close( m_socket ) ; m_socket = -1; } @@ -93,3 +93,10 @@ void GNet::Socket::setFault() m_reason = EFAULT ; } +bool GNet::Socket::canBindHint( const Address & address ) +{ + bool can_bind = bind( address ) ; + close() ; + return can_bind ; +} + diff --git a/src/gnet/gsocket_win32.cpp b/src/gnet/gsocket_win32.cpp index f7439ec..cdf9f26 100644 --- a/src/gnet/gsocket_win32.cpp +++ b/src/gnet/gsocket_win32.cpp @@ -91,3 +91,9 @@ void GNet::Socket::setFault() m_reason = WSAEFAULT ; } +bool GNet::Socket::canBindHint( const Address & ) +{ + // rebinding the same port number fails, so a dummy implementation here + return true ; +} + diff --git a/src/gsmtp/Makefile.am b/src/gsmtp/Makefile.am index f33edde..7ab6fd5 100644 --- a/src/gsmtp/Makefile.am +++ b/src/gsmtp/Makefile.am @@ -47,10 +47,14 @@ libgsmtp_a_SOURCES = \ gprotocolmessage.h \ gprotocolmessageforward.cpp \ gprotocolmessageforward.h \ + gprotocolmessagescanner.cpp \ + gprotocolmessagescanner.h \ gprotocolmessagestore.cpp \ gprotocolmessagestore.h \ gsasl_native.cpp \ gsasl.h \ + gscannerclient.cpp \ + gscannerclient.h \ gsecrets.cpp \ gsecrets.h \ gserverprotocol.cpp \ diff --git a/src/gsmtp/Makefile.in b/src/gsmtp/Makefile.in index 07ddbac..2e8a6ac 100644 --- a/src/gsmtp/Makefile.in +++ b/src/gsmtp/Makefile.in @@ -123,10 +123,14 @@ libgsmtp_a_SOURCES = \ gprotocolmessage.h \ gprotocolmessageforward.cpp \ gprotocolmessageforward.h \ + gprotocolmessagescanner.cpp \ + gprotocolmessagescanner.h \ gprotocolmessagestore.cpp \ gprotocolmessagestore.h \ gsasl_native.cpp \ gsasl.h \ + gscannerclient.cpp \ + gscannerclient.h \ gsecrets.cpp \ gsecrets.h \ gserverprotocol.cpp \ @@ -158,11 +162,12 @@ am_libgsmtp_a_OBJECTS = gadminserver.$(OBJEXT) gbase64.$(OBJEXT) \ gmessagestore.$(OBJEXT) gmessagestore_unix.$(OBJEXT) \ gnewfile.$(OBJEXT) gnewmessage.$(OBJEXT) \ gprotocolmessage.$(OBJEXT) gprotocolmessageforward.$(OBJEXT) \ + gprotocolmessagescanner.$(OBJEXT) \ gprotocolmessagestore.$(OBJEXT) gsasl_native.$(OBJEXT) \ - gsecrets.$(OBJEXT) gserverprotocol.$(OBJEXT) \ - gsmtpclient.$(OBJEXT) gsmtpserver.$(OBJEXT) \ - gstoredfile.$(OBJEXT) gstoredmessage.$(OBJEXT) \ - gverifier.$(OBJEXT) gxtext.$(OBJEXT) + gscannerclient.$(OBJEXT) gsecrets.$(OBJEXT) \ + gserverprotocol.$(OBJEXT) gsmtpclient.$(OBJEXT) \ + gsmtpserver.$(OBJEXT) gstoredfile.$(OBJEXT) \ + gstoredmessage.$(OBJEXT) gverifier.$(OBJEXT) gxtext.$(OBJEXT) libgsmtp_a_OBJECTS = $(am_libgsmtp_a_OBJECTS) DEFS = @DEFS@ @@ -181,8 +186,11 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/gnewfile.Po ./$(DEPDIR)/gnewmessage.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/gprotocolmessage.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/gprotocolmessageforward.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gprotocolmessagescanner.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/gprotocolmessagestore.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gsasl_native.Po ./$(DEPDIR)/gsecrets.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gsasl_native.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gscannerclient.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gsecrets.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/gserverprotocol.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/gsmtpclient.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/gsmtpserver.Po \ @@ -237,8 +245,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewmessage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessageforward.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessagescanner.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessagestore.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsasl_native.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gscannerclient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsecrets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gserverprotocol.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpclient.Po@am__quote@ diff --git a/src/gsmtp/gclientprotocol.cpp b/src/gsmtp/gclientprotocol.cpp index 6f9f132..a210f11 100644 --- a/src/gsmtp/gclientprotocol.cpp +++ b/src/gsmtp/gclientprotocol.cpp @@ -37,7 +37,7 @@ #include "gassert.h" GSmtp::ClientProtocol::ClientProtocol( Sender & sender , const Secrets & secrets , - const std::string & thishost_name , unsigned int timeout , bool must_authenticate ) : + const std::string & thishost_name , unsigned int timeout , bool must_authenticate , bool strict ) : m_sender(sender) , m_secrets(secrets) , m_thishost(thishost_name) , @@ -47,6 +47,8 @@ GSmtp::ClientProtocol::ClientProtocol( Sender & sender , const Secrets & secrets m_message_is_8bit(false) , m_authenticated_with_server(false) , m_must_authenticate(must_authenticate) , + m_strict(strict) , + m_warned(false) , m_timeout(timeout) , m_signalled(false) { @@ -147,7 +149,8 @@ void GSmtp::ClientProtocol::apply( const std::string & rx ) void GSmtp::ClientProtocol::sendMail() { - if( !m_server_has_8bitmime && m_message_is_8bit ) + const bool dodgy = m_message_is_8bit && !m_server_has_8bitmime ; + if( dodgy && m_strict ) { std::string reason = "cannot send 8-bit message to 7-bit server" ; G_WARNING( "GSmtp::ClientProtocol: " << reason ) ; @@ -156,6 +159,12 @@ void GSmtp::ClientProtocol::sendMail() } else { + if( dodgy && !m_warned ) + { + m_warned = true ; + G_WARNING( "GSmtp::ClientProtocol::sendMail: sending an eight-bit message " + "to a server which has not advertised the 8BITMIME extension" ) ; + } sendMailCore() ; } } diff --git a/src/gsmtp/gclientprotocol.h b/src/gsmtp/gclientprotocol.h index 2a34eb2..68844b3 100644 --- a/src/gsmtp/gclientprotocol.h +++ b/src/gsmtp/gclientprotocol.h @@ -159,7 +159,8 @@ public: ClientProtocol( Sender & sender , const Secrets & secrets , const std::string & thishost_name , - unsigned int timeout , bool must_authenticate ) ; + unsigned int timeout , bool must_authenticate , + bool eight_bit_strict = false ) ; // Constructor. The 'sender' and 'secrets' references // are kept. // @@ -168,6 +169,10 @@ public: // // The 'thishost_name' parameter is used in the // SMTP EHLO request. + // + // If the 'eight-bit-strict' flag is true then + // an eight-bit message being sent to a + // seven-bit server will be failed. G::Signal3 & doneSignal() ; // Returns a signal which is raised once the protocol has @@ -237,6 +242,8 @@ private: std::string m_auth_mechanism ; std::auto_ptr m_sasl ; bool m_must_authenticate ; + bool m_strict ; + bool m_warned ; unsigned int m_timeout ; G::Signal3 m_signal ; bool m_signalled ; diff --git a/src/gsmtp/gnewfile.cpp b/src/gsmtp/gnewfile.cpp index 10872b2..5f95f00 100644 --- a/src/gsmtp/gnewfile.cpp +++ b/src/gsmtp/gnewfile.cpp @@ -27,6 +27,7 @@ #include "gnewfile.h" #include "gmemory.h" #include "gprocess.h" +#include "gstr.h" #include "groot.h" #include "gfile.h" #include "gxtext.h" @@ -119,9 +120,10 @@ bool GSmtp::NewFile::store( const std::string & auth_id , const std::string & cl bool cancelled = false ; if( ok ) { - ok = preprocess( m_content_path , cancelled ) ; + std::string output ; + ok = preprocess( m_content_path , cancelled , output ) ; if( !ok ) - reason = "pre-processing failed" ; + reason = output.empty() ? std::string("pre-processing failed") : output ; } G_ASSERT( !(ok&&cancelled) ) ; @@ -165,11 +167,11 @@ void GSmtp::NewFile::cleanup() } } -bool GSmtp::NewFile::preprocess( const G::Path & path , bool & cancelled ) +bool GSmtp::NewFile::preprocess( const G::Path & path , bool & cancelled , std::string & output ) { if( ! m_preprocess ) return true ; - int exit_code = preprocessCore( path ) ; + int exit_code = preprocessCore( path , output ) ; bool is_ok = exit_code == 0 ; bool is_special = exit_code >= 100 && exit_code <= 107 ; @@ -199,16 +201,43 @@ bool GSmtp::NewFile::preprocess( const G::Path & path , bool & cancelled ) } } -int GSmtp::NewFile::preprocessCore( const G::Path & path ) +int GSmtp::NewFile::preprocessCore( const G::Path & path , std::string & output ) { G_LOG( "GSmtp::NewFile::preprocess: " << m_preprocessor << " " << path ) ; G::Strings args ; args.push_back( path.str() ) ; - int exit_code = G::Process::spawn( G::Root::nobody() , m_preprocessor , args ) ; - G_LOG( "GSmtp::NewFile::preprocess: exit status " << exit_code ) ; + std::string raw_output ; + int exit_code = G::Process::spawn( G::Root::nobody() , m_preprocessor , args , &raw_output ) ; + output = parseOutput( raw_output ) ; + G_LOG( "GSmtp::NewFile::preprocess: exit status " << exit_code << " (\"" << output << "\")" ) ; return exit_code ; } +std::string GSmtp::NewFile::parseOutput( std::string s ) const +{ + G_DEBUG( "GSmtp::NewFile::parseOutput: in: \"" << G::Str::toPrintableAscii(s) << "\"" ) ; + const std::string start("<<") ; + const std::string end(">>") ; + std::string result ; + G::Str::replaceAll( s , "\r\n" , "\n" ) ; + G::Str::replaceAll( s , "\r" , "\n" ) ; + G::Strings lines ; + G::Str::splitIntoFields( s , lines , "\n" ) ; + for( G::Strings::iterator p = lines.begin() ; p != lines.end() ; ++p ) + { + std::string line = *p ; + size_t pos_start = line.find(start) ; + size_t pos_end = line.find(end) ; + if( pos_start == 0U && pos_end != std::string::npos ) + { + result = G::Str::toPrintableAscii(line.substr(start.length(),pos_end-start.length())) ; + } + } + G_DEBUG( "GSmtp::NewFile::parseOutput: in: \"" << G::Str::toPrintableAscii(result) << "\"" ) ; + return result ; +} + + void GSmtp::NewFile::deliver( const G::Strings & /*to*/ , const G::Path & content_path , const G::Path & envelope_path_now , const G::Path & envelope_path_later ) @@ -263,6 +292,11 @@ unsigned long GSmtp::NewFile::id() const return m_seq ; } +G::Path GSmtp::NewFile::contentPath() const +{ + return m_content_path ; +} + void GSmtp::NewFile::setPreprocessor( const G::Path & exe ) { if( exe.isRelative() ) diff --git a/src/gsmtp/gnewfile.h b/src/gsmtp/gnewfile.h index 02fb366..420419a 100644 --- a/src/gsmtp/gnewfile.h +++ b/src/gsmtp/gnewfile.h @@ -70,6 +70,9 @@ public: // Defines a program which is used for pre-processing // messages before they are stored. + G::Path contentPath() const ; + // Returns the path of the content file. + private: FileStore & m_store ; unsigned long m_seq ; @@ -90,8 +93,9 @@ private: const std::string & crlf() const ; static bool isEightBit( const std::string & line ) ; void deliver( const G::Strings & , const G::Path & , const G::Path & , const G::Path & ) ; - bool preprocess( const G::Path & , bool & ) ; - int preprocessCore( const G::Path & ) ; + bool preprocess( const G::Path & , bool & , std::string & ) ; + int preprocessCore( const G::Path & , std::string & ) ; + std::string parseOutput( std::string ) const ; bool commit( const G::Path & , const G::Path & ) ; void rollback() ; void cleanup() ; diff --git a/src/gsmtp/gprotocolmessage.h b/src/gsmtp/gprotocolmessage.h index 30ac1a2..df5455a 100644 --- a/src/gsmtp/gprotocolmessage.h +++ b/src/gsmtp/gprotocolmessage.h @@ -61,6 +61,13 @@ public: // As a special case, if success is true and id is zero then // the message processing was cancelled. + virtual G::Signal3 & preparedSignal() = 0 ; + // Returns a signal which is raised once prepare() has + // completed. + // + // The signal parameters are 'success', 'temporary' and + // 'reason'. + virtual void clear() = 0 ; // Clears the message state and terminates // any asynchronous message processing. @@ -69,6 +76,13 @@ public: // Sets the message envelope 'from'. // Returns false if an invalid user. + virtual bool prepare() = 0 ; + // Called to start any asynchronous preparation which is + // required after setFrom(). Returns true if there + // is something to do (in which case preparedSignal() + // must be fired later), or false if there is nothing + // to do. + virtual bool addTo( const std::string & to_user , Verifier::Status to_status ) = 0 ; // Adds an envelope 'to'. // diff --git a/src/gsmtp/gprotocolmessageforward.cpp b/src/gsmtp/gprotocolmessageforward.cpp index 91ebe1f..c135019 100644 --- a/src/gsmtp/gprotocolmessageforward.cpp +++ b/src/gsmtp/gprotocolmessageforward.cpp @@ -44,13 +44,23 @@ GSmtp::ProtocolMessageForward::ProtocolMessageForward( MessageStore & store , m_pm.doneSignal().connect( G::slot(*this,&ProtocolMessageForward::processDone) ) ; } +G::Signal3 & GSmtp::ProtocolMessageForward::storageDoneSignal() +{ + return m_pm.doneSignal() ; +} + GSmtp::ProtocolMessageForward::~ProtocolMessageForward() { } G::Signal3 & GSmtp::ProtocolMessageForward::doneSignal() { - return m_signal ; + return m_done_signal ; +} + +G::Signal3 & GSmtp::ProtocolMessageForward::preparedSignal() +{ + return m_prepared_signal ; } void GSmtp::ProtocolMessageForward::clear() @@ -64,6 +74,11 @@ bool GSmtp::ProtocolMessageForward::setFrom( const std::string & from ) return m_pm.setFrom( from ) ; } +bool GSmtp::ProtocolMessageForward::prepare() +{ + return false ; // no async preparation required +} + bool GSmtp::ProtocolMessageForward::addTo( const std::string & to , Verifier::Status to_status ) { return m_pm.addTo( to , to_status ) ; @@ -90,19 +105,24 @@ void GSmtp::ProtocolMessageForward::process( const std::string & auth_id , m_pm.process( auth_id , client_ip ) ; } -void GSmtp::ProtocolMessageForward::processDone( bool success , unsigned long id , std::string reason_in ) +void GSmtp::ProtocolMessageForward::processDone( bool success , unsigned long id , std::string reason ) { - std::string reason( reason_in ) ; - bool nothing_to_do = success && id == 0UL ; if( success && id != 0UL ) { m_id = id ; - success = forward( id , nothing_to_do , &reason ) ; - } - if( nothing_to_do || !success ) + bool nothing_to_do = false ; + success = forward( id , nothing_to_do , &reason ) ; + if( !success || nothing_to_do ) + { + // failed or no recipients + m_done_signal.emit( success , id , reason ) ; + } + } + else { - m_signal.emit( success , id , reason ) ; + // failed or cancelled + m_done_signal.emit( success , id , reason ) ; } } @@ -131,14 +151,20 @@ bool GSmtp::ProtocolMessageForward::forward( unsigned long id , bool & nothing_t ok = reason.empty() ; if( !ok && reason_p != NULL ) + { + G_DEBUG( "GSmtp::ProtocolMessageForward::forward: client connect error" ) ; *reason_p = reason ; + } } return ok ; } catch( std::exception & e ) { if( reason_p != NULL ) + { + G_DEBUG( "GSmtp::ProtocolMessageForward::forward: exception" ) ; *reason_p = e.what() ; + } return false ; } } @@ -147,6 +173,6 @@ void GSmtp::ProtocolMessageForward::clientDone( std::string reason ) { G_DEBUG( "GSmtp::ProtocolMessageForward::clientDone: \"" << reason << "\"" ) ; const bool ok = reason.empty() ; - m_signal.emit( ok , m_id , reason ) ; + m_done_signal.emit( ok , m_id , reason ) ; } diff --git a/src/gsmtp/gprotocolmessageforward.h b/src/gsmtp/gprotocolmessageforward.h index 26bcaf5..44f97a0 100644 --- a/src/gsmtp/gprotocolmessageforward.h +++ b/src/gsmtp/gprotocolmessageforward.h @@ -66,12 +66,18 @@ public: virtual G::Signal3 & doneSignal() ; // See ProtocolMessage. + virtual G::Signal3 & preparedSignal() ; + // See ProtocolMessage. + virtual void clear() ; // See ProtocolMessage. virtual bool setFrom( const std::string & from_user ) ; // See ProtocolMessage. + virtual bool prepare() ; + // See ProtocolMessage. + virtual bool addTo( const std::string & to_user , Verifier::Status to_status ) ; // See ProtocolMessage. @@ -87,9 +93,16 @@ public: virtual void process( const std::string & auth_id , const std::string & client_ip ) ; // See ProtocolMessage. +protected: + G::Signal3 & storageDoneSignal() ; + // Returns the signal which is used to signal that the storage + // is complete. + + void processDone( bool , unsigned long , std::string ) ; + // ... + private: void operator=( const ProtocolMessageForward & ) ; // not implemented - void processDone( bool , unsigned long , std::string ) ; // ProtocolMessage::doneSignal() void clientDone( std::string ) ; // Client::doneSignal() bool forward( unsigned long , bool & , std::string * ) ; @@ -102,7 +115,8 @@ private: unsigned long m_id ; unsigned int m_response_timeout ; unsigned int m_connection_timeout ; - G::Signal3 m_signal ; + G::Signal3 m_done_signal ; + G::Signal3 m_prepared_signal ; } ; #endif diff --git a/src/gsmtp/gprotocolmessagescanner.cpp b/src/gsmtp/gprotocolmessagescanner.cpp new file mode 100644 index 0000000..3f5408e --- /dev/null +++ b/src/gsmtp/gprotocolmessagescanner.cpp @@ -0,0 +1,101 @@ +// +// Copyright (C) 2001-2003 Graeme Walker +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later +// version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// +// === +// +// gprotocolmessagescanner.cpp +// + +#include "gdef.h" +#include "gsmtp.h" +#include "gprotocolmessagescanner.h" +#include "gmessagestore.h" +#include "gfilestore.h" +#include "gmemory.h" +#include "gstr.h" +#include "gassert.h" +#include "glog.h" + +GSmtp::ProtocolMessageScanner::ProtocolMessageScanner( MessageStore & store , + const Secrets & client_secrets , + const std::string & smtp_server , + unsigned int smtp_response_timeout , unsigned int smtp_connection_timeout , + const std::string & scanner_server , + unsigned int scanner_response_timeout , unsigned int scanner_connection_timeout ) : + ProtocolMessageForward(store,client_secrets,smtp_server,smtp_response_timeout,smtp_connection_timeout), + m_store(store) , + m_scanner_server(scanner_server) , + m_scanner_response_timeout(scanner_response_timeout) , + m_scanner_connection_timeout(scanner_connection_timeout) , + m_id(0UL) +{ + G_DEBUG( "GSmtp::ProtocolMessageScanner::ctor" ) ; + scannerInit() ; + ProtocolMessageForward::storageDoneSignal().disconnect() ; + ProtocolMessageForward::storageDoneSignal().connect( G::slot(*this,&ProtocolMessageScanner::storageDone) ) ; +} + +void GSmtp::ProtocolMessageScanner::scannerInit() +{ + m_scanner_client <<= + new ScannerClient(m_scanner_server,m_scanner_connection_timeout,m_scanner_response_timeout) ; + m_scanner_client->connectedSignal().connect( G::slot(*this,&ProtocolMessageScanner::connectDone) ) ; + m_scanner_client->doneSignal().connect( G::slot(*this,&ProtocolMessageScanner::scannerDone) ) ; +} + +GSmtp::ProtocolMessageScanner::~ProtocolMessageScanner() +{ +} + +G::Signal3 & GSmtp::ProtocolMessageScanner::preparedSignal() +{ + return m_prepared_signal ; +} + +bool GSmtp::ProtocolMessageScanner::prepare() +{ + m_scanner_client->startConnecting() ; + return true ; +} + +void GSmtp::ProtocolMessageScanner::connectDone( std::string reason , bool temporary_error ) +{ + G_DEBUG( "GSmtp::ProtocolMessageScanner::connectDone: \"" << reason << "\", " << temporary_error ) ; + m_prepared_signal.emit( reason.empty() , temporary_error , reason ) ; +} + +void GSmtp::ProtocolMessageScanner::storageDone( bool , unsigned long id , std::string ) +{ + G_DEBUG( "GSmtp::ProtocolMessageScanner::storageDone" ) ; + m_id = id ; + FileStore & file_store = dynamic_cast(m_store) ; + m_scanner_client->startScanning( file_store.contentPath(id) ) ; +} + +void GSmtp::ProtocolMessageScanner::scannerDone( bool /* reason_is_from_scanner */ , std::string reason ) +{ + const bool ok = reason.empty() ; + ProtocolMessageForward::processDone( ok , m_id , reason ) ; +} + +void GSmtp::ProtocolMessageScanner::clear() +{ + scannerInit() ; + Base::clear() ; +} + diff --git a/src/gsmtp/gprotocolmessagescanner.h b/src/gsmtp/gprotocolmessagescanner.h new file mode 100644 index 0000000..f1b8b8d --- /dev/null +++ b/src/gsmtp/gprotocolmessagescanner.h @@ -0,0 +1,94 @@ +// +// Copyright (C) 2001-2003 Graeme Walker +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later +// version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// +// === +// +// gprotocolmessagescanner.h +// + +#ifndef G_SMTP_PROTOCOL_MESSAGE_SCANNER_H +#define G_SMTP_PROTOCOL_MESSAGE_SCANNER_H + +#include "gdef.h" +#include "gsmtp.h" +#include "gprotocolmessage.h" +#include "gprotocolmessagestore.h" +#include "gprotocolmessageforward.h" +#include "gscannerclient.h" +#include "gsecrets.h" +#include "gsmtpclient.h" +#include "gmessagestore.h" +#include "gnewmessage.h" +#include +#include + +namespace GSmtp +{ + class ProtocolMessageScanner ; +} + +// Class: GSmtp::ProtocolMessageScanner +// Description: A derivation of ProtocolMessageForward which adds in +// a scanning step. +// +// The scanning part deletages to a ScannerClient data member. +// +// See also: ProtocolMessageStore, ProtocolMessageForward +// +class GSmtp::ProtocolMessageScanner : public GSmtp::ProtocolMessageForward +{ +public: + ProtocolMessageScanner( MessageStore & store , const Secrets & client_secrets , + const std::string & smtp_server_address , + unsigned int smtp_response_timeout , unsigned int smtp_connection_timeout , + const std::string & scanner_server_address , + unsigned int scanner_response_timeout , unsigned int scanner_connection_timeout ) ; + // Constructor. The 'store' and 'client-secrets' references + // are kept. + + virtual ~ProtocolMessageScanner() ; + // Destructor. + + virtual G::Signal3 & preparedSignal() ; + // See ProtocolMessage. + + virtual bool prepare() ; + // See ProtocolMessage. + + virtual void clear() ; + // See ProtocolMessage. + +private: + void operator=( const ProtocolMessageScanner & ) ; // not implemented + void connectDone( std::string reason , bool ) ; + void storageDone( bool success , unsigned long id , std::string reason ) ; + void scannerDone( bool b , std::string reason ) ; + void scannerInit() ; + +private: + typedef ProtocolMessageForward Base ; + MessageStore & m_store ; + std::string m_scanner_server ; + unsigned int m_scanner_response_timeout ; + unsigned int m_scanner_connection_timeout ; + std::auto_ptr m_scanner_client ; + G::Signal3 m_prepared_signal ; + unsigned long m_id ; +} ; + +#endif diff --git a/src/gsmtp/gprotocolmessagestore.cpp b/src/gsmtp/gprotocolmessagestore.cpp index 13f3e48..e9e9e3e 100644 --- a/src/gsmtp/gprotocolmessagestore.cpp +++ b/src/gsmtp/gprotocolmessagestore.cpp @@ -68,6 +68,11 @@ bool GSmtp::ProtocolMessageStore::setFrom( const std::string & from ) } } +bool GSmtp::ProtocolMessageStore::prepare() +{ + return false ; // no async preparation required +} + bool GSmtp::ProtocolMessageStore::addTo( const std::string & to , Verifier::Status to_status ) { G_ASSERT( m_msg.get() != NULL ) ; @@ -121,19 +126,23 @@ void GSmtp::ProtocolMessageStore::process( const std::string & auth_id , const s id = m_msg->id() ; } clear() ; - m_signal.emit( true , id , std::string() ) ; + m_done_signal.emit( true , id , std::string() ) ; } catch( std::exception & e ) { G_ERROR( "GSmtp::ProtocolMessage::process: error: " << e.what() ) ; clear() ; - m_signal.emit( false , 0UL , e.what() ) ; + m_done_signal.emit( false , 0UL , e.what() ) ; } } G::Signal3 & GSmtp::ProtocolMessageStore::doneSignal() { - return m_signal ; + return m_done_signal ; } +G::Signal3 & GSmtp::ProtocolMessageStore::preparedSignal() +{ + return m_prepared_signal ; +} diff --git a/src/gsmtp/gprotocolmessagestore.h b/src/gsmtp/gprotocolmessagestore.h index e372724..698a45a 100644 --- a/src/gsmtp/gprotocolmessagestore.h +++ b/src/gsmtp/gprotocolmessagestore.h @@ -56,12 +56,18 @@ public: virtual G::Signal3 & doneSignal() ; // See ProtocolMessage. + virtual G::Signal3 & preparedSignal() ; + // See ProtocolMessage. + virtual void clear() ; // See ProtocolMessage. virtual bool setFrom( const std::string & from_user ) ; // See ProtocolMessage. + virtual bool prepare() ; + // See ProtocolMessage. + virtual bool addTo( const std::string & to_user , Verifier::Status to_status ) ; // See ProtocolMessage. @@ -84,7 +90,8 @@ private: MessageStore & m_store ; std::auto_ptr m_msg ; std::string m_from ; - G::Signal3 m_signal ; + G::Signal3 m_done_signal ; + G::Signal3 m_prepared_signal ; } ; #endif diff --git a/src/gsmtp/gscannerclient.cpp b/src/gsmtp/gscannerclient.cpp new file mode 100644 index 0000000..f05ab9a --- /dev/null +++ b/src/gsmtp/gscannerclient.cpp @@ -0,0 +1,255 @@ +// +// Copyright (C) 2001-2003 Graeme Walker +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later +// version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// +// === +// +// gscannerclient.cpp +// + +#include "gdef.h" +#include "gnet.h" +#include "gsmtp.h" +#include "gstr.h" +#include "gscannerclient.h" +#include "gassert.h" + +GSmtp::ScannerClient::ScannerClient( const std::string & host_and_service , + unsigned int connect_timeout , unsigned int response_timeout ) : + m_timer(*this) , + m_connect_timeout(connect_timeout) , + m_response_timeout(response_timeout) , + m_state("idle") , + m_socket(NULL) , + m_host(hostPart(host_and_service)) , + m_service(servicePart(host_and_service)) +{ + G_DEBUG( "GSmtp::ScannerClient::ctor: " << host_and_service ) ; +} + +GSmtp::ScannerClient::ScannerClient( const std::string & host , const std::string & service , + unsigned int connect_timeout , unsigned int response_timeout ) : + m_timer(*this) , + m_connect_timeout(connect_timeout) , + m_response_timeout(response_timeout) , + m_state("idle") , + m_socket(NULL) , + m_host(host) , + m_service(service) +{ + G_DEBUG( "GSmtp::ScannerClient::ctor: " << host << ":" << service ) ; +} + +G::Signal2 & GSmtp::ScannerClient::connectedSignal() +{ + return m_connected_signal ; +} + +G::Signal2 & GSmtp::ScannerClient::doneSignal() +{ + return m_done_signal ; +} + +void GSmtp::ScannerClient::startConnecting() +{ + G_DEBUG( "GSmtp::ScannerClient::startConnecting" ) ; + G_ASSERT( m_state == "idle" ) ; + + m_timer.startTimer( m_connect_timeout ) ; + setState( "connecting" ) ; + if( ! connect( m_host , m_service ) ) + { + setState( "failing" ) ; + m_timer.cancelTimer() ; + m_timer.startTimer(0U) ; + } +} + +void GSmtp::ScannerClient::onConnect( GNet::Socket & socket ) +{ + G_DEBUG( "GSmtp::ScannerClient::onConnect" ) ; + G_ASSERT( m_state == "connecting" ) ; + + m_socket = &socket ; + setState( "temp" ) ; + m_timer.cancelTimer() ; + m_timer.startTimer(0U) ; +} + +void GSmtp::ScannerClient::onError( const std::string & error ) +{ + G_WARNING( "GSmtp::ScannerClient::onError: connect error: " << error ) ; + G_ASSERT( m_state == "connecting" ) ; + + m_timer.cancelTimer() ; + setState( "end" ) ; + m_connected_signal.emit( error , GNet::Client::canRetry(error) ) ; +} + +std::string GSmtp::ScannerClient::startScanning( const G::Path & path ) +{ + G_DEBUG( "GSmtp::ScannerClient::startScanning: \"" << path << "\"" ) ; + G_ASSERT( m_state == "connected" || m_state == "disconnected" ) ; + + if( m_state == "disconnected" ) + { + setState( "end" ) ; + return "disconnected" ; + } + else + { + m_timer.startTimer( m_response_timeout ) ; + std::string data = request( path ) ; + ssize_t rc = m_socket->write( data.c_str() , data.length() ) ; + + std::string result = + rc < static_cast(data.length()) ? + ( m_socket->eWouldBlock() ? + std::string("flow control asserted by peer") : + std::string("connection lost") ) : + std::string() ; + + bool ok = result.empty() ; + if( ok ) + { + setState( "scanning" ) ; + } + else + { + setState( "end" ) ; + m_timer.cancelTimer() ; + } + return result ; + } +} + +void GSmtp::ScannerClient::onDisconnect() +{ + G_DEBUG( "GSmtp::ScannerClient::onDisconnect" ) ; + G_ASSERT( m_state == "connected" || m_state == "scanning" ) ; + + if( m_state == "connected" ) + { + setState( "disconnected" ) ; + } + else + { + setState( "end" ) ; + m_done_signal.emit( false , "disconnected" ) ; + } +} + +void GSmtp::ScannerClient::onData( const char * data , size_t size ) +{ + std::string s( data , size ) ; + G_DEBUG( "GSmtp::ScannerClient::onData: " << G::Str::toPrintableAscii(s) ) ; + G_ASSERT( m_state == "scanning" ) ; + + m_line_buffer.add( s ) ; + if( isDone() ) + { + G_DEBUG( "GSmtp::ScannerClient::onData: done" ) ; + m_timer.cancelTimer() ; + m_socket->close() ; + setState( "end" ) ; + bool from_scanner = true ; + m_done_signal.emit( from_scanner , result() ) ; + } +} + +void GSmtp::ScannerClient::onWriteable() +{ + // never gets here + G_DEBUG( "GSmtp::ScannerClient::onWriteable" ) ; +} + +void GSmtp::ScannerClient::onTimeout( GNet::Timer & ) +{ + if( m_state == "failing" ) + { + setState( "end" ) ; + m_connected_signal.emit( "cannot connect" , false ) ; + } + else if( m_state == "temp" ) + { + setState( "connected" ) ; + m_connected_signal.emit( std::string() , false ) ; + } + else if( m_state == "connecting" ) + { + setState( "end" ) ; + m_connected_signal.emit( "connect timeout" , true ) ; + } + else if( m_state == "scanning" ) + { + setState( "end" ) ; + bool from_scanner = false ; + m_done_signal.emit( from_scanner , "response timeout" ) ; + } +} + +void GSmtp::ScannerClient::setState( const std::string & new_state ) +{ + G_DEBUG( "GSmtp::ScannerClient::setState: \"" << m_state << "\" -> \"" << new_state << "\"" ) ; + m_state = new_state ; +} + +//static +std::string GSmtp::ScannerClient::hostPart( const std::string & s ) +{ + size_t pos = s.find(":") ; + if( pos == std::string::npos ) + { + throw FormatError(s) ; + } + return s.substr( 0U , pos ) ; +} + +//static +std::string GSmtp::ScannerClient::servicePart( const std::string & s ) +{ + size_t pos = s.find(":") ; + if( pos == std::string::npos || (pos+1U) == s.length() ) + { + throw FormatError(s) ; + } + return s.substr( pos+1U ) ; +} + +// scanner customisation... + +std::string GSmtp::ScannerClient::request( const G::Path & path ) const +{ + std::string prefix = "AREA: " ; + return prefix + path.str() + "\n" ; +} + +bool GSmtp::ScannerClient::isDone() const +{ + return m_line_buffer.more() ; +} + +std::string GSmtp::ScannerClient::result() +{ + std::string s = m_line_buffer.line() ; + if( s.find("ok") != std::string::npos ) + return std::string() ; + else + return s ; +} + + diff --git a/src/gsmtp/gscannerclient.h b/src/gsmtp/gscannerclient.h new file mode 100644 index 0000000..e2f25ab --- /dev/null +++ b/src/gsmtp/gscannerclient.h @@ -0,0 +1,124 @@ +// +// Copyright (C) 2001-2003 Graeme Walker +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later +// version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// +// === +// +// gscannerclient.h +// + +#ifndef G_SCANNER_CLIENT_H +#define G_SCANNER_CLIENT_H + +#include "gdef.h" +#include "gnet.h" +#include "gsmtp.h" +#include "gclient.h" +#include "gpath.h" +#include "gslot.h" +#include "gtimer.h" +#include "glinebuffer.h" +#include "gexception.h" + +namespace GSmtp +{ + class ScannerClient ; +} + +// Class: GSmtp::ScannerClient +// Description: A class which interacts with a remote 'scanner' process. The +// interface is asynchronous, with separate 'connect' and 'scan' stages. +// +class GSmtp::ScannerClient : private GNet::Client , private GNet::TimeoutHandler +{ +public: + G_EXCEPTION( FormatError , "scanner server format error" ) ; + + ScannerClient( const std::string & host_and_service , + unsigned int connect_timeout , unsigned int response_timeout ) ; + // Constructor. + + ScannerClient( const std::string & host , const std::string & service , + unsigned int connect_timeout , unsigned int response_timeout ) ; + // Constructor. + + G::Signal2 & connectedSignal() ; + // Returns a signal which indicates that connection + // is complete. + // + // The signal parameters are the empty string on success + // or a failure reason, and a boolean flag which is + // true if the failure reason implies a temporary + // error. + + G::Signal2 & doneSignal() ; + // Returns a signal which indicates that scanning + // is complete. + // + // The signal parameters are a boolean flag and + // a string. If the flag is true then the string is + // the response from the scanner, empty on success. + // If the flag is false then there has been a network + // error and the string is a reason string. + + void startConnecting() ; + // Initiates a connection to the scanner. + // + // The connectedSignal() will get raised + // some time later. + + std::string startScanning( const G::Path & path ) ; + // Starts the scanning process for the given + // content file. + // + // Returns an error string if an immediate error. + // + // The doneSignal() will get raised some time + // after startScanning() returns the empty + // string. + +private: + virtual void onConnect( GNet::Socket & socket ) ; // GNet::Client + virtual void onDisconnect() ; // GNet::Client + virtual void onData( const char * data , size_t size ) ; // GNet::Client + virtual void onWriteable() ; // GNet::Client + virtual void onError( const std::string & error ) ; // GNet::Client + virtual void onTimeout( GNet::Timer & ) ; // GNet::TimeoutHandler + void raiseSignal( const std::string & ) ; + std::string request( const G::Path & ) const ; + bool isDone() const ; + std::string result() ; + void setState( const std::string & ) ; + static std::string hostPart( const std::string & ) ; + static std::string servicePart( const std::string & ) ; + ScannerClient( const ScannerClient & ) ; // not implemented + void operator=( const ScannerClient & ) ; // not implemented + +private: + G::Signal2 m_done_signal ; + G::Signal2 m_connected_signal ; + GNet::Timer m_timer ; + unsigned int m_connect_timeout ; + unsigned int m_response_timeout ; + std::string m_state ; + GNet::Socket * m_socket ; + GNet::LineBuffer m_line_buffer ; + std::string m_host ; + std::string m_service ; +} ; + +#endif diff --git a/src/gsmtp/gserverprotocol.cpp b/src/gsmtp/gserverprotocol.cpp index f890dfe..a9f17bc 100644 --- a/src/gsmtp/gserverprotocol.cpp +++ b/src/gsmtp/gserverprotocol.cpp @@ -45,6 +45,7 @@ GSmtp::ServerProtocol::ServerProtocol( Sender & sender , Verifier & verifier , P m_sasl(secrets) { m_pmessage.doneSignal().connect( G::slot(*this,&ServerProtocol::processDone) ) ; + m_pmessage.preparedSignal().connect( G::slot(*this,&ServerProtocol::prepareDone) ) ; // (dont send anything to the peer from this ctor -- the Sender // object is not fuly constructed) @@ -56,7 +57,8 @@ GSmtp::ServerProtocol::ServerProtocol( Sender & sender , Verifier & verifier , P m_fsm.addTransition( eVrfy , s_Any , s_Same , &GSmtp::ServerProtocol::doVrfy ) ; m_fsm.addTransition( eEhlo , s_Any , sIdle , &GSmtp::ServerProtocol::doEhlo , s_Same ) ; m_fsm.addTransition( eHelo , s_Any , sIdle , &GSmtp::ServerProtocol::doHelo , s_Same ) ; - m_fsm.addTransition( eMail , sIdle , sGotMail , &GSmtp::ServerProtocol::doMail , sIdle ) ; + m_fsm.addTransition( eMail , sIdle , sPrepare , &GSmtp::ServerProtocol::doMailPrepare , sIdle ) ; + m_fsm.addTransition( ePrepared, sPrepare, sGotMail , &GSmtp::ServerProtocol::doMail , sIdle ) ; m_fsm.addTransition( eRcpt , sGotMail, sGotRcpt , &GSmtp::ServerProtocol::doRcpt , sGotMail ) ; m_fsm.addTransition( eRcpt , sGotRcpt, sGotRcpt , &GSmtp::ServerProtocol::doRcpt ) ; m_fsm.addTransition( eData , sGotMail, sIdle , &GSmtp::ServerProtocol::doNoRecipients ) ; @@ -128,6 +130,7 @@ bool GSmtp::ServerProtocol::apply( const std::string & line ) void GSmtp::ServerProtocol::processDone( bool success , unsigned long , std::string reason ) { + G_DEBUG( "GSmtp::ServerProtocol::processDone: " << success << ", \"" << reason << "\"" ) ; G_ASSERT( m_fsm.state() == sProcessing ) ; // (a RSET will call m_pmessage.clear() to cancel the callback) if( m_fsm.state() == sProcessing ) // just in case { @@ -136,12 +139,11 @@ void GSmtp::ServerProtocol::processDone( bool success , unsigned long , std::str } } - void GSmtp::ServerProtocol::doQuit( const std::string & , bool & ) { sendClosing() ; m_sender.protocolDone() ; - // do nothing more -- this object may have been deleted already + // do nothing more -- this object may have been deleted in protocolDone() } void GSmtp::ServerProtocol::doNoop( const std::string & , bool & ) @@ -314,7 +316,7 @@ void GSmtp::ServerProtocol::sendChallenge( const std::string & s ) send( std::string("334 ") + Base64::encode(s,std::string()) ) ; } -void GSmtp::ServerProtocol::doMail( const std::string & line , bool & predicate ) +void GSmtp::ServerProtocol::doMailPrepare( const std::string & line , bool & predicate ) { if( m_sasl.active() && !m_sasl.trusted(m_peer_address) && !m_authenticated ) { @@ -328,21 +330,56 @@ void GSmtp::ServerProtocol::doMail( const std::string & line , bool & predicate bool ok = m_pmessage.setFrom( from ) ; predicate = ok ; if( ok ) - sendMailReply() ; + { + bool async_prepare = m_pmessage.prepare() ; + if( ! async_prepare ) + m_fsm.apply( *this , ePrepared , "" ) ; // re-entrancy ok + } else + { sendBadFrom( from ) ; + } + } +} + +void GSmtp::ServerProtocol::prepareDone( bool success , bool temporary_fault , std::string reason ) +{ + G_DEBUG( "GSmtp::ServerProtocol::prepareDone: " << success << ", " + << temporary_fault << ", \"" << reason << "\"" ) ; + + // as a kludge mark temporary failures by prepending a space + if( !success && temporary_fault ) + reason = std::string(" ")+reason ; + + m_fsm.apply( *this , ePrepared , reason ) ; +} + +void GSmtp::ServerProtocol::doMail( const std::string & line , bool & predicate ) +{ + // here 'line' comes from prepareDone(), or empty if no preparation stage + G_DEBUG( "GSmtp::ServerProtocol::doMail: \"" << line << "\"" ) ; + if( line.empty() ) + { + sendMailReply() ; + } + else + { + predicate = false ; + bool temporary = line.at(0U) == ' ' ; + sendMailError( line.substr(temporary?1U:0U) , temporary ) ; } } void GSmtp::ServerProtocol::doRcpt( const std::string & line , bool & predicate ) { std::string to = parseTo( line ) ; - bool ok = m_pmessage.addTo( to , verify(to,m_pmessage.from()) ) ; + Verifier::Status status = verify( to , m_pmessage.from() ) ; + bool ok = m_pmessage.addTo( to , status ) ; predicate = ok ; if( ok ) sendRcptReply() ; else - sendBadTo( to ) ; + sendBadTo( G::Str::toPrintableAscii(status.reason) ) ; } void GSmtp::ServerProtocol::doUnknown( const std::string & line , bool & ) @@ -473,6 +510,12 @@ void GSmtp::ServerProtocol::sendMailReply() sendOk() ; } +void GSmtp::ServerProtocol::sendMailError( const std::string & reason , bool temporary ) +{ + std::string number( temporary ? "452" : "550" ) ; + send( number + " " + reason ) ; +} + void GSmtp::ServerProtocol::sendCompletionReply( bool ok , const std::string & reason ) { if( ok ) @@ -491,9 +534,9 @@ void GSmtp::ServerProtocol::sendBadFrom( const std::string & /*from*/ ) send( "553 mailbox name not allowed" ) ; } -void GSmtp::ServerProtocol::sendBadTo( const std::string & to ) +void GSmtp::ServerProtocol::sendBadTo( const std::string & text ) { - send( std::string("550 mailbox unavailable: ") + to ) ; + send( std::string("550 mailbox unavailable: ") + text ) ; } void GSmtp::ServerProtocol::sendEhloReply( const std::string & domain ) diff --git a/src/gsmtp/gserverprotocol.h b/src/gsmtp/gserverprotocol.h index 1a475fc..a3a885e 100644 --- a/src/gsmtp/gserverprotocol.h +++ b/src/gsmtp/gserverprotocol.h @@ -113,6 +113,7 @@ private: eData , eRcpt , eMail , + ePrepared , eVrfy , eHelp , eAuth , @@ -125,6 +126,7 @@ private: sEnd , sIdle , sGotMail , + sPrepare , sGotRcpt , sData , sProcessing , @@ -143,6 +145,7 @@ private: std::string commandLine( const std::string & line ) const ; static std::string crlf() ; void processDone( bool , unsigned long , std::string ) ; // ProtocolMessage::doneSignal() + void prepareDone( bool , bool , std::string ) ; bool isEndOfText( const std::string & ) const ; bool isEscaped( const std::string & ) const ; void doNoop( const std::string & , bool & ) ; @@ -151,6 +154,7 @@ private: void doHelo( const std::string & , bool & ) ; void doAuth( const std::string & , bool & ) ; void doAuthData( const std::string & , bool & ) ; + void doMailPrepare( const std::string & line , bool & ) ; void doMail( const std::string & line , bool & ) ; void doRcpt( const std::string & line , bool & ) ; void doUnknown( const std::string & line , bool & ) ; @@ -169,6 +173,7 @@ private: void sendEhloReply( const std::string & ) ; void sendRsetReply() ; void sendMailReply() ; + void sendMailError( const std::string & , bool ) ; void sendRcptReply() ; void sendDataReply() ; void sendCompletionReply( bool ok , const std::string & ) ; diff --git a/src/gsmtp/gsmtpserver.cpp b/src/gsmtp/gsmtpserver.cpp index d1b38bc..f3ea883 100644 --- a/src/gsmtp/gsmtpserver.cpp +++ b/src/gsmtp/gsmtpserver.cpp @@ -26,6 +26,7 @@ #include "gsmtpserver.h" #include "gprotocolmessagestore.h" #include "gprotocolmessageforward.h" +#include "gprotocolmessagescanner.h" #include "gmemory.h" #include "glocal.h" #include "glog.h" @@ -116,17 +117,22 @@ GSmtp::Server::Server( MessageStore & store , const Secrets & server_secrets , const Verifier & verifier , const std::string & ident , bool allow_remote , unsigned int port , const AddressList & interfaces , - const std::string & downstream_server , - unsigned int response_timeout , unsigned int connection_timeout , - const Secrets & client_secrets ) : + const std::string & smtp_server , + unsigned int smtp_response_timeout , unsigned int smtp_connection_timeout , + const Secrets & client_secrets , + const std::string & scanner_server , + unsigned int scanner_response_timeout , unsigned int scanner_connection_timeout ) : m_store(store) , m_ident(ident) , m_allow_remote( allow_remote ) , m_server_secrets(server_secrets) , m_verifier(verifier) , - m_downstream_server(downstream_server) , - m_response_timeout(response_timeout) , - m_connection_timeout(connection_timeout) , + m_smtp_server(smtp_server) , + m_smtp_response_timeout(smtp_response_timeout) , + m_smtp_connection_timeout(smtp_connection_timeout) , + m_scanner_server(scanner_server) , + m_scanner_response_timeout(scanner_response_timeout) , + m_scanner_connection_timeout(scanner_connection_timeout) , m_client_secrets(client_secrets) , m_gnet_server_1( *this ) , m_gnet_server_2( *this ) , @@ -183,17 +189,34 @@ GNet::ServerPeer * GSmtp::Server::newPeer( GNet::Server::PeerInfo peer_info ) return NULL ; } - const bool immediate = ! m_downstream_server.empty() ; - - std::auto_ptr pmessage( - immediate ? - static_cast(new ProtocolMessageForward(m_store, - m_client_secrets,m_downstream_server,m_response_timeout,m_connection_timeout)) : - static_cast(new ProtocolMessageStore(m_store)) ) ; - + std::auto_ptr pmessage( newProtocolMessage() ) ; return new ServerPeer( peer_info , *this , pmessage , m_ident , m_server_secrets , m_verifier ) ; } +GSmtp::ProtocolMessage * GSmtp::Server::newProtocolMessage() +{ + const bool immediate = ! m_smtp_server.empty() ; + const bool scan = ! m_scanner_server.empty() ; + if( immediate && scan ) + { + G_DEBUG( "GSmtp::Server::newProtocolMessage: new ProtocolMessageScanner" ) ; + return new ProtocolMessageScanner(m_store,m_client_secrets, + m_smtp_server,m_smtp_response_timeout,m_smtp_connection_timeout, + m_scanner_server,m_scanner_response_timeout,m_scanner_connection_timeout) ; + } + else if( immediate ) + { + G_DEBUG( "GSmtp::Server::newProtocolMessage: new ProtocolMessageForward" ) ; + return new ProtocolMessageForward(m_store,m_client_secrets, + m_smtp_server,m_smtp_response_timeout,m_smtp_connection_timeout) ; + } + else + { + G_DEBUG( "GSmtp::Server::newProtocolMessage: new ProtocolMessageStore" ) ; + return new ProtocolMessageStore(m_store) ; + } +} + // === GSmtp::ServerImp::ServerImp( GSmtp::Server & server ) : diff --git a/src/gsmtp/gsmtpserver.h b/src/gsmtp/gsmtpserver.h index 5c374a9..2ad2c26 100644 --- a/src/gsmtp/gsmtpserver.h +++ b/src/gsmtp/gsmtpserver.h @@ -111,10 +111,13 @@ public: const Secrets & server_secrets , const Verifier & verifier , const std::string & ident , bool allow_remote , unsigned int port , const AddressList & interfaces , - const std::string & downstream_server_address , - unsigned int response_timeout , - unsigned int connection_timeout , - const Secrets & client_secrets ) ; + const std::string & smtp_server_address , + unsigned int smtp_response_timeout , + unsigned int smtp_connection_timeout , + const Secrets & client_secrets , + const std::string & scanner_address , + unsigned int scanner_response_timeout , + unsigned int scanner_connection_timeout ) ; // Constructor. Listens on the given port number // using INET_ANY if 'interfaces' is empty, or // on specific interfaces otherwise. Currently @@ -138,6 +141,7 @@ public: private: void bind( ServerImp & , GNet::Address , unsigned int ) ; + ProtocolMessage * newProtocolMessage() ; ServerImp & imp( size_t n ) ; private: @@ -146,9 +150,12 @@ private: bool m_allow_remote ; const Secrets & m_server_secrets ; Verifier m_verifier ; - std::string m_downstream_server ; - unsigned int m_response_timeout ; - unsigned int m_connection_timeout ; + std::string m_smtp_server ; + unsigned int m_smtp_response_timeout ; + unsigned int m_smtp_connection_timeout ; + std::string m_scanner_server ; + unsigned int m_scanner_response_timeout ; + unsigned int m_scanner_connection_timeout ; const Secrets & m_client_secrets ; ServerImp m_gnet_server_1 ; ServerImp m_gnet_server_2 ; diff --git a/src/gsmtp/gverifier.cpp b/src/gsmtp/gverifier.cpp index 3152ecb..a4cff58 100644 --- a/src/gsmtp/gverifier.cpp +++ b/src/gsmtp/gverifier.cpp @@ -120,8 +120,10 @@ GSmtp::Verifier::Status GSmtp::Verifier::verifyExternal( const std::string & add std::string response ; int rc = G::Process::spawn( G::Root::nobody() , m_path , args , &response ) ; - G::Str::trim( response , "\r\n\t" ) ; G_LOG( "GSmtp::Verifier: " << rc << ": \"" << G::Str::toPrintableAscii(response) << "\"" ) ; + G::Str::trimRight( response , " \n\t" ) ; + G::Str::replaceAll( response , "\r\n" , "\n" ) ; + G::Str::replaceAll( response , "\r" , "" ) ; G::Strings response_parts ; G::Str::splitIntoFields( response , response_parts , "\n" ) ; diff --git a/src/main/commandline.cpp b/src/main/commandline.cpp index 48e8685..2f8b8b0 100644 --- a/src/main/commandline.cpp +++ b/src/main/commandline.cpp @@ -76,6 +76,7 @@ std::string Main::CommandLine::switchSpec( bool is_windows ) << "P!postmaster!deliver to postmaster and reject all other local mailbox addresses!0!!3|" << "Z!verifier!defines an external address verifier program!1!program!3|" << "Q!admin-terminate!!0!!0|" + << "R!scanner!!1!host:port!0|" ; return ss.str() ; } @@ -193,6 +194,11 @@ std::string Main::CommandLine::semanticError() const return "the --forward, --immediate and --poll switches require --forward-to" ; } + if( m_getopt.contains("scanner") && ! ( m_getopt.contains("as-proxy") || m_getopt.contains("immediate") ) ) + { + return "the --scanner switch requires --as-proxy or --immediate" ; + } + const bool log = m_getopt.contains("log") || m_getopt.contains("as-server") || diff --git a/src/main/common.dsp b/src/main/common.dsp index 9d14024..356ad64 100644 --- a/src/main/common.dsp +++ b/src/main/common.dsp @@ -289,6 +289,10 @@ SOURCE=..\gsmtp\gprotocolmessageforward.cpp # End Source File # Begin Source File +SOURCE=..\gsmtp\gprotocolmessagescanner.cpp +# End Source File +# Begin Source File + SOURCE=..\gsmtp\gprotocolmessagestore.cpp # End Source File # Begin Source File @@ -329,6 +333,10 @@ SOURCE=..\gsmtp\gsasl_native.cpp # End Source File # Begin Source File +SOURCE=..\gsmtp\gscannerclient.cpp +# End Source File +# Begin Source File + SOURCE=..\win32\gscmap.cpp # End Source File # Begin Source File diff --git a/src/main/configuration.cpp b/src/main/configuration.cpp index 0b1c1bd..992fdbc 100644 --- a/src/main/configuration.cpp +++ b/src/main/configuration.cpp @@ -67,7 +67,7 @@ std::string Main::Configuration::str( const std::string & p , const std::string << p << "spool directory: " << spoolDir() << eol << p << "immediate forwarding? " << yn(immediate()) << eol << p << "mail processor: " << (useFilter()?filter():na()) << eol - //<< p << "address verifier: " << na(verifier().str()) << eol + << p << "address verifier: " << na(verifier().str()) << eol << p << "admin port: " << (doAdmin()?G::Str::fromUInt(adminPort()):na()) << eol << p << "run as daemon? " << yn(daemon()) << eol << p << "verbose logging? " << yn(verbose()) << eol @@ -299,4 +299,18 @@ bool Main::Configuration::withTerminate() const return m_cl.contains("admin-terminate") ; } +std::string Main::Configuration::scannerAddress() const +{ + return m_cl.contains("scanner") ? m_cl.value("scanner") : std::string() ; +} + +unsigned int Main::Configuration::scannerConnectionTimeout() const +{ + return 10U ; // for now +} + +unsigned int Main::Configuration::scannerResponseTimeout() const +{ + return 90U ; // for now +} diff --git a/src/main/configuration.h b/src/main/configuration.h index e193a96..29edc64 100644 --- a/src/main/configuration.h +++ b/src/main/configuration.h @@ -167,6 +167,15 @@ public: // Returns true if the admin interface should support the // terminate command. + std::string scannerAddress() const ; + // Returns the address of a scanner process. + + unsigned int scannerConnectionTimeout() const ; + // Returns a timeout for connecting to the scanner process. + + unsigned int scannerResponseTimeout() const ; + // Returns a timeout for talking to the scanner process. + private: const CommandLine & m_cl ; diff --git a/src/main/doxygen.cfg b/src/main/doxygen.cfg old mode 100755 new mode 100644 index 2c6a3ab..8543731 --- a/src/main/doxygen.cfg +++ b/src/main/doxygen.cfg @@ -3,7 +3,7 @@ # General configuration options #--------------------------------------------------------------------------- PROJECT_NAME = E-MailRelay -PROJECT_NUMBER = 1.1.1 +PROJECT_NUMBER = 1.1.2 OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English EXTRACT_ALL = YES diff --git a/src/main/doxygen.h b/src/main/doxygen.h index 0111cd6..7080b70 100644 --- a/src/main/doxygen.h +++ b/src/main/doxygen.h @@ -27,10 +27,19 @@ source code. The Namespace List is a good starting for browsing -- the detailed description section towards the end of each namespace page gives a list of the namespace's key classes. -The E-MailRelay developer's guide also gives an overview -of the code structure, including simple class diagrams for the -GNet and -GSmtp namespaces. +The E-MailRelay design and implementation guide gives an overview +of the code structure, and there are a number of supporting diagrams: + */ diff --git a/src/main/run.cpp b/src/main/run.cpp old mode 100755 new mode 100644 index 7b62f67..29bae16 --- a/src/main/run.cpp +++ b/src/main/run.cpp @@ -50,7 +50,7 @@ //static std::string Main::Run::versionNumber() { - return "1.1.1" ; + return "1.1.2" ; } Main::Run::Run( Main::Output & output , const G::Arg & arg , const std::string & switch_spec ) : @@ -147,21 +147,41 @@ void Main::Run::run() } } +void Main::Run::checkPort( const std::string & interface_ , unsigned int port ) +{ + GNet::Address address = + interface_.length() ? + GNet::Address(interface_,port) : + GNet::Address(port) ; + GNet::Server::canBind( address , true ) ; +} + +void Main::Run::checkPorts() const +{ + if( cfg().doServing() && cfg().doSmtp() ) + checkPort( cfg().interface_() , cfg().port() ) ; + + if( cfg().doServing() && cfg().doAdmin() ) + checkPort( cfg().interface_() , cfg().adminPort() ) ; +} + void Main::Run::runCore() { // fqdn override option // GNet::Local::fqdn( cfg().fqdn() ) ; - // daemonising + // tighten the umask // - G::PidFile pid_file ; G::Process::Umask::set( G::Process::Umask::Tightest ) ; - if( cfg().daemon() ) closeFiles() ; // before opening any sockets or message-store streams - if( cfg().usePidFile() ) pid_file.init( G::Path(cfg().pidFile()) ) ; - if( cfg().daemon() ) G::Daemon::detach( pid_file ) ; - // release root privileges + // close inherited file descriptors to avoid locking file + // systems when running as a daemon -- this has to be done + // early, before opening any sockets or message-store streams + // + if( cfg().daemon() ) closeFiles() ; + + // release root privileges and extra group memberships // G::Root::init( cfg().nobody() ) ; @@ -172,6 +192,10 @@ void Main::Run::runCore() if( ! event_loop->init() ) throw G::Exception( "cannot initialise network layer" ) ; + // early check on socket bindability + // + checkPorts() ; + // network monitor singleton // GNet::Monitor monitor ; @@ -189,6 +213,12 @@ void Main::Run::runCore() m_client_secrets <<= new GSmtp::Secrets( cfg().clientSecretsFile() , "client" ) ; GSmtp::Secrets server_secrets( cfg().serverSecretsFile() , "server" ) ; + // daemonise + // + G::PidFile pid_file ; + if( cfg().usePidFile() ) pid_file.init( G::Path(cfg().pidFile()) ) ; + if( cfg().daemon() ) G::Daemon::detach( pid_file ) ; + // run as forwarding agent // if( cfg().doForwarding() ) @@ -228,7 +258,10 @@ void Main::Run::doServing( GSmtp::MessageStore & store , const GSmtp::Secrets & cfg().immediate() ? cfg().serverAddress() : std::string() , cfg().responseTimeout() , cfg().connectionTimeout() , - client_secrets ) ; + client_secrets , + cfg().scannerAddress() , + cfg().scannerResponseTimeout() , + cfg().scannerConnectionTimeout() ) ; } if( cfg().doAdmin() ) diff --git a/src/main/run.h b/src/main/run.h index 34f813d..d7a9991 100644 --- a/src/main/run.h +++ b/src/main/run.h @@ -108,6 +108,8 @@ private: void raiseNetworkEvent( std::string , std::string ) ; void emit( const std::string & , const std::string & , const std::string & ) ; std::string doPoll() ; + void checkPorts() const ; + static void checkPort( const std::string & , unsigned int ) ; private: Output & m_output ;