From 624eb9e1f5f7ca87a6d8fbbaef0bbaa3dea3bc21 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Wed, 16 Aug 2017 13:52:07 +0200
Subject: [PATCH] Bug 19108: (follow-up) Fix Stored XSS in fieldmapping.pl and
 items_search_fields.pl

To test:
- Add a framework with script in the description
- Access the Keywords to MARC mapping page
- Add an item search field where both name and label are script
- Try to edit/delete the added mapping

With the patch no script should be executed and everything
should still work ok.

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../intranet-tmpl/prog/en/modules/admin/fieldmapping.tt     | 6 +++---
 .../prog/en/modules/admin/items_search_fields.tt            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
index 238555a1b5..7e2f07370c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
@@ -25,7 +25,7 @@ $(document).ready(function() {
 		<div class="yui-b">
             <h2>Keyword to MARC mapping</h2>
             [% UNLESS ( fields.count ) %]
-                <div class="dialog message"><p>There are no mappings for the [% IF framework.frameworktext %]<em>[% framework.frameworktext %]</em>[% ELSE %]default[% END %] framework. </p></div>
+                <div class="dialog message"><p>There are no mappings for the [% IF framework.frameworktext %]<em>[% framework.frameworktext |html %]</em>[% ELSE %]default[% END %] framework. </p></div>
             [% END %]
 			<form method="get" action="/cgi-bin/koha/admin/fieldmapping.pl" id="selectframework">
 				<label for="framework">Framework:</label>
@@ -33,9 +33,9 @@ $(document).ready(function() {
                     <option value="">Default</option>
                 [% FOREACH f IN frameworks %]
                     [% IF f.frameworkcode == framework.frameworkcode %]
-                    <option selected="selected" value="[% f.frameworkcode %]">[% f.frameworktext %]</option>
+                    <option selected="selected" value="[% f.frameworkcode %]">[% f.frameworktext |html %]</option>
                     [% ELSE %]
-                    <option value="[% f.frameworkcode %]">[% f.frameworktext %]</option>
+                    <option value="[% f.frameworkcode %]">[% f.frameworktext |html %]</option>
                     [% END %]
                 [% END %]
                 </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
index 0904553259..6e12b1b1bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
@@ -77,8 +77,8 @@
                           <td>[% field.tagsubfield %]</td>
                           <td>[% field.authorised_values_category %]</td>
                           <td>
-                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name %]" title="Edit [% field.name %] field"><i class="fa fa-pencil"></i> Edit</a>
-                            <a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name %]"><i class="fa fa-trash"></i> Delete</a>
+                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name |html %]" title="Edit [% field.name |html %] field"><i class="fa fa-pencil"></i> Edit</a>
+                            <a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name |html %]"><i class="fa fa-trash"></i> Delete</a>
                           </td>
                         </tr>
                       [% END %]