X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fhttp.pm;h=43ccfc52569d4b4aa1e2a29e99d03960d7eb6c80;hp=0d62409fc73464894e8c28f3e3adfb8054517d5f;hb=929783d1045757abbe5c84ff2439547b0f8eca23;hpb=a72a10f754f7465121d6137bb3dcee0a21ea6443

diff --git a/FS/FS/part_export/http.pm b/FS/FS/part_export/http.pm
index 0d62409fc..43ccfc525 100644
--- a/FS/FS/part_export/http.pm
+++ b/FS/FS/part_export/http.pm
@@ -3,6 +3,9 @@ package FS::part_export::http;
 use base qw( FS::part_export );
 use vars qw( %options %info );
 use Tie::IxHash;
+use LWP::UserAgent;
+use HTTP::Request::Common qw( POST );
+use IO::Socket::SSL;
 
 tie %options, 'Tie::IxHash',
   'method' => { label   =>'Method',
@@ -11,6 +14,9 @@ tie %options, 'Tie::IxHash',
                 options =>[qw(POST)],
                 default =>'POST' },
   'url'    => { label   => 'URL', default => 'http://', },
+  'ssl_no_verify' => { label => 'Skip SSL certificate validation',
+                       type  => 'checkbox',
+                     },
   'insert_data' => {
     label   => 'Insert data',
     type    => 'textarea',
@@ -53,14 +59,21 @@ tie %options, 'Tie::IxHash',
 
 %info = (
   'svc'     => 'svc_domain',
-  'desc'    => 'Send an HTTP or HTTPS GET or POST request',
+  'desc'    => 'Send an HTTP or HTTPS GET or POST request, for domains1',
   'options' => \%options,
   'no_machine' => 1,
   'notes'   => <<'END'
-Send an HTTP or HTTPS GET or POST to the specified URL.  For HTTPS support,
-<a href="http://search.cpan.org/dist/Crypt-SSLeay">Crypt::SSLeay</a>
-or <a href="http://search.cpan.org/dist/IO-Socket-SSL">IO::Socket::SSL</a>
-is required.
+Send an HTTP or HTTPS GET or POST to the specified URL on domain addition,
+modification and deletion.
+<p>Each "Data" option takes a list of <i>name value</i> pairs on successive 
+lines.
+<ul><li><i>name</i> is an unquoted, literal string without whitespace.</li>
+<li><i>value</i> is a Perl expression that will be evaluated.  If it's a 
+literal string, it must be quoted.  This expression has access to the
+svc_domain object as '$svc_x' (or '$new' and '$old' in "Replace Data") 
+and the customer record as '$cust_main'.</li></ul>
+If "Success Regexp" is specified, the response from the server will be
+tested against it to determine if the export succeeded.</p>
 END
 );
 
@@ -91,11 +104,10 @@ sub _export_command {
 
   return unless $self->option("${action}_data");
 
-  my $cust_main = $svc_x->table eq 'cust_main'
-                    ? $svc_x
-                    : $svc_x->cust_svc->cust_pkg->cust_main;
+  my $cust_main = $svc_x->cust_main or return;
 
   $self->http_queue( $svc_x->svcnum,
+    ( $self->option('ssl_no_verify') ? 'ssl_no_verify' : '' ),
     $self->option('method'),
     $self->option('url'),
     $self->option('success_regexp'),
@@ -115,12 +127,11 @@ sub _export_replace {
 
   return unless $self->option('replace_data');
 
-  my $new_cust_main = $new->table eq 'cust_main'
-                        ? $new
-                        : $new->cust_svc->cust_pkg->cust_main;
+  my $new_cust_main = $new->cust_main or return;
   my $cust_main = $new_cust_main; #so folks can use $new_cust_main or $cust_main
 
   $self->http_queue( $new->svcnum,
+    ( $self->option('ssl_no_verify') ? 'ssl_no_verify' : '' ),
     $self->option('method'),
     $self->option('url'),
     $self->option('success_regexp'),
@@ -143,16 +154,18 @@ sub http_queue {
 }
 
 sub http {
+  my $ssl_no_verify = ( $_[0] eq 'ssl_no_verify' || $_[0] eq '' ) ? shift : '';
   my($method, $url, $success_regexp, @data) = @_;
 
   $method = lc($method);
 
-  eval "use LWP::UserAgent;";
-  die "using LWP::UserAgent: $@" if $@;
-  eval "use HTTP::Request::Common;";
-  die "using HTTP::Request::Common: $@" if $@;
-
-  my $ua = LWP::UserAgent->new;
+  my @lwp_opts = ();
+  push @lwp_opts, 'ssl_opts' => {
+                    verify_hostname => 0,
+                    SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE,
+                  }
+    if $ssl_no_verify;
+  my $ua = LWP::UserAgent->new(@lwp_opts);
 
   #my $response = $ua->$method(
   #  $url, \%data,