home
server
@@ -68,6 +85,8 @@
return if ! -f $full;
+ return if $full =~ m{\.ico$};
+
if ( my $pid = fork ) {
# parent
close($client);
@@ -109,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 {
@@ -125,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 '/' ) {
@@ -154,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+$} ) {
@@ -201,16 +225,36 @@
;
} 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;
+ $title = $ip;
if ( $param->{action} eq 'remove' ) {
client::remove( $param->{change_ip} );
@@ -240,33 +284,26 @@
if ( $ip && $ip ne $server::ip ) {
- my @editable = ( qw/hostname deploy homepage/ );
+ my @editable = ( qw/hostname config homepage/ );
client::conf( $ip, $_ => $param->{$_} ) foreach @editable;
my $conf = client::all_conf( $ip );
- my $deploy = delete $conf->{deploy};
+ 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|,
'mac' => format::mac( delete $conf->{mac}, 'html' ),
'hostname' => qq||,
- 'ping' => ping::host($ip) ? qq|up $nmap| : qq|down wol $nmap|,
- 'deploy' => html::select( 'deploy', $deploy, config::available ),
+ 'config' => html::select( 'config', $config, config::available ),
html::conf( $ip, $conf, 'edit', @editable )
);
-warn "XX conf ",dump( $conf );
-
- my $config = '';
-
- if ( $deploy ) {
- 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 {
@@ -309,7 +352,7 @@
if $ping;
$style ||= '';
(
- qq|$ip|
+ qq|$ip|
, format::mac( $mac => 'html' )
, $arp->{$mac}
, delete $conf->{hostname}
@@ -325,17 +368,42 @@
|;
}
+
+
} elsif ( $path =~ m{^/brctl} ) {
- print $client ok, html::table( -4,
+
+ 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 ) {
- ( '', '', '', $c[1] )
+ $in_virtual->{ $c[1] }++;
+ @c = ( '', '', '', $c[1] );
} else {
- @c
+ $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
+ , qq||
+ ;
+
+
} elsif ( $path =~ m{^/ip/?(\w+)?} ) {
print $client ok
, join("\n", map { qq|$_| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ ))
@@ -355,15 +423,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;
@@ -379,9 +452,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',
@@ -393,6 +466,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>;
@@ -416,7 +492,7 @@
warn "500 $request";
}
- print $client menu() if $client->connected;
+ print $client menu() . html_end() if $client->connected;
}