added pxelinux::config_ip_boot
[pxelator] / lib / PXElator / httpd.pm
index 507f86f..a342e83 100644 (file)
@@ -36,19 +36,6 @@ qq{
 </html>
 }}
 
-sub menu {
-qq{
-<div style="font-size: 80%; color: #888">
-<a href=/>home</a>
-<a href=/server>server</a>
-<a href=/brctl>brctl</a>
-<a href=/ip>ip</a>
-<a href=/nmap>nmap</a>
-<a href=/client>client</a>
-</div>
-
-}}
-
 our $port = 7777;
 
 use server;
@@ -78,6 +65,27 @@ use wol;
 
 use CouchDB;
 
+
+sub menu {
+       my $couch_url = $url;
+       $couch_url =~ s{:\d+.+}{:5984/_utils/};
+qq{
+<div style="font-size: 80%; color: #888">
+<a target=pids href=/ >home</a>
+|
+<a target=server href=/server >server</a>
+<a target=server href=/brctl >brctl</a>
+<a target=server href=/ip >ip</a>
+|
+<a target=couch href=$couch_url >couchdb</a>
+|
+<a target=client href=/nmap >nmap</a>
+<a target=client href=/client >client</a>
+</div>
+
+}}
+
+
 sub static {
        my ($client,$path) = @_;
 
@@ -85,6 +93,8 @@ sub static {
 
        return if ! -f $full;
 
+       return if $full =~ m{\.ico$};
+
        if ( my $pid = fork ) {
                # parent
                close($client);
@@ -215,31 +225,48 @@ warn "XXX pids = ", dump( $daemons::pids );
                        }
                }
 
+               my $kvm = kvm::next_nr;
+               $kvm = qq|<div><a href=/start_stop/kvm?nr=$kvm>create new kvm $kvm</a></div>|;
+
                print $client ok
                        , html::table( 2, @rows )
                        , $below_table
+                       , $kvm
                        , html::tabs( log::mac_changes )
                        , $debug_proc
                        ;
 
        } elsif ( $path =~ m{^/server} ) {
-               if ( my $c = $param->{new_clients} ) {
-                       server::shared( 'new_clients', $c );
+               foreach my $name ( keys %$param ) {
+                       eval '$server::' . $name . '= $param->{$name}';
+               }
+               my @table = (
+                         'debug' => qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
+                       , 'new_clients' => qq|<input type=text name=new_clients size=3 value="$server::new_clients">|
+               );
+
+               foreach my $editable ( 'ip', 'bcast', 'netmask', 'ip_from', 'ip_to', 'domain' ) {
+                       my $v = eval '$server::' . $editable;
+                       push @table, ( $editable, qq|<input type=text name=$editable value="$v">| );
+               }
+
+               foreach my $readonly ( 'base_dir', 'conf' ) {
+                       my $v = eval '$server::' . $readonly;
+                       push @table, ( $readonly, html::tt $v );
                }
+                       
                print $client ok
                        , qq|<form method=get>|
-                       , html::table( 2,
-                               'debug' => qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
-                               'new_clients' => qq|<input type=text name=new_clients size=3 value="| . server::shared( 'new_clients' ) . qq|">|,
-                                map {
-                                       ( $_, html::tt eval '$server::'.$_ )
-                                } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain', 'base_dir', 'conf' )
-                       )
-                       , qq|</form>|
+                       , html::table( 2, @table )
+                       , qq|
+                               <input type=submit name=action value=change>
+                               </form>
+                       |
                        ;
+
        } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
                my $ip = $1;
-               $title = $ip;
+               $title = $ip if $ip;
 
                if ( $param->{action} eq 'remove' ) {
                        client::remove( $param->{change_ip} );
@@ -336,8 +363,10 @@ warn "XXX pids = ", dump( $daemons::pids );
                                                        . '"'
                                                        if $ping;
                                                $style ||= '';
+                                               my $ip_text = qq|<tt>$ip</tt>|;
+                                               $ip_text = qq|<tt><b>$ip</b></tt>| if ip::in_dhcp_range($ip);
                                                (
-                                                       qq|<a $style name=$ip target=$ip href=/client/$ip>$ip</a>|
+                                                       qq|<a $style name=$ip target=client href=/client/$ip>$ip_text</a>|
                                                        , format::mac( $mac => 'html' )
                                                        , $arp->{$mac}
                                                        , delete $conf->{hostname}
@@ -353,17 +382,42 @@ warn "XXX pids = ", dump( $daemons::pids );
                                </form>
                        |;
                }
+
+
        } 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|<input type=submit name=delif value=$c[3] style="color:red" title="remove $c[3] from bridge">|;
                                }
+                               @c
                        } split(/\n/, `brctl show`)
-               );
+               ;
+
+               my @add_ifs = grep { ! $in_virtual->{$_} && $_ ne 'virtual' } ip::devices_up;
+
+               push @table, ( '', '', '', html::select( 'addif', @add_ifs ) . qq|<input type=submit value=add></form>| );
+
+               print $client ok
+                       , qq|<form>|
+                       , html::table( -4, @table )
+                       , qq|</form>|
+                       ;
+
+
        } elsif ( $path =~ m{^/ip/?(\w+)?} ) {
                print $client ok
                        , join("\n", map { qq|<a href=/ip/$_>$_</a>| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ ))
@@ -418,7 +472,7 @@ sub start {
 
        my $server = IO::Socket::INET->new(
                        Proto     => 'tcp',
-                       LocalAddr => $server::ip,
+#                      LocalAddr => $server::ip,
                        LocalPort => $httpd::port,
                        Listen    => SOMAXCONN,
                        Reuse     => 1
@@ -427,12 +481,27 @@ sub start {
        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;