Skip to content

Commit d18304c

Browse files
committed
fix merge
1 parent 43ff5cd commit d18304c

File tree

1 file changed

+0
-10
lines changed
  • x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc

1 file changed

+0
-10
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -659,16 +659,6 @@ private static void doWriteTo(Subject effectiveSubject, Subject authenticatingSu
659659
+ "]"
660660
);
661661
}
662-
if (effectiveSubject.getType() == Subject.Type.CLOUD_API_KEY
663-
&& out.getTransportVersion().before(TransportVersions.SECURITY_CLOUD_API_KEY_REALM_AND_TYPE)) {
664-
throw new IllegalArgumentException(
665-
"versions of Elasticsearch before ["
666-
+ TransportVersions.SECURITY_CLOUD_API_KEY_REALM_AND_TYPE.toReleaseVersion()
667-
+ "] can't handle cloud API key authentication and attempted to send to ["
668-
+ out.getTransportVersion().toReleaseVersion()
669-
+ "]"
670-
);
671-
}
672662
final boolean isRunAs = authenticatingSubject != effectiveSubject;
673663
if (isRunAs) {
674664
final User outerUser = effectiveSubject.getUser();

0 commit comments

Comments
 (0)