Skip to content

[ZEPPELIN-2468] Enable websocket without Origin if allowed.origins is * #2299

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

Closed
elek wants to merge 1 commit into from
Closed

[ZEPPELIN-2468] Enable websocket without Origin if allowed.origins is * #2299

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
10 changes: 6 additions & 4 deletions zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ public static void initSecurityManager(String shiroPath) {

public static Boolean isValidOrigin(String sourceHost, ZeppelinConfiguration conf)
throws UnknownHostException, URISyntaxException {
if (sourceHost == null || sourceHost.isEmpty()) {
return false;

String sourceUriHost = "";

if (sourceHost != null && !sourceHost.isEmpty()) {
sourceUriHost = new URI(sourceHost).getHost();
sourceUriHost = (sourceUriHost == null) ? "" : sourceUriHost.toLowerCase();
}
String sourceUriHost = new URI(sourceHost).getHost();
sourceUriHost = (sourceUriHost == null) ? "" : sourceUriHost.toLowerCase();

sourceUriHost = sourceUriHost.toLowerCase();
String currentHost = InetAddress.getLocalHost().getHostName().toLowerCase();
Expand Down
6 changes: 6 additions & 0 deletions zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ public void nullOrigin() throws URISyntaxException, UnknownHostException, Config
new ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site.xml"))));
}

@Test
public void nullOriginWithStar() throws URISyntaxException, UnknownHostException, ConfigurationException {
assertTrue(SecurityUtils.isValidOrigin(null,
new ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site-star.xml"))));
}

@Test
public void emptyOrigin() throws URISyntaxException, UnknownHostException, ConfigurationException {
assertFalse(SecurityUtils.isValidOrigin("",
Expand Down