Skip to content

Conversation

@elek
Copy link
Member

@elek elek commented Apr 28, 2017

Change-Id: Iaad10a69983036e84b766a22fbc32113b926b60d

What is this PR for?

With ZEPPELIN-2288 we restored the check of the Origin field for websocket requests.

Unfortunately the current implementation will deny the request if the Origin HTTP header is empty, even if the zeppelin.server.allowed.origins is *

This patch enables websocket requests without Origin in the HTTP header if the zeppelin.server.allowed.origins=*. This fixes the work behind a restrictive reverse proxy (or behind Apache Knox)

What type of PR is it?

Bug Fix

What is the Jira issue?

https://issues.apache.org/jira/browse/ZEPPELIN-2468

How should this be tested?

It could be tested with curl as described in ZEPPELIN-2288, but I added additional unit test, so the change has been covered on unit test level.

Screenshots (if appropriate)

N/A

Questions:

  • Does the licenses files need update? NO
  • Is there breaking changes for older versions? NO
  • Does this needs documentation? NO

Change-Id: Iaad10a69983036e84b766a22fbc32113b926b60d
@Leemoonsoo
Copy link
Member

LGTM

@prabhjyotsingh
Copy link
Contributor

Thank you @elek for the fix. Tested on CentOS works well. LGTM.

@Leemoonsoo
Copy link
Member

Merge to master and branch-0.7 if no further comments.

asfgit pushed a commit that referenced this pull request May 3, 2017
Change-Id: Iaad10a69983036e84b766a22fbc32113b926b60d

### What is this PR for?
With ZEPPELIN-2288 we restored the check of the Origin field for websocket requests.

Unfortunately the current implementation will deny the request if the Origin HTTP header is empty, even if the zeppelin.server.allowed.origins is *

This patch enables websocket requests without Origin in the HTTP header if the zeppelin.server.allowed.origins=*. This fixes the work behind a restrictive reverse proxy (or behind Apache Knox)

### What type of PR is it?
Bug Fix

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2468

### How should this be tested?

It could be tested with curl as described in ZEPPELIN-2288, but I added additional unit test, so the change has been covered on unit test level.

### Screenshots (if appropriate)
N/A

### Questions:
* Does the licenses files need update? NO
* Is there breaking changes for older versions? NO
* Does this needs documentation? NO

Author: Elek, Márton <[email protected]>

Closes #2299 from elek/ZEPPELIN-2468 and squashes the following commits:

d95bb41 [Elek, Márton] [ZEPPELIN-2468] Enable websocket without Origin if allowed.origins is *

(cherry picked from commit 73ae291)
Signed-off-by: Lee moon soo <[email protected]>
@asfgit asfgit closed this in 73ae291 May 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants