Skip to content

Release Request #228

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
buckett merged 3 commits into from
Sep 22, 2026
Merged

Release Request #228

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbee99b
AB#125030 Drop transport-encoding headers in response.
buckett May 20, 2026
fbfacd0
AB#125030 Strip full hop-by-hop response headers in proxy
Copilot May 20, 2026
3675bd3
Merge pull request #218 from oxctl/AB#125030
buckett Sep 15, 2026
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
11 changes: 11 additions & 0 deletions src/main/java/uk/ac/ox/ctl/canvasproxy/ProxyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
import java.net.SocketTimeoutException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

/**
* This proxy just sends requests on to Canvas. All it does is add the bearer token for the user.
Expand Down Expand Up @@ -85,6 +88,14 @@ public ResponseEntity<?> proxy(AbstractOAuth2TokenAuthenticationToken principal,

// We don't want to pass through cookies from Canvas.
httpHeaders.remove("Set-Cookie");
Set<String> hopByHopHeaders = new HashSet<>(Set.of("Connection", "Keep-Alive", "Proxy-Authenticate",
"Proxy-Authorization", "TE", "Trailer", "Transfer-Encoding", "Upgrade"));
response.getHeaders().getOrEmpty("Connection").stream()
.flatMap(connectionValue -> Arrays.stream(connectionValue.split(",")))
.map(String::trim)
.filter(headerName -> !headerName.isEmpty())
.forEach(hopByHopHeaders::add);
hopByHopHeaders.forEach(httpHeaders::remove);
return new ResponseEntity<>(response.getBody().readAllBytes(), httpHeaders, response.getStatusCode());
});
} catch (ResourceAccessException e) {
Expand Down
Loading