From 1a900aafa3d7996900e61ee3656fbffa6c7effb2 Mon Sep 17 00:00:00 2001 From: marcelloc Date: Mon, 14 Nov 2011 19:40:10 -0200 Subject: postfix - include sqlite databases, mail search, cron updates and minor gui changes --- config/postfix/postfix.inc | 138 +++++++++-- config/postfix/postfix.php | 423 +++++++++++++++++++++++++++++++++ config/postfix/postfix.xml | 43 +++- config/postfix/postfix_acl.xml | 4 + config/postfix/postfix_antispam.xml | 26 +- config/postfix/postfix_recipients.xml | 4 + config/postfix/postfix_search.php | 227 ++++++++++++++++++ config/postfix/postfix_sync.xml | 4 + config/postfix/postfix_view_config.php | 4 +- 9 files changed, 838 insertions(+), 35 deletions(-) create mode 100644 config/postfix/postfix.php create mode 100755 config/postfix/postfix_search.php (limited to 'config/postfix') diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc index e8152be7..ca81be8e 100644 --- a/config/postfix/postfix.inc +++ b/config/postfix/postfix.inc @@ -42,6 +42,7 @@ function px_get_real_interface_address($iface) { global $config; $iface = convert_friendly_interface_to_real_interface_name($iface); $line = trim(shell_exec("ifconfig $iface | grep inet | grep -v inet6")); + $postfix_enabled=$config['installedpackages']['postfix']['config'][0]['enable_postfix']; list($dummy, $ip, $dummy2, $netmask) = explode(" ", $line); return array($ip, long2ip(hexdec($netmask))); } @@ -53,6 +54,8 @@ function sync_relay_recipients($via_cron="cron"){ $relay_recipients=""; $relay_ldap_recipients=""; $ad_export="/usr/local/etc/postfix/adexport.pl"; + $cron_cmd="/usr/local/bin/php -q /usr/local/www/postfix_recipients.php"; + $postfix_enabled=$config['installedpackages']['postfix']['config'][0]['enable_postfix']; foreach ($config['installedpackages']['postfixrecipients']['config'] as $postfix_recipients_config) { if($postfix_recipients_config['location'] && file_exists($postfix_recipients_config['location'])) $relay_recipients .= file_get_contents($postfix_recipients_config['location']); @@ -61,36 +64,26 @@ function sync_relay_recipients($via_cron="cron"){ if($postfix_recipients_config['enable_ldap']){ #validate cront job if(preg_match("/(\d+)(\w)/",$postfix_recipients_config['freq'],$matches)){ - $cron_sufix="\t*\t*\troot\t/usr/local/bin/php /usr/local/www/postfix_recipients.php"; + $cron_postfix=array("minute" => "*", + "hour" => "*", + "mday" => "*", + "month" => "*", + "wday" => "*", + "who" => "root", + "command"=> $cron_cmd); switch ($matches[2]){ case m: - $cron= "*/".$matches[1]."\t*\t*".$cron_sufix; + $cron_postfix["month"]="*/".$matches[1]; break; case h: - $cron= "0\t*/".$matches[1]."\t*".$cron_sufix; + $cron_postfix["hour"]="*/".$matches[1]; break; case d: - $cron= "0\t0\t*/".$matches[1].$cron_sufix; + $cron_postfix["mday"]="*/".$matches[1]; break; default: $input_errors[] = "A valid number with a time reference is required for the field 'Frequency'"; } - #update cront job file - $crontab = file('/etc/crontab'); - foreach ($crontab as $line) - $new_cron.=(preg_match("/postfix_recipients.php/",$line)?$cron."\n":$line); - #include if conf does not exist in crontab - $new_cron.=(!preg_match("/postfix_recipients.php/",$new_cron)?"\n".$cron."\n\n":""); - file_put_contents("/etc/crontab",$new_cron, LOCK_EX); - #check crontab changes - $md5_new_file = trim(md5_file('/etc/crontab')); - if(file_exists('/etc/crontab.md5')) - $md5_old_file = trim(file_get_contents('/etc/crontab.md5')); - if($md5_new_file <> $md5_old_file){ - mwexec('/usr/bin/killall -HUP cron'); - file_put_contents("/etc/crontab.md5",$md5_new_file, LOCK_EX); - } - } $relay_ldap_recipients=""; if ($via_cron == "gui"){ #running via pfsense gui, not time for ldap fetch. @@ -139,7 +132,106 @@ function sync_relay_recipients($via_cron="cron"){ file_put_contents("/usr/local/etc/postfix/relay_ldap_recipients.txt",$relay_ldap_recipients, LOCK_EX); } } + } + #check crontab + $new_cron=array(); + $cron_cmd_sqlite = ""; + $cron_postfix_sqlite=""; + #check crontab Sqlite databases + if (is_array($config['installedpackages']['postfix']['config']) && $postfix_enabled=="on"){ + $cron_sqlite_queue=$config['installedpackages']['postfix']['config'][0]['update_sqlite']; + $cron_cmd_sqlite="/usr/local/bin/php -q /usr/local/www/postfix.php"; + if ($cron_sqlite_queue != "" && $cron_sqlite_queue != "never"){ + $cron_postfix_sqlite=array("minute" => "*", + "hour" => "*", + "mday" => "*", + "month" => "*", + "wday" => "*", + "who" => "root", + "command"=> ""); + switch ($cron_sqlite_queue){ + case '10min': + $cron_postfix_sqlite["minute"]="*/10"; + $cron_postfix_sqlite["command"] = $cron_cmd_sqlite ." 10min"; + break; + case '01hour': + $cron_postfix_sqlite["minute"]="0"; + $cron_postfix_sqlite["command"] = $cron_cmd_sqlite ." 01hour"; + break; + case '24hours': + $cron_postfix_sqlite["minute"]="0"; + $cron_postfix_sqlite["hour"]="0"; + $cron_postfix_sqlite["command"] = $cron_cmd_sqlite ." 24hours"; + break; + } + } + } + + #check crontab relay recipients + $cron_found=""; + if (is_array($config['cron']['item'])){ + #print "
";
+				foreach($config['cron']['item'] as $cron){
+					#check valid_recipients cron
+					if ($cron["command"] == $cron_cmd){
+						#postfix cron cmd found
+						if($postfix_enabled=="on")
+							$cron_found=$cron;
+						if($postfix_recipients_config['enable_ldap'] && $postfix_enabled=="on")
+							#update cron schedule
+							$new_cron['item'][]=$cron_postfix;
+						}
+					#check sqlite update queue	
+					else if(!preg_match("/.usr.local.www.postfix.php/",$cron["command"])){
+						#keep all non postfix cron cmds if not empty
+						if ($cron["command"] != "")
+							$new_cron['item'][]=$cron;
+						}
+					}
+			$write_cron=1;
+			# Check if crontab must be changed to valid recipients cmd
+			if ($postfix_recipients_config['enable_ldap']){
+				if ($cron_found!=$cron_postfix){
+					#update postfix cron schedule	
+					if (! is_array($cron_found) && $postfix_enabled=="on")
+						$new_cron['item'][]=$cron_postfix;
+					$write_cron=1;
+					}
+				}
+			else{
+				if (is_array($cron_found)){
+					#remove postfix cron cmd
+					$write_cron=1;
+					}
+				}
+			#check if cron must be changed to Sqlite cmd
+			if($cron_sqlite_queue != "" && $cron_sqlite_queue != "never"){
+				$new_cron['item'][]=$cron_postfix_sqlite;
+				$config['cron']=$new_cron;
+				$write_cron=1;
+				}
+			}
+
+			#call cron functions	
+			if ($write_cron==1){
+				$config['cron']=$new_cron;
+				write_config();
+				configure_cron();
+				}
+			#remove postfix old cron call
+			$old_cron=0;
+			$crontab = file('/etc/crontab');
+			$new_crontab="";
+			foreach ($crontab as $line){
+				if (preg_match("/php..usr.local.www.postfix_recipients.php/",$line))
+					$old_cron=1;
+				else
+					$new_crontab .= $line;
+				}
+			if ($old_cron==1)	
+				file_put_contents("/etc/crontab",$new_crontab, LOCK_EX);
 		}
+		
 	#save all relay recipients and reload postfix
 	file_put_contents("/usr/local/etc/postfix/relay_recipients",$relay_ldap_recipients."\n".$relay_recipients, LOCK_EX);
 	exec("/usr/local/sbin/postmap /usr/local/etc/postfix/relay_recipients");
@@ -286,7 +378,7 @@ EOF;
 			break;
 		}	
 	}
