Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
simplesamlphp
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Perun
Perun ProxyIdP
v1
simplesamlphp
Commits
1f4b6e84
Commit
1f4b6e84
authored
7 years ago
by
Thijs Kinkhorst
Browse files
Options
Downloads
Plain Diff
Merge branch 'tvdijen-patch-6'
parents
de8dac30
304d4bad
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/SimpleSAML/Metadata/Signer.php
+1
-5
1 addition, 5 deletions
lib/SimpleSAML/Metadata/Signer.php
modules/adfs/lib/XMLSecurityDSig.php
+0
-32
0 additions, 32 deletions
modules/adfs/lib/XMLSecurityDSig.php
with
1 addition
and
37 deletions
lib/SimpleSAML/Metadata/Signer.php
+
1
−
5
View file @
1f4b6e84
...
@@ -263,11 +263,7 @@ class SimpleSAML_Metadata_Signer
...
@@ -263,11 +263,7 @@ class SimpleSAML_Metadata_Signer
$rootNode
=
$xml
->
firstChild
;
$rootNode
=
$xml
->
firstChild
;
// sign the metadata with our private key
// sign the metadata with our private key
if
(
$type
==
'ADFS IdP'
)
{
$objXMLSecDSig
=
new
XMLSecurityDSig
();
$objXMLSecDSig
=
new
sspmod_adfs_XMLSecurityDSig
(
$metadataString
);
}
else
{
$objXMLSecDSig
=
new
XMLSecurityDSig
();
}
$objXMLSecDSig
->
setCanonicalMethod
(
XMLSecurityDSig
::
EXC_C14N
);
$objXMLSecDSig
->
setCanonicalMethod
(
XMLSecurityDSig
::
EXC_C14N
);
...
...
This diff is collapsed.
Click to expand it.
modules/adfs/lib/XMLSecurityDSig.php
deleted
100644 → 0
+
0
−
32
View file @
de8dac30
<?php
/**
* This class should be considered a temporary workaround to
* solve the lack of custom formatting in XMLSecurityDSig
* (xmlseclibs). It should be possible to either configure
* the original class to avoid formatting, or to use a custom
* template for the signature.
*
* @todo Move this functionality to xmlseclibs.
*
* @author Daniel Tsosie
* @package SimpleSAMLphp
*/
class
sspmod_adfs_XMLSecurityDSig
extends
XMLSecurityDSig
{
function
__construct
(
$metaxml
)
{
$template
=
''
;
if
(
strpos
(
"
\n
"
,
$metaxml
)
===
false
)
{
foreach
(
explode
(
"
\n
"
,
self
::
template
)
as
$line
)
{
$template
.
=
trim
(
$line
);
}
}
else
{
$template
=
self
::
template
;
}
$sigdoc
=
\SAML2\DOMDocumentFactory
::
fromString
(
$template
);
$this
->
sigNode
=
$sigdoc
->
documentElement
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment