Skip to content

Commit

Permalink
Bug 19319: Reflected XSS Vulnerability in opac-MARCdetail.pl
Browse files Browse the repository at this point in the history 
Try going to this URL on your site: /cgi-bin/koha/opac-MARCdetail.pl?biblionumber=2"><TEST>

Test Plan:
1) Go to /cgi-bin/koha/opac-MARCdetail.pl?biblionumber=2"><TEST>
2) Note <TEST> is embedded all over the html
3) Apply this patch
4) Refresh the page, note the injection is gone!
5) run koha qa test tools

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
  • Loading branch information
@kylemhall @joubu
kylemhall authored and joubu committed Jan 9, 2018
1 parent 26864e9 commit 950fc8e
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 36 deletions.
14 changes: 7 additions & 7 deletions koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
View file
Expand Up @@ -4,7 +4,7 @@
[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
[% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
[% IF ( AllowOnShelfHolds OR ItemsIssued ) %]
<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber | html %]">Place hold</a></li>
<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblio.biblionumber %]">Place hold</a></li>
[% END %]
[% END %]
[% END %]
Expand All @@ -14,21 +14,21 @@

[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
[% IF Koha.Preference('ArticleRequests') %]
<li><a class="article_request" href="/cgi-bin/koha/opac-request-article.pl?biblionumber=[% biblionumber | html %]">Request article</a></li>
<li><a class="article_request" href="/cgi-bin/koha/opac-request-article.pl?biblionumber=[% biblio.biblionumber %]">Request article</a></li>
[% END %]
[% END %]

[% IF Koha.Preference( 'virtualshelves' ) == 1 %]
[% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && loggedinusername ) %]
<li><a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% biblionumber | html %]">Save to your lists</a></li>
<li><a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% biblio.biblionumber %]">Save to your lists</a></li>
[% END %]
[% END %]

[% IF Koha.Preference( 'opacbookbag' ) == 1 %]
[% IF ( incart ) %]
<li><a class="incart cart[% biblionumber | html %] addrecord" href="#">In your cart</a> <a class="cartRemove cartR[% biblionumber | html %]" href="#">(remove)</a></li>
<li><a class="incart cart[% biblio.biblionumber %] addrecord" href="#">In your cart</a> <a class="cartRemove cartR[% biblio.biblionumber %]" href="#">(remove)</a></li>
[% ELSE %]
<li><a class="addtocart cart[% biblionumber | html %] addrecord" href="#">Add to your cart</a> <a style="display:none;" class="cartRemove cartR[% biblionumber | html %]" href="#">(remove)</a></li>
<li><a class="addtocart cart[% biblio.biblionumber %] addrecord" href="#">Add to your cart</a> <a style="display:none;" class="cartRemove cartR[% biblio.biblionumber %]" href="#">(remove)</a></li>
[% END %]
[% END %]

Expand All @@ -51,7 +51,7 @@
<li><a role="menuitem" href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
[% ELSE %]
<li>
<a role="menuitem" href="/cgi-bin/koha/opac-export.pl?op=export&amp;bib=[% biblionumber | html %]&amp;format=[% option %]">
<a role="menuitem" href="/cgi-bin/koha/opac-export.pl?op=export&amp;bib=[% biblio.biblionumber %]&amp;format=[% option %]">
[% SWITCH option %]
[% CASE 'bibtex' %]BIBTEX
[% CASE 'endnote' %]EndNote
Expand Down Expand Up @@ -107,7 +107,7 @@
<label class="label_dc" for="input-srw">SRW-DC</label>
<br>
<input type="hidden" name="op" value="export">
<input type="hidden" name="bib" value="[% biblionumber | html %]">
<input type="hidden" name="bib" value="[% biblio.biblionumber %]">
</fieldset>
</div>
<div class="modal-footer">
Expand Down
2 changes: 1 addition & 1 deletion koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt
View file
Expand Up @@ -19,7 +19,7 @@
<div id="usermarcdetail">
<div id="catalogue_detail_biblio">
<div id="views">
<span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Normal view</a></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber | html %]">MARC view</a></span> <span class="view current-view"><span id="ISBDview">ISBD view</span></span></div>
<span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber %]">Normal view</a></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblio.biblionumber %]">MARC view</a></span> <span class="view current-view"><span id="ISBDview">ISBD view</span></span></div>

<div id="isbdcontents">[% ISBD %]</div>

Expand Down
12 changes: 6 additions & 6 deletions koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
View file
@@ -1,6 +1,6 @@
[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; MARC details for record no. [% biblionumber | html %]</title>
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; MARC details for record no. [% biblio.biblionumber %]</title>
[% INCLUDE 'doc-head-close.inc' %]
[% BLOCK cssinclude %][% END %]
</head>
Expand All @@ -20,14 +20,14 @@
<div id="catalogue_detail_biblio">

<div id="views">
<span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Normal view</a></span>
<span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber %]">Normal view</a></span>
<span class="view current-view"><span id="MARCview">MARC view</span></span>
[% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber | html %]">ISBD view</a></span>[% END %]
[% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblio.biblionumber %]">ISBD view</a></span>[% END %]
</div>
<h1 class="title">[% bibliotitle %] (Record no. [% biblionumber | html %])</h1>
<h1 class="title">[% bibliotitle %] (Record no. [% biblio.biblionumber %])</h1>

[% IF ( OPACXSLTDetailsDisplay ) %]
<div id="switchview_div">[ <a id="switchview" href="/cgi-bin/koha/opac-showmarc.pl?id=[% biblionumber | html %]&amp;viewas=html">view plain</a> ]</div>
<div id="switchview_div">[ <a id="switchview" href="/cgi-bin/koha/opac-showmarc.pl?id=[% biblio.biblionumber %]&amp;viewas=html">view plain</a> ]</div>
<div id="plainmarc"></div>
[% END %]

