mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-12 16:35:45 +01:00
read permission descriptor from classpath
This commit is contained in:
@@ -49,7 +49,7 @@ import javax.xml.bind.annotation.XmlRootElement;
|
|||||||
* @author Sebastian Sdorra
|
* @author Sebastian Sdorra
|
||||||
* @since 1.31
|
* @since 1.31
|
||||||
*/
|
*/
|
||||||
@XmlRootElement(name = "permissions")
|
@XmlRootElement(name = "permission")
|
||||||
@XmlAccessorType(XmlAccessType.FIELD)
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
public class PermissionDescriptor implements Serializable
|
public class PermissionDescriptor implements Serializable
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,15 +42,30 @@ import com.google.inject.Singleton;
|
|||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.apache.shiro.subject.PrincipalCollection;
|
import org.apache.shiro.subject.PrincipalCollection;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import sonia.scm.store.ConfigurationEntryStore;
|
import sonia.scm.store.ConfigurationEntryStore;
|
||||||
import sonia.scm.store.ConfigurationEntryStoreFactory;
|
import sonia.scm.store.ConfigurationEntryStoreFactory;
|
||||||
|
|
||||||
//~--- JDK imports ------------------------------------------------------------
|
//~--- JDK imports ------------------------------------------------------------
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import java.net.URL;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
import java.util.Enumeration;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
|
import javax.xml.bind.JAXBContext;
|
||||||
|
import javax.xml.bind.JAXBException;
|
||||||
|
import javax.xml.bind.annotation.XmlAccessType;
|
||||||
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TODO add events
|
* TODO add events
|
||||||
*
|
*
|
||||||
@@ -64,6 +79,16 @@ public class DefaultSecuritySystem implements SecuritySystem
|
|||||||
/** Field description */
|
/** Field description */
|
||||||
private static final String NAME = "security";
|
private static final String NAME = "security";
|
||||||
|
|
||||||
|
/** Field description */
|
||||||
|
private static final String PERMISSION_DESCRIPTOR =
|
||||||
|
"META-INF/scm/permissions.xml";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* the logger for DefaultSecuritySystem
|
||||||
|
*/
|
||||||
|
private static final Logger logger =
|
||||||
|
LoggerFactory.getLogger(DefaultSecuritySystem.class);
|
||||||
|
|
||||||
//~--- constructors ---------------------------------------------------------
|
//~--- constructors ---------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -76,6 +101,7 @@ public class DefaultSecuritySystem implements SecuritySystem
|
|||||||
public DefaultSecuritySystem(ConfigurationEntryStoreFactory storeFactory)
|
public DefaultSecuritySystem(ConfigurationEntryStoreFactory storeFactory)
|
||||||
{
|
{
|
||||||
store = storeFactory.getStore(AssignedPermission.class, NAME);
|
store = storeFactory.getStore(AssignedPermission.class, NAME);
|
||||||
|
readAvailablePermissions();
|
||||||
}
|
}
|
||||||
|
|
||||||
//~--- methods --------------------------------------------------------------
|
//~--- methods --------------------------------------------------------------
|
||||||
@@ -165,9 +191,9 @@ public class DefaultSecuritySystem implements SecuritySystem
|
|||||||
@Override
|
@Override
|
||||||
public List<PermissionDescriptor> getAvailablePermissions()
|
public List<PermissionDescriptor> getAvailablePermissions()
|
||||||
{
|
{
|
||||||
|
assertIsAdmin();
|
||||||
|
|
||||||
// TODO
|
return availablePermissions;
|
||||||
return Collections.EMPTY_LIST;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -220,8 +246,151 @@ public class DefaultSecuritySystem implements SecuritySystem
|
|||||||
SecurityUtils.getSubject().checkRole(Role.ADMIN);
|
SecurityUtils.getSubject().checkRole(Role.ADMIN);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method description
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @param context
|
||||||
|
* @param descriptorUrl
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private List<PermissionDescriptor> parsePermissionDescriptor(
|
||||||
|
JAXBContext context, URL descriptorUrl)
|
||||||
|
{
|
||||||
|
List<PermissionDescriptor> descriptors = Collections.EMPTY_LIST;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
PermissionDescriptors descriptorWrapper =
|
||||||
|
(PermissionDescriptors) context.createUnmarshaller().unmarshal(
|
||||||
|
descriptorUrl);
|
||||||
|
|
||||||
|
descriptors = descriptorWrapper.getPermissions();
|
||||||
|
|
||||||
|
logger.debug("found {} permissions at {}", descriptors.size(),
|
||||||
|
descriptorUrl);
|
||||||
|
logger.trace("permissions from {}: {}", descriptorUrl, descriptors);
|
||||||
|
}
|
||||||
|
catch (JAXBException ex)
|
||||||
|
{
|
||||||
|
logger.error("could not parse permission descriptor", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
return descriptors;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method description
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private void readAvailablePermissions()
|
||||||
|
{
|
||||||
|
Builder<PermissionDescriptor> builder = ImmutableList.builder();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
JAXBContext context =
|
||||||
|
JAXBContext.newInstance(PermissionDescriptors.class);
|
||||||
|
|
||||||
|
Enumeration<URL> descirptorEnum =
|
||||||
|
getClassLoader().getResources(PERMISSION_DESCRIPTOR);
|
||||||
|
|
||||||
|
while (descirptorEnum.hasMoreElements())
|
||||||
|
{
|
||||||
|
URL descriptorUrl = descirptorEnum.nextElement();
|
||||||
|
|
||||||
|
logger.debug("read permission descriptor from {}", descriptorUrl);
|
||||||
|
|
||||||
|
builder.addAll(parsePermissionDescriptor(context, descriptorUrl));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (IOException ex)
|
||||||
|
{
|
||||||
|
logger.error("could not read permission descriptors", ex);
|
||||||
|
}
|
||||||
|
catch (JAXBException ex)
|
||||||
|
{
|
||||||
|
logger.error(
|
||||||
|
"could not create jaxb context to read permission descriptors", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
availablePermissions = builder.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
//~--- get methods ----------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method description
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private ClassLoader getClassLoader()
|
||||||
|
{
|
||||||
|
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
|
||||||
|
|
||||||
|
if (classLoader == null)
|
||||||
|
{
|
||||||
|
logger.warn("could not find context classloader, use default");
|
||||||
|
|
||||||
|
classLoader = DefaultSecuritySystem.class.getClassLoader();
|
||||||
|
}
|
||||||
|
|
||||||
|
return classLoader;
|
||||||
|
}
|
||||||
|
|
||||||
|
//~--- inner classes --------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class description
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @version Enter version here..., 13/04/30
|
||||||
|
* @author Enter your name here...
|
||||||
|
*/
|
||||||
|
@XmlRootElement(name = "permissions")
|
||||||
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
private static class PermissionDescriptors
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs ...
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public PermissionDescriptors() {}
|
||||||
|
|
||||||
|
//~--- get methods --------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method description
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public List<PermissionDescriptor> getPermissions()
|
||||||
|
{
|
||||||
|
if (permissions == null)
|
||||||
|
{
|
||||||
|
permissions = Collections.EMPTY_LIST;
|
||||||
|
}
|
||||||
|
|
||||||
|
return permissions;
|
||||||
|
}
|
||||||
|
|
||||||
|
//~--- fields -------------------------------------------------------------
|
||||||
|
|
||||||
|
/** Field description */
|
||||||
|
@XmlElement(name = "permission")
|
||||||
|
private List<PermissionDescriptor> permissions;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//~--- fields ---------------------------------------------------------------
|
//~--- fields ---------------------------------------------------------------
|
||||||
|
|
||||||
/** Field description */
|
/** Field description */
|
||||||
private final ConfigurationEntryStore<AssignedPermission> store;
|
private final ConfigurationEntryStore<AssignedPermission> store;
|
||||||
|
|
||||||
|
/** Field description */
|
||||||
|
private List<PermissionDescriptor> availablePermissions;
|
||||||
}
|
}
|
||||||
|
|||||||
54
scm-webapp/src/main/resources/META-INF/scm/permissions.xml
Normal file
54
scm-webapp/src/main/resources/META-INF/scm/permissions.xml
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!--*
|
||||||
|
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
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
|
||||||
|
<permissions>
|
||||||
|
|
||||||
|
<permission>
|
||||||
|
<display-name>All Repository (read)</display-name>
|
||||||
|
<description>Read access to all repositories</description>
|
||||||
|
<value>repository:*:READ</value>
|
||||||
|
</permission>
|
||||||
|
|
||||||
|
<permission>
|
||||||
|
<display-name>All Repository (write)</display-name>
|
||||||
|
<description>Write access to all repositories</description>
|
||||||
|
<value>repository:*:WRITE</value>
|
||||||
|
</permission>
|
||||||
|
|
||||||
|
<permission>
|
||||||
|
<display-name>All Repository (owner)</display-name>
|
||||||
|
<description>Owner access to all repositories</description>
|
||||||
|
<value>repository:*:OWNER</value>
|
||||||
|
</permission>
|
||||||
|
|
||||||
|
</permissions>
|
||||||
@@ -30,10 +30,12 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
package sonia.scm.security;
|
package sonia.scm.security;
|
||||||
|
|
||||||
//~--- non-JDK imports --------------------------------------------------------
|
//~--- non-JDK imports --------------------------------------------------------
|
||||||
|
|
||||||
|
import com.google.common.base.Predicate;
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
import com.google.inject.Provider;
|
import com.google.inject.Provider;
|
||||||
@@ -49,6 +51,8 @@ import org.apache.shiro.subject.PrincipalCollection;
|
|||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import org.mockito.Mockito;
|
||||||
|
|
||||||
import sonia.scm.cache.MapCacheManager;
|
import sonia.scm.cache.MapCacheManager;
|
||||||
import sonia.scm.config.ScmConfiguration;
|
import sonia.scm.config.ScmConfiguration;
|
||||||
import sonia.scm.group.Group;
|
import sonia.scm.group.Group;
|
||||||
@@ -75,6 +79,7 @@ import static org.mockito.Mockito.*;
|
|||||||
//~--- JDK imports ------------------------------------------------------------
|
//~--- JDK imports ------------------------------------------------------------
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.atomic.AtomicLong;
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
@@ -461,9 +466,9 @@ public class ScmRealmTest
|
|||||||
|
|
||||||
SecuritySystem securitySystem = mock(SecuritySystem.class);
|
SecuritySystem securitySystem = mock(SecuritySystem.class);
|
||||||
when(
|
when(
|
||||||
securitySystem.getConfiguration()
|
securitySystem.getPermissions(Mockito.<Predicate>any())
|
||||||
).thenReturn(
|
).thenReturn(
|
||||||
new SecurityConfiguration()
|
Collections.EMPTY_LIST
|
||||||
);
|
);
|
||||||
|
|
||||||
return new ScmRealm(
|
return new ScmRealm(
|
||||||
|
|||||||
Reference in New Issue
Block a user