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
0
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
9310bcbf
Commit
9310bcbf
authored
3 years ago
by
Tim van Dijen
Browse files
Options
Downloads
Patches
Plain Diff
Fix static calls to non-static methods
parent
8e787fbf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/admin/lib/Controller/Config.php
+8
-6
8 additions, 6 deletions
modules/admin/lib/Controller/Config.php
with
8 additions
and
6 deletions
modules/admin/lib/Controller/Config.php
+
8
−
6
View file @
9310bcbf
...
@@ -341,13 +341,15 @@ class Config
...
@@ -341,13 +341,15 @@ class Config
'enabled'
=>
$this
->
config
->
getString
(
'auth.adminpassword'
,
'123'
)
!==
'123'
,
'enabled'
=>
$this
->
config
->
getString
(
'auth.adminpassword'
,
'123'
)
!==
'123'
,
];
];
$cryptoUtils
=
new
Utils\Crypto
();
// perform some sanity checks on the configured certificates
// perform some sanity checks on the configured certificates
if
(
$this
->
config
->
getString
(
'enable.saml20-idp'
,
false
)
!==
false
)
{
if
(
$this
->
config
->
getString
(
'enable.saml20-idp'
,
false
)
!==
false
)
{
$handler
=
MetaDataStorageHandler
::
getMetadataHandler
();
$handler
=
MetaDataStorageHandler
::
getMetadataHandler
();
$metadata
=
$handler
->
getMetaDataCurrent
(
'saml20-idp-hosted'
);
$metadata
=
$handler
->
getMetaDataCurrent
(
'saml20-idp-hosted'
);
$metadata_config
=
Configuration
::
loadfromArray
(
$metadata
);
$metadata_config
=
Configuration
::
loadfromArray
(
$metadata
);
$private
=
Utils\Crypto
::
loadPrivateKey
(
$metadata_config
,
false
);
$private
=
$cryptoUtils
->
loadPrivateKey
(
$metadata_config
,
false
);
$public
=
Utils\Crypto
::
loadPublicKey
(
$metadata_config
,
false
);
$public
=
$cryptoUtils
->
loadPublicKey
(
$metadata_config
,
false
);
$matrix
[]
=
[
$matrix
[]
=
[
'required'
=>
'required'
,
'required'
=>
'required'
,
...
@@ -355,9 +357,9 @@ class Config
...
@@ -355,9 +357,9 @@ class Config
'enabled'
=>
$this
->
matchingKeyPair
(
$public
[
'PEM'
],
[
$private
[
'PEM'
],
$private
[
'password'
]]),
'enabled'
=>
$this
->
matchingKeyPair
(
$public
[
'PEM'
],
[
$private
[
'PEM'
],
$private
[
'password'
]]),
];
];
$private
=
Utils\Crypto
::
loadPrivateKey
(
$metadata_config
,
false
,
'new_'
);
$private
=
$cryptoUtils
->
loadPrivateKey
(
$metadata_config
,
false
,
'new_'
);
if
(
$private
!==
null
)
{
if
(
$private
!==
null
)
{
$public
=
Utils\Crypto
::
loadPublicKey
(
$metadata_config
,
false
,
'new_'
);
$public
=
$cryptoUtils
->
loadPublicKey
(
$metadata_config
,
false
,
'new_'
);
$matrix
[]
=
[
$matrix
[]
=
[
'required'
=>
'required'
,
'required'
=>
'required'
,
'descr'
=>
Translate
::
noop
(
'Matching key-pair for signing assertions (rollover key)'
),
'descr'
=>
Translate
::
noop
(
'Matching key-pair for signing assertions (rollover key)'
),
...
@@ -367,8 +369,8 @@ class Config
...
@@ -367,8 +369,8 @@ class Config
}
}
if
(
$this
->
config
->
getBoolean
(
'metadata.sign.enable'
,
false
)
!==
false
)
{
if
(
$this
->
config
->
getBoolean
(
'metadata.sign.enable'
,
false
)
!==
false
)
{
$private
=
Utils\Crypto
::
loadPrivateKey
(
$this
->
config
,
false
,
'metadata.sign.'
);
$private
=
$cryptoUtils
->
loadPrivateKey
(
$this
->
config
,
false
,
'metadata.sign.'
);
$public
=
Utils\Crypto
::
loadPublicKey
(
$this
->
config
,
false
,
'metadata.sign.'
);
$public
=
$cryptoUtils
->
loadPublicKey
(
$this
->
config
,
false
,
'metadata.sign.'
);
$matrix
[]
=
[
$matrix
[]
=
[
'required'
=>
'required'
,
'required'
=>
'required'
,
'descr'
=>
Translate
::
noop
(
'Matching key-pair for signing metadata'
),
'descr'
=>
Translate
::
noop
(
'Matching key-pair for signing metadata'
),
...
...
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