--- lib/PXElator/httpd.pm 2009/08/29 15:30:49 343
+++ lib/PXElator/httpd.pm 2009/09/08 16:54:35 393
@@ -19,8 +19,25 @@
use IO::Socket::INET;
use Regexp::Common qw/net/;
-sub menu {qq{
+our $title;
+sub html_start {
+qq{
+
+
+
home
server
@@ -109,7 +126,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 {
@@ -125,6 +142,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 '/' ) {
@@ -154,12 +173,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+$} ) {
@@ -201,16 +223,23 @@
;
} elsif ( $path =~ m{^/server} ) {
+ if ( my $c = $param->{new_clients} ) {
+ server::shared( 'new_clients', $c );
+ }
print $client ok
+ , qq|
|
;
} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
my $ip = $1;
+ $title = $ip;
if ( $param->{action} eq 'remove' ) {
client::remove( $param->{change_ip} );
@@ -239,29 +268,27 @@
}
if ( $ip && $ip ne $server::ip ) {
- my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
- my $nmap = qq|
nmap|;
+ 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||,
- 'ping' => ping::host($ip) ? qq|up $nmap| : qq|down $nmap|,
+ 'mac' => format::mac( delete $conf->{mac}, 'html' ),
+ 'hostname' => qq||,
+ 'config' => html::select( 'config', $config, config::available ),
+ html::conf( $ip, $conf, 'edit', @editable )
);
- my $config;
-
- if ( my $mac = client::mac_from_ip( $ip ) ) {
- my $deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
- push @table, (
- 'mac' => format::mac( $mac => 'html' ),
- 'deploy' => html::select( 'deploy', $deploy, config::available )
- );
- if ( $config = config::for_ip( $ip ) ) {
- $config = qq|config
| . html::pre( $config );
- }
- }
-
print $client ok
, qq||
- , $config
;
- if ( my $amt = client::conf( $ip, 'amt' ) ) {
- print $client qq|AMT
|, amt::info( $amt, $ip );
+ 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 {
@@ -304,23 +337,12 @@
if $ping;
$style ||= '';
(
- qq|$ip|
+ qq|$ip|
, format::mac( $mac => 'html' )
, $arp->{$mac}
, delete $conf->{hostname}
- , join("\n", map {
- my $name = $_;
- my $html = $conf->{$name};
- if ( $name eq 'amt' ) {
- $html = qq|logon|;
- }
- $html = qq|$html
|
- unless
-#0 &&
- $html =~ s{\b(\S+)\t(\S+)\t(\S+)\b}{$3 }gs;
- qq|$name $html
|
- } keys %$conf )
- );
+ , html::conf( $ip, $conf, 'inline' )
+ )
} client::all_ips
)
;
@@ -361,15 +383,20 @@
}
} 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;
@@ -385,9 +412,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',
@@ -399,6 +426,8 @@
print "url $url\n";
+ syslogd::install_local;
+
while (1) {
my $client = $server->accept() || next; # ALARM trickle us
my $request = <$client>;
@@ -422,7 +451,7 @@
warn "500 $request";
}
- print $client menu() if $client->connected;
+ print $client menu() . html_end() if $client->connected;
}