honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Security: switch to IllegalArgumentException if request cannot be serialized 

The commit switches the CreateTokenRequest and InvalidateTokenRequest to throw an
IllegalArgumentException when the version the request is being serialized to does not support the
request. This fixes test failures due to the use of the AssertingTransportInterceptor testing
serialization with versions prior to 6.2. The IAE is an indication to the
AssertingTranpsortInterceptor that the request does not support the version.

Original commit: elastic/x-pack-elasticsearch@c73abf1bc0
This commit is contained in:
jaymode 2018-01-24 12:11:51 -07:00
parent ae1a90eba6
commit a547049303
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenRequest.java
View File

@ -142,7 +142,7 @@ public final class CreateTokenRequest extends ActionRequest {
out.writeOptionalString(refreshToken); out.writeOptionalString(refreshToken);
} else { } else {
if ("refresh_token".equals(grantType)) { if ("refresh_token".equals(grantType)) {
throw new UnsupportedOperationException("a refresh request cannot be sent to an older version"); throw new IllegalArgumentException("a refresh request cannot be sent to an older version");
} else { } else {
out.writeString(username); out.writeString(username);
final byte[] passwordBytes = CharArrays.toUtf8Bytes(password.getChars()); final byte[] passwordBytes = CharArrays.toUtf8Bytes(password.getChars());

2
plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/InvalidateTokenRequest.java
View File

@ -74,7 +74,7 @@ public final class InvalidateTokenRequest extends ActionRequest {
if (out.getVersion().onOrAfter(Version.V_6_2_0)) { if (out.getVersion().onOrAfter(Version.V_6_2_0)) {
out.writeVInt(tokenType.ordinal()); out.writeVInt(tokenType.ordinal());
} else if (tokenType == Type.REFRESH_TOKEN) { } else if (tokenType == Type.REFRESH_TOKEN) {
throw new UnsupportedOperationException("refresh token invalidation cannot be serialized with version [" + out.getVersion() + throw new IllegalArgumentException("refresh token invalidation cannot be serialized with version [" + out.getVersion() +
"]"); "]");
} }
} }