Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 14:35:45 +01:00
Code Issues Packages Projects Releases Activity

replace groups class with groupnames

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-08-30 10:38:56 +02:00
parent c7f11a8203
commit 81060af003
4 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
View File

@@ -53,8 +53,8 @@ import sonia.scm.SCMContextProvider;
import sonia.scm.ScmClientConfig;
import sonia.scm.ScmState;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.group.GroupNames;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.security.Groups;
import sonia.scm.security.ScmAuthenticationToken;
import sonia.scm.user.User;
import sonia.scm.user.UserManager;
@@ -290,9 +290,9 @@ public class AuthenticationResource
{
PrincipalCollection collection = subject.getPrincipals();
User user = collection.oneByType(User.class);
Groups groups = collection.oneByType(Groups.class);
GroupNames groups = collection.oneByType(GroupNames.class);
return new ScmState(contextProvider, user, groups.getGroups(),
return new ScmState(contextProvider, user, groups.getCollection(),
repositoryManger.getConfiguredTypes(), userManager.getDefaultType(),
new ScmClientConfig(configuration));
}

101
scm-webapp/src/main/java/sonia/scm/security/Groups.java
View File

@@ -1,101 +0,0 @@
/**
* 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.security;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
/**
*
* @author Sebastian Sdorra
*/
public class Groups implements Serializable, Iterable<String>
{
/** Field description */
private static final long serialVersionUID = -4152799570939669716L;
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
*
* @param groups
*/
public Groups(Collection<String> groups)
{
this.groups = groups;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @return
*/
@Override
public Iterator<String> iterator()
{
return getGroups().iterator();
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @return
*/
public Collection<String> getGroups()
{
if (groups == null)
{
groups = Collections.EMPTY_LIST;
}
return groups;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private Collection<String> groups;
}

8
scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java
View File

@@ -60,6 +60,7 @@ import sonia.scm.cache.CacheManager;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.group.Group;
import sonia.scm.group.GroupManager;
import sonia.scm.group.GroupNames;
import sonia.scm.repository.Permission;
import sonia.scm.repository.PermissionType;
import sonia.scm.repository.Repository;
@@ -273,7 +274,7 @@ public class ScmRealm extends AuthorizingRealm
logger.trace("coullect AuthorizationInfo for user {}", user.getName());
}
Groups groups = principals.oneByType(Groups.class);
GroupNames groups = principals.oneByType(GroupNames.class);
info = createAuthorizationInfo(user, groups);
}
@@ -545,7 +546,7 @@ public class ScmRealm extends AuthorizingRealm
*/
collection.add(user.getId(), NAME);
collection.add(user, NAME);
collection.add(new Groups(groups), NAME);
collection.add(new GroupNames(groups), NAME);
return new SimpleAuthenticationInfo(collection, token.getPassword());
}
@@ -559,7 +560,8 @@ public class ScmRealm extends AuthorizingRealm
*
* @return
*/
private AuthorizationInfo createAuthorizationInfo(User user, Groups groups)
private AuthorizationInfo createAuthorizationInfo(User user,
GroupNames groups)
{
Set<String> roles = Sets.newHashSet();
List<org.apache.shiro.authz.Permission> permissions = null;

6
scm-webapp/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
View File

@@ -46,7 +46,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.security.Groups;
import sonia.scm.security.ScmAuthenticationToken;
import sonia.scm.user.User;
import sonia.scm.user.UserManager;
@@ -59,6 +58,7 @@ import java.util.Collections;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import sonia.scm.group.GroupNames;
/**
*
@@ -167,13 +167,13 @@ public class BasicSecurityContext implements WebSecurityContext
public Collection<String> getGroups()
{
Subject subject = SecurityUtils.getSubject();
Groups groups = getPrincipal(Groups.class);
GroupNames groups = getPrincipal(GroupNames.class);
Collection<String> groupCollection = null;
if (groups != null)
{
groupCollection = groups.getGroups();
groupCollection = groups.getCollection();
}
else
{