--- lib/PXElator/httpd.pm 2009/08/30 15:22:41 376 +++ lib/PXElator/httpd.pm 2009/09/14 13:44:42 431 @@ -19,17 +19,21 @@ use IO::Socket::INET; use Regexp::Common qw/net/; -sub menu {qq{ +our $title; -
-home -server -brctl -ip -nmap -client -
+sub html_start { +qq{ + + +$title + + +}} +sub html_end { +qq{ + + }} our $port = 7777; @@ -61,6 +65,24 @@ use CouchDB; + +sub menu { + my $couch_url = $url; + $couch_url =~ s{:\d+.+}{:5984/_utils/}; +qq{ +
+home +server +brctl +ip +nmap +client +couchdb +
+ +}} + + sub static { my ($client,$path) = @_; @@ -68,6 +90,8 @@ return if ! -f $full; + return if $full =~ m{\.ico$}; + if ( my $pid = fork ) { # parent close($client); @@ -109,7 +133,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 +149,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 +180,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+$} ) { @@ -193,24 +222,48 @@ } } + my $kvm = kvm::next_nr; + $kvm = qq|
create new kvm $kvm
|; + 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', 'bcast', '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|
| + , html::table( 2, @table ) + , qq| + +
+ | ; + } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) { my $ip = $1; + $title = $ip if $ip; if ( $param->{action} eq 'remove' ) { client::remove( $param->{change_ip} ); @@ -275,7 +328,10 @@ } } - print $client qq|

amt info

|, amt::info( $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,8 +360,10 @@ . '"' if $ping; $style ||= ''; + my $ip_text = qq|$ip|; + $ip_text = qq|$ip| if ip::in_dhcp_range($ip); ( - qq|$ip| + qq|$ip_text| , format::mac( $mac => 'html' ) , $arp->{$mac} , delete $conf->{hostname} @@ -321,17 +379,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|
| + , html::table( -4, @table ) + , qq|
| + ; + + } elsif ( $path =~ m{^/ip/?(\w+)?} ) { print $client ok , join("\n", map { qq|$_| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ )) @@ -360,9 +443,11 @@ 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; @@ -378,13 +463,13 @@ 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', - LocalAddr => $server::ip, +# LocalAddr => $server::ip, LocalPort => $httpd::port, Listen => SOMAXCONN, Reuse => 1 @@ -393,12 +478,27 @@ print "url $url\n"; syslogd::install_local; + client::rebuild_mac_links; while (1) { my $client = $server->accept() || next; # ALARM trickle us my $request = <$client>; - warn "request $request\n" if $debug; + my $headers; + + while ( my $header = <$client> ) { + chomp $header; + last if $header =~ m{^\s*$}; + my ( $n, $v ) = split(/:\s*/, $header); + $headers->{ lc $n } = $v; + } + + if ( my $host = $headers->{host} ) { + $url = 'http://' . $host; + $url .= ":$port" unless $url =~ m{:\d+$}; + } + + warn "## $url ## $request", dump( $headers ) if $debug; if ($request =~ m{^GET (/.*) HTTP/1.[01]}) { my $path = $1; @@ -417,7 +517,7 @@ warn "500 $request"; } - print $client menu() if $client->connected; + print $client menu() . html_end() if $client->connected; }