--- lib/PXElator/httpd.pm 2009/08/11 15:55:26 200 +++ lib/PXElator/httpd.pm 2009/08/29 17:03:35 347 @@ -24,6 +24,9 @@
@@ -49,7 +52,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 +71,6 @@ if ( my $pid = fork ) { # parent close($client); - print "http static child $pid\n"; $static_pids->{$pid} = $path; return 1; } @@ -81,7 +90,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,8 +105,6 @@ print STDERR "\n"; - warn "exit static child"; - exit(0); } @@ -116,20 +123,20 @@ 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 "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; @@ -138,7 +145,7 @@ if ( -e $proc ) { $html .= qq|$pid|; if ( $debug ) { - $html .= qq| ?|; + $html .= qq| ?| if $name->can('start'); $debug_proc .= qq|$proc| @@ -147,17 +154,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 { - $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 ); } @@ -185,88 +202,156 @@ } 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' ) ) + , 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; + my $ip = $1; - if ( my $new_ip = $param->{change_ip} ) { - client::change_ip( $ip, $new_ip ); - $ip = $new_ip; + 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 ne $server::ip ) { - my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} ); + 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 @editable = ( qw/hostname config homepage/ ); + + client::conf( $ip, $_ => $param->{$_} ) foreach @editable; + + 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|