X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=class%2Fmime%2FRfc822Header.class.php;h=7b37521670127c86dd6ce1d3fdcd9480920b6731;hp=19a012cbb7aef0ff6f97086d0dff2a52326f58cd;hb=340d67c221ae8e36ebfa286441aa9cf7d47bd990;hpb=19d470aa121cacdd916319ec6b55af180562805e diff --git a/class/mime/Rfc822Header.class.php b/class/mime/Rfc822Header.class.php index 19a012cb..7b375216 100644 --- a/class/mime/Rfc822Header.class.php +++ b/class/mime/Rfc822Header.class.php @@ -3,7 +3,7 @@ /** * Rfc822Header.class.php * - * Copyright (c) 2002 The SquirrelMail Project Team + * Copyright (c) 2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This contains functions needed to handle mime messages. @@ -26,6 +26,7 @@ class Rfc822Header { $bcc = array(), $in_reply_to = '', $message_id = '', + $references = '', $mime = false, $content_type = '', $disposition = '', @@ -50,12 +51,10 @@ class Rfc822Header { $pos = strpos($line, ':'); if ($pos > 0) { $field = substr($line, 0, $pos); - $value = trim(substr($line, $pos+1)); - if(!preg_match('/^X.*/i', $field) && - !preg_match('/^Subject/i', $field)) { - $value = $this->stripComments($value); + if (!strstr($field,' ')) { /* valid field */ + $value = trim(substr($line, $pos+1)); + $this->parseField($field, $value); } - $this->parseField($field, $value); } } if ($this->content_type == '') { @@ -65,7 +64,6 @@ class Rfc822Header { function stripComments($value) { $result = ''; - $cnt = strlen($value); for ($i = 0; $i < $cnt; ++$i) { switch ($value{$i}) { @@ -110,6 +108,7 @@ class Rfc822Header { $field = strtolower($field); switch($field) { case 'date': + $value = $this->stripComments($value); $d = strtr($value, array(' ' => ' ')); $d = explode(' ', $d); $this->date = getTimeStamp($d); @@ -139,19 +138,30 @@ class Rfc822Header { $this->in_reply_to = $value; break; case 'message-id': + $value = $this->stripComments($value); $this->message_id = $value; break; + case 'references': + $value = $this->stripComments($value); + $this->references = $value; + break; + case 'x-confirm-reading-to': + case 'return-receipt-to': case 'disposition-notification-to': + $value = $this->stripComments($value); $this->dnt = $this->parseAddress($value); break; case 'mime-version': + $value = $this->stripComments($value); $value = str_replace(' ', '', $value); $this->mime = ($value == '1.0' ? true : $this->mime); break; case 'content-type': + $value = $this->stripComments($value); $this->parseContentType($value); break; case 'content-disposition': + $value = $this->stripComments($value); $this->parseDisposition($value); break; case 'user-agent': @@ -162,125 +172,295 @@ class Rfc822Header { $this->priority = $value; break; case 'list-post': + $value = $this->stripComments($value); $this->mlist('post', $value); break; case 'list-reply': + $value = $this->stripComments($value); $this->mlist('reply', $value); break; case 'list-subscribe': + $value = $this->stripComments($value); $this->mlist('subscribe', $value); break; case 'list-unsubscribe': + $value = $this->stripComments($value); $this->mlist('unsubscribe', $value); break; case 'list-archive': + $value = $this->stripComments($value); $this->mlist('archive', $value); break; case 'list-owner': + $value = $this->stripComments($value); $this->mlist('owner', $value); break; case 'list-help': + $value = $this->stripComments($value); $this->mlist('help', $value); break; case 'list-id': + $value = $this->stripComments($value); $this->mlist('id', $value); break; default: break; } } - + /* + * parseAddress: recursive function for parsing address strings and store + * them in an address stucture object. + * input: $address = string + * $ar = boolean (return array instead of only the + * first element) + * $addr_ar = array with parsed addresses + * $group = string + * $host = string (default domainname in case of + * addresses without a domainname) + * $lookup = callback function (for lookup address + * strings which are probably nicks + * (without @ ) ) + * output: array with addressstructure objects or only one + * address_structure object. + * personal name: encoded: =?charset?Q|B?string?= + * quoted: "string" + * normal: string + * email : + * : mailbox@host + * This function is also used for validating addresses returned from compose + * That's also the reason that the function became a little bit huge and horrible + * Todo: Find a way to clean up this mess a bit (Marc Groot Koerkamp) + */ function parseAddress - ($address, $ar=false, $addr_ar = array(), $group = '') { + ($address, $ar=false, $addr_ar = array(), $group = '', $host='',$lookup=false) { $pos = 0; + $name = $addr = $comment = $is_encoded = ''; + /* + * in case of 8 bit addresses some how is represented as + * NON BRAKING SPACE + * This only happens when we validate addresses from the compose form. + * + * Note: when other charsets have dificulties with characters + * =,;:<>()" + * then we should find out the value for those characters ans replace + * them by proper ASCII values before we start parsing. + * + */ + $address = str_replace("\240",' ',$address); + + $address = trim($address); $j = strlen($address); - $name = ''; - $addr = ''; + while ($pos < $j) { - switch ($address{$pos}) { - case '"': /* get the personal name */ - if ($address{++$pos} == '"') { - ++$pos; - } else { - while ($pos < $j && $address{$pos} != '"') { - if ((substr($address, $pos, 2) == '\\"') || - (substr($address, $pos, 2) == '\\\\')) { - $name .= $address{$pos++}; - } - $name .= $address{$pos++}; - } - } + $char = $address{$pos}; + switch ($char) + { + case '=': + /* get the encoded personal name */ + if (preg_match('/^(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',substr($address,$pos),$reg)) { + $name .= $reg[1]; + $pos += strlen($reg[1]); + } + ++$pos; + $addr_start = $pos; + $is_encoded = true; + break; + case '"': /* get the personal name */ + $start_encoded = $pos; + ++$pos; + if ($address{$pos} == '"') { ++$pos; - break; - case '<': /* get email address */ - $addr_start = $pos++; - while ($pos < $j && $address{$pos} != '>') { - $addr .= $address{$pos++}; + } else { + $personal_start = $personal_end = $pos; + while ($pos < $j) { + $personal_end = strpos($address,'"',$pos); + if (($personal_end-2)>0 && (substr($address,$personal_end-2,2) === '\\"' || + substr($address,$personal_end-2,2) === '\\\\')) { + $pos = $personal_end+1; + } else { + $name .= substr($address,$personal_start,$personal_end-$personal_start); + break; + } } - ++$pos; - break; - case '(': /* rip off comments */ - $addr_start = $pos; - for (++$pos; ($pos < $j) && ($address{$pos} != ')'); ++$pos) { - $addr .= $address{$pos}; + if ($personal_end) { + $pos = $personal_end+1; + } else { + $pos = $j; } + } + $addr_start = $pos; + break; + case '<': /* get email address */ + $addr_start = $pos; + $addr_end = strpos($address,'>',$addr_start); + $addr = substr($address,$addr_start+1,$addr_end-$addr_start-1); + if ($addr_end) { + $pos = $addr_end+1; + } else { + $addr = substr($address,$addr_start+1); + $pos = $j; + } + break; + case '(': /* rip off comments */ + $addr_start = $pos; + $pos = strpos($address,')'); + if ($pos !== false) { + $comment = substr($address, $addr_start+1,($pos-$addr_start-1)); $address_start = substr($address, 0, $addr_start); $address_end = substr($address, $pos + 1); $address = $address_start . $address_end; - $j = strlen($address); - $pos = $addr_start + 1; - break; - case ',': /* we reached a delimiter */ - if ($addr == '') { - $addr = substr($address, 0, $pos); - } else if ($name == '') { - $name = trim(substr($address, 0, $addr_start)); - } - - $at = strpos($addr, '@'); - $addr_structure = new AddressStructure(); + } + $j = strlen($address); + $pos = $addr_start + 1; + break; + case ',': /* we reached a delimiter */ + if (!$name && !$addr) { + $addr = substr($address, 0, $pos); + } else if (!$addr) { + $addr = trim(substr($address, $addr_start, $pos)); + } else if ($name == '') { + $name = trim(substr($address, 0, $addr_start)); + } + $at = strpos($addr, '@'); + $addr_structure = new AddressStructure(); + if (!$name && $comment) $name = $comment; + if (!$is_encoded) { + $addr_structure->personal = encodeHeader($name); + } else { $addr_structure->personal = $name; - $addr_structure->group = $group; - if ($at) { - $addr_structure->mailbox = substr($addr, 0, $at); - $addr_structure->host = substr($addr, $at+1); + } + $is_encoded = false; + $addr_structure->group = $group; + if ($at) { + $addr_structure->mailbox = substr($addr, 0, $at); + $addr_structure->host = substr($addr, $at+1); + } else { + /* if lookup function */ + if ($lookup) { + $aAddr = call_user_func_array($lookup,array($addr)); + if (isset($aAddr['email'])) { + $at = strpos($aAddr['email'], '@'); + $addr_structure->mailbox = substr($aAddr['email'], 0, $at); + $addr_structure->host = substr($aAddr['email'], $at+1); + if (isset($aAddr['name'])) { + $addr_structure->personal = $aAddr['name']; + } else { + $addr_structure->personal = encodeHeader($addr); + } + } + } + if (!$addr_structure->mailbox) { + $addr_structure->mailbox = trim($addr); + if ($host) { + $addr_structure->host = $host; + } + } + } + $address = trim(substr($address, $pos+1)); + $j = strlen($address); + $pos = 0; + $name = ''; + $addr = ''; + $addr_ar[] = $addr_structure; + break; + case ':': /* process the group addresses */ + /* group marker */ + $group = substr($address, 0, $pos); + $address = substr($address, $pos+1); + $result = $this->parseAddress($address, $ar, $addr_ar, $group); + $addr_ar = $result[0]; + $pos = $result[1]; + $address = substr($address, $pos++); + $j = strlen($address); + $group = ''; + break; + case ';': + if ($group) { + $address = substr($address, 0, $pos - 1); + } + ++$pos; + break; + case ' ': + ++$pos; + break; + default: + /* + * this happens in the folowing situations : + * 1: unquoted personal name + * 2: emailaddress without < and > + * 3: unquoted personal name from compose that should be encoded. + * if it's a personal name then an emailaddress should follow + * the personal name may not have ',' inside it + * If it's a emailaddress then the personal name is not set. + * we should look for the delimiter ',' or a SPACE + */ + /* check for emailaddress */ + $i_space = strpos($address,' ',$pos); + $i_del = strpos($address,',',$pos); + if ($i_space || $i_del) { + if ($i_del) { + $address_part = substr($address,$pos,$i_del-$pos); } else { - $addr_structure->mailbox = $addr; + $address_part = substr($address,$pos); } - $address = trim(substr($address, $pos+1)); - $j = strlen($address); - $pos = 0; - $name = ''; - $addr = ''; - $addr_ar[] = $addr_structure; - break; - case ':': /* process the group addresses */ - /* group marker */ - $group = substr($address, 0, $pos); - $address = substr($address, $pos+1); - $result = $this->parseAddress($address, $ar, $addr_ar, $group); - $addr_ar = $result[0]; - $pos = $result[1]; - $address = substr($address, $pos++); - $j = strlen($address); - $group = ''; - break; - case ';': - if ($group) { - $address = substr($address, 0, $pos - 1); + if ($i = strpos($address_part,'@')) { + /* an email address is following */ + if (($i+$pos) < $i_space) { + $addr_start = $pos; + if ($i_space < $i_del && $i_del) { + if ($i_space) { + $addr = substr($address,$pos,$i_space-$pos); + $pos = $i_space; + } else { + $addr = substr($address,$pos); + $pos = $j; + } + } else { + if ($i_del) { + $addr = substr($address,$pos,$i_del-$pos); + $pos = $i_del; + } else { + $addr = substr($address,$pos); + $pos = $j; + } + } + } else { + if ($i_space) { + $name .= substr($address,$pos,$i_space-$pos) . ' '; + $addr_start = $i_space+1; + $pos = $i_space+1; + } else { + $addr = substr($address,$pos,$i_del-$pos); + $addr_start = $pos; + if ($i_del) { + $pos = $i_del; + } else { + $pos = $j; + } + } + } + } else { + /* email address without domain name, could be an alias */ + $addr_start = $pos; + $addr = $address_part; + $pos = strlen($address_part) + $pos; } - ++$pos; - break; - default: - ++$pos; - break; + } else { + $addr = substr($address,$pos); + $addr_start = $pos; + $pos = $j; + } + break; } } - if ($addr == '') { + if (!$name && !$addr) { $addr = substr($address, 0, $pos); + } else if (!$addr) { + $addr = trim(substr($address, $addr_start, $pos)); } else if ($name == '') { $name = trim(substr($address, 0, $addr_start)); } + if (!$name && $comment) $name = $comment; $at = strpos($addr, '@'); $addr_structure = new AddressStructure(); $addr_structure->group = $group; @@ -288,13 +468,40 @@ class Rfc822Header { $addr_structure->mailbox = trim(substr($addr, 0, $at)); $addr_structure->host = trim(substr($addr, $at+1)); } else { - $addr_structure->mailbox = trim($addr); + /* if lookup function */ + if ($lookup) { + $aAddr = call_user_func_array($lookup,array($addr)); + if (isset($aAddr['email'])) { + $at = strpos($aAddr['email'], '@'); + $addr_structure->mailbox = substr($aAddr['email'], 0, $at); + $addr_structure->host = substr($aAddr['email'], $at+1); + if (isset($aAddr['name']) && $aAddr['name']) { + $name = $aAddr['name']; + } else { + $name = $addr; + } + } + } + if (!$addr_structure->mailbox) { + $addr_structure->mailbox = trim($addr); + if ($host) { + $addr_structure->host = $host; + } + } + } + $name = trim($name); + if (!$is_encoded && !$group) { + $name = encodeHeader($name); } if ($group && $addr == '') { /* no addresses found in group */ - $name = "$group: Undisclosed recipients;"; + $name = $group; + $addr_structure->personal = $name; + $addr_ar[] = $addr_structure; + return (array($addr_ar,$pos+1 )); + } elseif ($group) { $addr_structure->personal = $name; $addr_ar[] = $addr_structure; - return (array($addr_ar, $pos+1)); + return (array($addr_ar,$pos+1 )); } else { $addr_structure->personal = $name; if ($name || $addr) { @@ -350,7 +557,7 @@ class Rfc822Header { $props = ''; if ($pos > 0) { $name = trim(substr($value, 0, $pos)); - $props = trim(substr($type, $pos+1)); + $props = trim(substr($value, $pos+1)); } else { $name = $value; } @@ -383,28 +590,36 @@ class Rfc822Header { * example1: header->getAddr_s('to'). * example2: header->getAddr_s(array('to', 'cc', 'bcc')) */ - function getAddr_s($arr, $separator = ',') { + function getAddr_s($arr, $separator = ',',$encoded=false) { $s = ''; if (is_array($arr)) { foreach($arr as $arg) { - if ($this->getAddr_s($arg)) { + if ($this->getAddr_s($arg, $separator, $encoded)) { $s .= $separator . $result; } } $s = ($s ? substr($s, 2) : $s); } else { - eval('$addr = $this->' . $arr . ';') ; + $addr = $this->{$arr}; if (is_array($addr)) { foreach ($addr as $addr_o) { if (is_object($addr_o)) { - $s .= $addr_o->getAddress() . $separator; + if ($encoded) { + $s .= $addr_o->getEncodedAddress() . $separator; + } else { + $s .= $addr_o->getAddress() . $separator; + } } } $s = substr($s, 0, -strlen($separator)); } else { if (is_object($addr)) { - $s .= $addr->getAddress(); + if ($encoded) { + $s .= $addr->getEncodedAddress(); + } else { + $s .= $addr->getAddress(); + } } } } @@ -417,7 +632,7 @@ class Rfc822Header { $arr = $this->getAddr_a($argument, $excl_arr, $arr); } } else { - eval('$addr = $this->' . $arg . ';') ; + $addr = $this->{$arg}; if (is_array($addr)) { foreach ($addr as $next_addr) { if (is_object($next_addr)) { @@ -445,6 +660,66 @@ class Rfc822Header { } return $arr; } + + function findAddress($address, $recurs = false) { + $result = false; + if (is_array($address)) { + $i=0; + foreach($address as $argument) { + $match = $this->findAddress($argument, true); + $last = end($match); + if ($match[1]) { + return $i; + } else { + if (count($match[0]) && !$result) { + $result = $i; + } + } + ++$i; + } + } else { + if (!is_array($this->cc)) $this->cc = array(); + $srch_addr = $this->parseAddress($address); + $results = array(); + foreach ($this->to as $to) { + if ($to->host == $srch_addr->host) { + if ($to->mailbox == $srch_addr->mailbox) { + $results[] = $srch_addr; + if ($to->personal == $srch_addr->personal) { + if ($recurs) { + return array($results, true); + } else { + return true; + } + } + } + } + } + foreach ($this->cc as $cc) { + if ($cc->host == $srch_addr->host) { + if ($cc->mailbox == $srch_addr->mailbox) { + $results[] = $srch_addr; + if ($cc->personal == $srch_addr->personal) { + if ($recurs) { + return array($results, true); + } else { + return true; + } + } + } + } + } + if ($recurs) { + return array($results, false); + } elseif (count($result)) { + return true; + } else { + return false; + } + } + //exit; + return $result; + } function getContentType($type0, $type1) { $type0 = $this->content_type->type0;