From: Michael Gernoth <michael@gernoth.net>
Date: Tue, 10 Feb 2009 10:06:39 +0000 (+0100)
Subject: cleanup cookie code
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/commitdiff_plain/0efb50b5cc0af4236a5ad8aa5b501eac0f67d8c9

cleanup cookie code
---

diff --git a/rsbs2.pl b/rsbs2.pl
index 6ce2321..cb0534a 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 version="1.0"?><?RMCXML version="1.0"?><RMCSEQ>'.$xml.'</RMCSEQ>');
 	$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);
 
@@ -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 {
@@ -698,7 +695,7 @@ if ($gui) {
 	spawn_gui($url);
 }
 
-$sid = login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});
+login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});
 
 if ($show) {
 	show_boarddesc();