--- lib/PXElator/httpd.pm 2009/08/10 16:36:16 193 +++ lib/PXElator/httpd.pm 2009/08/28 19:39:54 326 @@ -24,6 +24,9 @@
@@ -49,7 +52,12 @@ use kvm; use browser; use network; +use ip; +use wireshark; +use syslogd; +use nmap; +use CouchDB; sub static { my ($client,$path) = @_; @@ -61,7 +69,6 @@ if ( my $pid = fork ) { # parent close($client); - print "http static child $pid\n"; $static_pids->{$pid} = $path; return 1; } @@ -81,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; @@ -96,33 +103,38 @@ 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| . 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 } ); 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 +143,7 @@ if ( -e $proc ) { $html .= qq|$pid|; if ( $debug ) { - $html .= qq| ?|; + $html .= qq| ?| if $name->can('start'); $debug_proc .= qq|$proc|
@@ -140,17 +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 {
- $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 +191,7 @@
}
}
- print $client $ok
+ print $client ok
, html::table( 2, @rows )
, $below_table
, html::tabs( log::mac_changes )
@@ -177,39 +199,75 @@
;
} 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' ) )
+ 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, $to ) = ( $network | $server::ip_from, $network | $server::ip_to );
+ my $ip_int = ip::to_int $peer_ip;
+
+ # show edit for clients in our dhcp range
+ if ( $ip_int >= ( $network | $server::ip_from ) && $ip_int <= ( $network | $server::ip_to ) ) {
+ $ip = $peer_ip;
+ }
+ }
+
+ if ( $ip && $ip ne $server::ip ) {
my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
my @table = (
- 'ip' => $ip,
- 'hostname' => qq||,
+ 'ip' => qq|