RSB S2 User Interface

X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/65d527a7b64bd23ecf054c65dfbbbc212ccb0760..ba34b57f7e3ef0163d4c757f83237a73163acef0:/rsbs2.pl?ds=inline diff --git a/rsbs2.pl b/rsbs2.pl index 601e332..022a949 100755 --- a/rsbs2.pl +++ b/rsbs2.pl @@ -1,14 +1,14 @@ #!/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 $host; +my $ua = LWP::UserAgent->new(cookie_jar => {}); +my $url; my $poweronms=200; my $poweroffms=5000; my $verbose = 0; @@ -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]; @@ -145,8 +145,7 @@ sub _hash { sub _req { my $xml = shift; - $request = HTTP::Request->new(POST => "http://${host}/cgi/bin"); - $request->header(Cookie => "sid=$sid"); + $request = HTTP::Request->new(POST => "${url}/cgi/bin"); $request->content_type('application/x-www-form-urlencoded'); $request->content(''.$xml.''); $response = $ua->request($request); @@ -184,8 +183,7 @@ sub _getprop { sub logout { print "Logout\n" if ($verbose); - my $request = HTTP::Request->new(GET => "http://${host}/cgi/logout"); - $request->header(Cookie => "sid=$sid"); + my $request = HTTP::Request->new(GET => "${url}/cgi/logout"); 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 .= ''; } @@ -477,11 +475,25 @@ sub status { show_sensors(); } +sub spawn_gui { + my $base = shift; + open(APPLET,"|appletviewer /dev/stdin"); + print APPLET 'RSB S2 User Interface'; + print APPLET ''; + print APPLET '

'; + print APPLET ''; + close(APPLET); +} + sub login { my $user = shift; my $pass = shift; - my $response = $ua->get("http://${host}/cgi/challenge"); + my $response = $ua->get("${url}/cgi/challenge"); die $response->status_line if (!($response->is_success)); my $xmlin = XMLin($response->decoded_content); @@ -489,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/; @@ -498,15 +510,14 @@ sub login { my $login_hash = _hash($pass, $challenge); print "Hash: ${login_hash}\n" if ($verbose); - my $request = HTTP::Request->new(GET => "http://${host}/cgi/login?user=${user}&hash=${login_hash}"); - $request->header(Cookie => "sid=$sid"); + my $request = HTTP::Request->new(GET => "${url}/cgi/login?user=${user}&hash=${login_hash}"); $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 { @@ -552,6 +563,7 @@ my $enable_debug = ""; my $save = ""; my $load = ""; my $showstat = 0; +my $gui = 0; my $hostalias; while (defined($ARGV[0])) { @@ -616,6 +628,11 @@ while (defined($ARGV[0])) { shift @ARGV; last SWITCH; }; + /^-G$/ && do { + $gui = 1; + shift @ARGV; + last SWITCH; + }; /^-save$/ && do { shift @ARGV; $save = shift @ARGV; @@ -650,11 +667,12 @@ if (!$valid_arg) { print STDERR "\t-d\t\tpowerdown\n"; print STDERR "\t-c\t\tpowercycle\n"; print STDERR "\t-r\t\treset\n"; - print STDERR "\t-R\t\treset RSB S2 borad\n"; + print STDERR "\t-R\t\treset RSB S2 board\n"; print STDERR "\t-x\t\tshow all properties, variables and settings\n"; print STDERR "\t-l IP\t\tsend SYSLOG debug messages to IP\n"; print STDERR "\t-b\t\tshow board/server status\n"; print STDERR "\t-X\t\tsend raw XML string (start with REQ tag)\n"; + print STDERR "\t-G\t\tstart GUI in appletviewer\n"; print STDERR "\t-v\t\tverbose\n"; print STDERR "\t-save file\tsave configuration to 'file'\n"; print STDERR "\t-load file\tload configuration from 'file'\n"; @@ -667,11 +685,28 @@ if (!$valid_arg) { exit(1); } -$host = ${$Config{$hostalias}}{"host"}; +my $host = ${$Config{$hostalias}}{"host"}; $poweronms = ${$Config{$hostalias}}{"poweronms"} if (defined(${$Config{$hostalias}}{"poweronms"})); $poweroffms = ${$Config{$hostalias}}{"poweroffms"} if (defined(${$Config{$hostalias}}{"poweroffms"})); -$sid = login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"}); +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); +} + +login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"}); if ($show) { show_boarddesc();