projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#39115: View SNMP info on svc_broadband service [got rid of dialog, displays inline]
[freeside.git]
/
FS
/
FS
/
part_export
/
http.pm
diff --git
a/FS/FS/part_export/http.pm
b/FS/FS/part_export/http.pm
index
3749224
..
6cac600
100644
(file)
--- a/
FS/FS/part_export/http.pm
+++ b/
FS/FS/part_export/http.pm
@@
-11,6
+11,9
@@
tie %options, 'Tie::IxHash',
options =>[qw(POST)],
default =>'POST' },
'url' => { label => 'URL', default => 'http://', },
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',
'insert_data' => {
label => 'Insert data',
type => 'textarea',
@@
-33,6
+36,18
@@
tie %options, 'Tie::IxHash',
default => join("\n",
),
},
default => join("\n",
),
},
+ 'suspend_data' => {
+ label => 'Suspend data',
+ type => 'textarea',
+ default => join("\n",
+ ),
+ },
+ 'unsuspend_data' => {
+ label => 'Unsuspend data',
+ type => 'textarea',
+ default => join("\n",
+ ),
+ },
'success_regexp' => {
label => 'Success Regexp',
default => '',
'success_regexp' => {
label => 'Success Regexp',
default => '',
@@
-43,6
+58,7
@@
tie %options, 'Tie::IxHash',
'svc' => 'svc_domain',
'desc' => 'Send an HTTP or HTTPS GET or POST request',
'options' => \%options,
'svc' => 'svc_domain',
'desc' => 'Send an HTTP or HTTPS GET or POST request',
'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>
'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>
@@
-63,16
+79,25
@@
sub _export_delete {
$self->_export_command('delete', @_);
}
$self->_export_command('delete', @_);
}
+sub _export_suspend {
+ my $self = shift;
+ $self->_export_command('suspend', @_);
+}
+
+sub _export_unsuspend {
+ my $self = shift;
+ $self->_export_command('unsuspend', @_);
+}
+
sub _export_command {
my( $self, $action, $svc_x ) = ( shift, shift, shift );
return unless $self->option("${action}_data");
sub _export_command {
my( $self, $action, $svc_x ) = ( shift, shift, shift );
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->http_queue( $svc_x->svcnum,
+ ( $self->option('ssl_no_verify') ? 'ssl_no_verify' : '' ),
$self->option('method'),
$self->option('url'),
$self->option('success_regexp'),
$self->option('method'),
$self->option('url'),
$self->option('success_regexp'),
@@
-92,12
+117,11
@@
sub _export_replace {
return unless $self->option('replace_data');
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,
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'),
$self->option('method'),
$self->option('url'),
$self->option('success_regexp'),
@@
-120,6
+144,7
@@
sub http_queue {
}
sub http {
}
sub http {
+ my $ssl_no_verify = ( $_[0] eq 'ssl_no_verify' || $_[0] eq '' ) ? shift : '';
my($method, $url, $success_regexp, @data) = @_;
$method = lc($method);
my($method, $url, $success_regexp, @data) = @_;
$method = lc($method);
@@
-129,7
+154,9
@@
sub http {
eval "use HTTP::Request::Common;";
die "using HTTP::Request::Common: $@" 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 } if $ssl_no_verify;
+ my $ua = LWP::UserAgent->new(@lwp_opts);
#my $response = $ua->$method(
# $url, \%data,
#my $response = $ua->$method(
# $url, \%data,