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

[JBEAP-10709] [ELY-1130] keystore entry alias is not necessary if the… #806

Merged
merged 1 commit into from
May 11, 2017
Merged

[JBEAP-10709] [ELY-1130] keystore entry alias is not necessary if the… #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/org/wildfly/security/_private/ElytronMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,9 @@ public interface ElytronMessages extends BasicLogger {
@Message(id = 2033, value = "key must implement SecretKeySpec and keySpec must be SecretKeySpec, given key, keySpec: [%s]")
InvalidKeySpecException keyMustImplementSecretKeySpecAndKeySpecMustBeSecretKeySpec(String keyAndKeySpec);

@Message(id = 2034, value = "Alias must be specified if more than one entry exist in keystore")
ConfigXMLParseException missingAlias(@Param Location location);

/* util package */

@Message(id = 3001, value = "Unexpected padding")
Expand Down
16 changes: 12 additions & 4 deletions src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,9 +1300,6 @@ static ExceptionSupplier<KeyStore.Entry, ConfigXMLParseException> parseKeyStoreR
if (keyStoreName == null) {
throw missingAttribute(reader, "key-store-name");
}
if (alias == null) {
throw missingAttribute(reader, "alias");
}
ExceptionSupplier<KeyStore.Entry, ConfigXMLParseException> keyStoreCredential = null;
while (reader.hasNext()) {
final int tag = reader.nextTag();
Expand Down Expand Up @@ -1348,7 +1345,18 @@ static ExceptionSupplier<KeyStore.Entry, ConfigXMLParseException> parseKeyStoreR
} else {
protectionParameter = null;
}
return keyStoreSupplier.get().getEntry(finalAlias, protectionParameter == null ? null : protectionParameter);
if (finalAlias != null) {
return keyStoreSupplier.get().getEntry(finalAlias, protectionParameter == null ? null : protectionParameter);
} else {
// allow to retrieve entry without providing alias only if keystore includes one and only entry.
if (keyStoreSupplier.get().size() > 1) {
throw xmlLog.missingAlias(location);
} else if (keyStoreSupplier.get().aliases().hasMoreElements()) {
return keyStoreSupplier.get().getEntry(keyStoreSupplier.get().aliases().nextElement(), protectionParameter == null ? null : protectionParameter);
} else {
return null;
}
}
} catch (GeneralSecurityException e) {
throw xmlLog.xmlFailedToLoadKeyStoreData(location, e);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/schema/elytron-1_0.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
<xsd:element name="credential-store" type="credential-store-reference-type" minOccurs="1" maxOccurs="1"/>
</xsd:choice>
<xsd:attribute name="key-store-name" type="xsd:string" use="required"/>
<xsd:attribute name="alias" type="xsd:string" use="required"/>
<xsd:attribute name="alias" type="xsd:string" use="optional"/>
</xsd:complexType>

<xsd:complexType name="credential-store-reference-type">
Expand Down