Call srcfile() with nothrow, as clearly intended.

[git.ikiwiki.info.git] / IkiWiki / Plugin / getsource.pm

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index 4e74eaea0f0078bd7c56a13467a62b36299f0721..0a21413bdb9f9cdd591c93cf1785a3e4993d556e 100644 (file)
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -9,7 +9,7 @@ use open qw{:utf8 :std};
 sub import {
        hook(type => "getsetup", id => "getsource", call => \&getsetup);
        hook(type => "pagetemplate", id => "getsource", call => \&pagetemplate);
 sub import {
        hook(type => "getsetup", id => "getsource", call => \&getsetup);
        hook(type => "pagetemplate", id => "getsource", call => \&pagetemplate);

-       hook(type => "sessioncgi", id => "getsource", call => \&cgi_getsource);
+       hook(type => "cgi", id => "getsource", call => \&cgi_getsource);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -17,10 +17,11 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 1,
                plugin => {
                        safe => 1,
                        rebuild => 1,

+                       section => "web",

                },
                getsource_mimetype => {
                        type => "string",
                },
                getsource_mimetype => {
                        type => "string",

-                       example => "application/octet-stream",
+                       example => "text/plain; charset=utf-8",

                        description => "Mime type for returned source.",
                        safe => 1,
                        rebuild => 0,
                        description => "Mime type for returned source.",
                        safe => 1,
                        rebuild => 0,


@@ -39,39 +40,53 @@ sub pagetemplate (@) {
        }
 }
 
        }
 }
 

-sub cgi_getsource ($$) {
+sub cgi_getsource ($) {

        my $cgi=shift;
        my $cgi=shift;

-       my $session=shift;

 
 

-       # Note: we use sessioncgi rather than just cgi
-       # because we need $IkiWiki::pagesources{} to be
-       # populated.
-
-       return unless (defined $cgi->param('do') &&
-                                       $cgi->param("do") eq "getsource");
+       return unless defined $cgi->param('do') &&
+                     $cgi->param("do") eq "getsource";

 
        IkiWiki::decode_cgi_utf8($cgi);
 
        my $page=$cgi->param('page');
 
 
        IkiWiki::decode_cgi_utf8($cgi);
 
        my $page=$cgi->param('page');
 

-       if ($IkiWiki::pagesources{$page}) {
-               
-               my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
-               
-               if (! $config{getsource_mimetype}) {
-                       $config{getsource_mimetype} = "text/plain";
-               }
-               
-               print "Content-Type: $config{getsource_mimetype}\r\n";
-               
-               print ("\r\n");
-               
-               print $data;
-               
-               exit 0;
+       if (! defined $page || $page !~ /$config{wiki_file_regexp}/) {
+               error("invalid page parameter");

        }
        }

-       
-       error("Unable to find page source for page: $page");
+
+       # For %pagesources.
+       IkiWiki::loadindex();
+
+       if (! exists $pagesources{$page}) {
+               IkiWiki::cgi_custom_failure(
+                       $cgi,
+                       "404 Not Found",
+                       IkiWiki::cgitemplate($cgi, gettext("missing page"),
+                               "<p>".
+                               sprintf(gettext("The page %s does not exist."),
+                                       htmllink("", "", $page)).
+                               "</p>"));
+               exit;
+       }
+
+       if (! defined pagetype($pagesources{$page})) {
+               IkiWiki::cgi_custom_failure(
+                       $cgi->header(-status => "403 Forbidden"),
+                       IkiWiki::cgitemplate($cgi, gettext("not a page"),
+                               "<p>".
+                               sprintf(gettext("%s is an attachment, not a page."),
+                                       htmllink("", "", $page)).
+                               "</p>"));
+               exit;
+       }
+
+       if (! $config{getsource_mimetype}) {
+               $config{getsource_mimetype} = "text/plain; charset=utf-8";
+       }
+
+       print "Content-Type: $config{getsource_mimetype}\r\n";
+       print ("\r\n");
+       print readfile(srcfile($pagesources{$page}));

 
        exit 0;
 }
 
        exit 0;
 }