Attachment 34931 Details for Bug 13510 – [PASSED QA] Bug 13510 - Cross site scripting bug in opac-downloadshelf and opac-shelves

[patch] [PASSED QA] Bug 13510 - Cross site scripting bug in opac-downloadshelf and opac-shelves

Bug-13510---Cross-site-scripting-bug-in-opac-downl.patch (text/plain), 17.78 KB, created by Martin Renvoize (ashimema) on 2015-01-05 08:46:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2015-01-05 08:46:51 UTC

Size: 17.78 KB

patch

obsolete

>From 87ead358e7ab09ac03d24bbcf59e84ceee5c5cd6 Mon Sep 17 00:00:00 2001
>From: Liz <wizzyrea@gmail.com>
>Date: Mon, 5 Jan 2015 02:32:32 +0000
>Subject: [PATCH] Bug 13510 - Cross site scripting bug in opac-downloadshelf
> and opac-shelves
>
>A specially crafted url causes XSS in Koha
>
>To test:
>
>cgi-bin/koha/opac-shelves.pl?viewshelf=2%22%3E%3Cscript%3Eprompt(987898)%3C/script%3E
>
>cgi-bin/koha/opac-downloadshelf.pl?shelfid=2%22%3Cscript%3Eprompt(1)%3C/script%3E&showprivateshelves
>
>These should cause a popup without the patch. With the patch, no popup.
>
>You may need to create these lists, the xss will not be triggered if the list doesn't exist or you don't
>have permission to view them.
>
>Signed-off-by: Chris <chris@bigballofwax.co.nz>
>
>Fixes the two listed problems
>
>Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
>Confirmed patch fixes the problem.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../bootstrap/en/modules/opac-downloadshelf.tt     |    4 +-
> .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt |   46 ++++++++++----------
> 2 files changed, 25 insertions(+), 25 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
>index 87df1da..128cec2 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
>@@ -55,7 +55,7 @@
>                                             <option value="bibtex">BibTeX</option>
>                                             <option value="iso2709">MARC</option>
>                                             [% FOREACH csv_profile IN csv_profiles %]
>-                                            <option value="[% csv_profile.export_format_id %]">CSV - [% csv_profile.profile %]</option>
>+                                            <option value="[% csv_profile.export_format_id |html %]">CSV - [% csv_profile.profile |html %]</option>
>                                             [% END %]
>                                         </select>
>                                         <span class="required">Required</span>
>@@ -64,7 +64,7 @@
>                                     <fieldset class="action">
>                                         <input type="hidden" name="shelfid" value="[% shelfid | html %]" />
>                                         <input type="submit" name="save" class="btn" value="Go" />
>-                                        <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% shelfid %]" class="cancel close" data-dismiss="modal">Cancel</a>
>+                                        <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% shelfid | html %]" class="cancel close" data-dismiss="modal">Cancel</a>
>                                     </fieldset>
>                                 </form>
>                                 [% IF ( modal ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>index f39b2c5..4b929d2 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>@@ -156,10 +156,10 @@
>                             <div id="toolbar" class="toolbar clearfix">
>                                 <div class="list-actions">
>                                     <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New list</a> <span class="sep">|</span>
>-                                    <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfid=[% shelfnumber %]&amp;showprivateshelves=[% showprivateshelves %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a>
>+                                    <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfid=[% shelfnumber | html %]&amp;showprivateshelves=[% showprivateshelves | html %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a>
> 
>                                     [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
>-                                        <span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber %]" class="send" onclick="open('/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span>
>+                                        <span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber | html %]" class="send" onclick="open('/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber | html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span>
>                                     [% END %]
> 
>                                     <a class="print-small" href="/cgi-bin/koha/opac-shelves.pl" onclick="print(); return false;">Print list</a>
>@@ -169,30 +169,30 @@
>                                         <form method="get" action="/cgi-bin/koha/opac-shelves.pl" class="form-inline">
>                                             <input type="hidden" name="op" value="modif" />
>                                             <input type="hidden" name="display" value="viewshelf" />
>-                                            <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
>+                                            <input type="hidden" name="shelfnumber" value="[% shelfnumber | html %]" />
>                                             <input type="submit" class="editshelf" value="Edit list" />
>                                         </form>
> 
>                                         <form method="post" action="/cgi-bin/koha/opac-shelves.pl" class="form-inline">
>                                             <input type="hidden" value="1" name="shelves"/>
>-                                            <input type="hidden" value="1" name="DEL-[% shelfnumber %]"/>
>+                                            <input type="hidden" value="1" name="DEL-[% shelfnumber | html %]"/>
>                                             [% IF ( showprivateshelves ) %]
>                                                 <input type="hidden" name="display" value="privateshelves"/>
>                                             [% END %]
>                                             <input type="submit" class="deleteshelf" value="Delete list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/>
>                                         </form>
>                                         [% IF showprivateshelves && Koha.Preference('OpacAllowSharingPrivateLists') %]
>-                                            <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelfnumber %]" class="">Share list</a>
>+                                            <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelfnumber | html %]" class="">Share list</a>
>                                         [% END %]
>                                     [% ELSIF showprivateshelves # not manageshelf and private means shared %]
>                                         [% INCLUDE remove_share %]
>-                                            <input type="hidden" name="REMSHR-[% shelfnumber %]" value="1" />
>+                                            <input type="hidden" name="REMSHR-[% shelfnumber | html %]" value="1" />
>                                         </form>
>                                     [% END # / IF manageshelf %]
>                                 </div>
> 
>                                 <form action="/cgi-bin/koha/opac-shelves.pl" id="sorting-form" class="form-inline sort_by pull-right">
>-                                    <input type="hidden" name="viewshelf" value="[% shelfnumber %]" />
>+                                    <input type="hidden" name="viewshelf" value="[% shelfnumber | html %]" />
> 
>                                     <label for="sort">Sort by: </label>
>                                     <select name="sort" id="sort" class="resort" onchange="$('#sorting-form').submit()">
>@@ -268,7 +268,7 @@
> 
>                             <form action="/cgi-bin/koha/opac-shelves.pl" method="post" id="myform" name="myform" class="checkboxed">
>                                 [% IF ( manageshelf ) %]
>-                                    <input type="hidden" name="viewshelf" value="[% shelfnumber %]" />
>+                                    <input type="hidden" name="viewshelf" value="[% shelfnumber | html %]" />
>                                     <input type="hidden" name="modifyshelfcontents" value="1" />
>                                 [% END %]
>                                 <div class="searchresults">
>@@ -485,13 +485,13 @@
>                                         <form method="get" action="/cgi-bin/koha/opac-shelves.pl" class="form-inline">
>                                             <input type="hidden" name="op" value="modif" />
>                                             <input type="hidden" name="display" value="viewshelf" />
>-                                            <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
>+                                            <input type="hidden" name="shelfnumber" value="[% shelfnumber | html %]" />
>                                             <input type="submit" class="editshelf" value="Edit list" />
>                                         </form>
> 
>                                         <form method="post" action="/cgi-bin/koha/opac-shelves.pl" class="form-inline">
>                                             <input type="hidden" value="1" name="shelves"/>
>-                                            <input type="hidden" value="1" name="DEL-[% shelfnumber %]"/>
>+                                            <input type="hidden" value="1" name="DEL-[% shelfnumber | html  %]"/>
>                                             [% IF ( showprivateshelves ) %]
>                                                 <input type="hidden" name="display" value="privateshelves"/>
>                                             [% END %]
>@@ -511,13 +511,13 @@
>                     [% END # / IF viewshelf %]
> 
>                     [% IF ( itemsloop && allowremovingitems ) %]
>-                        <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
>+                        <input type="hidden" name="shelfnumber" value="[% shelfnumber | html %]" />
>                         <input type="hidden" name="modifyshelfcontents" value="1" />
>-                        <input type="hidden" name="viewshelf" value="[% shelfnumber %]" /><input type="submit" value="Remove selected items" id="remove-selected" class="btn btn-danger"/>
>+                        <input type="hidden" name="viewshelf" value="[% shelfnumber | html %]" /><input type="submit" value="Remove selected items" id="remove-selected" class="btn btn-danger"/>
>                         </form>
>                     [% ELSIF ( !itemsloop && manageshelf ) %]
>                         <form method="post" action="opac-shelves.pl">
>-                        <input type="hidden" name="DEL-[% shelfnumber %]" value="1" />
>+                        <input type="hidden" name="DEL-[% shelfnumber | html %]" value="1" />
>                         <input type="hidden" name="shelves" value="1" />
>                         <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
>                         <input type="submit" class="btn btn-danger" value="Delete this list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" />
>@@ -528,7 +528,7 @@
>                         <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
>                             <input type="hidden" name="op" value="modifsave" />
>                             <input type="hidden" name="display" value="[% display %]" />
>-                            <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
>+                            <input type="hidden" name="shelfnumber" value="[% shelfnumber | html %]" />
>                             <fieldset class="rows">
>                                 <legend>Editing <em>[% shelfname |html %]</em></legend>
>                                 <ol>
>@@ -588,9 +588,9 @@
>                             <fieldset class="action">
>                                 <input type="submit" value="Save" class="btn" />
>                                 [% IF ( showprivateshelves ) %]
>-                                    <a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=[% shelfnumber %]&amp;display=privateshelves">Cancel</a>
>+                                    <a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=[% shelfnumber | html %]&amp;display=privateshelves">Cancel</a>
>                                 [% ELSE %]
>-                                    <a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=[% shelfnumber %]">Cancel</a>
>+                                    <a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=[% shelfnumber | html %]">Cancel</a>
>                                 [% END %]
>                             </fieldset>
>                         </form>
>@@ -644,7 +644,7 @@
>                                                                     <td>
>                                                                         [% IF ( shelveslooppri.mine ) %]
>                                                                         <form action="/cgi-bin/koha/opac-shelves.pl" method="get" class="form-inline">
>-                                                                            <input type="hidden" name="shelfnumber" value="[% shelveslooppri.shelf %]" />
>+                                                                            <input type="hidden" name="shelfnumber" value="[% shelveslooppri.shelf |html %]" />
>                                                                             <input type="hidden" name="display" value="privateshelves" />
>                                                                             <input type="hidden" name="op" value="modif" />
>                                                                             <input type="submit" class="editshelf" value="Edit" />
>@@ -652,22 +652,22 @@
>                                                                         <form action="opac-shelves.pl" method="post" class="form-inline">
>                                                                             <input type="hidden" name="shelves" value="1" />
>                                                                             <input type="hidden" name="display" value="privateshelves" />
>-                                                                            <input type="hidden" name="DEL-[% shelveslooppri.shelf %]" value="1" />
>-                                                                            <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
>+                                                                            <input type="hidden" name="DEL-[% shelveslooppri.shelf |html %]" value="1" />
>+                                                                            <input type="hidden" name="shelfoff" value="[% shelfoff |html %]" />
>                                                                             [% IF ( shelveslooppri.confirm ) %]
>-                                                                                <input type="hidden" name="CONFIRM-[% shelveslooppri.confirm %]" value="1" />
>+                                                                                <input type="hidden" name="CONFIRM-[% shelveslooppri.confirm |html %]" value="1" />
>                                                                                 <input type="submit" class="btn btn-danger confirm" value="Confirm" />
>                                                                             [% ELSE %]
>                                                                                 <input type="submit" class="deleteshelf" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);" value="Delete" />
>                                                                             [% END %]
>                                                                         </form>
>                                                                             [% IF Koha.Preference('OpacAllowSharingPrivateLists') %]
>-                                                                                <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelveslooppri.shelf %]" class="">Share</a>
>+                                                                                <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelveslooppri.shelf |html %]" class="">Share</a>
>                                                                             [% END %]
>                                                                         [% ELSE # not shelveslooppri.mine, so shared %]
>                                                                             [% INCLUDE remove_share  # if pref is off, you should still be able to remove shares %]
>-                                                                            <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
>-                                                                            <input type="hidden" name="REMSHR-[% shelveslooppri.shelf %]" value="1" />
>+                                                                            <input type="hidden" name="shelfoff" value="[% shelfoff |html %]" />
>+                                                                            <input type="hidden" name="REMSHR-[% shelveslooppri.shelf |html %]" value="1" />
>                                                                             </form>
>                                                                         [% END %]&nbsp;
>                                                                     </td>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 13510: 34921 | 34925 | 34926 | 34927 | 34928 | 34929 | 34930 | 34931 | 34932