--- web/cgi-bin/docs.cgi 2000/11/09 22:03:56 1.3 +++ web/cgi-bin/docs.cgi 2004/03/25 22:51:20 1.13 @@ -1,114 +1,144 @@ #!/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 ($incdir) = "../htdocs"; +# Include files +my ($doctype) = "$incdir/doctype.inc"; +my ($style) = "$incdir/style.inc"; +my ($header) = "$incdir/header.inc"; +my ($footer) = "$incdir/footer.inc"; +my ($menu) = "$incdir/menu-static.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*$/); + +# This should be application/xhtml+xml 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/cms/documentation/".$doc; - +my($docname) = $doc =~ /\/([^\/]+)$/; - - The i-scream Project Documentation Viewer - - - - +&print_html($doctype); - +print <<"END"; - - - - - -
+ + + i-scream plain text documentation viewer + END -&print_html($left); +&print_html($style); print <<"END"; - + + +
+
END -&print_html($title); +&print_html($header); + +print <<"END"; + +
+

+ i-scream documentation viewer +

+

+ $docname +

+END + &print_file($doc); -&print_html($bottom); print <<"END"; -
+ +END - +&print_html($footer); +print <<"END"; + + +END + +&print_html($menu); + +print <<"END"; + + + END exit 0; # Print a file, whilst escaping HTML: - -sub print_file ($) { - my ($urls) = '(' . join ('|', qw{ - http - telnet - gopher - file - wais - ftp - } ) - . ')'; - +sub print_file { +my ($urls) = '(' . join ('|', qw{ + http + telnet + gopher + file + wais + ftp + } ) + . ')'; + my ($ltrs) = '\w'; my ($gunk) = '/#~:.?+=&%@!\-'; my ($punc) = '.:?\-'; my ($any) = "${ltrs}${gunk}${punc}"; my ($filename) = @_; - open(FILE, $filename) or die "Cannot open $filename: $!\n"; - print "
\n";
-    # Use $_ implicitly throughout.
-    while () {
-        # Must do the next line first!
-        s/&/&/g;
-        s//>/g;
-        s/"/"/g;
-        s/\b($urls:[$any]+?)(?=[$punc]*[^$any]|$)/$1<\/a>/igox;
-        print;
+    if(open(FILE, $filename)) {
+        print "          
\n";
+        # Use $_ implicitly throughout.
+        while () {
+            # Must do the next line first!
+            s/&/&/g;
+            s//>/g;
+            s/"/"/g;
+            s/\b($urls:[$any]+?)(?=[$punc]*[^$any]|$)/$1<\/a>/igox;
+            print;
+        }
+        print "\n
";
     }
-    print "
"; + else { + print "Failed to open $docname."; + } } -# Print a file without escaping HTML: - +# Print the contents of a file containing html sub print_html ($) { my ($filename) = @_; - print `cat $filename`; + open(FILE, $filename); + while() { + print; + } + close FILE; }