-	
+	$reject_unknown_helo_hostname=($antispam['reject_unknown_helo_hostname']?"reject_unknown_helo_hostname":"");
 	if ($antispam['header_check'] == "strong")
 	{
 	$postfix_main .= <<
+	based on varnish_view_config.
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+require_once("/etc/inc/util.inc");
+require_once("/etc/inc/functions.inc");
+require_once("/etc/inc/pkg-utils.inc");
+require_once("/etc/inc/globals.inc");
+function grep_log($from="",$to="",$subject=""){
+	global $postfix_dir,$postfix_db,$postfix_arg;
+	create_db();
+	
+	$total_lines=0;
+	$grep="postfix.\(cleanup\|smtp\|error\|qmgr\)";
+	$curr_time = time();
+	$m=date('M',strtotime($postfix_arg['time'],$curr_time));
+	$j=substr("  ".date('j',strtotime($postfix_arg['time'],$curr_time)),-3);
+	# file grep loop
+	foreach ($postfix_arg['grep'] as $hour){
+	  print "/usr/bin/grep '^".$m.$j." ".$hour.".*".$grep."' /var/log/maillog\n"; 
+	  $lists=array();
+	  exec("/usr/bin/grep " . escapeshellarg('^'.$m.$j." ".$hour.".*".$grep)." /var/log/maillog", $lists);
+	  $stm_noqueue="BEGIN;\n";
+	  $stm_queue="BEGIN;\n";
+	  foreach ($lists as $line){
+		$status=array();
+		$total_lines++;
+		#Nov  8 09:31:50 srvchunk01 postfix/smtpd[43585]: 19C281F59C8: client=pm03-974.auinmeio.com.br[177.70.232.225]
+		if(preg_match("/(\w+\s+\d+\s+[0-9,:]+) (\w+) postfix.smtpd\W\d+\W+(\w+): client=(.*)/",$line,$email)){
+			$values="'".$email[3]."','".$email[1]."','".$email[2]."','".$email[4]."'";
+			if(${$email[3]}!=$email[3])
+				$stm_queue.='insert into mail_queue(sid,date,server,client) values('.$values.');'."\n";
+			${$email[3]}=$email[3];
+		}
+		#Nov 13 00:09:07 srvchunk01 postfix/smtp[51436]: 9145C1F67F7: to=, relay=srvmail1-ma.ma.mail.test.com[172.23.3.6]:25, delay=2.4, delays=2.2/0/0.13/0.11, dsn=5.7.1, status=bounced (host srvmail1-ma.ma.mail.test.com[172.23.3.6] said: 550 5.7.1 Unable to relay for lidia.santos@ma.mail.test.com (in reply to RCPT TO command))
+		#Nov  3 21:45:32 srvchunk01 postfix/smtp[18041]: 4CE321F4887: to=, relay=smtpe1.emv3.com[81.92.120.9]:25, delay=1.9, delays=0.06/0.01/0.68/1.2, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as 2C33E2382C8)
+		else if(preg_match("/(\w+\s+\d+\s+[0-9,:]+) (\w+) postfix.smtp\W\d+\W+(\w+): to=\<(.*)\>, relay=(.*), delay=([0-9.]+).*dsn=([0-9.]+), status=(\w+) (.*)/",$line,$email)){
+			$stm_queue.= "update mail_queue set too='".$email[4]."', relay='".$email[5]."', dsn='".$email[7]."', status='".$email[8]."', status_info='".preg_replace("/(\s+|\'|\")/"," ",$email[9])."', delay='".$email[6]."' where sid='".$email[3]."';\n";
+			#print "update mail_queue set too='".$email[4]."', relay='".$email[5]."', dsn='".$email[9]."',status='".$email[8]."', status_info='".$email[9]."', delay='".$email[6]."' where sid='".$email[3]."';\n";
+		}
+		#Nov 13 01:48:44 srvch011 postfix/cleanup[16914]: D995B1F570B: message-id=<61.40.11745.10E3FBE4@ofertas6>
+		else if(preg_match("/(\w+\s+\d+\s+[0-9,:]+) (\w+) postfix.cleanup\W\d+\W+(\w+): message-id=\<(.*)\>/",$line,$email)){
+			$stm_queue.="update mail_queue set msgid='".$email[4]."' where sid='".$email[3]."';";
+		}
+		#Nov 14 02:40:05 srvchunk01 postfix/qmgr[46834]: BC5931F4F13: from=, size=32727, nrcpt=1 (queue active)
+		else if(preg_match("/(\w+\s+\d+\s+[0-9,:]+) (\w+) postfix.qmgr\W\d+\W+(\w+): from=\<(.*)\>\W+size=(\d+)/",$line,$email)){
+			$stm_queue.= "update mail_queue set fromm='".$email[4]."', size='".$email[5]."' where sid='".$email[3]."';\n";
+		}
+		#Nov 13 00:09:07 srvchunk01 postfix/bounce[56376]: 9145C1F67F7: sender non-delivery notification: D5BD31F6865
+		else if(preg_match("/(\w+\s+\d+\s+[0-9,:]+) (\w+) postfix.bounce\W\d+\W+(\w+): sender non-delivery notification: (\w+)/",$line,$email)){
+			$stm_queue.= "update mail_queue set bounce='".$email[4]."' where sid='".$email[3]."';\n";
+		}
+		#Nov  9 02:14:57 srvch011 postfix/cleanup[6856]: 617A51F5AC5: warning: header Subject: Mapeamento de Processos from lxalpha.12b.com.br[66.109.29.225]; from= to= proto=ESMTP helo=
+		#Nov  8 09:31:50 srvch011 postfix/cleanup[11471]: 19C281F59C8: reject: header From: "Giuliana Flores - Parceiro do Grupo Virtual"  from pm03-974.auinmeio.com.br[177.70.232.225]; from= to= proto=ESMTP helo=: 5.7.1 [SN007]
+		else if(preg_match("/(\w+\s+\d+\s+[0-9,:]+) (\w+) postfix.cleanup\W\d+\W+(\w+): (\w+): header (.*) from ([a-z,A-Z,0-9,.,-]+)\W([0-9,.]+)\W+from=\<(.*)\> to=\<(.*)\>.*helo=\W([a-z,A-Z,0-9,.,-]+)\W(.*|)/",$line,$email)){
+			$status['date']=$email[1];
+			$status['server']=$email[2];
+			$status['sid']=$email[3];
+			$status['remote_hostname']=$email[6];
+			$status['remote_ip']=$email[7];
+			$status['from']=$email[8];
+			$status['to']=$email[9];
+			$status['helo']=$email[10];
+			$status['status']=$email[4];
+			
+			if ($email[4] =="warning"){
+				$status['status_info']=preg_replace("/(\s+|\'|\")/"," ",$email[11]);
+				$status['subject']=preg_replace("/Subject: /","",$email[5]);
+				$status['subject']=preg_replace("/(\s+|\'|\")/"," ",$status['subject']);
+				$stm_queue.="update mail_queue set subject='".$status['subject']."', status='".$status['status']."', status_info='".$status['info']."', fromm='".$status['from']."',too='".$status['size']."',helo='".$status['helo']."' where sid='".$status['sid']."';\n";
+				}
+			else{
+				$status['status_info']=$email[5].$email[11];
+				$stm_queue.="update mail_queue set status='".$status['status']."', status_info='".$status['status_info']."', fromm='".$status['from']."',too='".$status['to']."',helo='".$status['helo']."' where sid='".$status['sid']."';\n";
+				}
+			}
+		#Nov  9 02:14:34 srvchunk01 postfix/smtpd[38129]: NOQUEUE: reject: RCPT from unknown[201.36.98.7]: 450 4.7.1 Client host rejected: cannot find your hostname, [201.36.98.7]; from= to= proto=ESMTP helo=
+		else if(preg_match("/(\w+\s+\d+\s+[0-9,:]+) (\w+) postfix.smtpd\W\d+\W+NOQUEUE:\s+(\w+): (.*); from=\<(.*)\> to=\<(.*)\>.*helo=\<(.*)\>/",$line,$email)){
+			$status['sid']='NOQUEUE';
+			$status['date']=$email[1];
+			$status['server']=$email[2];
+			$status['status']=$email[3];
+			$status['status_info']=$email[4];
+			$status['from']=$email[5];
+			$status['to']=$email[6];
+			$status['helo']=$email[7];	
+			$values="'".$status['date']."','".$status['status']."','".$status['status_info']."','".$status['from']."','".$status['to']."','".$status['helo']."'";
+			$stm_noqueue.='insert into mail_noqueue(date,status,status_info,fromm,too,helo) values('.$values.');'."\n";		
+		}
+		if ($total_lines%1000 == 0){
+			#save log in database
+			write_db($stm_noqueue."COMMIT;","noqueue");
+			write_db($stm_queue."COMMIT;","queue");
+			$stm_noqueue="BEGIN;\n";
+			$stm_queue="BEGIN;\n";
+		}
+	if ($total_lines%1000 == 0)
+		print "$line\n";
+		}
+	#save log in database
+	write_db($stm_noqueue."COMMIT;","noqueue");
+	write_db($stm_queue."COMMIT;","queue");
+	$stm_noqueue="BEGIN;\n";
+	$stm_queue="BEGIN;\n";
+	}
+}
+
+function write_db($stm,$table){
+	global $postfix_dir,$postfix_db;
+	print date("H:i:s") . " writing db...";
+	$dbhandle = sqlite_open($postfix_dir.'/'.$postfix_db, 0666, $error);
+	$ok = sqlite_exec($dbhandle, $stm, $error);
+	if (!$ok)
+		die ("Cannot execute query. $error\n$stm\n");
+	
+	print "ok ";
+	$result = sqlite_query($dbhandle, "select count(*) ".$table." from mail_".$table);
+	$row = sqlite_fetch_array($result, SQLITE_ASSOC); 
+	print $table .":". $row[$table]."\n";
+	sqlite_close($dbhandle);
+echo "
";		
+}
+
+function create_db(){
+	global $postfix_dir,$postfix_db,$postfix_arg;
+	if ($postfix_arg['time']== "-01 day"){
+		unlink_if_exists($postfix_dir.'/'.$postfix_db);
+		unlink_if_exists($postfix_dir.'/'.$postfix_db."-journal");
+		}
+	if (! is_dir($postfix_dir))
+		mkdir($postfix_dir,0775);
+	$new_db=(file_exists($postfix_dir.'/'.$postfix_db)?1:0);
+	$dbhandle = sqlite_open($postfix_dir.'/'.$postfix_db, 0666, $error);
+	if (!$dbhandle) die ($error);
+$stm = << array(substr(date("H:i",strtotime('-10 min',$curr_time)),0,-1)),
+							'time' => '-10 min');
+		break;
+	case "01hour":
+		$postfix_arg=array(	'grep' => array(date("H:",strtotime('-01 hour',$curr_time))),
+							'time' => '-01 hour');
+		break;
+	case "24hours":
+		$postfix_arg=array(	'grep' => array('00:','01:','02:','03:','04:','05:','06:','07:','08:','09:','10:','11:',
+											'12:','13:','14:','15:','16:','17:','18:','19:','20:','21:','22:','23:'),
+							'time' => '-01 day');
+		break;
+	case "24hours2":
+		$postfix_arg=array(	'grep' => array('00:','01:','02:','03:','04:','05:','06:','07:','08:','09:','10:','11:',
+											'12:','13:','14:','15:','16:','17:','18:','19:','20:','21:','22:','23:'),
+							'time' => '-02 day');
+		break;
+	case "24hours3":
+		$postfix_arg=array(	'grep' => array('00:','01:','02:','03:','04:','05:','06:','07:','08:','09:','10:','11:',
+											'12:','13:','14:','15:','16:','17:','18:','19:','20:','21:','22:','23:'),
+							'time' => '-03 day');
+		break;
+		
+		default:
+		die ("invalid parameters\n");
+}
+$postfix_db=date("Y-m-d",strtotime($postfix_arg['time'],$curr_time)).".db";
+grep_log();	
+}
+
+#http client call
+if ($_REQUEST['files']!= ""){
+	#do search
+	$queue=($_REQUEST['queue']=="QUEUE"?"mail_queue":"mail_noqueue");
+	$limit_prefix=(preg_match("/\d+/",$_REQUEST['limit'])?"limit ":"");
+	$limit=(preg_match("/\d+/",$_REQUEST['limit'])?$_REQUEST['limit']:"");
+	$files= explode(",", $_REQUEST['files']);
+	$stm_fetch=array();
+	$total_result=0;
+	foreach ($files as $postfix_db)
+		if (file_exists($postfix_dir.'/'.$postfix_db)){
+			$last_next="";
+			$dbhandle = sqlite_open($postfix_dir.'/'.$postfix_db, 0666, $error);
+			$stm='select * from '.$queue;
+			if ($_REQUEST['from']!= ""){
+				$next=($last_next==" and "?" and ":" where ");
+				$last_next=" and ";
+				$stm .=$next."fromm in('".$_REQUEST['from']."')";
+				}
+			if ($_REQUEST['to']!= ""){
+				$next=($last_next==" and "?" and ":" where ");
+				$last_next=" and ";
+				$stm .=$next."too in('".$_REQUEST['to']."')";
+				}
+			if ($_REQUEST['sid']!= ""){
+				$next=($last_next==" and "?" and ":" where ");
+				$last_next=" and ";
+				$stm .=$next."sid in('".$_REQUEST['sid']."')";
+				}
+			if ($_REQUEST['subject']!= ""){
+				$next=($last_next==" and "?" and ":" where ");
+				$last_next=" and ";
+				$stm .=$next."subject like '%".$_REQUEST['subject']."%'";
+				}
+			if ($_REQUEST['msgid']!= ""){
+				$next=($last_next==" and "?" and ":" where ");
+				$last_next=" and ";
+				$stm .=$next."msgid = '".$_REQUEST['msgid']."'";
+				}
+		if ($_REQUEST['status']!= ""){
+				$next=($last_next==" and "?" and ":" where ");
+				$last_next=" and ";
+				$stm .=$next."status = '".$_REQUEST['status']."'";
+				}
+			$result = sqlite_query($dbhandle, $stm." order by date desc $limit_prefix $limit ");
+			if (preg_match("/\d+/",$_REQUEST['limit'])){
+				for ($i = 1; $i <= $limit; $i++) {
+					$row = sqlite_fetch_array($result, SQLITE_ASSOC);
+					 if (is_array($row))
+						$stm_fetch[]=$row;
+					}
+			}
+			else{
+				$stm_fetch = sqlite_fetch_all($result, SQLITE_ASSOC);
+			}
+			sqlite_close($dbhandle);
+	}
+	$fields= explode(",", $_REQUEST['fields']);
+	if ($queue=="mail_noqueue"){
+		print '';
+		print '';
+		print '';
+		if(in_array("date",$fields))
+			print '';
+		if(in_array("from",$fields))
+			print '';
+		if(in_array("to",$fields))
+			print '';
+		if(in_array("helo",$fields))
+			print '';
+		if(in_array("status",$fields))
+			print '';
+		if(in_array("status_info",$fields))
+			print '';
+		print '';
+		foreach ($stm_fetch as $mail){
+			print '';
+		if(in_array("date",$fields))
+			print '';
+		if(in_array("from",$fields))
+			print '';
+		if(in_array("to",$fields))
+			print '';
+		if(in_array("helo",$fields))
+			print '';
+		if(in_array("status",$fields))
+			print '';
+		if(in_array("status_info",$fields))
+			print '';
+			print '';
+			$total_result++;
+		}
+	}
+  else{
+  		print '
'.gettext("Search Results").'
dateFromtoHeloStatusStatus Info
'.$mail['date'].''.$mail['fromm'].''.$mail['too'].''.$mail['helo'].''.$mail['status'].''.$mail['status_info'].'
';
+		print '';
+		print '';
+		if(in_array("date",$fields))
+			print '';
+		if(in_array("from",$fields))
+			print '';
+		if(in_array("to",$fields))
+			print '';
+		if(in_array("subject",$fields))
+			print '';
+		if(in_array("delay",$fields))
+			print '';
+		if(in_array("status",$fields))
+			print '';
+		if(in_array("status_info",$fields))
+			print '';
+		if(in_array("size",$fields))
+			print '';
+		if(in_array("helo",$fields))
+			print '';
+		if(in_array("sid",$fields))
+			print '';
+		if(in_array("msgid",$fields))
+			print '';
+		if(in_array("bounce",$fields))
+			print '';
+		if(in_array("relay",$fields))
+			print '';
+		print '';
+		foreach ($stm_fetch as $mail){
+			print '';
+			if(in_array("date",$fields))
+				print '';
+			if(in_array("from",$fields))
+				print '';
+			if(in_array("to",$fields))
+				print '';
+			if(in_array("subject",$fields))
+				print '';
+			if(in_array("delay",$fields))
+				print '';
+			if(in_array("status",$fields))
+				print '';
+			if(in_array("status_info",$fields))
+				print '';
+			if(in_array("size",$fields))
+				print '';
+			if(in_array("helo",$fields))
+				print '';
+			if(in_array("sid",$fields))
+				print '';
+			if(in_array("msgid",$fields))
+				print '';
+			if(in_array("bounce",$fields))
+				print '';
+			if(in_array("relay",$fields))
+				print '';
+			print '';
+			$total_result++;
+		}
+  }
+	print '';
+	print '';
+	print '';
+	print '';	
+	print '
'.gettext("Search Results").'
DateFromtoSubjectDelayStatusStatus InfoSizeHeloSIDMSGIDBounceRelay
'.$mail['date'].''.$mail['fromm'].''.$mail['too'].''.$mail['subject'].''.$mail['delay'].''.$mail['status'].''.$mail['status_info'].''.$mail['size'].''.$mail['helo'].''.$mail['sid'].''.$mail['msgid'].''.$mail['bounce'].''.$mail['relay'].'
Total:'.$total_result.'
';					
+}
+?>
\ No newline at end of file
diff --git a/config/postfix/postfix.xml b/config/postfix/postfix.xml
index 91659e71..06caf4ec 100644
--- a/config/postfix/postfix.xml
+++ b/config/postfix/postfix.xml
@@ -44,7 +44,7 @@
 	Describe your package requirements here
 	Currently there are no FAQ items provided.
 	postfix
