--- lib/PXElator/httpd.pm 2009/08/18 12:46:41 251
+++ lib/PXElator/httpd.pm 2009/09/09 09:41:03 407
@@ -19,13 +19,31 @@
use IO::Socket::INET;
use Regexp::Common qw/net/;
-sub menu {qq{
+our $title;
+sub html_start {
+qq{
+
+
+$title
+
+
+}}
+
+sub html_end {
+qq{
+
+
+}}
+
+sub menu {
+qq{
@@ -54,6 +72,9 @@
use ip;
use wireshark;
use syslogd;
+use nmap;
+use ping;
+use wol;
use CouchDB;
@@ -64,6 +85,8 @@
return if ! -f $full;
+ return if $full =~ m{\.ico$};
+
if ( my $pid = fork ) {
# parent
close($client);
@@ -105,7 +128,7 @@
}
sub ok {
- qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu()
+ qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . html_start() . menu()
}
sub redirect {
@@ -121,6 +144,8 @@
CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } );
+ $title = $path;
+
if ( my $found = static( $client,$path ) ) {
warn "static $found" if $debug;
} elsif ( $path eq '/' ) {
@@ -150,12 +175,15 @@
;
}
- if ( $name->can('fork_if_active') ) {
- $html .= qq| $_| foreach $name->fork_if_active;
+ my $class = $name;
+ $class =~ s{\.\d+$}{};
+
+ if ( $class->can('fork_if_active') ) {
+ $html .= qq| $_| foreach $class->fork_if_active;
}
- if ( $name->can('actions') ) {
- $html .= qq| $_| foreach $name->actions;
+ if ( $class->can('actions') ) {
+ $html .= qq| $_| foreach $class->actions;
}
} else {
if ( $pid =~ m{^\d+$} ) {
@@ -189,121 +217,230 @@
}
}
+ my $kvm = kvm::next_nr;
+ $kvm = qq||;
+
print $client ok
, html::table( 2, @rows )
, $below_table
+ , $kvm
, html::tabs( log::mac_changes )
, $debug_proc
;
} elsif ( $path =~ m{^/server} ) {
+ foreach my $name ( keys %$param ) {
+ eval '$server::' . $name . '= $param->{$name}';
+ }
+ my @table = (
+ 'debug' => qq|$debug|,
+ , 'new_clients' => qq||
+ );
+
+ foreach my $editable ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain' ) {
+ my $v = eval '$server::' . $editable;
+ push @table, ( $editable, qq|| );
+ }
+
+ foreach my $readonly ( 'base_dir', 'conf' ) {
+ my $v = eval '$server::' . $readonly;
+ push @table, ( $readonly, html::tt $v );
+ }
+
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' )
- )
+ , qq|
+ |
;
+
} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
- my $ip = $1 || $client->peerhost;
+ my $ip = $1;
+ $title = $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 ) {
+ 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_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 ne $server::ip ) {
- my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
+ 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|old: $ip|,
- 'hostname' => qq||,
+ 'mac' => format::mac( delete $conf->{mac}, 'html' ),
+ 'hostname' => qq||,
+ 'config' => html::select( 'config', $config, config::available ),
+ html::conf( $ip, $conf, 'edit', @editable )
);
- my $deploy;
-
- if ( my $mac = client::mac_from_ip( $ip ) ) {
- $deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
- push @table, (
- 'mac' => format::mac( $mac => 'html' ),
- 'deploy' => html::select( 'deploy', $deploy, config::available )
- );
- $deploy = qq|PXElinux
| . html::pre( config::for_ip( $ip ) );
- }
-
print $client ok
, qq||
- , $deploy
+ , qq|
+
+
+ |
;
- if ( my $amt = client::conf( $ip, 'amt' ) ) {
- print $client qq|AMT
|, amt::info( $amt );
+ if ( $config ) {
+ if ( my $for_ip = config::for_ip( $ip ) ) {
+ print $client qq|config::for_ip
| . html::pre( $for_ip );
+ }
+ }
+
+ if ( $conf->{amt} ) {
+ print $client qq|amt network
|, html::pre_dump( amt::network( $ip ) );
+ print $client qq|amt log
|, html::pre_dump( amt::log( $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')
- };
+ my @ping;
+ if ( my $host = $param->{ping_target} ) {
+ @ping = ( $host );
+ } elsif ( $param->{ping} ) {
+ @ping = client::all_ips;
+ }
- warn "# arp ",dump( $arp );
+ my $ping = ping::fping( @ping ) if @ping;
+ my $arp = client::arp_mac_dev;
print $client ok
, qq|Clients on $server::ip
|
, html::table( -5,
- 'ip', 'hostname', 'mac', 'deploy', 'arp',
+ 'ip', 'mac', 'dev', 'hostname', '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} || '';
+ my $style;
+ $style
+ = 'style="color:'
+ . ( $ping->{$ip} ? 'green' : 'red' )
+ . '"'
+ if $ping;
+ $style ||= '';
(
- qq|$ip|
- , client::conf( $ip, 'hostname' )
+ qq|$ip|
, format::mac( $mac => 'html' )
- , html::tt( client::conf( $ip, 'deploy' ) )
- , $arp
- );
- }
- 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
+ , $arp->{$mac}
+ , delete $conf->{hostname}
+ , html::conf( $ip, $conf, 'inline' )
+ )
+ } client::all_ips
)
;
+ print $client qq|
+
+ |;
}
+
+
} elsif ( $path =~ m{^/brctl} ) {
+
+ system 'brctl addif virtual ' . $param->{addif} if $param->{addif};
+ system 'brctl delif virtual ' . $param->{delif} if $param->{delif};
+
+ my $in_virtual;
+
+ my @table =
+ map {
+ my @c = split(/\t+/,$_,4);
+ if ( $#c == 1 ) {
+ $in_virtual->{ $c[1] }++;
+ @c = ( '', '', '', $c[1] );
+ } else {
+ $in_virtual->{ $c[3] }++;
+ }
+ if ( $c[3] =~ m{\d$} ) {
+ $c[3] = qq||;
+ }
+ @c
+ } split(/\n/, `brctl show`)
+ ;
+
+ my @add_ifs = grep { ! $in_virtual->{$_} && $_ ne 'virtual' } ip::devices_up;
+
+ push @table, ( '', '', '', html::select( 'addif', @add_ifs ) . qq|| );
+
print $client ok
- ,html::pre( `brctl show` )
+ , qq||
;
+
+
} 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{^/wol/(\S+)} ) {
+ print $client redirect( "$url/client/$1" ), wol::power_on($1);
+ } elsif ( $path =~ m!^/amt/(\w+)/$RE{net}{IPv4}{-keep}! ) {
+ my ( $run, $ip ) = ( $1, $2 );
+ print $client redirect( "$url/client/$ip" ), amt::RemoteControl( $ip, $run );
} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
eval 'our $' . $1 . ' = ' . $2;
warn $@ if $@;
print $client redirect($url), qq|$1 = $2
Location: $url|;
server::debug( $debug ) if $1 eq 'debug';
} elsif ( $path =~ m{^/start_stop/(\S+)} ) {
- print $client redirect, daemons::start_stop($1);
+ print $client redirect, daemons::start_stop($1,$param);
} elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) {
- $1->$2();
+ my ( $package, $method ) = ( $1, $2 );
+ $ENV{nr} = $1 if $package =~ s{\.(\d+)$}{};
+ $package->$method();
print $client redirect;
} elsif ( $path =~ m{^/kill/static/(\d+)} ) {
print $client redirect;
@@ -319,9 +456,9 @@
warn 'network ', network::setup();
- daemons::start_stop 'browser', $url;
+ daemons::start_stop 'browser', { url => $url };
daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd syslogd/ );
- daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
+# daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
my $server = IO::Socket::INET->new(
Proto => 'tcp',
@@ -333,6 +470,9 @@
print "url $url\n";
+ syslogd::install_local;
+ client::rebuild_mac_links;
+
while (1) {
my $client = $server->accept() || next; # ALARM trickle us
my $request = <$client>;
@@ -341,6 +481,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) ) {
@@ -355,7 +496,7 @@
warn "500 $request";
}
- print $client menu() if $client->connected;
+ print $client menu() . html_end() if $client->connected;
}