Add version info and optimize log for smart.log
This commit is contained in:
Mario Fetka
315
smart.cmake
315
smart.cmake
@@ -25,66 +25,114 @@
|
||||
|
||||
$redirected = 0;
|
||||
|
||||
$server_id = 'Server: SMArT/Perl/@MARS_NWE_VERSION@';
|
||||
$smart_version = '@MARS_NWE_VERSION@';
|
||||
$server_id = 'Server: SMArT/Perl/' . $smart_version;
|
||||
|
||||
do( '@MARS_NWE_INSTALL_FULL_CONFDIR@/smart.conf' )
|
||||
or die "Could not load @MARS_NWE_INSTALL_FULL_CONFDIR@/smart.conf: $@ $!";
|
||||
or die "Could not load @MARS_NWE_INSTALL_FULL_CONFDIR@/smart.conf: $@ $!";
|
||||
|
||||
close( STDERR );
|
||||
open( STDERR, '>>' . $smart_log_path )
|
||||
or die "Could not open $smart_log_path: $!";
|
||||
or die "Could not open $smart_log_path: $!";
|
||||
|
||||
select( STDERR ); $| = 1;
|
||||
select( STDOUT ); $| = 1;
|
||||
|
||||
$ENV{HOME} = '@MARS_NWE_INSTALL_FULL_CONFDIR@';
|
||||
$smart_libexec_dir = '@MARS_NWE_INSTALL_FULL_LIBEXECDIR@';
|
||||
$smart_libexec_dir =~ s#/*$##;
|
||||
|
||||
sub log_timestamp()
|
||||
{
|
||||
my @t = localtime( time() );
|
||||
return sprintf(
|
||||
'%04d-%02d-%02d %02d:%02d:%02d',
|
||||
$t[5] + 1900, $t[4] + 1, $t[3],
|
||||
$t[2], $t[1], $t[0]
|
||||
);
|
||||
}
|
||||
|
||||
sub log_msg( $$ )
|
||||
{
|
||||
my( $level, $msg ) = @_;
|
||||
print STDERR '[' . log_timestamp() . '] [' . $level . '] [SMArT ' . $smart_version . '] ' . $msg . "\n";
|
||||
}
|
||||
|
||||
sub log_info( $ )
|
||||
{
|
||||
log_msg( 'INFO', $_[0] );
|
||||
}
|
||||
|
||||
sub log_error( $ )
|
||||
{
|
||||
log_msg( 'ERROR', $_[0] );
|
||||
}
|
||||
|
||||
log_info( 'starting' );
|
||||
log_info( 'loaded configuration from ' . '@MARS_NWE_INSTALL_FULL_CONFDIR@/smart.conf' );
|
||||
|
||||
$l = <STDIN>;
|
||||
if( ! defined( $l ) )
|
||||
{
|
||||
log_error( 'no request line received on stdin' );
|
||||
exit( 1 );
|
||||
}
|
||||
$l =~ s/[\n\r]//g;
|
||||
log_info( 'request: ' . $l );
|
||||
|
||||
@c = split( ' ', $l );
|
||||
if( scalar( @c ) > 2 )
|
||||
{
|
||||
while( keys( %h ) < 15 ) # Who would ever want to send more headers???
|
||||
{
|
||||
$l = <STDIN>;
|
||||
$l =~ s/[\n\r]//g;
|
||||
if( $l eq '' )
|
||||
{ last; }
|
||||
$n = $l;
|
||||
$n =~ s/:[^:]*$//g;
|
||||
$v = $l;
|
||||
$v =~ s/^[^:]*://g;
|
||||
$h{$n} = $v;
|
||||
}
|
||||
while( keys( %h ) < 15 ) # Who would ever want to send more headers???
|
||||
{
|
||||
$l = <STDIN>;
|
||||
$l =~ s/[\n\r]//g;
|
||||
if( $l eq '' )
|
||||
{ last; }
|
||||
$n = $l;
|
||||
$n =~ s/:[^:]*$//g;
|
||||
$v = $l;
|
||||
$v =~ s/^[^:]*://g;
|
||||
$h{$n} = $v;
|
||||
}
|
||||
}
|
||||
|
||||
$c[0] = uc( $c[0] );
|
||||
|
||||
if( $h{Authorization} eq '' )
|
||||
{ error( 401 ); }
|
||||
{ error( 401 ); }
|
||||
else
|
||||
{
|
||||
@s = split( ' ', $h{Authorization} );
|
||||
if( $s[0] ne 'Basic' or length( $h{Authorization} ) > 80 ) # We can't be too careful, can we...
|
||||
{ error( 401 ); }
|
||||
@s = split( ' ', $h{Authorization} );
|
||||
if( $s[0] ne 'Basic' or length( $h{Authorization} ) > 80 ) # We can't be too careful, can we...
|
||||
{ error( 401 ); }
|
||||
else
|
||||
{
|
||||
$s[1] =~ tr#A-Za-z0-9+/##cd;
|
||||
$s[1] =~ tr#A-Za-z0-9+/# -_#;
|
||||
$s[1] = pack( 'c', 32 + 0.75 * length( $s[1] ) ) . $s[1];
|
||||
$s[1] = unpack( 'u', $s[1] );
|
||||
$s[1] =~ s/[\r\n]//g;
|
||||
@l = split( ':', $s[1] );
|
||||
if( $l[0] ne 'root' )
|
||||
{
|
||||
log_error( 'authentication failed for non-root user ' . $l[0] );
|
||||
error( 401 );
|
||||
}
|
||||
else
|
||||
{
|
||||
$s[1] =~ tr#A-Za-z0-9+/##cd;
|
||||
$s[1] =~ tr#A-Za-z0-9+/# -_#;
|
||||
$s[1] = pack( 'c', 32 + 0.75 * length( $s[1] ) ) . $s[1];
|
||||
$s[1] = unpack( 'u', $s[1] );
|
||||
$s[1] =~ s/[\r\n]//g;
|
||||
@l = split( ':', $s[1] );
|
||||
if( $l[0] ne 'root' )
|
||||
{ error( 401 ); }
|
||||
else
|
||||
{ if( $x = system( $smart_check_login, @l ) )
|
||||
{ error( 401 ); } }
|
||||
}
|
||||
{
|
||||
if( $x = system( $smart_check_login, @l ) )
|
||||
{
|
||||
log_error( 'authentication failed for user root' );
|
||||
error( 401 );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if( $c[0] ne 'GET' )
|
||||
{
|
||||
error( 501 );
|
||||
error( 501 );
|
||||
}
|
||||
|
||||
@p = split( '\?', $c[1] );
|
||||
@@ -94,33 +142,36 @@ $c = substr( shift( @p ), 1 );
|
||||
@p = split( '&', $p[0] );
|
||||
foreach $p ( @p )
|
||||
{
|
||||
$n = $p;
|
||||
$n =~ s/=.*//;
|
||||
$v = $p;
|
||||
$v =~ s/.*=//;
|
||||
$v =~ s/\+/ /g;
|
||||
$v =~ s/%([0-9A-F][0-9A-F])/pack('c',hex($1))/gie;
|
||||
$p{$n} = $v;
|
||||
$n = $p;
|
||||
$n =~ s/=.*//;
|
||||
$v = $p;
|
||||
$v =~ s/.*=//;
|
||||
$v =~ s/\+/ /g;
|
||||
$v =~ s/%([0-9A-F][0-9A-F])/pack('c',hex($1))/gie;
|
||||
$p{$n} = $v;
|
||||
}
|
||||
@c = split( '/', $c );
|
||||
|
||||
if( $c[0] eq 'apply' )
|
||||
{
|
||||
do( $smart_libexec_dir . '/readconfig.pl' );
|
||||
do( $smart_libexec_dir . '/apply.pl' );
|
||||
handle_request();
|
||||
exit;
|
||||
do( $smart_libexec_dir . '/readconfig.pl' )
|
||||
or do { log_error( 'could not load readconfig.pl: ' . $@ . ' ' . $! ); error( 500 ); };
|
||||
do( $smart_libexec_dir . '/apply.pl' )
|
||||
or do { log_error( 'could not load apply.pl: ' . $@ . ' ' . $! ); error( 500 ); };
|
||||
handle_request();
|
||||
exit;
|
||||
}
|
||||
elsif( $c[0] eq 'settings' )
|
||||
{
|
||||
do( $smart_libexec_dir . '/readconfig.pl' );
|
||||
do( $smart_libexec_dir . '/readconfig.pl' )
|
||||
or do { log_error( 'could not load readconfig.pl: ' . $@ . ' ' . $! ); error( 500 ); };
|
||||
}
|
||||
|
||||
drop_root();
|
||||
|
||||
if( $c[0] eq '' )
|
||||
{
|
||||
print <<EOF;
|
||||
print <<EOF;
|
||||
HTTP/1.0 200 OK
|
||||
Content-Type: text/html
|
||||
$server_id
|
||||
@@ -130,24 +181,27 @@ $server_id
|
||||
<TITLE>SMArT</TITLE>
|
||||
</HEAD>
|
||||
<FRAMESET COLS="50%,50%">
|
||||
<FRAME NAME="MENU" SRC="/static/menu.html">
|
||||
<FRAME NAME="OPTS" SRC="/static/start.html">
|
||||
<FRAME NAME="MENU" SRC="/static/menu.html">
|
||||
<FRAME NAME="OPTS" SRC="/static/start.html">
|
||||
</FRAMESET>
|
||||
</HTML>
|
||||
EOF
|
||||
exit;
|
||||
exit;
|
||||
}
|
||||
elsif( $c[0] eq 'static' )
|
||||
{
|
||||
do( $smart_libexec_dir . '/static.pl' );
|
||||
do( $smart_libexec_dir . '/static.pl' )
|
||||
or do { log_error( 'could not load static.pl: ' . $@ . ' ' . $! ); error( 500 ); };
|
||||
}
|
||||
elsif( $c[0] eq 'settings' )
|
||||
{
|
||||
do( $smart_libexec_dir . '/settings.pl' );
|
||||
do( $smart_libexec_dir . '/settings.pl' )
|
||||
or do { log_error( 'could not load settings.pl: ' . $@ . ' ' . $! ); error( 500 ); };
|
||||
}
|
||||
else
|
||||
{
|
||||
error( 500 );
|
||||
log_error( 'unknown path ' . $c[0] );
|
||||
error( 500 );
|
||||
}
|
||||
|
||||
handle_request();
|
||||
@@ -159,9 +213,9 @@ exit;
|
||||
|
||||
sub error( $ )
|
||||
{
|
||||
if( $_[0] eq '401' )
|
||||
{
|
||||
print <<EOF;
|
||||
if( $_[0] eq '401' )
|
||||
{
|
||||
print <<EOF;
|
||||
HTTP/1.0 401 Access denied
|
||||
Content-Type: text/plain
|
||||
WWW-Authenticate: Basic realm="SMArT"
|
||||
@@ -169,68 +223,71 @@ $server_id
|
||||
|
||||
You're not allowed to access this URL.
|
||||
EOF
|
||||
}
|
||||
elsif( $_[0] eq '404' )
|
||||
{
|
||||
print <<EOF;
|
||||
}
|
||||
elsif( $_[0] eq '404' )
|
||||
{
|
||||
log_error( 'HTTP error 404 for request ' . $cc );
|
||||
print <<EOF;
|
||||
HTTP/1.0 404 File not found
|
||||
Content-Type: text/plain
|
||||
$server_id
|
||||
|
||||
The file you requested does not exist.
|
||||
EOF
|
||||
}
|
||||
elsif( $_[0] eq '501' )
|
||||
{
|
||||
print <<EOF;
|
||||
}
|
||||
elsif( $_[0] eq '501' )
|
||||
{
|
||||
log_error( 'HTTP error 501 for request ' . $cc );
|
||||
print <<EOF;
|
||||
HTTP/1.0 501 Unknown command
|
||||
Content-Type: text/plain
|
||||
$server_id
|
||||
|
||||
Unknown command: $c[0]
|
||||
EOF
|
||||
}
|
||||
else
|
||||
{
|
||||
print <<EOF;
|
||||
}
|
||||
else
|
||||
{
|
||||
log_error( 'HTTP error 500 for request ' . $cc );
|
||||
print <<EOF;
|
||||
HTTP/1.0 500 Internal server error
|
||||
Content-Type: text/plain
|
||||
$server_id
|
||||
|
||||
Something went wrong...
|
||||
EOF
|
||||
}
|
||||
exit;
|
||||
}
|
||||
exit;
|
||||
}
|
||||
|
||||
sub unix_userlist()
|
||||
{
|
||||
my( @c, @d, %e );
|
||||
|
||||
while( @d = getpwent )
|
||||
{
|
||||
unshift( @c, { name => $d[0], uid => $d[2] } );
|
||||
}
|
||||
return( sort( { $a->{"name"} cmp $b->{"name"} } @c ) );
|
||||
my( @c, @d, %e );
|
||||
|
||||
while( @d = getpwent )
|
||||
{
|
||||
unshift( @c, { name => $d[0], uid => $d[2] } );
|
||||
}
|
||||
return( sort( { $a->{"name"} cmp $b->{"name"} } @c ) );
|
||||
}
|
||||
|
||||
sub unix_grouplist()
|
||||
{
|
||||
my( @c, @d, %e );
|
||||
|
||||
while( @d = getgrent )
|
||||
{
|
||||
unshift( @c, { name => $d[0], gid => $d[2] } );
|
||||
}
|
||||
return( sort( { $a->{"name"} cmp $b->{"name"} } @c ) );
|
||||
my( @c, @d, %e );
|
||||
|
||||
while( @d = getgrent )
|
||||
{
|
||||
unshift( @c, { name => $d[0], gid => $d[2] } );
|
||||
}
|
||||
return( sort( { $a->{"name"} cmp $b->{"name"} } @c ) );
|
||||
}
|
||||
|
||||
sub redirect( $ )
|
||||
{
|
||||
if( $redirected != 0 )
|
||||
{ return( 0 ); }
|
||||
$redirected = 1;
|
||||
print <<EOF;
|
||||
if( $redirected != 0 )
|
||||
{ return( 0 ); }
|
||||
$redirected = 1;
|
||||
print <<EOF;
|
||||
HTTP/1.0 302 Page relocated
|
||||
Content-Type: text/plain
|
||||
Location: $_[0]
|
||||
@@ -241,72 +298,72 @@ EOF
|
||||
|
||||
sub get_server
|
||||
{
|
||||
open( SFILE, '<' . $smart_nwclient_path );
|
||||
chomp( $line = <SFILE> );
|
||||
close( SFILE );
|
||||
|
||||
$line =~ s/\/.*//;
|
||||
return( $line );
|
||||
open( SFILE, '<' . $smart_nwclient_path );
|
||||
chomp( $line = <SFILE> );
|
||||
close( SFILE );
|
||||
|
||||
$line =~ s/\/.*//;
|
||||
return( $line );
|
||||
}
|
||||
|
||||
sub get_bindery_password
|
||||
{
|
||||
open( SFILE, '<' . $smart_nwclient_path );
|
||||
chomp( $line = <SFILE> );
|
||||
close( SFILE );
|
||||
|
||||
$line =~ s/.* //;
|
||||
return( $line );
|
||||
open( SFILE, '<' . $smart_nwclient_path );
|
||||
chomp( $line = <SFILE> );
|
||||
close( SFILE );
|
||||
|
||||
$line =~ s/.* //;
|
||||
return( $line );
|
||||
}
|
||||
|
||||
sub read_property_string
|
||||
{
|
||||
my @x = split( "\n", `nwbpvalues -c -o $_[0] -t $_[1] -p $_[2] -S $server` );
|
||||
my( $i, $s );
|
||||
|
||||
$i = 5;
|
||||
while( hex( $x[$i] ) > 0 )
|
||||
{
|
||||
$s .= pack( 'c', hex( $x[$i] ) );
|
||||
$i ++;
|
||||
}
|
||||
|
||||
return( $s );
|
||||
my @x = split( "\n", `nwbpvalues -c -o $_[0] -t $_[1] -p $_[2] -S $server` );
|
||||
my( $i, $s );
|
||||
|
||||
$i = 5;
|
||||
while( hex( $x[$i] ) > 0 )
|
||||
{
|
||||
$s .= pack( 'c', hex( $x[$i] ) );
|
||||
$i ++;
|
||||
}
|
||||
|
||||
return( $s );
|
||||
}
|
||||
|
||||
sub read_property_list
|
||||
{
|
||||
my @x = split( "\n", `nwbpvalues -c -o $_[0] -t $_[1] -p $_[2] -S $server` );
|
||||
my( $i, @l );
|
||||
|
||||
$i = 6;
|
||||
while( $x[$i] ne '' )
|
||||
{
|
||||
unshift( @l, $x[$i] );
|
||||
$i += 2;
|
||||
}
|
||||
|
||||
return( @l );
|
||||
my @x = split( "\n", `nwbpvalues -c -o $_[0] -t $_[1] -p $_[2] -S $server` );
|
||||
my( $i, @l );
|
||||
|
||||
$i = 6;
|
||||
while( $x[$i] ne '' )
|
||||
{
|
||||
unshift( @l, $x[$i] );
|
||||
$i += 2;
|
||||
}
|
||||
|
||||
return( @l );
|
||||
}
|
||||
|
||||
sub write_property_string
|
||||
{
|
||||
open( FILE, '|' . 'nwbpset -S ' . $server );
|
||||
print FILE <<EOF;
|
||||
open( FILE, '|' . 'nwbpset -S ' . $server );
|
||||
print FILE <<EOF;
|
||||
000$_[1]
|
||||
$_[0]
|
||||
$_[2]
|
||||
$_[3]
|
||||
$_[4]
|
||||
EOF
|
||||
for $i ( 0 .. length( $_[5] ) - 1 )
|
||||
{
|
||||
print( FILE unpack( 'H2', substr( $_[5], $i, 1 ) ) . "\n" );
|
||||
}
|
||||
close( FILE );
|
||||
for $i ( 0 .. length( $_[5] ) - 1 )
|
||||
{
|
||||
print( FILE unpack( 'H2', substr( $_[5], $i, 1 ) ) . "\n" );
|
||||
}
|
||||
close( FILE );
|
||||
}
|
||||
|
||||
sub drop_root
|
||||
{
|
||||
$< = $> = getpwnam( $nonroot_user );
|
||||
$< = $> = getpwnam( $nonroot_user );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user