You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mi...@apache.org on 2016/06/21 04:25:58 UTC
zeppelin git commit: [ZEPPELIN-1033] HotFixing of paragraph deletion
and re-ordering broken
Repository: zeppelin
Updated Branches:
refs/heads/master 2054f9f0f -> 286a8886b
[ZEPPELIN-1033] HotFixing of paragraph deletion and re-ordering broken
### What is this PR for?
This PR is for fixing [this issue](https://issues.apache.org/jira/browse/ZEPPELIN-1033)
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1033
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: astroshim <hsshim.nflabs.com>
Author: root <ro...@worker8.nflabs.com>
Closes #1048 from astroshim/ZEPPELIN-1033 and squashes the following commits:
eb80103 [astroshim] remove importing Ini and spaces
8eeb1bf [astroshim] update version of shiro config module.
5a2b268 [astroshim] add shiro ini to SecurityManager.
13a6139 [astroshim] add shiro-config-core
6c99111 [root] add initSecurityManager method.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/286a8886
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/286a8886
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/286a8886
Branch: refs/heads/master
Commit: 286a8886b0d1cf4667ce46f1bf7975185460dee3
Parents: 2054f9f
Author: astroshim <hsshim.nflabs.com>
Authored: Tue Jun 21 08:43:44 2016 +0900
Committer: Mina Lee <mi...@apache.org>
Committed: Mon Jun 20 21:25:51 2016 -0700
----------------------------------------------------------------------
pom.xml | 5 +++++
.../main/java/org/apache/zeppelin/server/ZeppelinServer.java | 2 ++
.../main/java/org/apache/zeppelin/utils/SecurityUtils.java | 8 ++++++++
3 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/286a8886/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a035c6d..ccd04ef 100755
--- a/pom.xml
+++ b/pom.xml
@@ -211,6 +211,11 @@
<artifactId>shiro-web</artifactId>
<version>1.2.3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-config-core</artifactId>
+ <version>1.2.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/286a8886/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 7412611..0ff0dc6 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -32,6 +32,7 @@ import org.apache.zeppelin.search.LuceneSearch;
import org.apache.zeppelin.search.SearchService;
import org.apache.zeppelin.socket.NotebookServer;
import org.apache.zeppelin.user.Credentials;
+import org.apache.zeppelin.utils.SecurityUtils;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.*;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -238,6 +239,7 @@ public class ZeppelinServer extends Application {
webapp.setInitParameter("shiroConfigLocations",
new File(conf.getShiroPath()).toURI().toString());
+ SecurityUtils.initSecurityManager(conf.getShiroPath());
webapp.addFilter(org.apache.shiro.web.servlet.ShiroFilter.class, "/api/*",
EnumSet.allOf(DispatcherType.class));
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/286a8886/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
index 4de4573..f9e5929 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
@@ -21,6 +21,8 @@ import org.apache.shiro.realm.text.IniRealm;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.ThreadContext;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import org.apache.shiro.mgt.SecurityManager;
+import org.apache.shiro.config.IniSecurityManagerFactory;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import java.net.InetAddress;
@@ -34,6 +36,12 @@ import java.util.*;
*/
public class SecurityUtils {
+ public static void initSecurityManager(String shiroPath) {
+ IniSecurityManagerFactory factory = new IniSecurityManagerFactory("file:" + shiroPath);
+ SecurityManager securityManager = factory.getInstance();
+ org.apache.shiro.SecurityUtils.setSecurityManager(securityManager);
+ }
+
public static Boolean isValidOrigin(String sourceHost, ZeppelinConfiguration conf)
throws UnknownHostException, URISyntaxException {
if (sourceHost == null || sourceHost.isEmpty()) {