Commit Graph

27862 Commits

Author SHA1 Message Date
Jonathan Druart 23d2002d42 Bug 19047: Fix AddBiblio call in ShelfBrowser.t
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2017-10-24 16:42:06 +13:00
Marcel de Rooy 68ac3ef2f3 Bug 19047: Fix AddBiblio call in Reserves.t
AddBiblio does not return a title; the biblioitemnumber is stored in the
title variable.
The variables for biblioitemnumber are not used and can be removed.

Test plan:
Run t/db_dependent/Reserves.t

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-10-24 16:42:06 +13:00
Tomas Cohen Arazi f76cfe153d Bug 19013: (QA followup) Set guarantorid to NULL patron sample data
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-10-24 13:31:09 +13:00
Jonathan Druart 8f20c30c3a Bug 19013: Fix borrowers.guarantorid in sammple_patrons.sql
That breaks randomly tests on Jenkins (Koha/Patrons.t)

It certainly affects data in other languages but I did not find a quick
and easy way to modify this file (replace all guarantorid values with
NULL)

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Easy fix
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-10-24 13:31:09 +13:00
Jonathan Druart 2b06af4eb3 Bug 19441: Remove ES-related tests
16.05.x do not provided stable ES support, it will take us too much time
to keep these tests up-to-date.

Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-10-13 13:22:15 +13:00
Jonathan Druart 12cb749e83 Bug 19441: Fix t/db_dependent/Biblio/TransformKohaToMarc.t
Koha::Caches and Koha::MarcSubfieldStructures do not exist in 16.05.x

Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-10-13 13:22:14 +13:00
Jonathan Druart f1e25582b5 Bug 19441: Fix t/db_dependent/Biblio/Isbd.t
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-10-13 13:22:14 +13:00
Jonathan Druart 9ce9b8db50 Bug 19441: Fix AutomaticItemModificationByAge.t
Koha::Caches does not exist in 16.05.x

Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-10-13 13:22:14 +13:00
Jonathan Druart ba82664d6f Bug 19441: Fix AuthorisedValues.t
Koha::AuthorisedValueCategor[y|ies] do not exist in 16.05.x

Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-10-13 13:22:14 +13:00
Jonathan Druart 0b1d54a544 Bug 19441: Fix xt/sample_notices.t
fr-CA is not up-to-date:
- RESERVESLIP have been renamed with HOLD_SLIP
- PASSWORD_RESET and MEMBERSHIP_EXPIRY are not defined

Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-10-13 13:22:14 +13:00
Mason James 1210a89759 Increment version for 16.05.17 release 2017-09-20 19:03:44 +12:00
Mason James f294eb6a18 Add release notes for Koha 16.05.17 2017-09-20 19:03:44 +12:00
Mason James 238d85795f Translation updates for Koha 16.05.17 2017-09-20 19:03:34 +12:00
Mason James 8f87903968 Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add classes MarcSubfieldStructure[s]"
This reverts commit 99e7f928b1.
2017-09-20 15:59:43 +12:00
Mason James 251619575c Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - add tests"
This reverts commit a53c3efd4c.
2017-09-20 15:59:35 +12:00
Mason James 4b19e4bb6a Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add search_by_marc_field"
This reverts commit c8fbb9c58b.
2017-09-20 15:59:27 +12:00
Mason James 3ecc48ed5b Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - inventory"
This reverts commit a1b569f89e.
2017-09-20 15:59:19 +12:00
Mason James 644d9e938e Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory"
This reverts commit 38cbc453e0.
2017-09-20 15:59:11 +12:00
Mason James e362ade666 Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField"
This reverts commit 65945e30f7.
2017-09-20 15:59:04 +12:00
Mason James 687946bd9b Revert "Bug 17249: GetKohaAuthorisedValuesFromField - rm GetAuthValCodeFromField"
This reverts commit 286b6f4e3e.
2017-09-20 15:58:54 +12:00
Jonathan Druart 566980bc27 Bug 19128: XSS - admin/authorised_values.tt 2017-09-20 15:16:28 +12:00
Katrin Fischer ffedb03412 Bug 19128 - XSS - patron-attr-types.tt, authorised_values.tt and categories.tt
Preparation:
- Add a branch with script in the branch name
- Add a patron category with script in the category name
- Add a new authorised value cateogory with script
- Add a new authroised value for this category with script
  in all possible fields

