--- parser3/src/classes/mail.C 2009/07/06 12:13:30 1.112 +++ parser3/src/classes/mail.C 2023/09/26 20:49:06 1.136 @@ -1,12 +1,10 @@ /** @file Parser: @b mail parser class. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ -static const char * const IDENT_MAIL_C="$Date: 2009/07/06 12:13:30 $"; - #include "pa_config_includes.h" #include "pa_vmethod_frame.h" @@ -21,9 +19,7 @@ static const char * const IDENT_MAIL_C=" #include "smtp.h" -// debug switches - -//#define DEBUG_JUST_SEE_MESSAGE +volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.136 2023/09/26 20:49:06 moko Exp $"; // defines @@ -47,7 +43,7 @@ public: // global variable -DECLARE_CLASS_VAR(mail, 0/*fictive*/, new MMail); +DECLARE_CLASS_VAR(mail, new MMail); // defines for statics @@ -66,25 +62,23 @@ static void sendmail( vmail_conf #endif , Value* smtp_server_port, - const String& message, - const String* from, const String* to, - const String* -#ifndef _MSC_VER + const String& message, + const String* from, + const String* to, + const String* +#ifndef WIN32 options #endif ) { - const char* message_cstr=message.untaint_cstr(String::L_AS_IS); - const char* exception_type="email.format"; if(!from) // we use in sendmail -f {from} && SMTP MAIL from: {from} - throw Exception(exception_type, - 0, - "parameter does not specify 'from' header field"); + throw Exception(exception_type, 0, "parameter does not specify 'from' header field"); + + const char* message_cstr=message.untaint_cstr(String::L_AS_IS); + if(smtp_server_port) { if(!to) // we use only in SMTP RCPT to: {to} - throw Exception(exception_type, - 0, - "parameter does not specify 'to' header field"); + throw Exception(exception_type, 0, "parameter does not specify 'to' header field"); SMTP smtp; char* server=smtp_server_port->as_string().cstrm(); @@ -96,11 +90,9 @@ static void sendmail( return; } -#if WIN32 +#ifdef WIN32 // win32 without SMTP server configured - throw Exception(PARSER_RUNTIME, - 0, - "$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined"); + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" MAIL_NAME ".SMTP not defined"); #else // unix // $MAIN:MAIL.sendmail["/usr/sbin/sendmail -t -i -f postmaster"] default @@ -111,15 +103,13 @@ static void sendmail( #ifdef PA_FORCED_SENDMAIL throw Exception(PARSER_RUNTIME, 0, - "Parser was configured with --with-sendmail="PA_FORCED_SENDMAIL + "Parser was configured with --with-sendmail=" PA_FORCED_SENDMAIL " key, to change sendmail you should reconfigure and recompie it"); #else if(Value* sendmail_value=vmail_conf->get_hash()->get(mail_sendmail_name)) *sendmail_command<as_string(); else - throw Exception(PARSER_RUNTIME, - 0, - "$"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" not defined"); + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" MAIL_NAME "." SENDMAIL_NAME " not defined"); #endif } else { #ifdef PA_FORCED_SENDMAIL @@ -151,9 +141,8 @@ static void sendmail( if(after_file_spec==STRING_NOT_FOUND || after_file_spec==0) file_spec=sendmail_command; else { - size_t pos_after=after_file_spec; - file_spec=&sendmail_command->mid(0, pos_after++); - sendmail_command->split(argv, pos_after, " ", String::L_AS_IS); + file_spec=&sendmail_command->mid(0, after_file_spec); + sendmail_command->split(argv, after_file_spec+1, " ", String::L_AS_IS); } if(!file_executable(*file_spec)) @@ -163,12 +152,10 @@ static void sendmail( #ifdef PA_FORCED_SENDMAIL " Use configure key \"--with-sendmail=appropriate sendmail command\"" #else - " Set $"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" to appropriate sendmail command" + " Set $" MAIN_CLASS_NAME ":" MAIL_NAME "." SENDMAIL_NAME " to appropriate sendmail command" #endif ); - - String in(message_cstr); PA_exec_result exec=pa_exec( // forced_allow #ifdef PA_FORCED_SENDMAIL @@ -179,51 +166,45 @@ static void sendmail( , *file_spec, 0 /* pass env */, argv, - in); + String::C(message_cstr, strlen(message_cstr))); + if(exec.status || exec.err.length()) - throw Exception("email.send", - 0, - "'%s' reported problem: %s (%d)", - file_spec->cstr(), - exec.err.length()?exec.err.cstr():"UNKNOWN", - exec.status); -#endif + throw Exception("email.send", 0, "'%s' reported problem: %s (%d)", file_spec->cstr(), exec.err.length() ? exec.err.cstr() : "UNKNOWN", exec.status); +#endif //WIN32 } // methods static void _send(Request& r, MethodParams& params) { - Value& vhash=params.as_no_junction(0, "message must not be code"); - HashStringValue* hash=vhash.get_hash(); - if(!hash) - throw Exception(PARSER_RUNTIME, - 0, - "message must be hash"); + HashStringValue* hash=params.as_hash(0, "message"); + if(!hash || !hash->count()) + return; + // todo@ check if enough options are specified. + // now ^mail:send[^hash::create[]] and ^mail:send[$.print-debug(1)] "work". const String* soptions=0; if(Value* voptions=hash->get(MAIL_OPTIONS_NAME)) soptions=&voptions->as_string(); - Value* vmail_conf=static_cast(r.classes_conf.get(mail_base_class->name())); + bool print_debug=false; + if(Value* vdebug=hash->get(MAIL_DEBUG_NAME)) + print_debug=vdebug->as_bool(); + + Value* vmail_conf=static_cast(r.classes_conf.get(mail_class->type())); Value* smtp_server_port=0; if(vmail_conf) { // $MAIN:MAIL.SMTP[mail.yourdomain.ru[:port]] - smtp_server_port=vmail_conf->get_hash()->get(String::Body("SMTP")); + smtp_server_port=vmail_conf->get_hash()->get("SMTP"); } - const String* from=0; String* to=0; - const String& message= - GET_SELF(r, VMail).message_hash_to_string(r, hash, 0, from, - smtp_server_port?true:false /*send by SMTP=strip to?*/, to); + const String& message = GET_SELF(r, VMail).message_hash_to_string(r, hash, from, smtp_server_port ? true : false /*send by SMTP=strip to?*/, to); -#ifdef DEBUG_JUST_SEE_MESSAGE - r.write_pass_lang(message); -#else - sendmail(vmail_conf, smtp_server_port, - message, from, to, soptions); -#endif + if(print_debug) + r.write(message); + else + sendmail(vmail_conf, smtp_server_port, message, from, to, soptions); } // constructor & configurator @@ -236,12 +217,11 @@ MMail::MMail(): Methoded(MAIL_CLASS_NAME void MMail::configure_user(Request& r) { // $MAIN:MAIL[$SMTP[mail.design.ru]] - if(Value* mail_element=r.main_class.get_element(mail_name, r.main_class, false)) + if(Value* mail_element=r.main_class.get_element(mail_name)) { if(mail_element->get_hash()) - r.classes_conf.put(name(), mail_element); + r.classes_conf.put(type(), mail_element); else if( !mail_element->is_string() ) - throw Exception(PARSER_RUNTIME, - 0, - "$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash"); + throw Exception(PARSER_RUNTIME, 0, "$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash"); + } }