Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 31393: Koha::Config: handle the special case for 'content' attribute

Browse source 
<key content="value"></key>

was wrongly parsed as

{ key => 'value' }

whereas it should be

{ key => { content => 'value' } }

The 'content' attribute is used in shibboleth config

Test plan:
1 Run `prove t/Koha/Config.t`

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Julian Maurice 2023-06-26 15:25:12 +02:00 committed by Tomas Cohen Arazi
parent b0a8372c2f
commit 6973625e7a
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Koha/Config.pm
View file

@ -239,7 +239,7 @@ sub _read_from_dom_node {
delete $subconfig->{id};
} else {
my @keys = keys %$subconfig;
if (1 == scalar @keys && $keys[0] eq 'content') {
if (!$node->hasAttributes() && 1 == scalar @keys && $keys[0] eq 'content') {
# An element with no attributes and no child elements becomes its text content
$subconfig = $subconfig->{content};
} elsif (0 == scalar @keys) {

9
t/Koha/Config.t
View file

@ -131,6 +131,15 @@ subtest 'read_from_file() tests' => sub {
}
},
'useshibboleth' => '0',
'shibboleth' => {
'autocreate' => '1',
'matchpoint' => 'userid',
'mapping' => {
'userid' => { 'is' => 'uid' },
'branchcode' => { 'content' => 'MAIN', 'is' => 'MAIN' },
'categorycode' => { 'content' => 'STAFF' },
},
},
'zebra_lockdir' => '/home/koha/var/lock/zebradb',
'lockdir' => '__LOCK_DIR__',
'use_zebra_facets' => '1',

9
t/data/koha-conf.xml
View file

@ -111,6 +111,15 @@
</mapping>
</ldapserver>
<useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
<shibboleth>
<autocreate>1</autocreate>
<matchpoint>userid</matchpoint> <!-- koha borrowers field to match against for authentication -->
<mapping>
<userid is="uid"></userid> <!-- mapping between koha borrowers field and shibboleth attribute name. AD FS should use eppn instead of uid. -->
<branchcode content="MAIN" is="MAIN"></branchcode>
<categorycode content="STAFF"></categorycode>
</mapping>
</shibboleth>
<zebra_lockdir>/home/koha/var/lock/zebradb</zebra_lockdir>
<lockdir>__LOCK_DIR__</lockdir>
<use_zebra_facets>1</use_zebra_facets>