Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix for flaky test AuthenticationTokenTest.equals #1338

Closed
wants to merge 3 commits into from
Closed

Fix for flaky test AuthenticationTokenTest.equals #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5aefc7d
Fix for flaky test AuthenticationTokenTest.equals
219sansim Oct 19, 2023
60afdc1
Merge branch 'main' into fix_flaky_auth_token_test
219sansim Nov 9, 2023
a1ec526
Merge branch 'main' into fix_flaky_auth_token_test
liga-oz Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions java-security-test/src/main/java/com/sap/cloud/security/test/JwtGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,19 @@
}

private String createTokenAsString() {
String header = base64Encode(jsonHeader.toString().getBytes());
String payload = base64Encode(jsonPayload.toString().getBytes());
//Sort the header and payload to get a deterministic Token each time
//Ensure keys and values are correctly formatted as JSON strings
JSONObject jsonObject = new JSONObject();
List<String> headerlist = new ArrayList<>();
jsonHeader.keySet().forEach(key -> headerlist.add("\"" + key.toString() + "\":" + jsonObject.valueToString(jsonHeader.get(key))));

Check notice

Code scanning / CodeQL

Useless toString on String Note

Redundant call to 'toString' on a String object.
Collections.sort(headerlist);
String header = "{" + String.join(", ", headerlist) + "}";
List<String> payloadlist = new ArrayList<>();
jsonPayload.keySet().forEach(key -> payloadlist.add("\"" + key.toString() + "\":" + jsonObject.valueToString(jsonPayload.get(key))));

Check notice

Code scanning / CodeQL

Useless toString on String Note

Redundant call to 'toString' on a String object.
Collections.sort(payloadlist);
String payload = "{" + String.join(", ", payloadlist) + "}";
header = base64Encode(header.getBytes());
payload = base64Encode(payload.getBytes());
String headerAndPayload = header + DOT + payload;
String signature = calculateSignature(headerAndPayload);
return headerAndPayload + DOT + signature;
Expand Down
2 changes: 1 addition & 1 deletion ...-security-compatibility/src/test/java/com/sap/cloud/security/comp/XsuaaTokenCompTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ void getSubdomainFails() {
@Test
void getAppToken() {
token = XsuaaTokenComp.createInstance(jwtGenerator.createToken());
assertThat(token.getAppToken(), startsWith("eyJqa3UiOiJodHRwOi8vbG9jYWx"));
assertThat(token.getAppToken(), startsWith("eyJhbGciOiJSUzI1NiIsICJqa3U"));
}

@Test
Expand Down
Loading