--- lib/PXElator/httpd.pm 2009/08/13 13:06:18 216
+++ lib/PXElator/httpd.pm 2009/08/28 21:55:41 329
@@ -24,6 +24,9 @@
@@ -49,6 +52,10 @@
use kvm;
use browser;
use network;
+use ip;
+use wireshark;
+use syslogd;
+use nmap;
use CouchDB;
@@ -120,14 +127,14 @@
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;
@@ -136,7 +143,7 @@
if ( -e $proc ) {
$html .= qq|$pid|;
if ( $debug ) {
- $html .= qq| ?|;
+ $html .= qq| ?| if $name->can('start');
$debug_proc
.= qq|$proc|
@@ -145,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 );
}
@@ -183,17 +200,42 @@
} 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 ( $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;
- if ( my $new_ip = $param->{change_ip} ) {
- client::change_ip( $ip, $new_ip );
- $ip = $new_ip;
+ 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 ne $server::ip ) {
+ if ( $ip && $ip ne $server::ip ) {
my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
my @table = (
@@ -209,63 +251,70 @@
'mac' => format::mac( $mac => 'html' ),
'deploy' => html::select( 'deploy', $deploy, config::available )
);
- $deploy = qq|PXElinux
| . html::pre( config::for_ip( $ip ) );
+ if ( my $pxelinux = config::for_ip( $ip ) ) {
+ $deploy = qq|PXElinux
| . html::pre( $pxelinux );
+ }
}
print $client ok
, qq||
+ , qq|
+
+
+ |
, $deploy
;
if ( my $amt = client::conf( $ip, 'amt' ) ) {
- print $client qq|AMT
|, amt::info( $amt );
+ print $client qq|AMT
|, amt::info( $amt, $ip );
}
- } else {
- my $arp = {
- map {
- my @c = split(/\s+/,$_);
- if ( $#c == 5 ) {
- ( uc $c[3] => [ $c[0] , $c[5] ] )
- } else {
- }
- } read_file('/proc/net/arp')
- };
+ } else {
- warn "# arp ",dump( $arp );
+ my $arp = clinet::arp_mac_dev;
print $client ok
, qq|Clients on $server::ip
|
- , html::table( -5,
- 'ip', 'hostname', 'mac', 'deploy', 'arp',
+ , html::table( -6,
+ 'ip', 'mac', 'dev', 'hostname', 'deploy', 'conf',
map {
my $ip = $_;
- $ip =~ s{^.+/ip/}{};
- my $mac = client::mac_from_ip $ip;
- my $arp = $arp->{ $mac };
- $arp = $arp ? $arp->[1] : '';
- $arp =~ s{$ip}{};
+ my $conf = client::all_conf( $ip );
+ my $mac = delete $conf->{mac} || '';
(
- qq|$ip|
- , client::conf( $ip, 'hostname' )
+ qq|$ip|
, format::mac( $mac => 'html' )
- , html::tt( client::conf( $ip, 'deploy' ) )
- , $arp
+ , $arp->{$mac}
+ , delete $conf->{hostname}
+ , delete $conf->{deploy}
+ , ( %$conf ? html::pre_dump( $conf ) : qq|nmap| )
);
- }
- glob("$server::conf/ip/*")
- )
- , qq|ARP
|
- , html::table( -3, 'mac', 'dev', 'ip',
- map {
- my $c = $arp->{$_};
- ( format::mac( $_ => 'html' ), $c->[1], $c->[0] )
- } sort keys %$arp
+ } client::all_ips
)
;
}
+ } elsif ( $path =~ m{^/brctl} ) {
+ print $client ok
+ ,html::pre( `brctl show` )
+ ;
+ } elsif ( $path =~ m{^/ip/?(\w+)?} ) {
+ print $client ok
+ , join("\n", map { qq|$_| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ ))
+ , ip::html( $1 )
+ ;
+ } elsif ( $path =~ m{^/nmap} ) {
+ if ( my $scan = $param->{scan} ) {
+ nmap::scan( $scan );
+ print $client redirect("$url/client#$scan");
+ } else {
+ print $client ok, qq|
+
+ |;
+ }
} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
eval 'our $' . $1 . ' = ' . $2;
warn $@ if $@;
@@ -288,10 +337,10 @@
sub start {
- warn 'tap ', network::tap();
+ warn 'network ', network::setup();
daemons::start_stop 'browser', $url;
- daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd/ );
+ daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd syslogd/ );
daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
my $server = IO::Socket::INET->new(
@@ -312,6 +361,7 @@
if ($request =~ m{^GET (/.*) HTTP/1.[01]}) {
my $path = $1;
+ $path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/ge;
my $param;
if ( $path =~ s{\?(.+)}{} ) {
foreach my $p ( split(/[&;]/, $1) ) {