]> git.koha-community.org Git - koha.git/commit
Bug 13789 - facets with accented utf-8 characters generate double encoded links
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 4 Mar 2015 10:38:42 +0000 (11:38 +0100)
committerTomas Cohen Arazi <tomascohen@gmail.com>
Sat, 7 Mar 2015 20:05:04 +0000 (21:05 +0100)
commit1ca9adaa56ff809a76ff903bb231175d0195163c
tree96954948fd6d60ed049a0dc7a550018a88dd411a
parent07e6ddc44af5ba6cdcccbcdac44bba223d891610
Bug 13789 - facets with accented utf-8 characters generate double encoded links

Bug 13425 tried to fix XSS in OPAC, by using url filter in template toolkit
on whole generated url. This doesn't work and create double encoded strings
in facets because we are creating url variable by concatenating query_cgi
(which did pass through uri_escape_utf8 on perl side) and other
parameters which have to be escaped in template.

Also, code like

[% SET limit_cgi_f = limit_cgi | url %]

doesn't do anything (at least doesn't apply url filter) so it's not needed.

This patch also fixes encoding of hidden fields used in sort by form.

And lastly, it tries to make facet changes for opac and intranet as same as
possible to simplify future maintencence of this code.

Test scenario:
1. find results in your opac which contain accented characters
2. click on them and verify that results are missing
3. apply this patch
4. re-run search and click on facets link verifying that there are
   now results
5. test sort by form and verify that results are ok
6. verify that facets are still safe from injection by constructing url like
   /cgi-bin/koha/opac-search.pl?q=123&sort_by='"><script>prompt('Happy_Holidays')</script>&limit=123
   and verifying that you DON'T see prompt window in your browser

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
catalogue/search.pl
koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
opac/opac-search.pl