sub new {
my $class = shift;
- my $self = {'_DEBUG' => 0,
- '_CONNECTOR' => undef,
+ my $self = {'_CONNECTOR' => undef,
_API => {
- io => sub { printf(@_) },
+ io => sub { print(@_) },
+ io_debug => sub { print(@_) },
connectors => sub { return ({ 'name' => 'direct',
'schemas' => {} }) },
},
@_,
};
-
+
# Add the 'enabled' property to all modules
$self->{_PARAMS}->{enabled} = [1, 'Whether the module is enabled'];
bless($self, $class);
my $self = shift;
my @data = @_;
- $data[0] = "DEBUG: " . $data[0];
- if ($self->{'_DEBUG'} != 0) {$self->error(@data)};
+ $data[0] = "(" . ref($self) . ") " . $data[0];
+
+ $self->{_API}->{io_debug}->(@data);
}
sub _getval {
return $s;
}
-sub setdebug {
- my $self = shift;
-
- $self->{'_DEBUG'} = shift;
-}
-
sub ua {
my $self = shift;
my $ua;
$ua = LWP::UserAgent->new(
'agent' => 'Mozilla/5.0',
'cookie_jar' => HTTP::Cookies->new,
+ 'parse_head' => 0,
'timeout' => 15,
);
delete($ENV{'HTTPS_PROXY'});
if (defined($self->{'_CONNECTOR'})) {
+ #
+ # The "environment" connector is special, it loads proxies from
+ # the environment variables. It also does not define any schemas,
+ # so the code below will not reset this.
+ #
+ if ($self->{'_CONNECTOR'}->{'name'} eq 'environment') {
+ $self->debug("Using proxy settings from environment");
+ $ua->env_proxy;
+ }
my $schemas = $self->{'_CONNECTOR'}->{'schemas'};
foreach (keys(%{$schemas})) {
$self->debug("Adding schema %s with proxy %s", $_, $schemas->{$_});
# OK, so here's the gist.
#
# The usual way of reqesting an HTTPS URL through a proxy is
- # to connect to the proxy server, issue a CONNECT request to
+ # to connect to the proxy server, issue a CONNECT request to
# create a channel to the web server and start an SSL session over
# this channel, so there is an end-to-end connection between
# the client and the server.
my $ua = shift || $self->ua();
my $r;
+ $self->debug("Getting %s", $url);
$r = $ua->get($url);
+ $self->debug("Return code: %s", $r->status_line);
+ $self->debug("Content length: %d", length($r->decoded_content)) if $r->is_success();
return $r->decoded_content() if $r->is_success();
return undef;
}
sub connectors {
my $self = shift;
-
+
return $self->{_API}->{connectors}->();
}