X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/3f4d6039fcf53e15e439597d6115b97ccd576457..HEAD:/rsbs2.pl

diff --git a/rsbs2.pl b/rsbs2.pl
index 6ce2321..76f745b 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);
 
@@ -221,8 +219,9 @@ sub serveraction {
 
 	my $pmode = 2;
 
-	setprop("SERVER_HARD_RESET_VIA_IPMI", "FALSE");
-	setprop("SERVER_POWER_CHANGE_VIA_IPMI", "FALSE");
+	#setprop("SERVER_HARD_RESET_VIA_IPMI", "FALSE");
+	#setprop("SERVER_POWER_CHANGE_VIA_IPMI", "FALSE");
+
 	#PM Mode
 	setprop("SERVER_POWER_ON_MODE", sprintf("0x%x", $pmode));
 	setprop("SERVER_POWER_OFF_MODE", sprintf("0x%x", $pmode));
@@ -237,23 +236,37 @@ sub serveraction {
 }
 
 sub powerup {
-	print "powerup\n" if ($verbose);
-	setprop("SERVER_POWER_ON_PULSE_MS", sprintf("0x%x", $poweronms));
-	setprop("SERVER_POWER_OFF_PULSE_MS", "0x0");
-	serveraction("powercycle");
+	if (_getprop("SERVER_POWER_CHANGE_VIA_IPMI")->{PROPLIST}->{PROP}->{VAL} eq "TRUE") {
+		print "powerup via IPMI\n" if ($verbose);
+		serveraction("powerup");
+	} else {
+		print "powerup via relay (hack)\n" if ($verbose);
+		setprop("SERVER_POWER_ON_PULSE_MS", sprintf("0x%x", $poweronms));
+		setprop("SERVER_POWER_OFF_PULSE_MS", "0x0");
+		serveraction("powercycle");
+	}
 }
 
 sub powerdown {
-	print "powerdown\n" if ($verbose);
-	setprop("SERVER_POWER_ON_PULSE_MS", "0x0");
-	setprop("SERVER_POWER_OFF_PULSE_MS", sprintf("0x%x", $poweroffms));
-	serveraction("powercycle");
+	if (_getprop("SERVER_POWER_CHANGE_VIA_IPMI")->{PROPLIST}->{PROP}->{VAL} eq "TRUE") {
+		print "powerdown via IPMI\n" if ($verbose);
+		serveraction("powerdown");
+	} else {
+		print "powerdown via relay (hack)\n" if ($verbose);
+		setprop("SERVER_POWER_ON_PULSE_MS", "0x0");
+		setprop("SERVER_POWER_OFF_PULSE_MS", sprintf("0x%x", $poweroffms));
+		serveraction("powercycle");
+	}
 }
 
 sub powercycle {
-	print "powercycle\n" if ($verbose);
-	setprop("SERVER_POWER_ON_PULSE_MS", sprintf("0x%x", $poweronms));
-	setprop("SERVER_POWER_OFF_PULSE_MS", sprintf("0x%x", $poweroffms));
+	if (_getprop("SERVER_POWER_CHANGE_VIA_IPMI")->{PROPLIST}->{PROP}->{VAL} eq "TRUE") {
+		print "powercycle via IPMI\n" if ($verbose);
+	} else {
+		print "powercycle via relay\n" if ($verbose);
+		setprop("SERVER_POWER_ON_PULSE_MS", sprintf("0x%x", $poweronms));
+		setprop("SERVER_POWER_OFF_PULSE_MS", sprintf("0x%x", $poweroffms));
+	}
 	serveraction("powercycle");
 }
 
@@ -387,7 +400,7 @@ sub get_sensors {
 		return;
 	}
 
-	my $req = '<REQ CMD="sensorpropget"><HANDLE>0x1</HANDLE><SENSORLIST>';
+	my $req = '<REQ CMD="sensorpropget"><HANDLE>'.$slist->{HANDLE}.'</HANDLE><SENSORLIST>';
 	foreach my $s (@{$slist->{SENSORLIST}->{SENSOR}}) {
 		$req .= '<SENSOR KEY="'.$s->{KEY}.'"/>';
 	}
@@ -414,7 +427,7 @@ sub show_sensors {
 		print $sensor->{NAME}.": ".$sensor->{VAL}.$sensor->{UNITS};
 
 		my @info = ();
-		foreach my $field qw(MIN MAX LOW_NON_CRITICAL UPPER_NON_CRITICAL LOW_CRITICAL UPPER_CRITICAL) {
+		foreach my $field (qw(MIN MAX LOW_NON_CRITICAL UPPER_NON_CRITICAL LOW_CRITICAL UPPER_CRITICAL)) {
 			if ($sensor->{$field} ne '') {
 				push @info, "${field}: ".$sensor->{$field}.$sensor->{UNITS};
 			}
@@ -479,7 +492,8 @@ sub status {
 
 sub spawn_gui {
 	my $base = shift;
-	open(APPLET,"|appletviewer /dev/stdin");
+	$ENV{'AWT_TOOLKIT'} = 'MToolkit';
+	open(APPLET,"|appletviewer -J-Djava.security.policy=applet.policy -J-Djava.net.preferIPv4Stack=true /dev/stdin");
 	print APPLET '<HTML><HEAD><TITLE>RSB S2 User Interface</TITLE></HEAD>';
 	print APPLET '<BODY>';
 	print APPLET '<object width="640" height="480">';
@@ -503,7 +517,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 +527,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 +705,25 @@ 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);
+	exit 0;
 }
 
-$sid = login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});
+login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});
 
 if ($show) {
 	show_boarddesc();