--- lib/PXElator/httpd.pm 2009/08/09 23:18:59 189 +++ lib/PXElator/httpd.pm 2009/09/08 18:28:15 400 @@ -19,11 +19,31 @@ use IO::Socket::INET; use Regexp::Common qw/net/; -sub menu {qq{ +our $title; +sub html_start { +qq{ + + +$title + + +}} + +sub html_end { +qq{ + + +}} + +sub menu { +qq{
home server +brctl +ip +nmap client
@@ -49,7 +69,14 @@ use kvm; use browser; use network; +use ip; +use wireshark; +use syslogd; +use nmap; +use ping; +use wol; +use CouchDB; sub static { my ($client,$path) = @_; @@ -61,7 +88,6 @@ if ( my $pid = fork ) { # parent close($client); - print "http static child $pid\n"; $static_pids->{$pid} = $path; return 1; } @@ -81,7 +107,7 @@ my $buff; my $pos = 0; - warn "static $path $type $size block: $block\n"; + CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost }); progress_bar::start; @@ -96,33 +122,40 @@ print STDERR "\n"; - warn "exit static child"; - exit(0); } -my $ok = qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu(); -my $redirect = qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $url\r\n\r\n|; +sub ok { + qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . html_start() . menu() +} + +sub redirect { + my $to = shift; + $to ||= $url; + qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $to\r\n\r\n| +} sub get_request { my ( $client, $path, $param ) = @_; server->refresh; - warn "get_request $path ", $param ? dump( $param ) : '', "\n"; + CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } ); + + $title = $path; if ( my $found = static( $client,$path ) ) { warn "static $found" if $debug; } elsif ( $path eq '/' ) { - my @rows = ( - 'debug', qq|$debug|, - ); + my @rows; my $debug_proc = ''; +warn "XXX pids = ", dump( $daemons::pids ); + foreach my $name ( sort keys %$daemons::pids ) { - my $pid = $daemons::pids->{$name} || next; + my $pid = $daemons::pids->{$name}; # || next; my $html; @@ -131,7 +164,7 @@ if ( -e $proc ) { $html .= qq|$pid|; if ( $debug ) { - $html .= qq| ?|; + $html .= qq| ?| if $name->can('start'); $debug_proc .= qq|$proc
|
@@ -140,17 +173,30 @@
 						;
 				}
 
-				if ( $name->can('start_fork') ) {
-					$html .= qq| $_| foreach $name->start_fork;
+				my $class = $name;
+				$class =~ s{\.\d+$}{};
+
+				if ( $class->can('fork_if_active') ) {
+					$html .= qq| $_| foreach $class->fork_if_active;
 				}
 
-				if ( $name->can('actions') ) {
-					$html .= qq| $_| foreach $name->actions;
+				if ( $class->can('actions') ) {
+					$html .= qq| $_| foreach $class->actions;
 				}
 			} else {
-				$html .= qq|restart $pid exited|;
+				if ( $pid =~ m{^\d+$} ) {
+					$html .= qq|$pid exited |
+				} else {
+					$html .= qq|$pid |;
+				}
+				$html .= qq|restart| if $pid || $name->can('start');
+				if ( $name->can('fork_actions') ) {
+					$html .= qq| $_| foreach $name->fork_actions;
+				}
 			}
 
+			die "no html generated" unless $html;
+
 			push @rows, ( $name => $html );
 		}
 
@@ -169,7 +215,7 @@
 			}
 		}
 
-		print $client $ok
+		print $client ok
 			, html::table( 2, @rows )
 			, $below_table
 			, html::tabs( log::mac_changes )
@@ -177,66 +223,196 @@
 			;
 
 	} elsif ( $path =~ m{^/server} ) {
-		print $client $ok
-			, html::table( 2, map { ( $_, html::tt eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' ) )
+		foreach my $name ( keys %$param ) {
+			eval '$server::' . $name . '= $param->{$name}';
+		}
+		my @table = (
+			  'debug' => qq|$debug|,
+			, 'new_clients' => qq||
+		);
+
+		foreach my $editable ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain' ) {
+			my $v = eval '$server::' . $editable;
+			push @table, ( $editable, qq|| );
+		}
+
+		foreach my $readonly ( 'base_dir', 'conf' ) {
+			my $v = eval '$server::' . $readonly;
+			push @table, ( $readonly, html::tt $v );
+		}
+			
+		print $client ok
+			, qq|
|
+			, html::table( 2, @table )
+			, qq|
+				
+				

+			|
 			;
+
 	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
-		my $ip = $1 || $client->peerhost;
-		if ( $ip ne $server::ip ) {
-			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
+		my $ip = $1;
+		$title = $ip;
 
-			my @table = (
-				'ip' => $ip,
-				'hostname' => qq||,
-			);
+		if ( $param->{action} eq 'remove' ) {
+			client::remove( $param->{change_ip} );
+			print $client redirect("$url/client");
+			return;
+		} elsif ( $param->{action} eq 'change' ) {
+			if ( my $new_ip = client::change_ip( $ip, $param->{change_ip} ) ) {
+				print $client redirect("$url/client#$new_ip");
+				return;
+			}
+		}
 
-			my $deploy;
+ 		if ( ! $ip ) {
+			my $peer_ip = $client->peerhost;
 
-			if ( my $mac = client::mac( $ip ) ) {
-				$deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
-				push @table, (
-					'mac' => $mac,
-					'deploy' => html::select( 'deploy', $deploy, config::available )
-				);
-				$deploy = qq|
PXElinux
| . html::pre( config::for_ip( $ip ) );
+			my $netmask  = ip::to_int $server::netmask;
+			my $network  = ip::to_int($server::ip) & $netmask;
+			my $from_int = $network | $server::ip_from;
+			my $to_int   = $network | $server::ip_to;
+			my $ip_int   = ip::to_int $peer_ip;
+
+			# show edit for clients in our dhcp range
+ 			if ( $ip_int >= $from_int && $ip_int <= $to_int ) {
+				$ip = $peer_ip;
 			}
+		}
+
+		if ( $ip && $ip ne $server::ip ) {
+
+			my @editable = ( qw/hostname config homepage/ );
+
+			client::conf( $ip, $_ => $param->{$_} ) foreach @editable;
 
-			print $client $ok
+			my $conf = client::all_conf( $ip );
+			my $config = delete $conf->{config};
+
+			my $nmap = qq|nmap|;
+			my @table = (
+				'ping' => ping::host($ip)
+					? qq|up $nmap|
+					: qq|down wol $nmap|
+					,
+				'ip' => qq|