-	1.2
+	1.3
 	Services: Postfix relay and antispam
 	/usr/local/pkg/postfix.inc
 	
@@ -53,6 +53,12 @@
 		
Services

 		pkg_edit.php?xml=postfix.xml&id=0
 	
+	
+		Search Email
+		Search postfix logs
+		
Diagnostics

+		/postfix_search.php
+	
 	
 		postfix
 		postfix.sh
@@ -93,6 +99,17 @@
 		/usr/local/www/
 		0755
 	
+	
+		http://www.pfsense.org/packages/config/postfix/postfix_search.php
+		/usr/local/www/
+		0755
+	
+	
+		http://www.pfsense.org/packages/config/postfix/postfix.php
+		/usr/local/www/
+		0755
+	
+
 	
 		http://www.pfsense.org/packages/config/postfix/adexport.pl
 		/usr/local/etc/postfix/
@@ -124,6 +141,10 @@
 			View config files
 			/postfix_view_config.php
 		
+		
+			Search Email
+			/postfix_search.php
+		
 
 	
 		
@@ -139,7 +160,8 @@
 		
 			Listen interface(s)
 			enabled_interface
-			Do not listen on WAN without a good "antispam/close relay" configuration.]]>
+			Do not listen on WAN without a good "antispam/close relay" configuration.

+									If you need postfix on other ip then Interface address, choose localhost and then create a nat rule from external ip to localhost.]]>
 			interfaces_selection
 			
 			loopback
@@ -189,7 +211,22 @@
 				
 				
 		
-		
+		
+			Update Sqlite
+			update_sqlite
+			
+								  To use Diagnostics -> Search mail you need to:

+								  Select Loggin Destination to /var/log/maillog

+								  Select update Sqlite frequency

+								  Inlcude /^Subject:/ WARN line in Acl Headers after all your Subject rules.]]>
+	    	select
+ 				
+				
+				
+				
+				
+				
+				
 		
 			Debug peer list
 			debug_list
diff --git a/config/postfix/postfix_acl.xml b/config/postfix/postfix_acl.xml
index f3f944e5..5227228d 100644
--- a/config/postfix/postfix_acl.xml
+++ b/config/postfix/postfix_acl.xml
@@ -118,6 +118,10 @@
 			View config files
 			/postfix_view_config.php
 		
+		
+			Search Email
+			/postfix_search.php
+		
 	
 	
 		
diff --git a/config/postfix/postfix_antispam.xml b/config/postfix/postfix_antispam.xml
index 8561d571..8d293522 100644
--- a/config/postfix/postfix_antispam.xml
+++ b/config/postfix/postfix_antispam.xml
@@ -119,6 +119,10 @@
 			View config files
 			/postfix_view_config.php
 		
+		
+			Search Email
+			/postfix_search.php
+		
 
 	
 		
@@ -133,13 +137,21 @@
 				
 				
 			
-			Enable sender, client, recipients and rfc verification
+			Default: Strong

+								Enable sender, client, recipients and rfc verification.
]]>
+		
+		
+			Helo Hostname
+			reject_unknown_helo_hostname
+			checkbox
+			Default: Checked

+								Reject unknow helo hostname during smtp communication.]]>
 		
 		
 			Zombie blocker
 			zombie_blocker
 			
-			Use postfix 2.8 Postscreen feature to detect zombie spammers]]>
+			Default: Enabled with enforce
Use postfix 2.8 Postscreen feature to detect zombie spammers]]>
 			
 	    	select
  				
@@ -154,7 +166,7 @@
 			greet_time
 			input
 			10
-			syntax: 2,6s   (default: up to 2 seconds under stress, up to 6 seconds otherwise)

+			Default: up to 2 seconds under stress, up to 6 seconds otherwises
syntax: 2,6s

 								The amount of time that postscreen will wait for an SMTP client to send a command before its turn, and for DNS blocklist lookup results to arrive .

 								Specify a non-zero time value (an integral value plus an optional one-letter suffix that specifies the time unit).

 								Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).]]>
@@ -186,7 +198,7 @@
 				
 				
 				
