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>
273 lines
13 KiB
Text
273 lines
13 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
|
|
[% BLOCK ServerType %]
|
|
[% IF (server.servertype||type) == 'sru' %]
|
|
SRU
|
|
[% ELSIF (server.servertype||type) == 'zed' %]
|
|
Z39.50
|
|
[% END %]
|
|
[% END %]
|
|
|
|
<title>Koha › Administration › Z39.50/SRU servers
|
|
[% IF op == 'edit' %] › Modify [% PROCESS ServerType %] server [% server.servername | html %][% END %]
|
|
[% IF op == 'add' %] › New [% PROCESS ServerType %] server[% END %]
|
|
</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
|
|
[% IF op == 'list' %]
|
|
[% Asset.css("css/datatables.css") | $raw %]
|
|
[% END %]
|
|
|
|
</head>
|
|
|
|
<body id="admin_z3950servers" class="admin">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'z3950-admin-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> ›
|
|
<a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a>
|
|
[% IF op == 'edit' %]› Modify [% PROCESS ServerType %] server [% server.servername | html %][% END %]
|
|
[% IF op == 'add' %]› New [% PROCESS ServerType %] server[% END %]
|
|
</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% IF msg_deleted %]
|
|
<div class="dialog alert">Z39.50/SRU server deleted ([% msg_add | html %])</div>
|
|
[% ELSIF msg_updated %]
|
|
<div class="dialog message">Z39.50/SRU server updated ([% msg_add | html %])</div>
|
|
[% ELSIF msg_added %]
|
|
<div class="dialog message">Z39.50/SRU server added ([% msg_add | html %])</div>
|
|
[% ELSIF msg_notfound %]
|
|
<div class="dialog alert">Error: Server with id [% msg_add | html %] not found</div>
|
|
[% END %]
|
|
|
|
[% IF ( add_form ) %]
|
|
<form action="[% script_name | html %]" name="Aform" method="post" id="serverentry">
|
|
<input type="hidden" name="op" value="add_validated" />
|
|
<input type="hidden" name="servertype" value="[% server.servertype||type||'zed' | html %]"/>
|
|
[% IF op == 'edit' %]
|
|
<h1>Modify [% PROCESS ServerType %] server</h1>
|
|
<input type="hidden" name="id" value="[% server.id | html %]" />
|
|
[% ELSE %]
|
|
<h1>New [% PROCESS ServerType %] server</h1>
|
|
[% END %]
|
|
<fieldset class="rows">
|
|
<ol>
|
|
<li><label for="name" class="required">Server name: </label>
|
|
<input type="text" name="servername" id="servername" size="65" maxlength="100" value="[% server.servername | html %]" required="required" /> <span class="required">Required</span>
|
|
</li>
|
|
|
|
<li><label for="host" class="required">Hostname: </label> <input type="text" name="host" id="host" size="30" value="[% server.host | html %]" required="required" /> <span class="required">Required</span>
|
|
[% IF (server.servertype||type) == 'sru' %]
|
|
<div class="hint">Includes the domain part, but the path part of the URL should go into Database.</div>
|
|
[% END %]
|
|
</li>
|
|
<li><label for="port" class="required">Port: </label> <input type="text" name="port" id="port" size="5" value="[% server.port | html %]" required="required" /> <span class="required">Required</span>
|
|
</li>
|
|
<li><label for="db" class="required">Database: </label> <input type="text" name="db" id="db" value="[% server.db | html %]" required="required" /> <span class="required">Required</span>
|
|
</li>
|
|
<li><label for="userid">Userid: </label> <input type="text" name="userid" id="userid" value="[% server.userid | html %]" />
|
|
</li>
|
|
<li><label for="password">Password: </label> <input type="text" name="password" id="password" value="[% server.password | html %]" />
|
|
</li>
|
|
<li><label for="checked">Preselected (searched by default): </label>
|
|
[% IF ( server.checked ) %]
|
|
<input type="checkbox" name="checked" id="checked" value="1" checked="checked" />
|
|
[% ELSE %]
|
|
<input type="checkbox" name="checked" id="checked" value="1" />
|
|
[% END %]
|
|
</li>
|
|
<li><label for="rank">Rank (display order): </label> <input type="text" name="rank" id="rank" size="4" value="[% server.rank | html %]" />
|
|
</li>
|
|
|
|
<li><label for="syntax">Syntax (z3950 can send<br /> records in various format. Choose one): </label>
|
|
<select name="syntax" id="syntax">
|
|
<option value="UNIMARC">UNIMARC</option>
|
|
<option value="INTERMARC">INTERMARC</option>
|
|
<option value="CCF">CCF</option>
|
|
<option value="USMARC">MARC21/USMARC</option>
|
|
<option value="UKMARC">UKMARC</option>
|
|
<option value="NORMARC">NORMARC</option>
|
|
<option value="LIBRISMARC">LIBRISMARC</option>
|
|
<option value="DANMARC">DANMARC</option>
|
|
<option value="FINMARC">FINMARC</option>
|
|
<option value="CANMARC">CANMARC</option>
|
|
<option value="SBN">SBN</option>
|
|
<option value="PICAMARC">PICAMARC</option>
|
|
<option value="AUSMARC">AUSMARC</option>
|
|
<option value="IBERMARC">IBERMARC</option>
|
|
<option value="CATMARC">CATMARC</option>
|
|
<option value="MALMARC">MALMARC</option>
|
|
</select>
|
|
</li>
|
|
|
|
<li><label for="encoding">Encoding (z3950 can send<br /> records in various encodings. Choose one): </label>
|
|
<select name="encoding" id="encoding">
|
|
[% FOREACH enc IN [ 'utf8' 'EUC-KR' 'ISO_5426' 'ISO_6937' 'ISO_8859-1' 'MARC-8' ] %]
|
|
<option value="[% enc | html %]">[% enc | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
|
|
<li><label for="timeout">Timeout (0 its like not set): </label>
|
|
<input type="text" name="timeout" id="timeout" size="4" value="[% server.timeout | html %]" /> seconds
|
|
</li>
|
|
<li><label for="recordtype">Record type: </label>
|
|
<select name="recordtype" id="recordtype">
|
|
<option value="biblio">Bibliographic</option>
|
|
<option value="authority">Authority</option>
|
|
</select>
|
|
</li>
|
|
[% IF (server.servertype||type) == 'sru' %]
|
|
<li>
|
|
<label for="sru_options">Additional SRU options: </label>
|
|
<input type="text" name="sru_options" id="sru_options" size="50" value="[% server.sru_options | html %]"/>
|
|
<div class="hint">Separate options by commas. Example: sru=get,sru_version=1.1. See also http://www.indexdata.com/yaz/doc/zoom.html.</div>
|
|
</li>
|
|
<li>
|
|
<label for="sru_fields">SRU Search fields mapping: </label>
|
|
<input type="hidden" name="sru_fields" id="sru_fields" value="[% server.sru_fields | html %]" />
|
|
<input type="text" name="show_sru_fields" id="show_sru_fields" size="100" value="[% server.sru_fields | html %]" disabled="disabled" /> <input type="button" id="modify_sru_fields" value="Modify" />
|
|
</li>
|
|
[% END %]
|
|
<li>
|
|
<label for="add_xslt">XSLT File(s) for transforming results: </label>
|
|
<input type="text" name="add_xslt" id="add_xslt" size="100" value="[% server.add_xslt | html %]"/>
|
|
<div class="hint">Separate multiple filenames by commas.</div>
|
|
</li>
|
|
|
|
</ol>
|
|
</fieldset>
|
|
|
|
<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">Cancel</a></fieldset>
|
|
</form>
|
|
[% END %]
|
|
|
|
[% IF op == 'list' %]
|
|
<div id="toolbar" class="btn-toolbar">
|
|
<a id="newserver" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a>
|
|
<a id="newserver" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a>
|
|
</div>
|
|
<h3>Z39.50/SRU servers administration</h3>
|
|
[% IF id %]
|
|
You searched for record [% id | html %]
|
|
[% ELSIF searchfield %]
|
|
You searched for [% searchfield | html %]
|
|
[% END %]
|
|
<table id="serverst">
|
|
<thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th></th>
|
|
</tr></thead>
|
|
<tbody>
|
|
[% FOREACH loo IN loop %]
|
|
<tr>
|
|
<td><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&id=[% loo.id | html %]">[% loo.servername | html %]</a></td><td>[% loo.host | html %]:[% loo.port | html %]</td><td>[% loo.db | html %]</td><td>[% loo.userid | html %]</td><td>[% IF loo.password %]########[% END %]</td><td>[% IF ( loo.checked ) %]Yes[% ELSE %]No[% END %]</td><td>[% loo.rank | html %]</td>
|
|
<td>[% loo.syntax | html %]</td><td>[% loo.encoding | html %]</td><td>[% loo.timeout | html %]</td>
|
|
<td>[% IF ( loo.recordtype == 'biblio' ) %]
|
|
<span>Bibliographic</span>
|
|
[% ELSIF ( loo.recordtype == 'authority' ) %]
|
|
<span>Authority</span>
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
<div class="dropdown">
|
|
<a class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" href="#">
|
|
Actions <b class="caret"></b>
|
|
</a>
|
|
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
|
|
<li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&id=[% loo.id | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
|
|
<li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=add&id=[% loo.id | html %]"><i class="fa fa-copy"></i> Copy</a></li>
|
|
<li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&id=[% loo.id | html %]" class="delete" data-servername="[% loo.servername | html %]"><i class="fa fa-trash"></i> Delete</a></li>
|
|
</ul>
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% END %]
|
|
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'admin-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/admin-menu.js") | $raw %]
|
|
[% IF op == 'list' %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
[% END %]
|
|
|
|
<script type="text/javascript">
|
|
[% IF ( add_form ) %]
|
|
$(document).ready(function(){
|
|
// Update selects for syntax, encoding and recordtype
|
|
[% IF server %]
|
|
$("#syntax").val('[% server.syntax | html %]');
|
|
$("#encoding").val('[% server.encoding | html %]');
|
|
$("#recordtype").val('[% server.recordtype | html %]');
|
|
[% END %]
|
|
$( "#serverentry" ).validate({
|
|
rules: {
|
|
servername: { required: true },
|
|
host: { required: true },
|
|
port: {
|
|
required: true,
|
|
number: true
|
|
},
|
|
db: { required: true },
|
|
rank: { number: true },
|
|
timeout: { number: true }
|
|
}
|
|
});
|
|
$("#serverentry").submit(function( event ) {
|
|
// first test if show_sru_fields exists
|
|
if( $('#show_sru_fields').length && $('#show_sru_fields').val()=='' && !confirm( _("No SRU search field mappings have been defined. This means that all field searches will go through the whole record. Continue?"))) {
|
|
return false;
|
|
}
|
|
// copy show_sru_fields to hidden counterpart
|
|
$('#sru_fields').val( $('#show_sru_fields').val() );
|
|
// enable recordtype to include field in post
|
|
$('#recordtype').prop('disabled',false);
|
|
});
|
|
$("#servername").on("blur",function(){
|
|
toUC(this);
|
|
});
|
|
$("#modify_sru_fields").on("click",function(){
|
|
ModMapping();
|
|
});
|
|
});
|
|
function ModMapping () {
|
|
var map= $('#show_sru_fields').val();
|
|
var type= $('#recordtype').val();
|
|
window.open('/cgi-bin/koha/admin/sru_modmapping.pl?mapping='+map + '&type=' + type,'popup','width=800,height=400,resizable=yes,toolbar=false,scrollbars=yes,top');
|
|
}
|
|
[% ELSE %]
|
|
$(document).ready(function() {
|
|
$("#serverst").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"aoColumnDefs": [
|
|
{ "aTargets": [2,3,4,7,8,9,10,11], "bSortable": false, "bSearchable": false },
|
|
],
|
|
"sPaginationType": "four_button"
|
|
}));
|
|
$(".delete").on("click",function(e){
|
|
var servername = $(this).data("servername");
|
|
if( confirm( _("Are you sure you want to delete server %s?").format(servername) ) ) {
|
|
return true;
|
|
} else {
|
|
e.preventDefault();
|
|
}
|
|
});
|
|
});
|
|
[% END %]
|
|
</script>
|
|
[% END %]
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|