X-Git-Url: http://git.treefish.org/fex.git/blobdiff_plain/7fa382617fbaccc0ce522b2b3adbbee9db5ad227..e5c93609849bda051fff54b5d5265af5608c6c69:/lib/dop?ds=sidebyside
diff --git a/lib/dop b/lib/dop
index df9511b..20df28e 100755
--- a/lib/dop
+++ b/lib/dop
@@ -16,7 +16,7 @@ use Cwd qw(getcwd abs_path);
# import from fex.pp
our ($bs,$tmpdir,@doc_dirs);
-my $log = "$logdir/dop.log";
+my $log = 'dop.log';
# POSIX time format needed for HTTP header
setlocale(LC_TIME,'POSIX');
@@ -27,31 +27,29 @@ sub dop {
my $seek = 0;
my $stop = 0;
my ($link,$host,$path,$range);
-
+
our $error = 'F*EX document output ERROR';
-
+
security_check($doc);
-
+
# reget?
if ($range = $ENV{HTTP_RANGE}) {
$seek = $1 if $range =~ /^bytes=(\d+)-/i;
$stop = $1 if $range =~ /^bytes=\d*-(\d+)/i;
}
- # redirect on relative symlinks without "../"
- if ($link = readlink($doc) and
+ # redirect on relative symlinks without "../"
+ if ($link = readlink($doc) and
$link !~ m:^/: and $link !~ m:\.\./: and $link !~ /^:.+:$/) {
$path = $ENV{REQUEST_URI};
$path =~ s:[^/]*$::;
$doc = "$path/$link";
$doc =~ s:/+:/:g;
$doc =~ s:^/::;
- $host = $ENV{HTTP_HOST} || $hostname;
nvt_print(
- "HTTP/1.1 301 Moved Permanently",
- "Location: $ENV{PROTO}://$host/$doc",
+ "HTTP/1.1 302 Found",
+ "Location: /$doc",
"Content-Length: 0",
- "Connection: close",
""
);
&reexec;
@@ -99,7 +97,7 @@ sub http_output {
} elsif ($file =~ /(.+)\.tgz$/ and -f "$1.tar") {
@files = ("$1.tar");
open $file,'-|',qw'gzip -c',@files or http_error(503);
- } elsif ($file =~ /(.+)\.(tar|tgz|zip)$/ and
+ } elsif ($file =~ /(.+)\.(tar|tgz|zip)$/ and
@s = lstat($streamfile = "$1.stream") and $s[4] == $<)
{
# streaming file (only if it is owned by user fex)
@@ -124,18 +122,18 @@ sub http_output {
}
close $streamfile;
foreach (@files) {
- if (/^\// or /\.\.\//) {
+ if (/^\// or /\.\.\//) {
# absolute path or relative path with parent directory is not allowed
http_error(403);
}
- if (@s = stat($_) and not($s[2] & S_IRGRP) or not -r $_) {
+ if (@s = stat($_) and not($s[2] & S_IRGRP) or not -r $_) {
# file must be readable by user and group
http_error(403);
}
}
http_error(416) if $ENV{HTTP_RANGE};
close STDERR;
- if ($file =~ /\.tar$/) { @a = qw'tar --exclude *~ --exclude .* -cf -' }
+ if ($file =~ /\.tar$/) { @a = qw'tar --exclude *~ --exclude .* -cf -' }
elsif ($file =~ /\.tgz$/) { @a = qw'tar --exclude *~ --exclude .* -czf -' }
elsif ($file =~ /\.zip$/) { @a = qw'zip -x *~ */.*/* @ -rq -' }
else { http_error(400) }
@@ -143,9 +141,9 @@ sub http_output {
} else {
http_error(404);
}
-
+
$type = 'application/octet-stream';
- if ($file =~ /\.html$/) { $type = 'text/html' }
+ if ($file =~ /\.html$/) { $type = 'text/html' }
# elsif ($file =~ /\.txt$/) { $type = 'text/plain' }
elsif ($file =~ /\.css$/) { $type = 'text/css' }
elsif ($file =~ /\.js$/) { $type = 'text/javascript' }
@@ -181,8 +179,8 @@ sub http_output {
} elsif ($ENV{'QUERY_STRING'} eq '!') {
$type = 'text/plain';
}
-
-
+
+
if ($type eq 'text/html') {
$seek = $stop = 0;
local $^W = 0;
@@ -253,9 +251,9 @@ sub http_output {
http_header('416 Requested Range Not Satisfiable');
exit;
}
-
+
alarm($timeout*10);
-
+
if ($seek or $stop) {
my $range;
if ($stop) {
@@ -307,6 +305,7 @@ sub http_output {
if ($type eq 'text/html') {
alarm($timeout*10);
print $htmldoc;
+ $s = $size;
} else {
# binary data # can be stream!
seek $file,$seek,0 if $seek;
@@ -315,14 +314,14 @@ sub http_output {
$b = $size-$s;
$data = substr($data,0,$b)
}
- $s += $b;
+ $s += $b;
alarm($timeout*10);
print $data or last;
}
}
fdlog($log,$file,$s,$size) if $s;
}
-
+
alarm(0);
close $file;
exit if @files; # streaming end
@@ -341,22 +340,22 @@ sub showindex {
my $allowed;
my ($htindex,$htauth);
local $_;
-
+
$uri =~ s:/+$::;
$dir =~ s:/+$::;
security_check($dir);
-
+
$htindex = "$dir/.htindex";
$htauth = "$dir/.htauth";
-
+
open $htindex,$htindex or http_error(403);
require_auth($htauth,$dir) if -f $htauth;
-
+
# .htindex may contain listing regexp
chomp ($allowed = <$htindex>||'.');
close $htindex;
-
+
opendir $dir,$dir or http_error(503);
while (defined($_ = readdir $dir)) {
next if /^[.#]/ or /~$/;
@@ -382,7 +381,7 @@ sub showindex {
$htmldoc .= "\n";
}
}
-
+
# # then the symlinks
# $htmldoc .= "\n\n";
# my $link;
@@ -391,7 +390,7 @@ sub showindex {
# $htmldoc .= "$l -> $dir/$link\n";
# }
# }
-
+
# then the files
$htmldoc .= "\n\n";
foreach my $f (sort @files) {
@@ -403,7 +402,7 @@ sub showindex {
}
}
$htmldoc .= "\n