-			
+			Default: Enabled only in postscreen
Safety net to keep mail queued that would otherwise be returned to the sender.

 								This parameter disables locally-generated bounces, and prevents the Postfix SMTP server from rejecting mail permanently, by changing 5xx reply codes into 4xx.

 								However, soft_bounce is no cure for address rewriting mistakes or mail routing mistakes.]]>
 			
@@ -208,7 +220,7 @@
 		
 			RBL threshold
 			rbl_threshold
-			How many RBL Lists Postscreen must find clien's ip address to block sender.
+			Default: 2
How many RBL Lists Postscreen must find clien's ip address to block sender.]]>
 	    	select
  				
 				
@@ -223,13 +235,13 @@
 			postfix_spf
 			select
  				
-				
+				
 				
 				
 				
 				
 			
-			The Sender Policy Framework (SPF) is an open standard specifying a technical method to prevent sender address forgery.]]>
+			Default: REJECT the mail when the sender credentials FAILS
The Sender Policy Framework (SPF) is an open standard specifying a technical method to prevent sender address forgery.]]>
 			
 		
 		
diff --git a/config/postfix/postfix_recipients.xml b/config/postfix/postfix_recipients.xml
index 450b6df4..88f4916b 100644
--- a/config/postfix/postfix_recipients.xml
+++ b/config/postfix/postfix_recipients.xml
@@ -118,6 +118,10 @@
 			View config files
 			/postfix_view_config.php
 		
