Skip to content
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

Jump to bottom

Fix SAML config: convert SamlConfig toLower #2158

Merged
merged 5 commits into from
Jan 20, 2023
Merged

Fix SAML config: convert SamlConfig toLower #2158

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
320f40c
Convert SamlConfig toLower
strehle Jan 10, 2023
37703d7
sonar findings
strehle Jan 10, 2023
fa2b158
review
strehle Jan 19, 2023
01172a1
Merge branch 'develop' of github.com:cloudfoundry/uaa into fix/2157
strehle Jan 19, 2023
94b495b
sorry, yes
strehle Jan 19, 2023
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
5 changes: 3 additions & 2 deletions ...in/java/org/cloudfoundry/identity/uaa/impl/config/IdentityZoneConfigurationBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;

import static java.util.Collections.EMPTY_MAP;
Expand Down Expand Up @@ -97,7 +98,7 @@ public void afterPropertiesSet() throws InvalidIdentityZoneDetailsException {
samlKeys = ofNullable(samlKeys).orElse(EMPTY_MAP);
for (Map.Entry<String, Map<String,String>> entry : samlKeys.entrySet()) {
SamlKey samlKey = new SamlKey(entry.getValue().get("key"), entry.getValue().get("passphrase"), entry.getValue().get("certificate"));
definition.getSamlConfig().addKey(entry.getKey(), samlKey);
definition.getSamlConfig().addKey(ofNullable(entry.getKey()).orElseThrow(() -> new InvalidIdentityZoneDetailsException("SAML key id must not be null.", null)).toLowerCase(Locale.US), samlKey);
strehle marked this conversation as resolved.
Show resolved Hide resolved
}
definition.getSamlConfig().setActiveKeyId(this.activeKeyId);

Expand Down Expand Up @@ -165,7 +166,7 @@ public IdentityZoneConfigurationBootstrap setSamlKeys(Map<String, Map<String, St
}

public IdentityZoneConfigurationBootstrap setActiveKeyId(String activeKeyId) {
this.activeKeyId = activeKeyId;
this.activeKeyId = activeKeyId != null ? activeKeyId.toLowerCase(Locale.US) : null;
strehle marked this conversation as resolved.
Show resolved Hide resolved
return this;
}

Expand Down
20 changes: 18 additions & 2 deletions ...st/java/org/cloudfoundry/identity/uaa/config/IdentityZoneConfigurationBootstrapTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ public void test_multiple_keys() throws InvalidIdentityZoneDetailsException {
key1.put("key", SamlTestUtils.PROVIDER_PRIVATE_KEY);
key1.put("passphrase", SamlTestUtils.PROVIDER_PRIVATE_KEY_PASSWORD);
key1.put("certificate", SamlTestUtils.PROVIDER_CERTIFICATE);
keys.put("key1", key1);
bootstrap.setActiveKeyId("key1");
keys.put("Key1", key1);
bootstrap.setActiveKeyId("KEY1");
bootstrap.setSamlKeys(keys);
bootstrap.afterPropertiesSet();
IdentityZone uaa = provisioning.retrieve(IdentityZone.getUaaZoneId());
Expand All @@ -139,6 +139,22 @@ public void test_multiple_keys() throws InvalidIdentityZoneDetailsException {
assertEquals(SamlTestUtils.PROVIDER_CERTIFICATE, config.getKeys().get("key1").getCertificate());
}

@Test
void test_keyId_null_exception() {
bootstrap.setSamlSpPrivateKey(SamlTestUtils.PROVIDER_PRIVATE_KEY);
bootstrap.setSamlSpCertificate(SamlTestUtils.PROVIDER_CERTIFICATE);
bootstrap.setSamlSpPrivateKeyPassphrase(SamlTestUtils.PROVIDER_PRIVATE_KEY_PASSWORD);
Map<String, Map<String, String>> keys = new HashMap<>();
Map<String, String> key1 = new HashMap<>();
key1.put("key", SamlTestUtils.PROVIDER_PRIVATE_KEY);
key1.put("passphrase", SamlTestUtils.PROVIDER_PRIVATE_KEY_PASSWORD);
key1.put("certificate", SamlTestUtils.PROVIDER_CERTIFICATE);
keys.put(null, key1);
bootstrap.setActiveKeyId(null);
bootstrap.setSamlKeys(keys);
assertThrows(InvalidIdentityZoneDetailsException.class, () -> bootstrap.afterPropertiesSet());
}

@Test
public void testDefaultSamlKeys() throws Exception {
bootstrap.setSamlSpPrivateKey(SamlTestUtils.PROVIDER_PRIVATE_KEY);
Expand Down