undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Better processing format string in custom links in navbar

Browse Source 
Make processing format string in custom links in action bar ('actions'
feature) more robust.  Now there would be no problems if one of
expanded values (for example project name, of project filename)
contains '%'; additionally format string supports '%' escaping by
doubling, i.e. '%%' expands to '%'.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Jakub Narebski 2008-10-12 00:02:32 +02:00 committed by Shawn O. Pearce
parent 5c283eb13c
commit 2b11e059ee
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gitweb/gitweb.perl
View File

@ -290,10 +290,10 @@ our %feature = (
# The 'default' value consists of a list of triplets in the form # The 'default' value consists of a list of triplets in the form
# (label, link, position) where position is the label after which # (label, link, position) where position is the label after which
# to inster the link and link is a format string where %n expands # to insert the link and link is a format string where %n expands
# to the project name, %f to the project path within the filesystem, # to the project name, %f to the project path within the filesystem,
# %h to the current hash (h gitweb parameter) and %b to the current # %h to the current hash (h gitweb parameter) and %b to the current
# hash base (hb gitweb parameter). # hash base (hb gitweb parameter); %% expands to %.
# To enable system wide have in $GITWEB_CONFIG e.g. # To enable system wide have in $GITWEB_CONFIG e.g.
# $feature{'actions'}{'default'} = [('graphiclog', # $feature{'actions'}{'default'} = [('graphiclog',
@ -2866,14 +2866,19 @@ sub git_print_page_nav {
$arg{'tree'}{'hash_base'} = $treebase if defined $treebase; $arg{'tree'}{'hash_base'} = $treebase if defined $treebase;
my @actions = gitweb_check_feature('actions'); my @actions = gitweb_check_feature('actions');
my %repl = (
'%' => '%',
'n' => $project, # project name
'f' => $git_dir, # project path within filesystem
'h' => $treehead || '', # current hash ('h' parameter)
'b' => $treebase || '', # hash base ('hb' parameter)
);
while (@actions) { while (@actions) {
my ($label, $link, $pos) = (shift(@actions), shift(@actions), shift(@actions)); my ($label, $link, $pos) = splice(@actions,0,3);
# insert
@navs = map { $_ eq $pos ? ($_, $label) : $_ } @navs; @navs = map { $_ eq $pos ? ($_, $label) : $_ } @navs;
# munch munch # munch munch
$link =~ s#%n#$project#g; $link =~ s/%([%nfhb])/$repl{$1}/g;
$link =~ s#%f#$git_dir#g;
$treehead ? $link =~ s#%h#$treehead#g : $link =~ s#%h##g;
$treebase ? $link =~ s#%b#$treebase#g : $link =~ s#%b##g;
$arg{$label}{'_href'} = $link; $arg{$label}{'_href'} = $link;
} }