+				
+			Search Email
+			/postfix_search.php
+		
 
 	
 		
diff --git a/config/postfix/postfix_search.php b/config/postfix/postfix_search.php
new file mode 100755
index 00000000..f347dbf0
--- /dev/null
+++ b/config/postfix/postfix_search.php
@@ -0,0 +1,227 @@
+
+	based on varnish_view_config.
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+	$one_two = true;
+
+$pgtitle = "Diagnostics: Search Mail";
+include("head.inc");
+
+?>
+
+
+
+
+

+
+
+
+
+
+	
+

+	
+		
+ 		
+ 		
+    		
+		
+	
+
+	

+		
+		

+				

+					
+					
+						
+						
+						
+						
+                        
+                        
+                        
+						
+                        
+                        
+					
+					
+                        
+                        
+					
+					
+                        
+                        
+					
+					
+                        
+                        
+				
+				
+                        
+                        
+					
+				
+                        
+                        
+					
+				
+                        
+                        
+					
+						
+                        
+                        ';
+                        	                        			}?>	
+							
+					
+                        
+                        
+					
+					
+							
+							
+                        

+                          

+                          

+                          

+                          

+                          

+                        

+                        

+                        

+                        	
+                        	'.$matches[1]."\n" . $select_output;
+											}
+                        			closedir($handle);
+                        			echo '
'.gettext("Select what database files you want to use in your search.").'

+                        
" onclick="getsearch_results(true)">
+						

+						
+				

+			

+	

+	

+

+
+
+
+
+
diff --git a/config/postfix/postfix_sync.xml b/config/postfix/postfix_sync.xml
index f859e795..afceaf9a 100644
--- a/config/postfix/postfix_sync.xml
+++ b/config/postfix/postfix_sync.xml
@@ -118,6 +118,10 @@
 			View config files
 			/postfix_view_config.php
 		
+		
+			Search Email
+			/postfix_search.php
+		
 
 	
 		
diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php
index c73e9cb4..ab136a2a 100644
--- a/config/postfix/postfix_view_config.php
+++ b/config/postfix/postfix_view_config.php
@@ -34,7 +34,7 @@ $pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
 if(strstr($pfSversion, "1.2"))
 	$one_two = true;
 
-$pgtitle = "Postfix: View Configuration";
+$pgtitle = "Services: Postfix View Configuration";
 include("head.inc");
 
 ?>
@@ -60,7 +60,7 @@ include("head.inc");
 	$tab_array[] = array(gettext("Antispam"), false, "/pkg_edit.php?xml=postfix_antispam.xml&id=0");
 	$tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=postfix_sync.xml&id=0");
 	$tab_array[] = array(gettext("View config files"), true, "/postfix_view_config.php");
-	
+	$tab_array[] = array(gettext("Search Email"), false, "/postfix_search.php");
 	display_top_tabs($tab_array);
 ?>
 		
-- 
cgit v1.2.3