Expand Down Expand Up @@ -194,7 +194,7 @@ $(document).ready(function(){
$(this).text(_("view labeled"));
$("#labeledmarc").hide();
if(!loaded){
$("#plainmarc").show().html("<div style=\"margin:1em;padding:1em;border:1px solid #EEE;font-size:150%;\"><img src=\"[% interface %]/[% theme %]/images/loading.gif\" /> "+_("Loading")+"...</div>").load("/cgi-bin/koha/opac-showmarc.pl","id=[% biblionumber | html %]&viewas=html");
$("#plainmarc").show().html("<div style=\"margin:1em;padding:1em;border:1px solid #EEE;font-size:150%;\"><img src=\"[% interface %]/[% theme %]/images/loading.gif\" /> "+_("Loading")+"...</div>").load("/cgi-bin/koha/opac-showmarc.pl","id=[% biblio.biblionumber %]&viewas=html");
loaded = 1;
} else {
$("#plainmarc").show();
Expand Down
34 changes: 17 additions & 17 deletions koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
View file
Expand Up @@ -57,7 +57,7 @@

<div id="bookcover">
[% IF ( OPACLocalCoverImages ) %]
<div title="[% biblionumber |url %]" class="[% biblionumber | html %]" id="local-thumbnail-preview"></div>
<div title="[% biblionumber |url %]" class="[% biblio.biblionumber %]" id="local-thumbnail-preview"></div>
[% END %]
[% IF ( OPACAmazonCoverImages ) %]
[% IF ( OPACURLOpenInNewWindow ) %]
Expand Down Expand Up @@ -105,15 +105,15 @@
[% END %]
</div><!-- / #bookcover -->

<abbr class="unapi-id" title="koha:biblionumber:[% biblionumber | html %]"><!-- unAPI --></abbr>
<abbr class="unapi-id" title="koha:biblionumber:[% biblio.biblionumber %]"><!-- unAPI --></abbr>
[% IF ( ocoins ) # COinS / Openurl %]
<span class="Z3988" title="[% ocoins %]"></span>
[% END %]

<div id="views">
<span class="view current-view"><span id="Normalview">Normal view</span></span>
<span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber | html %]">MARC view</a></span>
[% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber | html %]">ISBD view</a></span>[% END %]
<span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblio.biblionumber %]">MARC view</a></span>
[% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblio.biblionumber %]">ISBD view</a></span>[% END %]
</div>
[% IF ( OPACXSLTDetailsDisplay ) %]
[% XSLTBloc %]
Expand Down Expand Up @@ -409,16 +409,16 @@
[% END %]
[% IF ( TagsInputEnabled ) %]
[% IF ( loggedinusername ) %]
<form id="tagform[% biblionumber | html %]" method="post" action="/cgi-bin/koha/opac-tags.pl" style="display:none;">
<label for="newtag[% biblionumber | html %]">New tag(s), separated by a comma:</label>
<input name="newtag[% biblionumber | html %]" id="newtag[% biblionumber | html %]" maxlength="100" type="text"/>
<input name="tagbutton" class="btn btn-small tagbutton" title="[% biblionumber | html %]" type="submit" value="Add" />
<a class="cancel_tag_add" id="cancel[% biblionumber | html %]" href="#">(done)</a>
<form id="tagform[% biblio.biblionumber %]" method="post" action="/cgi-bin/koha/opac-tags.pl" style="display:none;">
<label for="newtag[% biblio.biblionumber %]">New tag(s), separated by a comma:</label>
<input name="newtag[% biblio.biblionumber %]" id="newtag[% biblio.biblionumber %]" maxlength="100" type="text"/>
<input name="tagbutton" class="btn btn-small tagbutton" title="[% biblio.biblionumber %]" type="submit" value="Add" />
<a class="cancel_tag_add" id="cancel[% biblio.biblionumber %]" href="#">(done)</a>
</form>
<span id="newtag[% biblionumber | html %]_status" class="tagstatus" style="display:none;">
<span id="newtag[% biblio.biblionumber %]_status" class="tagstatus" style="display:none;">
Tag status here.
</span>
<a class="tag_add" id="tag_add[% biblionumber | html %]" href="#">Add tag(s)</a>
<a class="tag_add" id="tag_add[% biblio.biblionumber %]" href="#">Add tag(s)</a>
[% ELSE %]
<span id="login4tags">
[% IF Koha.Preference('casAuthentication') %]
Expand Down Expand Up @@ -498,7 +498,7 @@

<!-- define some hidden vars for ratings -->

<input type="hidden" name='biblionumber' value="[% biblionumber | html %]" />
<input type="hidden" name='biblionumber' value="[% biblio.biblionumber %]" />
<input type="hidden" name='rating_value' id='rating_value' value="[% my_rating.rating_value %]" />

[% UNLESS ( rating_readonly ) %]&nbsp; <input name="rate_button" type="submit" value="Rate me" />[% END %]&nbsp;
Expand Down Expand Up @@ -652,7 +652,7 @@

<div id="holdings">
[% IF too_many_items %]
<p>This record has many physical items ([% items_count %]). <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]&amp;viewallitems=1">Click here to view them all.</a></p>
<p>This record has many physical items ([% items_count %]). <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber %]&amp;viewallitems=1">Click here to view them all.</a></p>
[% ELSIF ( itemloop.size ) %]
[% INCLUDE items_table items=itemloop tab="holdings" table_id="holdingst" %]
[% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %]
Expand Down Expand Up @@ -881,7 +881,7 @@
</table>
[% END # / IF subscription.latestserials %]
[% END # / FOREACH subscriptions %]
<p class="subscription_moredetails"><a href="opac-serial-issues.pl?biblionumber=[% biblionumber | html %]">More details</a></p>
<p class="subscription_moredetails"><a href="opac-serial-issues.pl?biblionumber=[% biblio.biblionumber %]">More details</a></p>
</div> <!-- / #subscriptions -->
[% END # IF subscriptionsnumber %]

Expand Down Expand Up @@ -967,7 +967,7 @@

[% IF ( loggedinusername ) %]
[% UNLESS ( loggedincommenter ) %]
<div id="addcomment"> <a href="#" onclick="Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber | html %]'); return false;">
<div id="addcomment"> <a href="#" onclick="Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=[% biblio.biblionumber %]'); return false;">
Post your comments on this item.
</a></div>
[% END %]
Expand Down Expand Up @@ -1040,7 +1040,7 @@
<p>Click on an image to view it in the image viewer</p>
[% FOREACH image IN localimages %]
[% IF image %]
<a class="localimage" href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber | html %]&amp;imagenumber=[% image %]"><img alt="" src="/cgi-bin/koha/opac-image.pl?thumbnail=1&amp;imagenumber=[% image %]" /></a>
<a class="localimage" href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblio.biblionumber %]&amp;imagenumber=[% image %]"><img alt="" src="/cgi-bin/koha/opac-image.pl?thumbnail=1&amp;imagenumber=[% image %]" /></a>
[% END %]
[% END %]
</div><!-- / #images -->
Expand Down Expand Up @@ -1665,7 +1665,7 @@
$.post("/cgi-bin/koha/opac-ratings-ajax.pl", {
rating_old_value: $("#rating_value").attr("value"),
borrowernumber: "[% borrowernumber %]",
biblionumber: "[% biblionumber | html %]",
biblionumber: "[% biblio.biblionumber %]",
rating_value: value,
auth_error: value
}, function (data) {
Expand Down
6 changes: 4 additions & 2 deletions opac/opac-ISBDdetail.pl
View file
Expand Up @@ -55,7 +55,7 @@ =head1 FUNCTIONS
use Koha::ItemTypes;
use Koha::Patrons;
use Koha::RecordProcessor;

use Koha::Biblios;

my $query = CGI->new();
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
Expand All @@ -71,6 +71,8 @@ =head1 FUNCTIONS
my $biblionumber = $query->param('biblionumber');
$biblionumber = int($biblionumber);

my $biblio = Koha::Biblios->find( $biblionumber );

# get biblionumbers stored in the cart
if(my $cart_list = $query->cookie("bib_list")){
my @cart_list = split(/\//, $cart_list);
Expand Down Expand Up @@ -185,7 +187,7 @@ =head1 FUNCTIONS
AllowOnShelfHolds => $allow_onshelf_holds,
norequests => $norequests,
ISBD => $res,
biblionumber => $biblionumber,
biblio => $biblio,
);

#Search for title in links
Expand Down
2 changes: 1 addition & 1 deletion opac/opac-MARCdetail.pl
View file
Expand Up @@ -349,7 +349,7 @@ =head1 DESCRIPTION
item_loop => \@item_loop,
item_header_loop => \@item_header_loop,
item_subfield_codes => \@item_subfield_codes,
biblionumber => $biblionumber,
biblio => $biblio,
);

output_html_with_http_headers $query, $cookie, $template->output;
4 changes: 2 additions & 2 deletions opac/opac-detail.pl
View file
Expand Up @@ -78,6 +78,7 @@ BEGIN

my $biblionumber = $query->param('biblionumber') || $query->param('bib') || 0;
$biblionumber = int($biblionumber);
my $biblio = Koha::Biblios->find( $biblionumber );

my @all_items = GetItemsInfo($biblionumber);
my @hiddenitems;
Expand Down Expand Up @@ -136,7 +137,7 @@ BEGIN
}
}

$template->param( biblionumber => $biblionumber );
$template->param( biblio => $biblio );

# get biblionumbers stored in the cart
my @cart_list;
Expand Down Expand Up @@ -603,7 +604,6 @@ BEGIN
}
my $has_hold;
if ( $show_holds_count || $show_priority) {
my $biblio = Koha::Biblios->find( $biblionumber );
my $holds = $biblio->holds;
$template->param( holds_count => $holds->count );
while ( my $hold = $holds->next ) {
Expand Down

0 comments on commit 950fc8e

Please sign in to comment.