Skip to content

Commit de44463

Browse files
handle null issuer value
1 parent 16cb4b8 commit de44463

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlObjectHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ private ElasticsearchSecurityException samlSignatureException(Issuer issuer, Lis
269269

270270
// package private for testing
271271
String describeIssuer(@Nullable Issuer issuer) {
272-
if (issuer == null) {
272+
if (issuer == null || issuer.getValue() == null) {
273273
return "";
274274
}
275275
final String msg = " The issuer included in the SAML message was [%s]";

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlAuthenticatorTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,6 +1377,11 @@ public void testDescribeNullIssuer() {
13771377
assertThat(authenticator.describeIssuer(null), equalTo(""));
13781378
}
13791379

1380+
public void testDescribeNullIssuerValue() {
1381+
final Issuer issuer = new IssuerBuilder().buildObject();
1382+
assertThat(authenticator.describeIssuer(issuer), equalTo(""));
1383+
}
1384+
13801385
public void testDescribeIssuer() {
13811386
final Issuer issuer = new IssuerBuilder().buildObject();
13821387
issuer.setValue("https://idp.saml.elastic.test/");

0 commit comments

Comments
 (0)