Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
GIP RENATER
switch-wayf
Commits
b7f11f0f
Commit
b7f11f0f
authored
Nov 08, 2010
by
haemmer
Browse files
Added a check for $SProviders[$entityID]['DSURL']
Fixed a bug in main code of readMetadata.php
parent
2cb3b70d
Changes
2
Hide whitespace changes
Inline
Side-by-side
functions.php
View file @
b7f11f0f
...
...
@@ -411,7 +411,7 @@ function isVerifiedReturnURL($entityID, $returnURL) {
}
// Check using DiscoveryResponse extension
if
(
in_array
(
$returnURL
,
$SProviders
[
$entityID
][
'DSURL'
])){
if
(
isset
(
$SProviders
[
$entityID
][
'DSURL'
])
in_array
(
$returnURL
,
$SProviders
[
$entityID
][
'DSURL'
])){
return
true
;
}
...
...
readMetadata.php
View file @
b7f11f0f
...
...
@@ -78,18 +78,24 @@ if(isRunViaCLI()){
require
(
$metadataSPFile
);
}
// Now merge IDPs from metadata and static file
$IDProviders
=
mergeInfo
(
$IDProviders
,
$metadataIDProviders
,
$SAML2MetaOverLocalConf
,
$includeLocalConfEntries
);
// Fow now copy the array by reference
$SProviders
=
&
$metadataSProviders
;
}
elseif
(
file_exists
(
$metadataIDPFile
)){
// Read SP and IDP files generated with metadata
require
(
$metadataIDPFile
);
require
(
$metadataSPFile
);
}
// Now merge IDPs from metadata and static file
$IDProviders
=
mergeInfo
(
$IDProviders
,
$metadataIDProviders
,
$SAML2MetaOverLocalConf
,
$includeLocalConfEntries
);
// Fow now copy the array by reference
$SProviders
=
&
$metadataSProviders
;
// Now merge IDPs from metadata and static file
$IDProviders
=
mergeInfo
(
$IDProviders
,
$metadataIDProviders
,
$SAML2MetaOverLocalConf
,
$includeLocalConfEntries
);
// Fow now copy the array by reference
$SProviders
=
&
$metadataSProviders
;
}
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment