summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xadmin.pl67
-rwxr-xr-xlogin.pl69
2 files changed, 40 insertions, 96 deletions
diff --git a/admin.pl b/admin.pl
index 009fa65c..7d3ad3c4 100755
--- a/admin.pl
+++ b/admin.pl
@@ -26,7 +26,6 @@
# Web: http://sourceforge.net/projects/ledger-smb/
#
# Contributors:
-# Portions Copyright (C) Dieter Simader 2001
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -63,17 +62,16 @@ $| = 1;
eval { require "ledger-smb.conf"; };
-
if ($ENV{CONTENT_LENGTH}) {
- read(STDIN, $_, $ENV{CONTENT_LENGTH});
+ read(STDIN, $_, $ENV{CONTENT_LENGTH});
}
if ($ENV{QUERY_STRING}) {
- $_ = $ENV{QUERY_STRING};
+ $_ = $ENV{QUERY_STRING};
}
if ($ARGV[0]) {
- $_ = $ARGV[0];
+ $_ = $ARGV[0];
}
@@ -89,57 +87,32 @@ $script = substr($0, $pos + 1);
if (-e "$userspath/nologin" && $script ne 'admin.pl') {
- print "Content-Type: text/html\n\n" if $ENV{HTTP_USER_AGENT};
- print "\nLogin disabled!\n";
- exit;
+ print "Content-Type: text/html\n\n<html><body><strong>";
+ print "\nLogin disabled!\n";
+ print "\n</strong></body></html>";
+ exit;
}
if ($form{path}) {
- $form{path} =~ s/%2f/\//gi;
- $form{path} =~ s/\.\.\///g;
- if ($form{path} !~ /^bin\//) {
- print "Content-Type: text/html\n\n" if $ENV{HTTP_USER_AGENT};
- print "\nInvalid path!\n";
- exit;
- }
+ if ($form{path} ne 'bin/lynx'){ $form{path} = 'bin/mozilla';}
+ $ARGV[0] = "$_&script=$script";
+ require "$form{path}/$script";
- $ARGV[0] = "$_&script=$script";
- require "$form{path}/$script";
} else {
- if (!$form{terminal}) {
- if ($ENV{HTTP_USER_AGENT}) {
- # web browser
- $form{terminal} = "lynx";
- if ($ENV{HTTP_USER_AGENT} !~ /lynx/i) {
- $form{terminal} = "mozilla";
- }
- } else {
- if ($ENV{TERM} =~ /xterm/) {
- $form{terminal} = "xterm";
- }
- if ($ENV{TERM} =~ /(console|linux|vt.*)/i) {
- $form{terminal} = "console";
- }
- }
- }
-
-
- if ($form{terminal}) {
-
- $ARGV[0] = "path=bin/$form{terminal}&script=$script";
- map { $ARGV[0] .= "&${_}=$form{$_}" } keys %form;
-
- require "bin/$form{terminal}/$script";
-
- } else {
-
- print "Content-Type: text/html\n\n" if $ENV{HTTP_USER_AGENT};
- print qq|\nUnknown terminal\n|;
- }
+ $form{terminal} = "lynx";
+
+ if ($ENV{HTTP_USER_AGENT} !~ /lynx/i) {
+ $form{terminal} = "mozilla";
+ }
+
+ $ARGV[0] = "path=bin/$form{terminal}&script=$script";
+ map { $ARGV[0] .= "&${_}=$form{$_}" } keys %form;
+
+ require "bin/$form{terminal}/$script";
}
diff --git a/login.pl b/login.pl
index c1d16c91..7d3ad3c4 100755
--- a/login.pl
+++ b/login.pl
@@ -62,17 +62,16 @@ $| = 1;
eval { require "ledger-smb.conf"; };
-
if ($ENV{CONTENT_LENGTH}) {
- read(STDIN, $_, $ENV{CONTENT_LENGTH});
+ read(STDIN, $_, $ENV{CONTENT_LENGTH});
}
if ($ENV{QUERY_STRING}) {
- $_ = $ENV{QUERY_STRING};
+ $_ = $ENV{QUERY_STRING};
}
if ($ARGV[0]) {
- $_ = $ARGV[0];
+ $_ = $ARGV[0];
}
@@ -88,60 +87,32 @@ $script = substr($0, $pos + 1);
if (-e "$userspath/nologin" && $script ne 'admin.pl') {
- print "Content-Type: text/html\n\n<html><body><strong>" if $ENV{HTTP_USER_AGENT};
- print "\nLogin disabled!\n";
- print "\n</strong></body></html>" if $ENV{HTTP_USER_AGENT};
- exit;
+ print "Content-Type: text/html\n\n<html><body><strong>";
+ print "\nLogin disabled!\n";
+ print "\n</strong></body></html>";
+ exit;
}
if ($form{path}) {
- $form{path} =~ s/%2f/\//gi;
- $form{path} =~ s/\.\.\///g;
- if ($form{path} !~ /^bin\//) {
- print "Content-Type: text/html\n\n<html><body><strong>" if $ENV{HTTP_USER_AGENT};
- print "\nInvalid path!\n";
- print "\n</strong></body></html>" if $ENV{HTTP_USER_AGENT};
- exit;
- }
+ if ($form{path} ne 'bin/lynx'){ $form{path} = 'bin/mozilla';}
+ $ARGV[0] = "$_&script=$script";
+ require "$form{path}/$script";
- $ARGV[0] = "$_&script=$script";
- require "$form{path}/$script";
} else {
- if (!$form{terminal}) {
- if ($ENV{HTTP_USER_AGENT}) {
- # web browser
- $form{terminal} = "lynx";
- if ($ENV{HTTP_USER_AGENT} !~ /lynx/i) {
- $form{terminal} = "mozilla";
- }
- } else {
- if ($ENV{TERM} =~ /xterm/) {
- $form{terminal} = "xterm";
- }
- if ($ENV{TERM} =~ /(console|linux|vt.*)/i) {
- $form{terminal} = "console";
- }
- }
- }
-
-
- if ($form{terminal}) {
-
- $ARGV[0] = "path=bin/$form{terminal}&script=$script";
- map { $ARGV[0] .= "&${_}=$form{$_}" } keys %form;
-
- require "bin/$form{terminal}/$script";
-
- } else {
-
- print "Content-Type: text/html\n\n<html><body><strong>" if $ENV{HTTP_USER_AGENT};
- print qq|\nUnknown terminal\n|;
- print "\n</strong></body></html>" if $ENV{HTTP_USER_AGENT};
- }
+ $form{terminal} = "lynx";
+
+ if ($ENV{HTTP_USER_AGENT} !~ /lynx/i) {
+ $form{terminal} = "mozilla";
+ }
+
+ $ARGV[0] = "path=bin/$form{terminal}&script=$script";
+ map { $ARGV[0] .= "&${_}=$form{$_}" } keys %form;
+
+ require "bin/$form{terminal}/$script";
}