abort messages with http error code

[sheet.git] / source.plp

diff --git a/source.plp b/source.plp
index e3b2609b92f12362b4adce28497ef22d77008c42..269e342a2c331a31aa2cd3f6f82a13cae54b34a9 100644 (file)
--- a/source.plp
+++ b/source.plp
@@ -1,6 +1,7 @@
 <(common.inc.plp)><:
 
 my $source = $Request;
+my $incname = qr{ [a-z][/a-z0-9_.-]* \.(?:plp?|css|js|txt) }x;
 
 if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
        # convert perl include to json construct
@@ -27,7 +28,7 @@ if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
 
 Html({
        title => "$source source code",
-       version => '1.1',
+       version => '1.2',
        description => !$source ? 'Index of source files for this site.' : [
                "Source code of the $source file at this site,",
                "with syntax highlighted and references linked."
@@ -36,6 +37,7 @@ Html({
                sheet cheat source code perl plp html agpl
        '],
        stylesheet => [qw'light dark mono red'],
+       data => [$source =~ m{\A($incname)\z}],
 });
 
 say '';
@@ -52,10 +54,11 @@ if (not $source) {
        say "</ul>\n";
 }
 else {
-       say "<h1>Source of $source</h1>";
+       my $href = showlink($source, $source =~ m{\A (\w+) \.plp \z}x && "/$1");
+       say "<h1>Source of $href</h1>";
 
        if ($source =~ m{(?:/|^)\.}) {
-               die "File request not permitted\n";
+               Abort("File request not permitted", '403 source not allowed');
        }
        elsif ($source =~ s{::}{/}g or !-e $source) {
                $source .= '.pm';
@@ -65,7 +68,7 @@ else {
                        last;
                }
        }
-       -r $source or die "Requested file not found\n";
+       -r $source or Abort("Requested file not found", '404 source not found');
        my $size = (stat $source)->[7];
 
        if (my $hl = eval {
@@ -93,7 +96,7 @@ else {
                        my $arg = '';
                        print "<$tag$arg class=\"sy-\l$type\">" if $tag;
                        if (!$type || $type eq 'Constant'
-                       and $contents =~ s{^(['"]?)(/?[a-z0-9_.]+\.(?:plp?|css|js))(?=\1$)}{}) {
+                       and $contents =~ s{^(['"]?)($incname)(?=\1$)}{}) {
                                # link other page sources, stylesheets, and javascript
                                print $1 . showlink($2, "/source/$2");
                        }