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

Check for port before setting Origin header for watch requests. #1669

Merged
merged 3 commits into from
Aug 1, 2019
Merged

Check for port before setting Origin header for watch requests. #1669

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
9e34cad
Check for port before setting Origin header for watch requests.
kjcjohnson Jul 27, 2019
ef566f2
Merge branch 'master' into iss_1667
kjcjohnson Jul 30, 2019
06758e5
Whitespace cleanup in CHANGELOG.md
kjcjohnson Aug 1, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### 4.3-SNAPSHOT
Bugs
* Fixed user/password authentication bug in OpenShift 4
* Fix #1667: Origin header for watch requests had a port of -1 when no port specified

Improvements
* Test coverage for PersistentVolumeClaim
Expand Down
7 changes: 6 additions & 1 deletion ...lient/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchConnectionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,15 @@ private final void runWatch() {

httpUrlBuilder.addQueryParameter("watch", "true");

String origin = requestUrl.getProtocol() + "://" + requestUrl.getHost();
if (requestUrl.getPort() != -1) {
origin += ":" + requestUrl.getPort();
}

Request request = new Request.Builder()
.get()
.url(httpUrlBuilder.build())
.addHeader("Origin", requestUrl.getProtocol() + "://" + requestUrl.getHost() + ":" + requestUrl.getPort())
.addHeader("Origin", origin)
.build();

webSocket = clonedClient.newWebSocket(request, new WebSocketListener() {
Expand Down
7 changes: 6 additions & 1 deletion ...etes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchHTTPManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,15 @@ private final void runWatch() {

httpUrlBuilder.addQueryParameter("watch", "true");

String origin = requestUrl.getProtocol() + "://" + requestUrl.getHost();
if (requestUrl.getPort() != -1) {
origin += ":" + requestUrl.getPort();
}

final Request request = new Request.Builder()
.get()
.url(httpUrlBuilder.build())
.addHeader("Origin", requestUrl.getProtocol() + "://" + requestUrl.getHost() + ":" + requestUrl.getPort())
.addHeader("Origin", origin)
.build();

clonedClient.newCall(request).enqueue(new Callback() {
Expand Down