-
Notifications
You must be signed in to change notification settings - Fork 24.6k
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.
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
Security: fix TokenMetaData equals and hashcode #30347
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ed8d7ec
Security: fix TokenMetaData equals and hashcode
jaymode 2c586d2
Merge branch 'master' into tokenmetadata_eq_hashcode
jaymode 445d890
add javadoc
jaymode 0ce0479
changelog
jaymode 090b55f
Merge branch 'master' into tokenmetadata_eq_hashcode
jaymode aa70f44
Merge branch 'master' into tokenmetadata_eq_hashcode
jaymode 3239f21
remove changelog entry
jaymode File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
javadocs?