Skip to content

add support to get private key as string instead of file path/name fr… #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gonenradai wants to merge 3 commits into
base: master
Choose a base branch
from
+16 −8
Open

add support to get private key as string instead of file path/name fr… #670

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f125520
add support to get private key as string instead of file path/name fr…
gonenradai Aug 8, 2017
0f4a720
Fix Psalm-issue
tvdijen Jun 6, 2019
3227ccd
Merge branch 'master' into support-private-key-from-string
tvdijen Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions lib/SimpleSAML/Utils/Crypto.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,20 +196,28 @@ public static function loadPrivateKey(
bool $full_path = false
): ?array {
$file = $metadata->getString($prefix . 'privatekey', null);

if ($file === null) {
// no private key found
if ($required) {
throw new Error\Exception('No private key found in metadata.');
} else {
return null;
// try getting the privatekeydata
$data = $metadata->getString($prefix . 'privatekeydata', null);
if ($data === null) {
if ($required) {
throw new Error\Exception('No private key found in metadata.');
} else {
return null;
}
}
}

if (!$full_path) {
$file = Config::getCertPath($file);
// file could be still null if privateKey was passed as string in configuration throutgh privatekeydata
if ($file !== null) {
if (!$full_path) {
$file = Config::getCertPath($file);
}
$data = @file_get_contents($file);
}

$data = @file_get_contents($file);

if ($data === false) {
throw new Error\Exception('Unable to load private key from file "' . $file . '"');
}
Expand Down