X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/3f4d6039fcf53e15e439597d6115b97ccd576457..38720405ac62b9d9d50466ece9df34872e3896e9:/rsbs2.pl
diff --git a/rsbs2.pl b/rsbs2.pl
index 6ce2321..022a949 100755
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -1,13 +1,13 @@
#!/usr/bin/perl -w
use LWP::UserAgent;
+use LWP::ConnCache;
use XML::Simple;
use Data::Dumper;
use MIME::Base64;
use Digest::MD5 qw(md5);
-my $ua = LWP::UserAgent->new;
-my $sid;
+my $ua = LWP::UserAgent->new(cookie_jar => {});
my $url;
my $poweronms=200;
my $poweroffms=5000;
@@ -132,7 +132,7 @@ sub _crc16 {
sub _hash {
my ($password, $challenge) = @_;
my @challenge_bytes = unpack 'c16', decode_base64($challenge);
- my @pwd_hash = unpack 'c16', md5($password);
+ my @pwd_hash = unpack 'c16', md5($password);
my @xor_bytes;
for my $i (0..15) {
$xor_bytes[$i] = $challenge_bytes[$i] ^ $pwd_hash[$i];
@@ -146,7 +146,6 @@ sub _hash {
sub _req {
my $xml = shift;
$request = HTTP::Request->new(POST => "${url}/cgi/bin");
- $request->header(Cookie => "sid=$sid");
$request->content_type('application/x-www-form-urlencoded');
$request->content(''.$xml.'');
$response = $ua->request($request);
@@ -185,7 +184,6 @@ sub _getprop {
sub logout {
print "Logout\n" if ($verbose);
my $request = HTTP::Request->new(GET => "${url}/cgi/logout");
- $request->header(Cookie => "sid=$sid");
my $response = $ua->request($request);
die("While trying to logout: " . $response->status_line . "\n") unless ($response->is_success);
@@ -387,7 +385,7 @@ sub get_sensors {
return;
}
- my $req = '0x1';
+ my $req = ''.$slist->{HANDLE}.'';
foreach my $s (@{$slist->{SENSORLIST}->{SENSOR}}) {
$req .= '';
}
@@ -503,7 +501,7 @@ sub login {
my $challenge = $xmlin->{CHALLENGE};
print "Challenge: ${challenge}\n" if ($verbose);
- $sid = $response->headers->header('Set-Cookie');
+ my $sid = $response->headers->header('Set-Cookie');
die "No SessionID!" if (!defined($sid));
chomp($sid);
$sid =~ s/.*sid=(.*);.*/$1/;
@@ -513,14 +511,13 @@ sub login {
print "Hash: ${login_hash}\n" if ($verbose);
my $request = HTTP::Request->new(GET => "${url}/cgi/login?user=${user}&hash=${login_hash}");
- $request->header(Cookie => "sid=$sid");
$response = $ua->request($request);
die("While trying to login: " . $response->status_line . "\n") unless ($response->is_success);
$xmlin = XMLin($response->decoded_content);
die "Error logging in: ".$xmlin->{RC} if ($xmlin->{RC} ne '0x0');
- $sid;
+ print "Logged in\n" if ($verbose);
}
sub read_inifile {
@@ -692,13 +689,24 @@ my $host = ${$Config{$hostalias}}{"host"};
$poweronms = ${$Config{$hostalias}}{"poweronms"} if (defined(${$Config{$hostalias}}{"poweronms"}));
$poweroffms = ${$Config{$hostalias}}{"poweroffms"} if (defined(${$Config{$hostalias}}{"poweroffms"}));
-$url = "http://${host}";
+my $ssl = ${$Config{$hostalias}}{"ssl"};
+my $port = ${$Config{$hostalias}}{"port"};
+
+if (defined($ssl) && (lc($ssl) eq 'yes')) {
+ $ENV{HTTPS_DEBUG} = 1;
+ $ENV{HTTPS_VERSION} = 3;
+ $port = 443 if (!defined($port));
+ $url = "https://${host}:${port}";
+} else {
+ $port = 80 if (!defined($port));
+ $url = "http://${host}:${port}";
+}
if ($gui) {
spawn_gui($url);
}
-$sid = login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});
+login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});
if ($show) {
show_boarddesc();