- Test editing patron categories
- Test editing patron attribute types
- Test viewing and editing authorised values

Verify that with this script there is no more script executed
and everything works fine.

Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:14:43 +12:00
Jonathan Druart ceb5b6cc82 Bug 19127: (follow-up) Stored XSS in csv-profiles.pl
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:13:22 +12:00
Amit Gupta 4d7b768750 Bug 19127 - Stored XSS in csv-profiles.pl
To Test
1. Hit the page /cgi-bin/koha/tools/csv-profiles.pl?op=add_form
2. Add a text in the field Profile name, Profile description
   and Profile MARC fields that contains js
3. Save the page.
4. Notice js is execute
5. Apply patch and reload, the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:13:21 +12:00
Katrin Fischer c127306b54 Bug 19125 - XSS - members.pl
In preparation to test this patch:
- Add a patron list named <script>alert("patron list")</script>
- Add a library named <script>alert("library")</script>
- Add a patron category named <script>alert("patron category")</script>

To test:
- Access patron search page and do a search
- Verify that the alerts added above are executed
- Apply patch
- Verify that no alerts are displayed

Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:13:01 +12:00
Jonathan Druart 5caf641f7d Bug 19108: (follow-up) Stored XSS in biblio_framework.pl
Prevent software error
Template process failed: undef error - text: filter not found at
/home/vagrant/kohaclone/C4/Templates.pm line 121.

Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:07:28 +12:00
Amit Gupta 8dc404940d Bug 19108 - Stored XSS in biblio_framework.pl and marctagstructure.pl
To Test
1. Hit the page /cgi-bin/koha/admin/biblio_framework.pl?op=add_form
2. Add a text in the field Description that contains js
3. Save the page.
4. Notice js is execute
5. Click on Actions -> MARC structure
6. Apply patch and reload, the js is escaped

Fixed for both the pages biblio_framework.pl and marctagstructure.pl

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:06:30 +12:00
Amit Gupta 280750052a Bug 19108 - Stored XSS in fieldmapping.pl
To Test
1. Hit the page /cgi-bin/koha/admin/fieldmapping.pl
2. Add a text in the field Field name that contains js
3. Save the page.
4. Notice js is execute
5. Apply patch and reload, the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:03:20 +12:00
Amit Gupta 12d677ba88 Bug 19108 - Stored XSS in authtypes.pl
To Test
1. Hit the page /cgi-bin/koha/admin/authtypes.pl?op=add_form
2. Add a text in the field Description that contains js
3. Save the page.
4. Notice js is execute
5. Apply patch and reload, the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:03:19 +12:00
Amit Gupta 3a1f035038 Bug 19108 - Stored XSS in classsources.pl
Fixed for both Classification sources & Classification filing rules

To Test
1. first case classification source: Hit the page
   /cgi-bin/koha/admin/classsources.pl?op=add_source
   second case classification filing rules:
   Hit the page /cgi-bin/koha/admin/classsources.pl?op=add_sort_rule
2. Add a text in the field Description that contains js
3. Save the page.
4. Notice js is execute
5. Apply patch and reload, the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:03:19 +12:00
Amit Gupta 5ffa9b924c Bug 19108 - Stored XSS in items_search_fields.pl
To Test
1. Hit the page /cgi-bin/koha/admin/items_search_fields.pl
2. Add a text in the field Name and Label that contains js
3. Save the page.
4. Notice js is execute
5. Apply patch and reload, the js is escaped

Fixed for new and edit page

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:03:19 +12:00
Amit Gupta 75ca6a17ad Bug 19108 - Stored XSS in oai_sets.pl
To Test
1. Hit the page /cgi-bin/koha/admin/oai_sets.pl
2. Click on New set
3. Add a text in the field setSpec, setName that contains js
4. Save the page.
5. Notice js is execute
6. Apply patch and reload, the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:03:18 +12:00
Jonathan Druart 5a58f35afc Bug 19103: (follow-up) Stored XSS in itemtypes.pl
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:03:02 +12:00
Amit Gupta 8675e0c467 Bug 19103 - Stored XSS in matching-rules.pl
To Test
1. Hit the page /cgi-bin/koha/admin/matching-rules.pl
2. Click on new record matching rule
3. Add a text in the field Description that contain js.
4. Save the page.
5. Notice js is execute
6. Apply patch and reload, the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:03:02 +12:00
Amit Gupta 174f1eda3b Bug 19103 - Stored XSS in patron-attr-types.pl
To Test
1. Hit the page /cgi-bin/koha/admin/patron-attr-types.pl
2. Click on new patron attribute type
2. Add a text in the field Description that contain js.
2. Save the page.
3. Notice js is execute
4. Apply patch and reload, the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:03:01 +12:00
Amit Gupta 9ce88fb28a Bug 19103 - Stored XSS in itemtypes.pl
To Test
1. Hit the page /cgi-bin/koha/admin/itemtypes.pl
2. Add a text in the field Description, Checkin message that contains js
2. Save the page.
3. Notice js is execute
4. Apply patch and reload, the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:03:01 +12:00
Katrin Fischer a7bf6705a3 Bug 19086 - Follow-up - subscription-detail.pl
Add script to the callnumber field on adding a subscription.

Verify script is executed without this patch, but not with it.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2017-09-20 15:02:38 +12:00
Katrin Fischer 4c8e2f74d9 Bug 19086 - Follow-up - XSS in supplier.tt
In preparation:
Make sure you enter <script>alert("sth")</script>
in all fields of a new vendor that are not validated
and save.

1) Access vendor summary page.
2) Verify scripts are executed
3) Apply patch
4) Verify scripts are on longer executed

This works in combination with the other patches for XSS
on this bug.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2017-09-20 15:02:38 +12:00
Amit Gupta 0eb03b0817 Bug 19086 Stored XSS in subscription-add.pl
To Test
1. Hit the page /cgi-bin/koha/serials/subscription-add.pl
2. Add a text in the field Public note and Nonpublic note
   that contains js (Internalnotes, notes)
2. Save the page.
3. Notice js is execute
4. Apply patch and reload, the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2017-09-20 15:02:38 +12:00
Amit Gupta c532e5f0ab Bug 19086 Stored XSS in supplier.pl
1. Hit the page /cgi-bin/koha/acqui/supplier.pl?op=enter
2. Add a text in the field company_postal, physical, company_fax,
   accountnumber, contactposition, contact_fax, contact_notes, notes that contains java script
3. Save the page.
4. Notice js is execute
5. Apply patch and reload the js is escaped

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2017-09-20 15:02:38 +12:00
Chris Cormack 1deab6d87f Bug 19086 Stored XSS in circulation.pl
1/ To test add a message to a borrower that contains js
2/ hit /cgi-bin/koha/circ/circulation.pl?borrowernumber=[number]
  where number is the borrowernumber of the borrower you set the message
  for
3/ Notice js is execute
4/ Apply patch, reload, js is escaped

Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:02:32 +12:00
Chris Cormack 683f9ec507 Bug 19086 XSS in members/member.pl
To test
1/ hit /cgi-bin/koha/members/member.pl?&searchmember=<script>alert('XSS Payload')</script>
2/ Notice js is executed
3/ Apply patch, reload
4/ js is now escaped

Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 15:01:15 +12:00
Fridolin Somers 8383e75464 Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
Followup correcting a typo of previous patch :
  name="holdingbranch" options = branche
it is branche[s]

Test plan :
- Look at 'Current location' in item search
=> Without patch you see only 'All libraries'
=> With patch you see 'All libraries' and each existing library, like in 'Home library'
2017-09-20 14:08:19 +12:00
Marc Véron 552af02c9f Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
This patch removes entries like the following in translations of itemsearch.tt:
"[%% INCLUDE form_field_select name=\"homebranch\" options = branches "
"empty_option = \"All libraries\" %%] [%% INCLUDE form_field_select name="
"\"holdingbranch\" options = branches empty_option = \"All libraries\" %%] %s "
"[%% INCLUDE form_field_select name=\"location\" options = locations "
"empty_option = \"All locations\" %%] %s "

New patch on top of Bug 18633 that resolves parts of initial comment.

To test:
- Verify that in itemsearch.tt no tt directives are splitted by new lines
  (search for [% INCLUDE )
- Verify that itemsearch.tt works as before

Followed test plan and verified that tt directives are not split by new
lines, the changes to the fieldset tags in comment 3 have been removed
and itemtype.tt still works correctly as before

Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 14:08:19 +12:00
Jonathan Druart 286b6f4e3e Bug 17249: GetKohaAuthorisedValuesFromField - rm GetAuthValCodeFromField
The subroutine GetAuthValCodeFromField was only used from
GetKohaAuthorisedValuesFromField.

Test plan:
  git grep GetAuthValCodeFromField
should not return any occurrences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2017-09-20 14:00:06 +12:00
Jonathan Druart 65945e30f7 Bug 17249: Remove GetKohaAuthorisedValuesFromField
Remove the subroutine, it's no longer in used.

Test plan:
  git grep GetKohaAuthorisedValuesFromField
should not return any occurrences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2017-09-20 14:00:06 +12:00
Jonathan Druart 38cbc453e0 Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory
Before this patch set, the tests in
t/db_dependent/Items/GetItemsForInventory.t were executed in 4s. But
with the previous patch, it was in 45sec(!)
To make sure decrease this execution time to what it was before, this
patch introduces a local to avoid the same query to be executed several
times.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2017-09-20 14:00:06 +12:00
Jonathan Druart a1b569f89e Bug 17249: Remove GetKohaAuthorisedValuesFromField - inventory
This patch deals with the inventory files calling
GetKohaAuthorisedValuesFromField.

Test plan:
  prove t/db_dependent/Items/GetItemsForInventory.t
should still return green

Use the inventory tool, on the result page the AV descriptions should
correctly replace the codes

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2017-09-20 14:00:06 +12:00
Jonathan Druart c8fbb9c58b Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add search_by_marc_field
This patch adds a new Koha::AuthorisedValues->search_by_marc_field
method.
It will permit to replace several subroutine from C4::Koha dealing with
authorised values.
It also uses this new methods to replace an occurrence of
GetKohaAuthorisedValuesFromField in C4::Record::marcrecord2csv

Test plan:
  prove t/db_dependent/AuthorisedValues.t
should return green

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 14:00:05 +12:00
Jonathan Druart a53c3efd4c Bug 17249: Remove GetKohaAuthorisedValuesFromField - add tests
This patch adds a few tests to C4::Record::marcrecord2csv
The subroutine was not covered enough to validate that this patch set
won't add regressions.

Note that the patch set will fix an issue: If 2 subfields of a field are
linked to AVs and you want to display them in a CSV, they won't be
replaced with their descriptions.

Test plan:
Apply the patch, and make a copy of t/db_dependent/Record/marcrecord2csv.t
Checkout master and prove marcrecord2csv.t
Tests should fail
Checkout the branch with the whole patch set applied
The tests should pass

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2017-09-20 14:00:05 +12:00