From fc5c1f2a44dc3e2e8896714c170f92742622a6b9 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 23 Oct 2011 16:38:03 +0200 Subject: [PATCH] added injection for requested repository --- .../src/main/java/sonia/scm/util/IOUtil.java | 24 ++++ .../web/filter/ProviderPermissionFilter.java | 90 ++++++++++++++ .../main/java/sonia/scm/ScmServletModule.java | 3 + .../scm/repository/RepositoryProvider.java | 113 ++++++++++++++++++ 4 files changed, 230 insertions(+) create mode 100644 scm-core/src/main/java/sonia/scm/web/filter/ProviderPermissionFilter.java create mode 100644 scm-webapp/src/main/java/sonia/scm/repository/RepositoryProvider.java diff --git a/scm-core/src/main/java/sonia/scm/util/IOUtil.java b/scm-core/src/main/java/sonia/scm/util/IOUtil.java index 03fbb0f823..f6557abc89 100644 --- a/scm-core/src/main/java/sonia/scm/util/IOUtil.java +++ b/scm-core/src/main/java/sonia/scm/util/IOUtil.java @@ -592,6 +592,30 @@ public class IOUtil return cmds; } + /** + * Method description + * + * + * @param name + * + * @return + * @since 1.9 + */ + public static String trimSeperatorChars(String name) + { + if (name.startsWith(File.separator)) + { + name = name.substring(1); + } + + if (name.endsWith(File.separator)) + { + name = name.substring(0, name.length() - 1); + } + + return name; + } + //~--- get methods ---------------------------------------------------------- /** diff --git a/scm-core/src/main/java/sonia/scm/web/filter/ProviderPermissionFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/ProviderPermissionFilter.java new file mode 100644 index 0000000000..2263d8a20d --- /dev/null +++ b/scm-core/src/main/java/sonia/scm/web/filter/ProviderPermissionFilter.java @@ -0,0 +1,90 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of SCM-Manager; nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.web.filter; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.google.inject.Provider; + +import sonia.scm.repository.Repository; +import sonia.scm.web.security.WebSecurityContext; + +//~--- JDK imports ------------------------------------------------------------ + +import javax.servlet.http.HttpServletRequest; + +/** + * + * @author Sebastian Sdorra + * @since 1.9 + */ +public abstract class ProviderPermissionFilter extends PermissionFilter +{ + + /** + * Constructs ... + * + * + * @param securityContextProvider + * @param repositoryProvider + */ + public ProviderPermissionFilter( + Provider securityContextProvider, + Provider repositoryProvider) + { + super(securityContextProvider); + this.repositoryProvider = repositoryProvider; + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param request + * + * @return + */ + @Override + protected Repository getRepository(HttpServletRequest request) + { + return repositoryProvider.get(); + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private Provider repositoryProvider; +} diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java index e2c8c3d276..03e097e1e2 100644 --- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java +++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java @@ -61,8 +61,10 @@ import sonia.scm.plugin.PluginLoader; import sonia.scm.plugin.PluginManager; import sonia.scm.plugin.ScriptResourceServlet; import sonia.scm.repository.ChangesetViewerUtil; +import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryBrowserUtil; import sonia.scm.repository.RepositoryManager; +import sonia.scm.repository.RepositoryProvider; import sonia.scm.repository.xml.XmlRepositoryManager; import sonia.scm.security.CipherHandler; import sonia.scm.security.CipherUtil; @@ -198,6 +200,7 @@ public class ScmServletModule extends ServletModule ScmConfiguration config = getScmConfiguration(context); CipherUtil cu = CipherUtil.getInstance(); + bind(Repository.class).toProvider(RepositoryProvider.class); bind(StoreFactory.class).to(JAXBStoreFactory.class); bind(ScmConfiguration.class).toInstance(config); bind(PluginLoader.class).toInstance(pluginLoader); diff --git a/scm-webapp/src/main/java/sonia/scm/repository/RepositoryProvider.java b/scm-webapp/src/main/java/sonia/scm/repository/RepositoryProvider.java new file mode 100644 index 0000000000..dbd9275cc7 --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/repository/RepositoryProvider.java @@ -0,0 +1,113 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of SCM-Manager; nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.repository; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.servlet.RequestScoped; + +//~--- JDK imports ------------------------------------------------------------ + +import javax.servlet.http.HttpServletRequest; + +/** + * + * @author Sebastian Sdorra + */ +@RequestScoped +public class RepositoryProvider implements Provider +{ + + /** Field description */ + public static final String ATTRIBUTE_NAME = "scm.request.repository"; + + //~--- constructors --------------------------------------------------------- + + /** + * Constructs ... + * + * + * @param requestProvider + * @param manager + */ + @Inject + public RepositoryProvider(Provider requestProvider, + RepositoryManager manager) + { + this.requestProvider = requestProvider; + this.manager = manager; + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + @Override + public Repository get() + { + Repository repository = null; + HttpServletRequest request = requestProvider.get(); + + if (request != null) + { + repository = (Repository) request.getAttribute(ATTRIBUTE_NAME); + + if (repository == null) + { + repository = manager.getFromRequest(request); + + if (repository != null) + { + request.setAttribute(ATTRIBUTE_NAME, repository); + } + } + } + + return repository; + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private RepositoryManager manager; + + /** Field description */ + private Provider requestProvider; +}