Skip to content

Remove check for method HttpServletRequest#getHeader and related test #6290

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

Merged
merged 1 commit into from Dec 18, 2018
Merged

Remove check for method HttpServletRequest#getHeader and related test #6290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions .../main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.springframework.security.web.header.writers;

import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;

Expand All @@ -25,7 +24,6 @@
import org.springframework.http.HttpStatus;
import org.springframework.security.web.header.Header;
import org.springframework.security.web.header.HeaderWriter;
import org.springframework.util.ReflectionUtils;

/**
* Inserts headers to prevent caching if no cache control headers have been specified.
Expand All @@ -44,17 +42,13 @@ public final class CacheControlHeadersWriter implements HeaderWriter {
private static final String PRAGMA = "Pragma";
private static final String CACHE_CONTROL = "Cache-Control";

private final Method getHeaderMethod;

private final HeaderWriter delegate;

/**
* Creates a new instance
*/
public CacheControlHeadersWriter() {
this.delegate = new StaticHeadersWriter(createHeaders());
this.getHeaderMethod = ReflectionUtils.findMethod(HttpServletResponse.class,
"getHeader", String.class);
}

@Override
Expand All @@ -67,11 +61,7 @@ public void writeHeaders(HttpServletRequest request, HttpServletResponse respons
}

private boolean hasHeader(HttpServletResponse response, String headerName) {
if (this.getHeaderMethod == null) {
return false;
}
return ReflectionUtils.invokeMethod(this.getHeaderMethod, response,
headerName) != null;
return response.getHeader(headerName) != null;
}

private static List<Header> createHeaders() {
Expand Down
25 changes: 0 additions & 25 deletions .../java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.springframework.security.web.header.writers;

import javax.servlet.http.HttpServletResponse;

import org.junit.Before;
import org.junit.Test;
Expand All @@ -29,10 +28,6 @@
import org.springframework.util.ReflectionUtils;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.spy;

/**
* @author Rob Winch
Expand Down Expand Up @@ -68,26 +63,6 @@ public void writeHeaders() {
.containsOnly("0");
}

@Test
public void writeHeadersServlet25() {
spy(ReflectionUtils.class);
when(ReflectionUtils.findMethod(HttpServletResponse.class, "getHeader",
String.class)).thenReturn(null);
this.response = spy(this.response);
doThrow(NoSuchMethodError.class).when(this.response).getHeader(anyString());
this.writer = new CacheControlHeadersWriter();

this.writer.writeHeaders(this.request, this.response);

assertThat(this.response.getHeaderNames().size()).isEqualTo(3);
assertThat(this.response.getHeaderValues("Cache-Control"))
.containsOnly("no-cache, no-store, max-age=0, must-revalidate");
assertThat(this.response.getHeaderValues("Pragma"))
.containsOnly("no-cache");
assertThat(this.response.getHeaderValues("Expires"))
.containsOnly("0");
}

// gh-2953
@Test
public void writeHeadersDisabledIfCacheControl() {
Expand Down