--- lib/PXElator/httpd.pm 2009/08/06 18:10:31 162 +++ lib/PXElator/httpd.pm 2009/08/28 23:30:38 334 @@ -24,22 +24,14 @@
home server +brctl +ip +nmap client
}} -our $pids; -$pids = { httpd => $$ } unless defined $pids; # keep pids on refresh - -sub DESTROY { - warn "pids ",dump( $pids ); - foreach ( values %$pids ) { - warn "kill $_"; - kill 1,$_ || kill 9, $_; - } -} - our $port = 7777; use server; @@ -52,6 +44,20 @@ use config; use client; use log; +use x11; +use amt; +use boolean; +use daemons; + +use kvm; +use browser; +use network; +use ip; +use wireshark; +use syslogd; +use nmap; + +use CouchDB; sub static { my ($client,$path) = @_; @@ -63,7 +69,6 @@ if ( my $pid = fork ) { # parent close($client); - print "http static child $pid\n"; $static_pids->{$pid} = $path; return 1; } @@ -83,7 +88,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; @@ -98,88 +103,47 @@ print STDERR "\n"; - warn "exit static child"; - exit(0); } -use boolean; - -use kvm; - -$SIG{CHLD} = 'IGNORE'; - -sub start_stop { - my $daemon = shift; - my $pid = $pids->{$daemon} || 'not started'; - - warn "start_stop $daemon $pid\n"; - - if ( $pid =~ m{^\d+$} ) { - my $pstree = `pstree -p $pid`; - my @pids = $pstree =~ m{\((\d+)\)}g; - warn "pstree $pstree pids ",dump( @pids ); - kill 1, $_ foreach reverse @pids; - $pids->{$daemon} = 'stopped'; - return qq|$daemon pid $pid stopped|; - } else { - if ( $pid = fork ) { - # parent - $pids->{$daemon} = $pid; - warn "forked $daemon $pid\n"; - return qq|$daemon pid $pid started|; - } elsif ( defined $pid ) { - # child - my $invoke = 'start'; - $invoke = $1 if $daemon =~ s{/(.+)}{}; - if ( $daemon =~ m{dhcpd|tftpd|dnsd} ) { - my $exec = "perl -I$server::base_dir/lib -I$server::base_dir/lib/PXElator -M$daemon -e ${daemon}::${invoke}"; - warn "exec $exec"; - exec "xterm -T $daemon -n $daemon -e $exec"; - } else { - my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')'; - warn "eval $eval"; - eval $eval; - warn "can't start $daemon: $@" if $@; - } - exit; - } else { - die "fork error $!"; - } - } +sub ok { + qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu() } -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 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 } ); 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 'pids: ', dump( $pids ) if $debug; - foreach my $name ( sort keys %$pids ) { - my $pid = $pids->{$name} || next; +warn "XXX pids = ", dump( $daemons::pids ); + + foreach my $name ( sort keys %$daemons::pids ) { + my $pid = $daemons::pids->{$name}; # || next; - my $html = qq|$pid|; + my $html; my $proc = "/proc/$pid/status"; if ( -e $proc ) { + $html .= qq|$pid|; if ( $debug ) { - $html .= qq| ?|; + $html .= qq| ?| if $name->can('start'); $debug_proc .= qq|$proc
|
@@ -188,15 +152,27 @@
 						;
 				}
 
-				if ( $name->can('start_fork') ) {
-					$html .= qq| $_| foreach $name->start_fork;
+				if ( $name->can('fork_if_active') ) {
+					$html .= qq| $_| foreach $name->fork_if_active;
 				}
 
 				if ( $name->can('actions') ) {
-					$html .= qq| $_| foreach $name->actions;
+					$html .= qq| $_| foreach $name->actions;
+				}
+			} else {
+				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 );
 		}
 
@@ -215,7 +191,7 @@
 			}
 		}
 
-		print $client $ok
+		print $client ok
 			, html::table( 2, @rows )
 			, $below_table
 			, html::tabs( log::mac_changes )
@@ -223,53 +199,163 @@
 			;
 
 	} elsif ( $path =~ m{^/server} ) {
-		print $client $ok
-			, html::table( 2, map { ( $_, eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir' ) )
+		print $client ok
+			, html::table( 2,
+				'debug' => qq|$debug|,
+				 map {
+					( $_, html::tt eval '$server::'.$_ )
+				 } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' )
+			)
 			;
 	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
-		my $ip = $1 || $client->peerhost;
-		if ( $ip ne $server::ip ) {
+		my $ip = $1;
+
+		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;
+			}
+		}
+
+ 		if ( ! $ip ) {
+			my $peer_ip = $client->peerhost;
+
+			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 $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
-			my $deploy   = client::conf( $ip, 'deploy'   => $param->{deploy}   );
-			print $client $ok
+
+			my @table = (
+				'ip' => qq|