--- lib/PXElator/httpd.pm 2009/07/30 21:31:30 67 +++ lib/PXElator/httpd.pm 2009/08/27 17:44:03 311 @@ -17,17 +17,20 @@ use File::Slurp; #use JSON; use IO::Socket::INET; -use Module::Refresh; +use Regexp::Common qw/net/; -our $pids = { httpd => $$ }; +sub menu {qq{ -sub DESTROY { - warn "pids ",dump( $pids ); - foreach ( values %$pids ) { - warn "kill $_"; - kill 1,$_ || kill 9, $_; - } -} +
+home +server +brctl +ip +nmap +client +
+ +}} our $port = 7777; @@ -36,6 +39,25 @@ our $url = "http://$server::ip:$port"; use html; +our $static_pids; +use progress_bar; +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) = @_; @@ -44,6 +66,13 @@ return if ! -f $full; + if ( my $pid = fork ) { + # parent + close($client); + $static_pids->{$pid} = $path; + return 1; + } + my $type = 'application/octet-stream'; $type = 'text/html' if $path =~ m{\.htm}; $type = 'application/javascript' if $path =~ m{\.js}; @@ -54,116 +83,254 @@ print $client "HTTP/1.0 200 OK\r\nContent-Type: $type\r\nContent-Length: $size\r\nConnection: close\r\n\r\n"; open(my $fh, $full); - print "static $path $type $size\n"; - my $block = 8192; + my $block = 1400; # try not to fragment packages (pxelinux seems to have problems with it) my $buff; my $pos = 0; + CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost }); + + progress_bar::start; + while( my $len = read $fh, $buff, $block ) { print $client $buff; + $client->flush; $pos += $len; - printf "%s %d/%d %.2f%%\r", $path, $pos, $size, $pos * 100 / $size; + progress_bar::tick( $path, $pos, $size ); } close($fh); close($client); - print "$path $pos == $size OK\n"; + print STDERR "\n"; - return $path; + exit(0); } -use boolean; - -use screen; -use kvm; - -$SIG{CHLD} = 'IGNORE'; - -sub start_stop { - my $daemon = shift; - my $pid = $pids->{$daemon}; - - warn "start_stop $daemon $pid pids: ",dump( $pids ); - - if ( $pid =~ m{^\d+$} ) { - warn "kill 9 $pid"; - kill 9, $pid; - $pids->{$daemon} = 'stopped'; - return qq|$daemon pid $pid stopped|; - } else { - if ( $pid = fork ) { - # parent - $pids->{$daemon} = $pid; - warn "forked $daemon $pid"; - return qq|$daemon pid $pid started|; - } elsif ( defined $pid ) { - # child - my $eval = $daemon . '::start(' . ( @_ ? 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|; -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 ) = @_; - warn "get_request $client $path ",dump( $param ); + server->refresh; + + 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 $screen = $pids->{screen} ? qq|stop $pids->{screen}| : 'start'; - my $kvm = $pids->{kvm} ? qq|stop $pids->{kvm}| : - $pids->{screen} ? qq|start| : qq|start screen first|; - - my @rows = ( - 'ip', html::tt( $server::ip ), - 'netmask', html::tt( $server::netmask ), - - 'debug', qq|$debug|, - ); - foreach my $name ( %$pids ) { - my $pid = $pids->{$name} || next; + 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 $html; + my $proc = "/proc/$pid/status"; - my $html = qq|$pid|; - $html .= qq|
|
-					.  ( $debug && -e $proc ? read_file($proc) : '' )
-					.  qq|
| if $debug; + if ( -e $proc ) { + $html .= qq|$pid|; + if ( $debug ) { + $html .= qq| ?| if $name->can('start'); + + $debug_proc + .= qq|$proc
|
+						.  read_file($proc)
+						.  qq|
| + ; + } + + if ( $name->can('fork_if_active') ) { + $html .= qq| $_| foreach $name->fork_if_active; + } + + if ( $name->can('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 ); } - print $client $ok, html::table( 2, @rows ); + my $below_table = ''; + + warn 'static_pids: ', dump( $static_pids ) if $debug; + foreach my $pid ( keys %$static_pids ) { + my $path = $static_pids->{$pid}; + if ( -d "/proc/$pid" ) { + push @rows, ( $path => qq|$pid| ); + } elsif ( $param->{clean_completed_downloads} ) { + delete $static_pids->{$pid} + } else { + push @rows, ( $path => "$pid competed" ); + $below_table = qq|clean completed downloads|; + } + } + + print $client ok + , html::table( 2, @rows ) + , $below_table + , html::tabs( log::mac_changes ) + , $debug_proc + ; + + } elsif ( $path =~ m{^/server} ) { + 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 ( my $new_ip = $param->{change_ip} ) { + client::change_ip( $ip, $new_ip ); + $ip = $new_ip; + } + + my $ip_short = (split(/\./, $ip, 4))[3]; + + # if ( $ip ne $server::ip ) -- not flexible enough for tunnel endpoints + if ( $ip_short >= $server::ip_from && $ip_short <= $server::ip_to ) { + my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} ); + + my @table = ( + 'ip' => qq|