dcd1f5d48c
Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
64 lines
2.4 KiB
Text
64 lines
2.4 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Tools › Manage staged MARC records › Compare matched records</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<style type="text/css">
|
|
ins { background-color: #e6ffe6; }
|
|
del { background-color: #ffe6e6; }
|
|
#col1 ins, #col2 del { display: none; }
|
|
pre { padding: 10px; overflow: scroll; }
|
|
</style>
|
|
</head>
|
|
|
|
<body id="tools_compare-marc-import" class="tools">
|
|
|
|
[% INCLUDE 'header.inc' %]
|
|
|
|
<div id="breadcrumbs">
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged MARC records</a> › <a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | html %]">Batch [% batchid | html %]</a> › Compare matched records
|
|
</div>
|
|
|
|
<div id="doc3">
|
|
<div class="yui-g">
|
|
<div id="col1" class="yui-u first">
|
|
<h1>Original</h1>
|
|
[% IF ( ERROR_FORMATTED1 ) %]
|
|
<div class="dialog alert">
|
|
<p>The biblionumber <em>[% BIBLIONUMBER | html %]</em> doesn't match any existing record.</p>
|
|
</div>
|
|
[% ELSE %]
|
|
<h2>[% BIBLIOTITLE | html %]</h2>
|
|
<pre>[% MARC_FORMATTED1 | html %]</pre>
|
|
[% END %]
|
|
</div>
|
|
<div id="col2" class="yui-u">
|
|
<h1>Imported</h1>
|
|
[% IF ( ERROR_FORMATTED2 ) %]
|
|
<div class="dialog alert">
|
|
<p>The import id number <em>[% IMPORTID | html %]</em> doesn't match any existing record.</p>
|
|
</div>
|
|
[% ELSE %]
|
|
<h2>[% IMPORTTITLE | html %]</h2>
|
|
<pre>[% MARC_FORMATTED2 | html %] </pre>
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
|
|
<p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | html %]">Return to staged MARC batch [% batchid | html %]</a></p>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/tools-menu.js") | $raw %]
|
|
[% Asset.js("lib/jsdiff/jsdiff.min.js") | $raw %]
|
|
<script type="text/javascript">
|
|
$(document).ready(function(){
|
|
var diff1 = $("#col1 pre").text();
|
|
var diff2 = $("#col2 pre").text();
|
|
var diffs = diffString(diff1,diff2);
|
|
$("#col1 pre,#col2 pre").html(diffs);
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|