-
Notifications
You must be signed in to change notification settings - Fork 24.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Security: fix TokenMetaData equals and hashcode (#30347)
The TokenMetaData equals method compared byte arrays using `.equals` on the arrays themselves, which is the equivalent of an `==` check. This means that a seperate byte[] with the same contents would not be considered equivalent to the existing one, even though it should be. The method has been updated to use `Array#equals` and similarly the hashcode method has been updated to call `Arrays#hashCode` instead of calling hashcode on the array itself.
- Loading branch information
Showing
4 changed files
with
69 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...in/core/src/test/java/org/elasticsearch/xpack/core/security/authc/TokenMetaDataTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.core.security.authc; | ||
|
||
import org.elasticsearch.common.io.stream.BytesStreamOutput; | ||
import org.elasticsearch.common.settings.SecureString; | ||
import org.elasticsearch.test.ESTestCase; | ||
import org.elasticsearch.test.EqualsHashCodeTestUtils; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Arrays; | ||
import java.util.List; | ||
|
||
public class TokenMetaDataTests extends ESTestCase { | ||
|
||
public void testEqualsAndHashCode() { | ||
final int numKeyAndTimestamps = scaledRandomIntBetween(1, 8); | ||
final List<KeyAndTimestamp> keyAndTimestampList = generateKeyAndTimestampListOfSize(numKeyAndTimestamps); | ||
final byte[] currentKeyHash = randomByteArrayOfLength(8); | ||
final TokenMetaData original = new TokenMetaData(keyAndTimestampList, currentKeyHash); | ||
|
||
EqualsHashCodeTestUtils.checkEqualsAndHashCode(original, tokenMetaData -> { | ||
final List<KeyAndTimestamp> copiedList = new ArrayList<>(keyAndTimestampList); | ||
final byte[] copyKeyHash = Arrays.copyOf(currentKeyHash, currentKeyHash.length); | ||
return new TokenMetaData(copiedList, copyKeyHash); | ||
}, tokenMetaData -> { | ||
final List<KeyAndTimestamp> modifiedList = generateKeyAndTimestampListOfSize(numKeyAndTimestamps); | ||
return new TokenMetaData(modifiedList, currentKeyHash); | ||
}); | ||
|
||
EqualsHashCodeTestUtils.checkEqualsAndHashCode(original, tokenMetaData -> { | ||
BytesStreamOutput out = new BytesStreamOutput(); | ||
tokenMetaData.writeTo(out); | ||
return new TokenMetaData(out.bytes().streamInput()); | ||
}, tokenMetaData -> { | ||
final byte[] modifiedKeyHash = randomByteArrayOfLength(8); | ||
return new TokenMetaData(keyAndTimestampList, modifiedKeyHash); | ||
}); | ||
} | ||
|
||
private List<KeyAndTimestamp> generateKeyAndTimestampListOfSize(int size) { | ||
final List<KeyAndTimestamp> keyAndTimestampList = new ArrayList<>(size); | ||
for (int i = 0; i < size; i++) { | ||
keyAndTimestampList.add( | ||
new KeyAndTimestamp(new SecureString(randomAlphaOfLengthBetween(1, 12).toCharArray()), randomNonNegativeLong())); | ||
} | ||
return keyAndTimestampList; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters