--- lib/PXElator/httpd.pm 2009/09/08 21:06:40 405 +++ lib/PXElator/httpd.pm 2010/10/09 12:38:00 543 @@ -18,6 +18,7 @@ #use JSON; use IO::Socket::INET; use Regexp::Common qw/net/; +use POSIX qw(strftime); our $title; @@ -36,19 +37,6 @@ }} -sub menu { -qq{ -
-home -server -brctl -ip -nmap -client -
- -}} - our $port = 7777; use server; @@ -63,7 +51,6 @@ use log; use x11; use amt; -use boolean; use daemons; use kvm; @@ -76,7 +63,29 @@ use ping; use wol; -use CouchDB; +use store; + + +sub menu { + my $store_url = $url; + $store_url =~ s{:\d+.+}{:28017}; +qq{ +
+home +| +server +brctl +ip +| +MongoDB +latest +| +nmap +client +
+ +}} + sub static { my ($client,$path) = @_; @@ -109,7 +118,7 @@ my $buff; my $pos = 0; - CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost }); + store::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost }); progress_bar::start; @@ -137,12 +146,17 @@ qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $to\r\n\r\n| } +sub toggle { + my $v = shift; + return $v ? 0 : 1; +} + sub get_request { my ( $client, $path, $param ) = @_; server->refresh; - CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } ); + store::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } ); $title = $path; @@ -218,12 +232,12 @@ } my $kvm = kvm::next_nr; - $kvm = qq|new kvm $kvm|; + $kvm = qq|
create new kvm $kvm
|; print $client ok , html::table( 2, @rows ) - , $kvm , $below_table + , $kvm , html::tabs( log::mac_changes ) , $debug_proc ; @@ -233,11 +247,11 @@ eval '$server::' . $name . '= $param->{$name}'; } my @table = ( - 'debug' => qq|$debug|, + 'debug' => qq|$debug|, , 'new_clients' => qq|| ); - foreach my $editable ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain' ) { + foreach my $editable ( 'ip', 'bcast', 'netmask', 'ip_from', 'ip_to', 'domain' ) { my $v = eval '$server::' . $editable; push @table, ( $editable, qq|| ); } @@ -256,9 +270,69 @@ | ; + } elsif ( $path =~ m{^/store/latest} ) { + print $client ok + , qq| + + | + , qq|| + ; + my ( $s1,$s2 ) = ( ' class=z', '' ); + my @cols; + + my $from_t = $param->{from_t}; + + my $q; + $q->{'package.time'} = { '$lt' => $from_t * 1 } if $from_t; +# $q->{'package.name'} = { '$ne' => 'syslogd' }; + $q->{'package.name'} = { '$ne' => 'dhcpd' }; +# $q->{'package.name'} = { '$ne' => [ 'dhcpd', 'dnsd' ] }; + $q->{'tag'} = { '$ne' => 'CRON' }; + store::query( $q, sub { + my $o = shift; + my $p = delete( $o->{package} ); + delete( $o->{_id} ); + + if ( ! @cols ) { + #@cols = keys %$p; + @cols = qw( time name ); + print $client qq|| + ; + } + + # XXX sigh, dump dies if we don't do this +# delete $o->{$_} foreach ( grep { ! defined $o->{$_} } keys %$o ); + + print $client qq|| + , strftime( qq||, localtime($p->{time}) ) + , map { qq|\n| + ; + ( $s1, $s2 ) = ( $s2, $s1 ); + $from_t = $p->{time}; + }); + print $client qq|
| + , join(qq||, @cols) + , qq|
%H:%M:%S$_| } ( $p->{name} , html::pre_dump($o) ) + , qq|
|, + qq|more| + ; + } 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} ); @@ -288,13 +362,19 @@ 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 @editable = ( qw/hostname config homepage/ ); + # add params with config prefix if config exists + push @editable, grep { m{^\Q$config\E} } keys %$conf if $config; + my @update = grep { defined $param->{$_} } @editable; + if ( @update ) { + client::conf( $ip, $_ => $param->{$_} ) foreach @update; + print $client redirect("$url/client/$ip"); + return; + } + my $nmap = qq|nmap|; my @table = ( 'ping' => ping::host($ip) @@ -330,6 +410,8 @@ } else { + print $client ok qq|

Clients on $server::ip

|; + my @ping; if ( my $host = $param->{ping_target} ) { @ping = ( $host ); @@ -340,31 +422,42 @@ 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', 'mac', 'dev', 'hostname', 'conf', - map { - my $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| - , format::mac( $mac => 'html' ) - , $arp->{$mac} - , delete $conf->{hostname} - , html::conf( $ip, $conf, 'inline' ) - ) - } client::all_ips - ) + my @clients; + + foreach my $ip ( client::all_ips ) { + + my $conf = client::all_conf( $ip ); + my $mac = delete $conf->{mac} || ''; + my $dev = $arp->{$mac}; + + my $in_dhcp_range = ip::in_dhcp_range($ip); + + next unless $dev || $param->{all} || $in_dhcp_range; + + my $style + = 'style="color:' + . ( $ping->{$ip} ? 'green' : 'red' ) + . '"' + if $ping; + + $style ||= ''; + my $ip_text = qq|$ip|; + $ip_text = qq|$ip| if $in_dhcp_range; + + $dev = qq|$dev| if $dev; + + push @clients + , qq|$ip_text| + , format::mac( $mac => 'html' ) + , $dev + , delete $conf->{hostname} + , html::conf( $ip, $conf, 'inline' ) ; + } + + my $all = $param->{all} ? 0 : 1; + + print $client html::table( -5, 'ip', 'mac', qq|dev|, 'hostname', 'conf', @clients ); print $client qq|
@@ -462,7 +555,7 @@ my $server = IO::Socket::INET->new( Proto => 'tcp', - LocalAddr => $server::ip, +# LocalAddr => $server::ip, LocalPort => $httpd::port, Listen => SOMAXCONN, Reuse => 1 @@ -477,7 +570,21 @@ 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;