Skip to content

Commit

Permalink
Rename JsonFriendlyRequest to SavedRequest
Browse files Browse the repository at this point in the history
  • Loading branch information
@jungm
jungm committed Jun 2, 2024
1 parent 1db4218 commit a56e666
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 28 deletions.
6 changes: 3 additions & 3 deletions ...omee-security/src/main/java/org/apache/tomee/security/cdi/LoginToContinueInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.tomee.security.cdi;

import org.apache.tomee.security.http.JsonFriendlyRequest;
import org.apache.tomee.security.http.SavedRequest;
import org.apache.tomee.security.http.LoginToContinueMechanism;
import org.apache.tomee.security.http.SavedAuthentication;

Expand Down Expand Up @@ -154,7 +154,7 @@ private AuthenticationStatus processContainerInitiatedAuthentication(
httpMessageContext.getCallerPrincipal(),
httpMessageContext.getGroups());

final JsonFriendlyRequest savedRequest = getRequest(httpMessageContext.getRequest());
final SavedRequest savedRequest = getRequest(httpMessageContext.getRequest());
return httpMessageContext.redirect(savedRequest.getUrlWithQueryString());

} else if (authenticationStatus.equals(SEND_FAILURE)) {
Expand All @@ -172,7 +172,7 @@ private AuthenticationStatus processContainerInitiatedAuthentication(
}

if (isOnOriginalURLAfterAuthenticate(httpMessageContext)) {
final JsonFriendlyRequest savedRequest = getRequest(httpMessageContext.getRequest());
final SavedRequest savedRequest = getRequest(httpMessageContext.getRequest());
final SavedAuthentication savedAuthentication = getAuthentication(httpMessageContext.getRequest());

clearRequestAndAuthentication(httpMessageContext.getRequest());
Expand Down
6 changes: 3 additions & 3 deletions ...e-security/src/main/java/org/apache/tomee/security/cdi/OpenIdAuthenticationMechanism.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import org.apache.openejb.util.Logger;
import org.apache.tomee.security.cdi.openid.TomEEOpenIdContext;
import org.apache.tomee.security.cdi.openid.storage.OpenIdStorageHandler;
import org.apache.tomee.security.http.JsonFriendlyRequest;
import org.apache.tomee.security.http.SavedRequest;
import org.apache.tomee.security.http.openid.model.TokenResponse;
import org.apache.tomee.security.http.openid.model.TomEEOpenIdCredential;

Expand Down Expand Up @@ -195,7 +195,7 @@ protected AuthenticationStatus redirectToAuthorization(HttpServletRequest reques
}

storageHandler.set(request, response, OpenIdConstant.ORIGINAL_REQUEST, fullRequestUrl);
storageHandler.set(request, response, OpenIdStorageHandler.REQUEST_KEY, JsonFriendlyRequest.fromRequest(request).toJson());
storageHandler.set(request, response, OpenIdStorageHandler.REQUEST_KEY, SavedRequest.fromRequest(request).toJson());

return messageContext.redirect(buildAuthorizationUri(request, response).toString());
}
Expand Down Expand Up @@ -270,7 +270,7 @@ protected AuthenticationStatus handleTokenResponse(TokenResponse tokenResponse,
OpenIdStorageHandler.REQUEST_KEY);

httpMessageContext.withRequest(
JsonFriendlyRequest.fromJson(originalRequestJson).mask(httpMessageContext.getRequest()));
SavedRequest.fromJson(originalRequestJson).mask(httpMessageContext.getRequest()));
}

return httpMessageContext.notifyContainerAboutLogin(validationResult);
Expand Down
14 changes: 4 additions & 10 deletions ...tomee-security/src/main/java/org/apache/tomee/security/http/LoginToContinueMechanism.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,11 @@
*/
package org.apache.tomee.security.http;

import org.apache.tomcat.util.buf.ByteChunk;

import jakarta.security.enterprise.authentication.mechanism.http.LoginToContinue;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.io.InputStream;
import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Set;

