X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fsmtp.php;h=9ec78632da8503cd5c4423c9afdc0d3c9172af49;hp=b7ececf2c20312ffe92b9c961ff01c8c965bf3d9;hb=fdc3543312de7862c3ea6442bf08174aa09713ff;hpb=9949206dba7cb11642f9c9380a2fafb9999d39e7
diff --git a/functions/smtp.php b/functions/smtp.php
index b7ececf2..9ec78632 100644
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -3,10 +3,24 @@
**
** This contains all the functions needed to send messages through
** an smtp server or sendmail.
+ **
+ ** $Id$
**/
$smtp_php = true;
+ // This should most probably go to some initialization...
+ if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) {
+ $popuser = $usernamedata[1];
+ $domain = $usernamedata[2];
+ unset($usernamedata);
+ } else {
+ $popuser = $username;
+ }
+ // We need domain for smtp
+ if (!$domain)
+ $domain = getenv('HOSTNAME');
+
// Returns true only if this message is multipart
function isMultipart () {
global $attachments;
@@ -28,23 +42,23 @@
while (list($localname, $remotename) = each($attachments)) {
// This is to make sure noone is giving a filename in another
// directory
- $localname = ereg_replace ("\\/", "", $localname);
+ $localname = ereg_replace ("\\/", '', $localname);
- $fileinfo = fopen ($attachment_dir.$localname.".info", "r");
+ $fileinfo = fopen ($attachment_dir.$localname.'.info', 'r');
$filetype = fgets ($fileinfo, 8192);
fclose ($fileinfo);
$filetype = trim ($filetype);
- if ($filetype=="")
- $filetype = "application/octet-stream";
+ if ($filetype=='')
+ $filetype = 'application/octet-stream';
- $header = "--".mimeBoundary()."\r\n";
- $header .= "Content-Type: $filetype\r\n";
+ $header = '--'.mimeBoundary()."\r\n";
+ $header .= "Content-Type: $filetype;name=\"$remotename\"\r\n";
$header .= "Content-Disposition: attachment; filename=\"$remotename\"\r\n";
$header .= "Content-Transfer-Encoding: base64\r\n\r\n";
fputs ($fp, $header);
$length += strlen($header);
- $file = fopen ($attachment_dir.$localname, "r");
+ $file = fopen ($attachment_dir.$localname, 'r');
while ($tmp = fread($file, 570)) {
$encoded = chunk_split(base64_encode($tmp));
$length += strlen($encoded);
@@ -66,7 +80,7 @@
while (list($localname, $remotename) = each($attachments)) {
if (!ereg ("\\/", $localname)) {
unlink ($attachment_dir.$localname);
- unlink ($attachment_dir.$localname.".info");
+ unlink ($attachment_dir.$localname.'.info');
}
}
}
@@ -74,14 +88,10 @@
// Return a nice MIME-boundary
function mimeBoundary () {
- global $version, $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT;
-
static $mimeBoundaryString;
if ($mimeBoundaryString == "") {
- $temp = "SquirrelMail".$version.$REMOTE_ADDR.$SERVER_NAME.
- $REMOTE_PORT;
- $mimeBoundaryString = "=-_+".substr(md5($temp),1,20);
+ $mimeBoundaryString = GenerateRandomString(70, '\'()+,-./:=?_', 7);
}
return $mimeBoundaryString;
@@ -89,18 +99,22 @@
/* Time offset for correct timezone */
function timezone () {
- $diff_second = date("Z");
+ global $invert_time;
+
+ $diff_second = date('Z');
+ if ($invert_time)
+ $diff_second = - $diff_second;
if ($diff_second > 0)
- $sign = "+";
+ $sign = '+';
else
- $sign = "-";
+ $sign = '-';
$diff_second = abs($diff_second);
$diff_hour = floor ($diff_second / 3600);
$diff_minute = floor (($diff_second-3600*$diff_hour) / 60);
- $zonename = "(".strftime("%Z").")";
+ $zonename = '('.strftime('%Z').')';
$result = sprintf ("%s%02d%02d %s", $sign, $diff_hour, $diff_minute, $zonename);
return ($result);
}
@@ -108,51 +122,59 @@
/* Print all the needed RFC822 headers */
function write822Header ($fp, $t, $c, $b, $subject, $more_headers) {
global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT;
- global $data_dir, $username, $domain, $version, $useSendmail;
+ global $data_dir, $username, $popuser, $domain, $version, $useSendmail;
global $default_charset, $HTTP_VIA, $HTTP_X_FORWARDED_FOR;
+ global $REMOTE_HOST;
// Storing the header to make sure the header is the same
// everytime the header is printed.
static $header, $headerlength;
- if ($header == "") {
+ if ($header == '') {
$to = parseAddrs($t);
$cc = parseAddrs($c);
$bcc = parseAddrs($b);
- $reply_to = getPref($data_dir, $username, "reply_to");
- $from = getPref($data_dir, $username, "full_name");
- $from_addr = getPref($data_dir, $username, "email_address");
-
- if ($from_addr == "")
- $from_addr = "$username@$domain";
+ $reply_to = getPref($data_dir, $username, 'reply_to');
+ $from = getPref($data_dir, $username, 'full_name');
+ $from_addr = getPref($data_dir, $username, 'email_address');
+
+ if ($from_addr == '')
+ $from_addr = $popuser.'@'.$domain;
$to_list = getLineOfAddrs($to);
$cc_list = getLineOfAddrs($cc);
$bcc_list = getLineOfAddrs($bcc);
-
+
/* Encoding 8-bit characters and making from line */
- $subject = encodeHeader($subject);
- if ($from == "")
+ $subject = sqStripSlashes(encodeHeader($subject));
+ if ($from == '')
$from = "<$from_addr>";
else
- $from = encodeHeader($from) . " <$from_addr>";
+ $from = '"' . encodeHeader($from) . "\" <$from_addr>";
/* This creates an RFC 822 date */
$date = date("D, j M Y H:i:s ", mktime()) . timezone();
/* Create a message-id */
- $message_id = "<" . $REMOTE_PORT . "." . $REMOTE_ADDR . ".";
- $message_id .= time() . "@" . $SERVER_NAME .">";
+ $message_id = '<' . $REMOTE_PORT . '.' . $REMOTE_ADDR . '.';
+ $message_id .= time() . '.squirrel@' . $SERVER_NAME .'>';
/* Make an RFC822 Received: line */
- $received_from = "$REMOTE_ADDR";
+ if (isset($REMOTE_HOST))
+ $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";
+ else
+ $received_from = $REMOTE_ADDR;
+
if (isset($HTTP_VIA) || isset ($HTTP_X_FORWARDED_FOR)) {
- if ($HTTP_X_FORWARDED_FOR == "")
- $HTTP_X_FORWARDED_FOR = "unknown";
+ if ($HTTP_X_FORWARDED_FOR == '')
+ $HTTP_X_FORWARDED_FOR = 'unknown';
$received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)";
}
- $header = "Received: from $received_from by $SERVER_NAME with HTTP; ";
- $header .= "$date\r\n";
+
+ $header = "Received: from $received_from\r\n";
+ $header .= " (SquirrelMail authenticated user $username)\r\n";
+ $header .= " by $SERVER_NAME with HTTP;\r\n";
+ $header .= " $date\r\n";
/* Insert the rest of the header fields */
$header .= "Message-ID: $message_id\r\n";
@@ -173,7 +195,7 @@
$header .= "Cc: $cc_list\r\n"; // Who the CCs are
}
- if ($reply_to != "")
+ if ($reply_to != '')
$header .= "Reply-To: $reply_to\r\n";
if ($useSendmail) {
@@ -189,11 +211,11 @@
$header .= "MIME-Version: 1.0\r\n";
if (isMultipart()) {
- $header .= "Content-Type: multipart/mixed; boundary=\"";
+ $header .= 'Content-Type: multipart/mixed; boundary="';
$header .= mimeBoundary();
$header .= "\"\r\n";
} else {
- if ($default_charset != "")
+ if ($default_charset != '')
$header .= "Content-Type: text/plain; charset=$default_charset\r\n";
else
$header .= "Content-Type: text/plain;\r\n";
@@ -217,7 +239,7 @@
$attachmentlength = 0;
if (isMultipart()) {
- $body = "--".mimeBoundary()."\r\n";
+ $body = '--'.mimeBoundary()."\r\n";
if ($default_charset != "")
$body .= "Content-Type: text/plain; charset=$default_charset\r\n";
@@ -225,15 +247,16 @@
$body .= "Content-Type: text/plain\r\n";
$body .= "Content-Transfer-Encoding: 8bit\r\n\r\n";
- $body .= stripslashes($passedBody) . "\r\n";
+ $body .= sqStripSlashes($passedBody) . "\r\n\r\n";
fputs ($fp, $body);
$attachmentlength = attachFiles($fp);
+ if (!isset($postbody)) $postbody = "";
$postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n";
fputs ($fp, $postbody);
} else {
- $body = stripslashes($passedBody) . "\r\n";
+ $body = sqStripSlashes($passedBody) . "\r\n";
fputs ($fp, $body);
$postbody = "\r\n";
fputs ($fp, $postbody);
@@ -244,10 +267,18 @@
// Send mail using the sendmail command
function sendSendmail($t, $c, $b, $subject, $body, $more_headers) {
- global $sendmail_path, $username, $domain;
+ global $sendmail_path, $popuser, $username, $domain;
+
+ // Build envelope sender address. Make sure it doesn't contain
+ // spaces or other "weird" chars that would allow a user to
+ // exploit the shell/pipe it is used in.
+ $envelopefrom = "$popuser@$domain";
+ $envelopefrom = ereg_replace("[[:blank:]]",'', $envelopefrom);
+ $envelopefrom = ereg_replace("[[:space:]]",'', $envelopefrom);
+ $envelopefrom = ereg_replace("[[:cntrl:]]",'', $envelopefrom);
// open pipe to sendmail
- $fp = popen (escapeshellcmd("$sendmail_path -t -f$username@$domain"), "w");
+ $fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), 'w');
$headerlength = write822Header ($fp, $t, $c, $b, $subject, $more_headers);
$bodylength = writeBody($fp, $body);
@@ -261,7 +292,7 @@
$read = fgets($smtpConnection, 1024);
$counter = 0;
while ($read) {
- echo $read . "
";
+ echo $read . '
';
$data[$counter] = $read;
$read = fgets($smtpConnection, 1024);
$counter++;
@@ -269,69 +300,70 @@
}
function sendSMTP($t, $c, $b, $subject, $body, $more_headers) {
- global $username, $domain, $version, $smtpServerAddress, $smtpPort,
+ global $username, $popuser, $domain, $version, $smtpServerAddress, $smtpPort,
$data_dir, $color;
$to = parseAddrs($t);
$cc = parseAddrs($c);
$bcc = parseAddrs($b);
- $from_addr = getPref($data_dir, $username, "email_address");
+ $from_addr = getPref($data_dir, $username, 'email_address');
- if ($from_addr == "")
- $from_addr = "$username@$domain";
+ if (!$from_addr)
+ $from_addr = "$popuser@$domain";
$smtpConnection = fsockopen($smtpServerAddress, $smtpPort, $errorNumber, $errorString);
if (!$smtpConnection) {
- echo "Error connecting to SMTP Server.
";
+ echo 'Error connecting to SMTP Server.
';
echo "$errorNumber : $errorString
";
exit;
}
- $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
- errorCheck($tmp);
+ $tmp = fgets($smtpConnection, 1024);
+ errorCheck($tmp, $smtpConnection);
$to_list = getLineOfAddrs($to);
$cc_list = getLineOfAddrs($cc);
/** Lets introduce ourselves */
fputs($smtpConnection, "HELO $domain\r\n");
- $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
- errorCheck($tmp);
+ $tmp = fgets($smtpConnection, 1024);
+ errorCheck($tmp, $smtpConnection);
/** Ok, who is sending the message? */
fputs($smtpConnection, "MAIL FROM:<$from_addr>\r\n");
- $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
- errorCheck($tmp);
+ $tmp = fgets($smtpConnection, 1024);
+ errorCheck($tmp, $smtpConnection);
/** send who the recipients are */
for ($i = 0; $i < count($to); $i++) {
fputs($smtpConnection, "RCPT TO:<$to[$i]>\r\n");
- $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
- errorCheck($tmp);
+ $tmp = fgets($smtpConnection, 1024);
+ errorCheck($tmp, $smtpConnection);
}
for ($i = 0; $i < count($cc); $i++) {
fputs($smtpConnection, "RCPT TO:<$cc[$i]>\r\n");
- $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
- errorCheck($tmp);
+ $tmp = fgets($smtpConnection, 1024);
+ errorCheck($tmp, $smtpConnection);
}
for ($i = 0; $i < count($bcc); $i++) {
fputs($smtpConnection, "RCPT TO:<$bcc[$i]>\r\n");
- $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
- errorCheck($tmp);
+ $tmp = fgets($smtpConnection, 1024);
+ errorCheck($tmp, $smtpConnection);
}
/** Lets start sending the actual message */
fputs($smtpConnection, "DATA\r\n");
- $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
- errorCheck($tmp);
+ $tmp = fgets($smtpConnection, 1024);
+ errorCheck($tmp, $smtpConnection);
// Send the message
$headerlength = write822Header ($smtpConnection, $t, $c, $b, $subject, $more_headers);
$bodylength = writeBody($smtpConnection, $body);
fputs($smtpConnection, ".\r\n"); // end the DATA part
- $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
- $num = errorCheck($tmp);
+ $tmp = fgets($smtpConnection, 1024);
+ $num = errorCheck($tmp, $smtpConnection);
if ($num != 250) {
+ $tmp = nl2br(htmlspecialchars($tmp));
echo "ERROR
Message not sent!
Reason given: $tmp