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

Ufal/header value could have equals char #895

Merged
merged 2 commits into from
Mar 11, 2025
Merged

Ufal/header value could have equals char #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be09e48
Set limit when splitting key/value using `=`
milanmajchrak Mar 11, 2025
5ffb503
The IT should expect encoded netid in the URL
milanmajchrak Mar 11, 2025
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
2 changes: 1 addition & 1 deletion dspace-api/src/main/java/org/dspace/authenticate/clarin/Headers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void initialise(String shibHeaders, String header_separator) {
for (String line : shibHeaders.split("\n")) {
String key = " ";
try {
String key_value[] = line.split("=");
String key_value[] = line.split("=", 2);
key = key_value[0].trim();
headers_.put(key, List.of(key_value[1]));
} catch (Exception ignore) {
Expand Down
17 changes: 12 additions & 5 deletions ...rver-webapp/src/test/java/org/dspace/app/rest/security/ClarinShibbolethLoginFilterIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -144,7 +146,8 @@ public void shouldReturnUserWithoutEmailException() throws Exception {
.header("Shib-Identity-Provider", IDP_TEST_EPERSON))
.andExpect(status().isFound())
.andExpect(redirectedUrl("http://localhost:4000/login/auth-failed?netid=" +
Util.formatNetId(netId, IDP_TEST_EPERSON)));
URLEncoder.encode(Objects.requireNonNull(Util.formatNetId(netId, IDP_TEST_EPERSON)),
StandardCharsets.UTF_8)));
}

/**
Expand All @@ -170,7 +173,8 @@ public void userFillInEmailAndShouldBeRegisteredByVerificationToken() throws Exc
.header("SHIB-NETID", netId))
.andExpect(status().isFound())
.andExpect(redirectedUrl("http://localhost:4000/login/auth-failed?netid=" +
Util.formatNetId(netId, idp)));
URLEncoder.encode(Objects.requireNonNull(Util.formatNetId(netId, idp)),
StandardCharsets.UTF_8)));

// Send the email with the verification token.
String tokenAdmin = getAuthToken(admin.getEmail(), password);
Expand Down Expand Up @@ -618,7 +622,8 @@ public void shouldAskForEmailWhenHasPersistentId() throws Exception {
.header(NET_ID_PERSISTENT_ID, persistentId))
.andExpect(status().isFound())
.andExpect(redirectedUrl("http://localhost:4000/login/auth-failed?netid=" +
Util.formatNetId(persistentId, IDP_TEST_EPERSON)));
URLEncoder.encode(Objects.requireNonNull(Util.formatNetId(persistentId, IDP_TEST_EPERSON)),
StandardCharsets.UTF_8)));
}

// The user was registered and signed in with the verification token on the second attempt, after the email
Expand All @@ -636,7 +641,8 @@ public void shouldNotAuthenticateOnSecondAttemptWithoutVerificationTokenInReques
.header("SHIB-NETID", netId))
.andExpect(status().isFound())
.andExpect(redirectedUrl("http://localhost:4000/login/auth-failed?netid=" +
Util.formatNetId(netId, idp)));
URLEncoder.encode(Objects.requireNonNull(Util.formatNetId(netId, idp)),
StandardCharsets.UTF_8)));

// Send the email with the verification token.
String tokenAdmin = getAuthToken(admin.getEmail(), password);
Expand All @@ -655,7 +661,8 @@ public void shouldNotAuthenticateOnSecondAttemptWithoutVerificationTokenInReques
.header("SHIB-NETID", netId))
.andExpect(status().isFound())
.andExpect(redirectedUrl("http://localhost:4000/login/auth-failed?netid=" +
Util.formatNetId(netId, idp)));
URLEncoder.encode(Objects.requireNonNull(Util.formatNetId(netId, idp)),
StandardCharsets.UTF_8)));
}

@Test
Expand Down