public interface LoginToContinueMechanism {
Expand All @@ -40,7 +34,7 @@ public interface LoginToContinueMechanism {

static void saveRequest(final HttpServletRequest request) throws IOException {
// Stash the SavedRequest in our session for later use
request.getSession().setAttribute(ORIGINAL_REQUEST, JsonFriendlyRequest.fromRequest(request));
request.getSession().setAttribute(ORIGINAL_REQUEST, SavedRequest.fromRequest(request));
}

static boolean matchRequest(final HttpServletRequest request) {
Expand All @@ -51,7 +45,7 @@ static boolean matchRequest(final HttpServletRequest request) {
}

// Is there a saved request?
JsonFriendlyRequest originalRequest = (JsonFriendlyRequest) request.getSession().getAttribute(ORIGINAL_REQUEST);
SavedRequest originalRequest = (SavedRequest) request.getSession().getAttribute(ORIGINAL_REQUEST);
if (originalRequest == null) {
return false;
}
Expand All @@ -72,8 +66,8 @@ static boolean hasRequest(final HttpServletRequest request) {
return request.getSession().getAttribute(ORIGINAL_REQUEST) != null;
}

static JsonFriendlyRequest getRequest(final HttpServletRequest request) {
return (JsonFriendlyRequest) request.getSession().getAttribute(ORIGINAL_REQUEST);
static SavedRequest getRequest(final HttpServletRequest request) {
return (SavedRequest) request.getSession().getAttribute(ORIGINAL_REQUEST);
}

static void saveAuthentication(final HttpServletRequest request,
Expand Down
12 changes: 6 additions & 6 deletions ...ee/security/http/JsonFriendlyRequest.java → ...che/tomee/security/http/SavedRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@

// JSON-B friendly class that stores the request data required for #
// both @LoginToContinue and @OpenIdAuthenticationMechanismDefinition(redirectToOriginalResource=true)
public class JsonFriendlyRequest implements Serializable {
private static final Logger LOGGER = Logger.getInstance(LogCategory.TOMEE_SECURITY, JsonFriendlyRequest.class);
public class SavedRequest implements Serializable {
private static final Logger LOGGER = Logger.getInstance(LogCategory.TOMEE_SECURITY, SavedRequest.class);

private static final CookieDeSerializer COOKIE_DE_SERIALIZER = new CookieDeSerializer();
private static final JsonbConfig jsonbConfig = new JsonbConfig()
Expand All @@ -57,7 +57,7 @@ public class JsonFriendlyRequest implements Serializable {
private String url;
private String queryString;

public static JsonFriendlyRequest fromRequest(HttpServletRequest request) {
public static SavedRequest fromRequest(HttpServletRequest request) {
Cookie[] cookies = request.getCookies();
Map<String, List<String>> headers = new HashMap<>();
Enumeration<String> headerNames = request.getHeaderNames();
Expand All @@ -69,7 +69,7 @@ public static JsonFriendlyRequest fromRequest(HttpServletRequest request) {
String method = request.getMethod();
String queryString = request.getQueryString();

JsonFriendlyRequest result = new JsonFriendlyRequest();
SavedRequest result = new SavedRequest();
result.setCookies(cookies);
result.setHeaders(headers);
result.setMethod(method);
Expand All @@ -79,9 +79,9 @@ public static JsonFriendlyRequest fromRequest(HttpServletRequest request) {
return result;
}

public static JsonFriendlyRequest fromJson(String json) {
public static SavedRequest fromJson(String json) {
try (Jsonb jsonb = JsonbBuilder.create(jsonbConfig)) {
return jsonb.fromJson(json, JsonFriendlyRequest.class);
return jsonb.fromJson(json, SavedRequest.class);
} catch (Exception e) {
LOGGER.error("Could not restore request from JSON", e);
return null;
Expand Down
12 changes: 6 additions & 6 deletions ...ecurity/http/JsonFriendlyRequestTest.java → ...tomee/security/http/SavedRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

public class JsonFriendlyRequestTest {
public class SavedRequestTest {

@Test
public void testSerializable() {
JsonFriendlyRequest request = new JsonFriendlyRequest();
SavedRequest request = new SavedRequest();
assertTrue("must implement Serializable, since it will be set as a session attribute",
request instanceof Serializable);
}

@Test
public void serialization() throws Exception {
JsonFriendlyRequest request = new JsonFriendlyRequest();
SavedRequest request = new SavedRequest();
request.setCookies(new Cookie[] {new Cookie("first", "val1"), new Cookie("second", "val2")});
request.setHeaders(new LinkedHashMap<>());
request.getHeaders().put("header1", List.of("h1val1", "h1val2"));
Expand All @@ -57,7 +57,7 @@ public void serialization() throws Exception {
@Test
public void deserialization() throws Exception {
String json = "{\"cookies\":[{\"name\":\"first\",\"value\":\"val1\",\"attributes\":{}},{\"name\":\"second\",\"value\":\"val2\",\"attributes\":{}}],\"headers\":{\"header1\":[\"h1val1\",\"h1val2\"],\"header2\":[\"h2val1\"]},\"method\":\"PATCH\",\"queryString\":\"foo=bar\",\"url\":\"http://example.com/foo\"}";
JsonFriendlyRequest request = JsonFriendlyRequest.fromJson(json);
SavedRequest request = SavedRequest.fromJson(json);

assertNotNull(request);
assertEquals(2, request.getCookies().length);
Expand All @@ -76,7 +76,7 @@ public void deserialization() throws Exception {
@Test
public void cookieSerialization() throws Exception {
JsonbConfig config = new JsonbConfig()
.withSerializers(new JsonFriendlyRequest.CookieDeSerializer());
.withSerializers(new SavedRequest.CookieDeSerializer());

try (Jsonb jsonb = JsonbBuilder.create(config)){
Cookie cookie = new Cookie("name", "value");
Expand All @@ -91,7 +91,7 @@ public void cookieSerialization() throws Exception {
@Test
public void cookieDeserialization() throws Exception {
JsonbConfig config = new JsonbConfig()
.withDeserializers(new JsonFriendlyRequest.CookieDeSerializer());
.withDeserializers(new SavedRequest.CookieDeSerializer());

try (Jsonb jsonb = JsonbBuilder.create(config)){
String json = "{\"name\":\"name\",\"value\":\"value\",\"attributes\":{\"Domain\":\"example.com\",\"Max-Age\":\"123\",\"Path\":\"/aaa\"}}";
Expand Down

0 comments on commit a56e666

Please sign in to comment.