Skip to content

Alternative credential retrieval - threadsafe #2722

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
paullallier wants to merge 10 commits into
base: master
Choose a base branch
from
+58 −4
Open

Alternative credential retrieval - threadsafe #2722

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
64fc419
Fallback to $_SERVER as source for credentials
paullallier Jul 4, 2023
c0edd18
Fallback to $_SERVER as source for credentials
paullallier Jul 4, 2023
7728a7b
Merge remote-tracking branch 'origin/alternative_credential_retrieval…
paullallier Jul 4, 2023
5c2fc0b
Fallback to $_SERVER as source for credentials
paullallier Jul 4, 2023
ecfa9d0
Revert change to ENV_SESSION since it's not working
paullallier Aug 25, 2023
4651651
Merge branch 'aws:master' into alternative_credential_retrieval
paullallier Jul 1, 2024
6ac8156
Update CredentialProvider.php
paullallier Jul 1, 2024
6523dae
Add missing LF
paullallier Jul 1, 2024
4356661
Set the $_SERVER variables a different way
paullallier Jul 12, 2024
f46cea5
Merge branch 'master' into alternative_credential_retrieval
stobrien89 Aug 29, 2025
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
Prev Previous commit
Next Next commit
Update CredentialProvider.php 
Add a fall-through in case the $_SERVER variable isn't set (and re-introduce the equivalent change for ENV_SESSION)
  • Loading branch information
@paullallier
paullallier authored Jul 1, 2024
commit 6ac8156b8f618a19a19675fbbbf7ba1160f1f4e1
6 changes: 3 additions & 3 deletions src/Credentials/CredentialProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,11 @@ public static function env()
{
return function () {
// Use credentials from environment variables, if available
$key = getenv(self::ENV_KEY) ?: $_SERVER[self::ENV_KEY];
$secret = getenv(self::ENV_SECRET) ?: $_SERVER[self::ENV_SECRET];
$key = getenv(self::ENV_KEY) ?: $_SERVER[self::ENV_KEY] ?? false;
$secret = getenv(self::ENV_SECRET) ?: $_SERVER[self::ENV_SECRET] ?? false;
if ($key && $secret) {
return Promise\Create::promiseFor(
new Credentials($key, $secret, getenv(self::ENV_SESSION) ?: NULL)
new Credentials($key, $secret, getenv(self::ENV_SESSION) ?: $_SERVER[self::ENV_SESSION] ?? NULL)
);
}

Expand Down