From 5611ad0738bc1e896741fe9d78864913fb903832 Mon Sep 17 00:00:00 2001
From: mattf <mattf@3d104415-ff17-0410-8863-d5cf3c621b8a>
Date: Tue, 25 Feb 2014 19:09:14 +0000
Subject: [PATCH] Added option for SSL no-cert-verify (--ssl-no-cert) for email
 parsing script

git-svn-id: svn://192.168.202.10@2077 3d104415-ff17-0410-8863-d5cf3c621b8a
---
 bin/AST_inbound_email_parser.pl | 44 ++++++++++++++++++++++++++-------
 docs/Email_user_manual.txt      |  6 +++++
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/bin/AST_inbound_email_parser.pl b/bin/AST_inbound_email_parser.pl
index 5d3a82b5..0a73b413 100644
--- a/bin/AST_inbound_email_parser.pl
+++ b/bin/AST_inbound_email_parser.pl
@@ -56,12 +56,14 @@ use MIME::QuotedPrint;
 # 130127-0025 - Added better non-latin characters support
 # 130607-0155 - Encoding fix
 # 140212-0719 - Added ignoresizeerrors option, changed debug and added --force-check option
+# 140225-1241 - Added option for SSL no-cert-verify (--ssl-no-cert)
 #
 
 # default path to astguiclient configuration file:
 $PATHconf =		'/etc/astguiclient.conf';
 $|=1;
 $force_check=0;
+$ssl_no_cert=0;
 $DB=0;
 $DBX=0;
 $secX = time();
@@ -122,6 +124,7 @@ if (length($ARGV[0])>1)
 		print "  [--debug] = verbose debug messages\n";
 		print "  [--debugX] = extra verbose debug messages\n";
 		print "  [--force-check] = forces check of email\n";
+		print "  [--ssl-no-cert] = ignores ssl cert verification\n";
 		print "\n";
 		exit;
 		}
@@ -139,6 +142,10 @@ if (length($ARGV[0])>1)
 			{
 			$force_check=1;
 			}
+		if ($args =~ /--ssl-no-cert/i)
+			{
+			$ssl_no_cert=1;
+			}
 		}
 	}
 else
@@ -232,17 +239,36 @@ while (@row=$rslt->fetchrow_array) {
 			# Connect to IMAP server
 			use Mail::IMAPClient;
 			use Mail::Message;
+			use IO::Socket::SSL;
 
-			my $client = Mail::IMAPClient->new(
-			  Server   => "$VARemail_server",
-			  User     => "$VARemail_user",
-			  Password => "$VARemail_pwd",
-			  Port     => 993,
-			  Ssl      =>  1,
-			  Ignoresizeerrors => 1,
-			  )
-			  or die "Cannot connect through IMAPClient: $!";
+			if ($ssl_no_cert > 0)
+				{
+				%args = (
+				  User     => "$VARemail_user",
+				  Password => "$VARemail_pwd",
+				  Ignoresizeerrors => 1,
+				  Socket   => IO::Socket::SSL->new
+					(	Proto    => 'tcp',
+						PeerAddr => "$VARemail_server",
+						PeerPort => 993, # IMAP over SSL standard port
+						SSL_verify_mode => 'SSL_VERIFY_NONE',
+					),
+				 );
+				}
+			else
+				{
+				%args = (
+				  Server   => "$VARemail_server",
+				  User     => "$VARemail_user",
+				  Password => "$VARemail_pwd",
+				  Port     => 993,
+				  Ssl      =>  1,
+				  Ignoresizeerrors => 1,
+				  );
+				}
 
+				my $client = Mail::IMAPClient->new(%args)
+				  or die "Cannot connect through IMAPClient: ($VARemail_ID|$VARemail_server|$VARemail_user|ssl-no-cert:$ssl_no_cert) $@ $!";
 			# Include options for folders in IMAP?  POP3 doesn't support this.
 
 			# List folders on remote server (see if all is ok)
diff --git a/docs/Email_user_manual.txt b/docs/Email_user_manual.txt
index 30add077..15d3de86 100644
--- a/docs/Email_user_manual.txt
+++ b/docs/Email_user_manual.txt
@@ -90,6 +90,12 @@ active on ONLY ONE server on your Vicidial installation:
 
 * * * * * /usr/share/astguiclient/AST_inbound_email_parser.pl
 
+other allowed run time options for this script:
+  [--debug] = verbose debug messages
+  [--debugX] = extra verbose debug messages
+  [--force-check] = forces check of email
+  [--ssl-no-cert] = ignores ssl cert verification
+
 This script will check to see if any active email account is due to be checked 
 for new messages, per the "Email Frequency Check Rate" setting on the active 
 accounts.  If new emails are found in an active account, one of two things will