factored out an urlabs from aggregate and cgi

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6da281999f0b4c035805626f11d6e244c105d69f..ef8ccb2da51e4b763418344237280cf563011fba 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -501,6 +501,12 @@ sub defaultconfig () {
        return @ret;
 }
 
        return @ret;
 }
 

+# URL to top of wiki as a path starting with /, valid from any wiki page or
+# the CGI; if that's not possible, an absolute URL. Either way, it ends with /
+my $local_url;
+# URL to CGI script, similar to $local_url
+my $local_cgiurl;
+

 sub checkconfig () {
        # locale stuff; avoid LC_ALL since it overrides everything
        if (defined $ENV{LC_ALL}) {
 sub checkconfig () {
        # locale stuff; avoid LC_ALL since it overrides everything
        if (defined $ENV{LC_ALL}) {


@@ -537,7 +543,33 @@ sub checkconfig () {
        if ($config{cgi} && ! length $config{url}) {
                error(gettext("Must specify url to wiki with --url when using --cgi"));
        }
        if ($config{cgi} && ! length $config{url}) {
                error(gettext("Must specify url to wiki with --url when using --cgi"));
        }

-       
+
+       if (defined $config{url} && length $config{url}) {
+               eval q{use URI};
+               my $baseurl = URI->new($config{url});
+
+               $local_url = $baseurl->path . "/";
+               $local_cgiurl = undef;
+
+               if (length $config{cgiurl}) {
+                       my $cgiurl = URI->new($config{cgiurl});
+
+                       $local_cgiurl = $cgiurl->path;
+
+                       if ($cgiurl->scheme ne $baseurl->scheme or
+                               $cgiurl->authority ne $baseurl->authority) {
+                               # too far apart, fall back to absolute URLs
+                               $local_url = "$config{url}/";
+                               $local_cgiurl = $config{cgiurl};
+                       }
+               }
+
+               $local_url =~ s{//$}{/};
+       }
+       else {
+               $local_cgiurl = $config{cgiurl};
+       }
+

        $config{wikistatedir}="$config{srcdir}/.ikiwiki"
                unless exists $config{wikistatedir} && defined $config{wikistatedir};
 
        $config{wikistatedir}="$config{srcdir}/.ikiwiki"
                unless exists $config{wikistatedir} && defined $config{wikistatedir};
 


@@ -717,7 +749,7 @@ sub pagename ($) {
 
        my $type=pagetype($file);
        my $page=$file;
 
        my $type=pagetype($file);
        my $page=$file;

-       $page=~s/\Q.$type\E*$//
+       $page=~s/\Q.$type\E*$//

                if defined $type && !$hooks{htmlize}{$type}{keepextension}
                        && !$hooks{htmlize}{$type}{noextension};
        if ($config{indexpages} && $page=~/(.*)\/index$/) {
                if defined $type && !$hooks{htmlize}{$type}{keepextension}
                        && !$hooks{htmlize}{$type}{noextension};
        if ($config{indexpages} && $page=~/(.*)\/index$/) {


@@ -1010,11 +1042,17 @@ sub linkpage ($) {
 sub cgiurl (@) {
        my %params=@_;
 
 sub cgiurl (@) {
        my %params=@_;
 

-       my $cgiurl=$config{cgiurl};
+       my $cgiurl=$local_cgiurl;
+

        if (exists $params{cgiurl}) {
                $cgiurl=$params{cgiurl};
                delete $params{cgiurl};
        }
        if (exists $params{cgiurl}) {
                $cgiurl=$params{cgiurl};
                delete $params{cgiurl};
        }

+
+       unless (%params) {
+               return $cgiurl;
+       }
+

        return $cgiurl."?".
                join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 }
        return $cgiurl."?".
                join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 }


@@ -1022,7 +1060,7 @@ sub cgiurl (@) {
 sub baseurl (;$) {
        my $page=shift;
 
 sub baseurl (;$) {
        my $page=shift;
 

-       return "$config{url}/" if ! defined $page;
+       return $local_url if ! defined $page;

        
        $page=htmlpage($page);
        $page=~s/[^\/]+$//;
        
        $page=htmlpage($page);
        $page=~s/[^\/]+$//;


@@ -1030,6 +1068,14 @@ sub baseurl (;$) {
        return $page;
 }
 
        return $page;
 }
 

+sub urlabs ($$) {
+       my $url=shift;
+       my $urlbase=shift;
+
+       eval q{use URI};
+       URI->new_abs($url, $urlbase)->as_string;
+}
+

 sub abs2rel ($$) {
        # Work around very innefficient behavior in File::Spec if abs2rel
        # is passed two relative paths. It's much faster if paths are
 sub abs2rel ($$) {
        # Work around very innefficient behavior in File::Spec if abs2rel
        # is passed two relative paths. It's much faster if paths are


@@ -1096,13 +1142,13 @@ sub beautify_urlpath ($) {
        return $url;
 }
 
        return $url;
 }
 

-sub urlto ($$;$) {
+sub urlto ($;$$) {

        my $to=shift;
        my $from=shift;
        my $absolute=shift;
        
        if (! length $to) {
        my $to=shift;
        my $from=shift;
        my $absolute=shift;
        
        if (! length $to) {

-               return beautify_urlpath(baseurl($from)."index.$config{htmlext}");
+               $to = 'index';

        }
 
        if (! $destsources{$to}) {
        }
 
        if (! $destsources{$to}) {


@@ -1113,6 +1159,12 @@ sub urlto ($$;$) {
                return $config{url}.beautify_urlpath("/".$to);
        }
 
                return $config{url}.beautify_urlpath("/".$to);
        }
 

+       if (! defined $from) {
+               my $u = $local_url;
+               $u =~ s{/$}{};
+               return $u.beautify_urlpath("/".$to);
+       }
+

        my $link = abs2rel($to, dirname(htmlpage($from)));
 
        return beautify_urlpath($link);
        my $link = abs2rel($to, dirname(htmlpage($from)));
 
        return beautify_urlpath($link);


@@ -1124,7 +1176,7 @@ sub isselflink ($$) {
        my $page=shift;
        my $link=shift;
 
        my $page=shift;
        my $link=shift;
 

-        return $page eq $link;
+       return $page eq $link;

 }
 
 sub htmllink ($$$;@) {
 }
 
 sub htmllink ($$$;@) {


@@ -1201,7 +1253,7 @@ sub userpage ($) {
 sub openiduser ($) {
        my $user=shift;
 
 sub openiduser ($) {
        my $user=shift;
 

-       if ($user =~ m!^https?://! &&
+       if (defined $user && $user =~ m!^https?://! &&

            eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
                my $display;
 
            eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
                my $display;
 


@@ -1519,6 +1571,69 @@ sub check_content (@) {
        return defined $ok ? $ok : 1;
 }
 
        return defined $ok ? $ok : 1;
 }
 

+sub check_canchange (@) {
+       my %params = @_;
+       my $cgi = $params{cgi};
+       my $session = $params{session};
+       my @changes = @{$params{changes}};
+
+       my %newfiles;
+       foreach my $change (@changes) {
+               # This untaint is safe because we check file_pruned and
+               # wiki_file_regexp.
+               my ($file)=$change->{file}=~/$config{wiki_file_regexp}/;
+               $file=possibly_foolish_untaint($file);
+               if (! defined $file || ! length $file ||
+                   file_pruned($file)) {
+                       error(gettext("bad file name %s"), $file);
+               }
+
+               my $type=pagetype($file);
+               my $page=pagename($file) if defined $type;
+
+               if ($change->{action} eq 'add') {
+                       $newfiles{$file}=1;
+               }
+
+               if ($change->{action} eq 'change' ||
+                   $change->{action} eq 'add') {
+                       if (defined $page) {
+                               check_canedit($page, $cgi, $session);
+                               next;
+                       }
+                       else {
+                               if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+                                       IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
+                                       check_canedit($file, $cgi, $session);
+                                       next;
+                               }
+                       }
+               }
+               elsif ($change->{action} eq 'remove') {
+                       # check_canremove tests to see if the file is present
+                       # on disk. This will fail when a single commit adds a
+                       # file and then removes it again. Avoid the problem
+                       # by not testing the removal in such pairs of changes.
+                       # (The add is still tested, just to make sure that
+                       # no data is added to the repo that a web edit
+                       # could not add.)
+                       next if $newfiles{$file};
+
+                       if (IkiWiki::Plugin::remove->can("check_canremove")) {
+                               IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
+                               check_canedit(defined $page ? $page : $file, $cgi, $session);
+                               next;
+                       }
+               }
+               else {
+                       error "unknown action ".$change->{action};
+               }
+
+               error sprintf(gettext("you are not allowed to change %s"), $file);
+       }
+}
+
+

 my $wikilock;
 
 sub lockwiki () {
 my $wikilock;
 
 sub lockwiki () {


@@ -1769,12 +1884,14 @@ sub template_depends ($$;@) {
        my $page=shift;
        
        my ($filename, $tpage, $untrusted)=template_file($name);
        my $page=shift;
        
        my ($filename, $tpage, $untrusted)=template_file($name);

+       if (! defined $filename) {
+               error(sprintf(gettext("template %s not found"), $name))
+       }
+

        if (defined $page && defined $tpage) {
                add_depends($page, $tpage);
        }
        if (defined $page && defined $tpage) {
                add_depends($page, $tpage);
        }

-
-       return unless defined $filename;
-
+       

        my @opts=(
                filter => sub {
                        my $text_ref = shift;
        my @opts=(
                filter => sub {
                        my $text_ref = shift;


@@ -1782,6 +1899,7 @@ sub template_depends ($$;@) {
                },
                loop_context_vars => 1,
                die_on_bad_params => 0,
                },
                loop_context_vars => 1,
                die_on_bad_params => 0,

+               parent_global_vars => 1,

                filename => $filename,
                @_,
                ($untrusted ? (no_includes => 1) : ()),
                filename => $filename,
                @_,
                ($untrusted ? (no_includes => 1) : ()),


@@ -1821,7 +1939,7 @@ sub misctemplate ($$;@) {
                title => $title,
                wikiname => $config{wikiname},
                content => $content,
                title => $title,
                wikiname => $config{wikiname},
                content => $content,

-               baseurl => baseurl(),
+               baseurl => $config{url}.'/',

                html5 => $config{html5},
                %params,
        );
                html5 => $config{html5},
                %params,
        );


@@ -1923,7 +2041,7 @@ sub rcs_recentchanges ($) {
        $hooks{rcs}{rcs_recentchanges}{call}->(@_);
 }
 
        $hooks{rcs}{rcs_recentchanges}{call}->(@_);
 }
 

-sub rcs_diff ($) {
+sub rcs_diff ($;$) {

        $hooks{rcs}{rcs_diff}{call}->(@_);
 }
 
        $hooks{rcs}{rcs_diff}{call}->(@_);
 }
 


@@ -2323,7 +2441,7 @@ sub glob2re ($) {
        my $re=quotemeta(shift);
        $re=~s/\\\*/.*/g;
        $re=~s/\\\?/./g;
        my $re=quotemeta(shift);
        $re=~s/\\\*/.*/g;
        $re=~s/\\\?/./g;

-       return $re;
+       return qr/^$re$/i;

 }
 
 package IkiWiki::FailReason;
 }
 
 package IkiWiki::FailReason;


@@ -2417,6 +2535,8 @@ sub derel ($$) {
        return $path;
 }
 
        return $path;
 }
 

+my %glob_cache;
+

 sub match_glob ($$;@) {
        my $page=shift;
        my $glob=shift;
 sub match_glob ($$;@) {
        my $page=shift;
        my $glob=shift;


@@ -2424,8 +2544,13 @@ sub match_glob ($$;@) {
        
        $glob=derel($glob, $params{location});
 
        
        $glob=derel($glob, $params{location});
 

-       my $regexp=IkiWiki::glob2re($glob);
-       if ($page=~/^$regexp$/i) {
+       # Instead of converting the glob to a regex every time,
+       # cache the compiled regex to save time.
+       my $re=$glob_cache{$glob};
+       unless (defined $re) {
+               $glob_cache{$glob} = $re = IkiWiki::glob2re($glob);
+       }
+       if ($page =~ $re) {

                if (! IkiWiki::isinternal($page) || $params{internal}) {
                        return IkiWiki::SuccessReason->new("$glob matches $page");
                }
                if (! IkiWiki::isinternal($page) || $params{internal}) {
                        return IkiWiki::SuccessReason->new("$glob matches $page");
                }


@@ -2543,7 +2668,12 @@ sub match_created_after ($$;@) {
 }
 
 sub match_creation_day ($$;@) {
 }
 
 sub match_creation_day ($$;@) {

-       if ((localtime($IkiWiki::pagectime{shift()}))[3] == shift) {
+       my $page=shift;
+       my $d=shift;
+       if ($d !~ /^\d+$/) {
+               return IkiWiki::ErrorReason->new("invalid day $d");
+       }
+       if ((localtime($IkiWiki::pagectime{$page}))[3] == $d) {

                return IkiWiki::SuccessReason->new('creation_day matched');
        }
        else {
                return IkiWiki::SuccessReason->new('creation_day matched');
        }
        else {


@@ -2552,7 +2682,12 @@ sub match_creation_day ($$;@) {
 }
 
 sub match_creation_month ($$;@) {
 }
 
 sub match_creation_month ($$;@) {

-       if ((localtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
+       my $page=shift;
+       my $m=shift;
+       if ($m !~ /^\d+$/) {
+               return IkiWiki::ErrorReason->new("invalid month $m");
+       }
+       if ((localtime($IkiWiki::pagectime{$page}))[4] + 1 == $m) {

                return IkiWiki::SuccessReason->new('creation_month matched');
        }
        else {
                return IkiWiki::SuccessReason->new('creation_month matched');
        }
        else {


@@ -2561,7 +2696,12 @@ sub match_creation_month ($$;@) {
 }
 
 sub match_creation_year ($$;@) {
 }
 
 sub match_creation_year ($$;@) {

-       if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
+       my $page=shift;
+       my $y=shift;
+       if ($y !~ /^\d+$/) {
+               return IkiWiki::ErrorReason->new("invalid year $y");
+       }
+       if ((localtime($IkiWiki::pagectime{$page}))[5] + 1900 == $y) {

                return IkiWiki::SuccessReason->new('creation_year matched');
        }
        else {
                return IkiWiki::SuccessReason->new('creation_year matched');
        }
        else {


@@ -2580,7 +2720,7 @@ sub match_user ($$;@) {
                return IkiWiki::ErrorReason->new("no user specified");
        }
 
                return IkiWiki::ErrorReason->new("no user specified");
        }
 

-       if (defined $params{user} && $params{user}=~/^$regexp$/i) {
+       if (defined $params{user} && $params{user}=~$regexp) {

                return IkiWiki::SuccessReason->new("user is $user");
        }
        elsif (! defined $params{user}) {
                return IkiWiki::SuccessReason->new("user is $user");
        }
        elsif (! defined $params{user}) {