--- parser3/src/classes/mail.C 2001/04/10 07:27:53 1.12 +++ parser3/src/classes/mail.C 2001/08/24 06:26:13 1.35 @@ -5,24 +5,44 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: mail.C,v 1.12 2001/04/10 07:27:53 paf Exp $ + $Id: mail.C,v 1.35 2001/08/24 06:26:13 parser Exp $ */ +static const char *RCSId="$Id: mail.C,v 1.35 2001/08/24 06:26:13 parser Exp $"; #include "pa_config_includes.h" -#ifdef WIN32 +#ifdef _MSC_VER # include "smtp/smtp.h" #endif -#include "_mail.h" #include "pa_common.h" #include "pa_request.h" #include "pa_vfile.h" #include "pa_exec.h" -// global var +// defines -VStateless_class *mail_class; +#define MAIL_CLASS_NAME "mail" + +#define MAIL_NAME "MAIL" + +// global variable + +Methoded *mail_class; + +// class + +class MMail : public Methoded { +public: + MMail(Pool& pool); +public: // Methoded + bool used_directly() { return true; } + void configure_user(Request& r); +private: + String mail_name; + String content_disposition_name; + String content_disposition_filename_name; +}; // helpers @@ -44,15 +64,13 @@ static void uuencode(String& result, con result << "begin 644 " << file_name_cstr << "\n"; //body - const unsigned char *itemp; - - int index; - int count=45; - const unsigned char *in=(const unsigned char *)vfile.value_ptr(); size_t in_length=vfile.value_size(); - for(itemp=in; itemp<(in+in_length); itemp+=count) { + int count=45; + for(const unsigned char *itemp=in; itemp<(in+in_length); itemp+=count) { + int index; + if((itemp+count)>(in+in_length)) count=in_length-(itemp-in); @@ -98,11 +116,13 @@ static void uuencode(String& result, con } //footer - result.APPEND_CLEAN((const char *)uue_table, 1/* one char */, 0, 0) << "\n" + result.APPEND_AS_IS((const char *)uue_table, 1/* one char */, 0, 0) << "\n" "end\n"; } -/// ^mail:send[$attach[$type[uue|mime64] $value[DATA]]] +/** ^mail:send[$attach[$type[uue|mime64] $value[DATA]]] + @todo solve - bad with html attaches +*/ static const String& attach_hash_to_string(Request& r, const String& origin_string, Hash& attach_hash) { Pool& pool=r.pool(); @@ -115,7 +135,7 @@ static const String& attach_hash_to_stri const VFile *vfile; if(Value *value=static_cast(attach_hash.get(*value_name))) - vfile=value->as_vfile(); + vfile=value->as_vfile(String::UL_AS_IS); // bad with html attaches. todo: solve else PTHROW(0, 0, &origin_string, @@ -125,11 +145,8 @@ static const String& attach_hash_to_stri if(Value *vfile_name=static_cast(attach_hash.get( *new(pool) String(pool, "file-name")))) // specified $file-name file_name=&vfile_name->as_string(); - else // no $file-name - if(Value *vfile_name=static_cast(vfile->fields().get(*name_name))) - file_name=&vfile_name->as_string(); // VFile knows name - else // vfile doesn't know name - file_name=new(pool) String(pool, "noname.dat"); + else // no $file-name, VFile surely knows name + file_name=&static_cast(vfile->fields().get(*name_name))->as_string(); const char *file_name_cstr=file_name->cstr(String::UL_FILE_NAME); String& result=*new(pool) String(pool); @@ -151,8 +168,19 @@ static const String& attach_hash_to_stri } +static void *find_content_type(const Hash::Key& aattribute, Hash::Val *ameaning, + void *) { + return StrEqNc(aattribute.cstr(), CONTENT_TYPE_NAME)?ameaning:0; +} +static void *find_content_type_charset(const Hash::Key& aattribute, Hash::Val *ameaning, + void *) { + return StrEqNc(aattribute.cstr(), "charset")?ameaning:0; +} + +/// used by mail: _send / letter_hash_to_string / add_header_attribute struct Mail_info { String *attribute_to_exclude; + const char *charset; String *header; const String **from, **to; }; @@ -175,22 +203,25 @@ static void add_header_attribute(const H // append header line *mi.header << aattribute << ":" << - attributed_meaning_to_string(lmeaning, String::UL_MAIL_HEADER) << + attributed_meaning_to_string(lmeaning, String::UL_MAIL_HEADER). + cstr(String::UL_UNSPECIFIED, 0, mi.charset) << "\n"; } -struct Seq_item { + +/// used in mail: _send / letter_hash_to_string / add_part +struct Mail_seq_item { const String *part_name; Value *part_value; }; static void add_part(const Hash::Key& part_name, Hash::Val *part_value, void *info) { - Seq_item **seq_ref=static_cast(info); + Mail_seq_item **seq_ref=static_cast(info); (**seq_ref).part_name=&part_name; (**seq_ref).part_value=static_cast(part_value); (*seq_ref)++; } static double key_of_part(const void *item) { - const char *cstr=static_cast(item)->part_name->cstr(); + const char *cstr=static_cast(item)->part_name->cstr(); char *error_pos; return strtod(cstr, &error_pos); } @@ -218,8 +249,19 @@ static const String& letter_hash_to_stri // prepare header: 'hash' without "body" String& result=*new(pool) String(pool); + + const char *charset=0; + if(Value *content_type= + static_cast(letter_hash.first_that(find_content_type))) + if(Hash *hash=content_type->get_hash()) + if(Value *content_type_charset= + static_cast(hash->first_that(find_content_type_charset))) + charset=content_type_charset->as_string().cstr(); + + *from=*to=0; Mail_info mail_info={ /*excluding*/ body_name, + charset, &result, from, to }; @@ -236,10 +278,10 @@ static const String& letter_hash_to_stri // body parts.. // ..collect - Seq_item *seq=(Seq_item *)malloc(sizeof(Seq_item)*body_hash->size()); - Seq_item *seq_ref=seq; body_hash->for_each(add_part, &seq_ref); + Mail_seq_item *seq=(Mail_seq_item *)pool.malloc(sizeof(Mail_seq_item)*body_hash->size()); + Mail_seq_item *seq_ref=seq; body_hash->for_each(add_part, &seq_ref); // ..sort - _qsort(seq, body_hash->size(), sizeof(Seq_item), + _qsort(seq, body_hash->size(), sizeof(Mail_seq_item), sort_cmp_string_double_value); // ..insert in 'seq' order for(int i=0; isize(); i++) { @@ -279,22 +321,23 @@ static void sendmail(Request& r, const S Pool& pool=r.pool(); char *letter_cstr=letter.cstr(); + Hash *mail_conf=static_cast(r.classes_conf.get(mail_class->name())); -#ifdef WIN32 +#ifdef _MSC_VER if(!from) PTHROW(0, 0, &method_name, - "not specified 'from'"); + "has no 'from' header specified"); if(!to) PTHROW(0, 0, &method_name, - "not specified 'to'"); + "has no 'to' header specified"); SMTP& smtp=*new(pool) SMTP(pool, method_name); Value *server_port; - // $MAIN:MAIL.SMTP[mail.design.ru] - if(r.mail && - (server_port=static_cast(r.mail->get( + // $MAIN:MAIL.SMTP[mail.yourdomain.ru[:port]] + if(mail_conf && + (server_port=static_cast(mail_conf->get( *new(pool) String(pool, "SMTP"))))) { char *server=server_port->as_string().cstr(); const char *port=rsplit(server, ':'); @@ -305,64 +348,79 @@ static void sendmail(Request& r, const S } else PTHROW(0, 0, &method_name, - "$MAIN:MAIL.SMTP not defined"); + "$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined"); #else // unix - // $MAIN:MAIL.SMTP[mail.design.ru] - if(r.mail) { - int no=0; + // $MAIN:MAIL.prog1["/usr/sbin/sendmail -t"] default + // $MAIN:MAIL.prog2["/usr/lib/sendmail -t"] default + if(mail_conf) { char no_cstr[MAX_NUMBER]; - while(true) { - snprintf(no_cstr, MAX_NUMBER, "%d", ++no); - String prog_key(pool, "prog"); prog_key << no_cstr; - if(Value *prog_value=static_cast(r.mail->get(prog_key))) { - // "/usr/sbin/sendmail -t" - const String& prog_string=prog_value->as_string(); - Array argv(pool); - const String *file_spec; - int after_file_spec=prog_string.pos(" ", 1); - if(after_file_spec<=0) - file_spec=&prog_string; - else { - size_t pos_after=after_file_spec; - file_spec=&prog_string.mid(0, pos_after); - prog_string.split(argv, &pos_after, " ", 1, String::UL_CLEAN); + for(int no=-2; ; no++) { + const String *prog_string; + switch(no) { + case -2: prog_string=new(pool) String(pool, "/usr/sbin/sendmail -t"); break; + case -1: prog_string=new(pool) String(pool, "/usr/lib/sendmail -t"); break; + default: + { + String prog_key(pool, "prog"); + snprintf(no_cstr, MAX_NUMBER, "%d", no); + prog_key << no_cstr; + if(Value *prog_value=static_cast(mail_conf->get(prog_key))) + prog_string=&prog_value->as_string(); + else + if(no==0) + continue; + else + PTHROW(0, 0, + &method_name, + "$"MAIN_CLASS_NAME":"MAIL_NAME".%s not defined", + prog_key.cstr()); } + } + // we know prog_string here + Array argv(pool); + const String *file_spec; + int after_file_spec=prog_string->pos(" ", 1); + if(after_file_spec<=0) + file_spec=prog_string; + else { + size_t pos_after=after_file_spec; + file_spec=&prog_string->mid(0, pos_after); + prog_string->split(argv, &pos_after, " ", 1, String::UL_CLEAN); + } - String in(pool, letter_cstr); String out(pool); String err(pool); - int exit_status=pa_exec(*file_spec, - 0/*default env*/, - &argv, - in, out, err); - if(exit_status || err.size()) - PTHROW(0, 0, - &method_name, - "'%s' reported problem: %s (%d)", - file_spec->cstr(), - err.size()?err.cstr():"UNKNOWN", - exit_status); - } else + // skip unavailable default programs + if(no<0 && !file_executable(*file_spec)) + continue; + + String in(pool, letter_cstr); String out(pool); String err(pool); + int exit_status=pa_exec(*file_spec, + 0/*default env*/, + &argv, + in, out, err); + if(exit_status || err.size()) PTHROW(0, 0, &method_name, - "$MAIN:MAIL.%s not defined", prog_key.cstr()); + "'%s' reported problem: %s (%d)", + file_spec->cstr(), + err.size()?err.cstr():"UNKNOWN", + exit_status); + break; } } else PTHROW(0, 0, &method_name, - "$MAIN:MAIL not defined"); + "$" MAIN_CLASS_NAME ":" MAIL_NAME " not defined"); #endif } // methods -static void _send(Request& r, const String& method_name, Array *params) { +static void _send(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vhash=*static_cast(params->get(0)); - // forcing [this body type] - r.fail_if_junction_(true, vhash, method_name, "message must not be code"); - + Value& vhash=params->as_no_junction(0, "message must not be code"); Hash *hash=vhash.get_hash(); if(!hash) PTHROW(0, 0, @@ -372,12 +430,38 @@ static void _send(Request& r, const Stri const String *from, *to; const String& letter=letter_hash_to_string(r, method_name, *hash, 0, &from, &to); - //r.write_assign_lang(*new(pool) VString(letter)); +// r.write_assign_lang(*new(pool) VString(letter)); sendmail(r, method_name, letter, from, to); } -// initialize -void initialize_mail_class(Pool& pool, VStateless_class& vclass) { +// constructor & configurator + +MMail::MMail(Pool& apool) : Methoded(apool), + mail_name(apool, MAIL_NAME), + content_disposition_name(apool, CONTENT_DISPOSITION_NAME), + content_disposition_filename_name(apool, CONTENT_DISPOSITION_FILENAME_NAME) +{ + set_name(*NEW String(pool(), MAIL_CLASS_NAME)); + // ^mail:send{hash} - vclass.add_native_method("send", Method::CT_STATIC, _send, 1, 1); + add_native_method("send", Method::CT_STATIC, _send, 1, 1); +} + +void MMail::configure_user(Request& r) { + Pool& pool=r.pool(); + + // $MAIN:MAIL[$SMTP[mail.design.ru]] + if(Value *mail_element=r.main_class->get_element(mail_name)) + if(Hash *mail_conf=mail_element->get_hash()) + r.classes_conf.put(name(), mail_conf); + else + PTHROW(0, 0, + 0, + "$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash"); +} + +// creator + +Methoded *MMail_create(Pool& pool) { + return mail_class=new(pool) MMail(pool); }