[ZEPPELIN-1354] [WIP] Inject Services #1361
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.zeppelin.inject; | ||
|
|
||
| import com.google.inject.Binder; | ||
| import com.google.inject.Module; | ||
| import com.google.inject.Provides; | ||
| import org.apache.zeppelin.conf.ZeppelinConfiguration; | ||
| import org.apache.zeppelin.search.SearchService; | ||
| import org.apache.zeppelin.server.ZeppelinServer; | ||
| import org.apache.zeppelin.web.WebSecurity; | ||
|
|
||
| /** | ||
| * Guice injection module. | ||
| */ | ||
| public class ZeppelinModule implements Module { | ||
| private ZeppelinConfiguration conf; | ||
|
|
||
| public ZeppelinModule(ZeppelinConfiguration conf) { | ||
| this.conf = conf; | ||
| } | ||
|
|
||
| @Override | ||
| public void configure(Binder binder) { | ||
|
|
||
| binder.bind(WebSecurity.class) | ||
| .to((Class<WebSecurity>) conf.getZeppelinWebSecurityClassname()); | ||
|
Contributor
There was a problem hiding this comment. Shall we add |
||
|
|
||
| binder.bind(SearchService.class) | ||
| .to((Class<SearchService>) conf.getZeppelinSearchServiceClassname()); | ||
|
|
||
| binder.requestStaticInjection(ZeppelinServer.class); | ||
|
|
||
| } | ||
|
|
||
| @Provides | ||
| public ZeppelinConfiguration getZeppelinConfiguration() { | ||
| return conf; | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.zeppelin.web; | ||
|
|
||
| import org.apache.zeppelin.conf.ZeppelinConfiguration; | ||
| import org.apache.zeppelin.server.CorsFilter; | ||
| import org.apache.zeppelin.utils.SecurityUtils; | ||
| import org.eclipse.jetty.servlet.FilterHolder; | ||
| import org.eclipse.jetty.webapp.WebAppContext; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.servlet.DispatcherType; | ||
| import java.io.File; | ||
| import java.util.EnumSet; | ||
|
|
||
| /** | ||
| * Default implementation of the actions to be taken | ||
| * by Zeppelin to secure the Web channel. | ||
| */ | ||
| public class DefaultWebSecurity implements WebSecurity { | ||
|
|
||
| @Inject | ||
| private ZeppelinConfiguration conf; | ||
|
|
||
| @Override | ||
| public void addCorFilter(WebAppContext webApp) { | ||
|
|
||
| webApp.addFilter(new FilterHolder(CorsFilter.class), "/*", | ||
| EnumSet.allOf(DispatcherType.class)); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void addSecurityFilter(WebAppContext webApp) { | ||
|
|
||
| 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)); | ||
|
|
||
| webApp.addEventListener(new org.apache.shiro.web.env.EnvironmentLoaderListener()); | ||
|
Contributor
There was a problem hiding this comment. Wouldnt be cleaner to import |
||
|
|
||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.zeppelin.web; | ||
|
|
||
| import org.eclipse.jetty.webapp.WebAppContext; | ||
|
|
||
| /** | ||
| * Definition of the actions to be taken | ||
| * by Zeppelin to secure the Web channel. | ||
| */ | ||
| public interface WebSecurity { | ||
|
|
||
| void addCorFilter(WebAppContext webApp); | ||
|
|
||
| void addSecurityFilter(WebAppContext webApp); | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like governator is not used (all import are commented), I think it better to remove it instead of having bunch of commented code.