X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fdocs.cgi;h=402c9e505ba29cb49bd023f9ed76ce1ed741b7ca;hb=044ce3d999326b8748cd8f2821ed593298bb07ba;hp=6760915f660057df6c621761aa92c3e39f764961;hpb=a9505cb6bcd4d76d48f6a126f8eea18be87ec2ad;p=www.i-scream.org.git diff --git a/cgi-bin/docs.cgi b/cgi-bin/docs.cgi index 6760915..402c9e5 100755 --- a/cgi-bin/docs.cgi +++ b/cgi-bin/docs.cgi @@ -1,75 +1,83 @@ #!/usr/bin/perl -w -#------------------------------------------------------------ -# docs.cgi -# -# Web-based text file viewer. -# Copyright Paul Mutton, 2000. -#------------------------------------------------------------ - use strict; use CGI; $| = 1; # Settings -my ($left) = "../left.inc" ; -my ($title) = "../title.inc"; -my ($bottom) = "../bottom.inc"; - +my ($menu) = "../nwww/menu.inc" ; +my ($header) = "../nwww/header.inc"; +my ($footer) = "../nwww/footer.inc"; +my ($style) = "../nwww/style.inc"; my ($query) = new CGI; -my ($doc) = ($query->param('doc') =~ /^\s*(.*?\.txt)\s*$/); -$doc = "../documentation/".$doc; + +# Note filenames may only have one dot in them, in the ".txt". +# This prevents malicious users using "../" to view files. +my ($doc) = ($query->param('doc') =~ /^\s*([^\.]*?\.txt)\s*$/); print "Content-type: text/html\n\n"; -print <<"END"; - +unless (defined $doc) { + print "The link to this page was broken - it must specify a .txt file."; + exit; +} - +# Prevent hackers from supplying a malformed document string. +# I.e. only allow normal characters, slashes and dots. +unless ($doc =~ /^[a-zA-Z_\-0-9\.\/]+$/) { + print "Malformed request."; + exit; +} +$doc = "../htdocs/documentation/".$doc; + +my($docname) = $doc =~ /\/([^\/]+)$/; + +print <<"END"; +
-
+
END
-&print_html($left);
+&print_html($header);
print <<"END";
+
+ i-scream documentation viewer- |
-
+$docnameEND -&print_html($title); &print_file($doc); -&print_html($bottom); +print ""; -print <<"END"; +&print_html($footer); - |
-
\n"; # Use $_ implicitly throughout. while ("; } +else { + print "Failed to open $docname."; +} +} # Print a file without escaping HTML: - sub print_html ($) { - my ($filename) = @_; - print `cat $filename`; +my ($filename) = @_; +print `cat $filename 2>&1`; }) { @@ -87,13 +109,18 @@ sub print_file ($) { s/</g; s/>/>/g; s/"/"/g; + s/\b($urls:[$any]+?)(?=[$punc]*[^$any]|$)/$1<\/a>/igox; print; } print "