diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java index 1ad54af4..262fa4b8 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java @@ -38,7 +38,7 @@ * @author Olivier Lamy * @since 2.1 */ -@Service("ldapRoleMapperConfiguration#default") +@Service( "ldapRoleMapperConfiguration#default" ) public class DefaultLdapRoleMapperConfiguration implements LdapRoleMapperConfiguration { @@ -46,10 +46,9 @@ public class DefaultLdapRoleMapperConfiguration private Logger log = LoggerFactory.getLogger( getClass() ); @Inject - @Named(value = "userConfiguration#default") + @Named( value = "userConfiguration#default" ) private UserConfiguration userConf; - public void addLdapMapping( String ldapGroup, List roles ) throws MappingException { @@ -61,6 +60,12 @@ public void removeLdapMapping( String group ) log.warn( "removeLdapMapping not implemented" ); } + public void updateLdapMapping( String ldapGroup, List roles ) + throws MappingException + { + log.warn( "removeLdapMapping not implemented" ); + } + public void setLdapGroupMappings( Map> mappings ) throws MappingException { diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java index d3fc17d5..f2f3aa19 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java @@ -39,6 +39,15 @@ public interface LdapRoleMapperConfiguration void addLdapMapping( String ldapGroup, List roles ) throws MappingException; + /** + * update an existing mapping + * @param ldapGroup + * @param roles + * @throws MappingException + */ + void updateLdapMapping( String ldapGroup, List roles ) + throws MappingException; + /** * remove a mapping * diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/LdapGroupMapping.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/LdapGroupMapping.java index caaec016..a9a66ebf 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/LdapGroupMapping.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/LdapGroupMapping.java @@ -19,25 +19,28 @@ */ import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; +import java.util.Collection; import java.util.List; /** * @author Olivier Lamy * @since 2.1 */ -@XmlRootElement( name = "ldapGroupMapping" ) +@XmlRootElement(name = "ldapGroupMapping") public class LdapGroupMapping + implements Serializable { private String group; - private List roleNames; + private Collection roleNames; public LdapGroupMapping() { // no op } - public LdapGroupMapping( String group, List roleNames ) + public LdapGroupMapping( String group, Collection roleNames ) { this.group = group; this.roleNames = roleNames; @@ -53,12 +56,12 @@ public void setGroup( String group ) this.group = group; } - public List getRoleNames() + public Collection getRoleNames() { return roleNames; } - public void setRoleNames( List roleNames ) + public void setRoleNames( Collection roleNames ) { this.roleNames = roleNames; } diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/StringList.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/StringList.java new file mode 100644 index 00000000..97dba5bc --- /dev/null +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/StringList.java @@ -0,0 +1,55 @@ +package org.apache.archiva.redback.rest.api.model; +/* + * 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. + */ + +import javax.xml.bind.annotation.XmlRootElement; +import java.util.ArrayList; +import java.util.List; + +/** + * jaxrs fail to return List so use this contains for rest services returning that + * + * @author Olivier Lamy + * @since 2.1 + */ +@XmlRootElement( name = "stringList" ) +public class StringList +{ + private List strings; + + public StringList() + { + // no op + } + + public StringList( List strings ) + { + this.strings = strings; + } + + public List getStrings() + { + return strings == null ? new ArrayList( 0 ) : strings; + } + + public void setStrings( List strings ) + { + this.strings = strings; + } +} diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/LdapGroupMappingService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/LdapGroupMappingService.java index 170cfeb0..46b6950d 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/LdapGroupMappingService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/LdapGroupMappingService.java @@ -21,6 +21,7 @@ import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.apache.archiva.redback.rest.api.model.LdapGroupMapping; +import org.apache.archiva.redback.rest.api.model.StringList; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -44,7 +45,7 @@ public interface LdapGroupMappingService @GET @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_ADMINISTRATOR_ROLE ) - String getLdapGroups() + StringList getLdapGroups() throws RedbackServiceException; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java new file mode 100644 index 00000000..62c595fe --- /dev/null +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java @@ -0,0 +1,186 @@ +package org.apache.archiva.redback.rest.services; +/* + * 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. + */ + +import org.apache.archiva.redback.common.ldap.MappingException; +import org.apache.archiva.redback.common.ldap.connection.LdapConnection; +import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory; +import org.apache.archiva.redback.common.ldap.connection.LdapException; +import org.apache.archiva.redback.common.ldap.role.LdapRoleMapper; +import org.apache.archiva.redback.common.ldap.role.LdapRoleMapperConfiguration; +import org.apache.archiva.redback.rest.api.model.LdapGroupMapping; +import org.apache.archiva.redback.rest.api.model.StringList; +import org.apache.archiva.redback.rest.api.services.LdapGroupMappingService; +import org.apache.archiva.redback.rest.api.services.RedbackServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * @author Olivier Lamy + * @since 2.1 + */ +public class DefaultLdapGroupMappingService + implements LdapGroupMappingService +{ + private Logger log = LoggerFactory.getLogger( getClass() ); + + @Inject + private LdapRoleMapper ldapRoleMapper; + + @Inject + @Named( value = "ldapRoleMapperConfiguration#default" ) + private LdapRoleMapperConfiguration ldapRoleMapperConfiguration; + + @Inject + private LdapConnectionFactory ldapConnectionFactory; + + public StringList getLdapGroups() + throws RedbackServiceException + { + LdapConnection ldapConnection = null; + + DirContext context = null; + + try + { + ldapConnection = ldapConnectionFactory.getConnection(); + return new StringList( ldapRoleMapper.getAllGroups( context ) ); + } + catch ( LdapException e ) + { + log.error( e.getMessage(), e ); + throw new RedbackServiceException( e.getMessage() ); + } + catch ( MappingException e ) + { + log.error( e.getMessage(), e ); + throw new RedbackServiceException( e.getMessage() ); + } + finally + { + closeContext( context ); + closeLdapConnection( ldapConnection ); + } + } + + public List getLdapGroupMappings() + throws RedbackServiceException + { + try + { + Map> map = ldapRoleMapperConfiguration.getLdapGroupMappings(); + List ldapGroupMappings = new ArrayList( map.size() ); + for ( Map.Entry> entry : map.entrySet() ) + { + LdapGroupMapping ldapGroupMapping = new LdapGroupMapping( entry.getKey(), entry.getValue() ); + ldapGroupMappings.add( ldapGroupMapping ); + } + + return ldapGroupMappings; + } + catch ( MappingException e ) + { + log.error( e.getMessage(), e ); + throw new RedbackServiceException( e.getMessage() ); + } + } + + public Boolean addLdapGroupMapping( LdapGroupMapping ldapGroupMapping ) + throws RedbackServiceException + { + try + { + ldapRoleMapperConfiguration.addLdapMapping( ldapGroupMapping.getGroup(), + new ArrayList( ldapGroupMapping.getRoleNames() ) ); + } + catch ( MappingException e ) + { + log.error( e.getMessage(), e ); + throw new RedbackServiceException( e.getMessage() ); + } + return Boolean.TRUE; + } + + public Boolean removeLdapGroupMapping( String group ) + throws RedbackServiceException + { + try + { + ldapRoleMapperConfiguration.removeLdapMapping( group ); + } + catch ( MappingException e ) + { + log.error( e.getMessage(), e ); + throw new RedbackServiceException( e.getMessage() ); + } + return Boolean.TRUE; + } + + public Boolean updateLdapGroupMapping( LdapGroupMapping ldapGroupMapping ) + throws RedbackServiceException + { + try + { + ldapRoleMapperConfiguration.updateLdapMapping( ldapGroupMapping.getGroup(), + new ArrayList( ldapGroupMapping.getRoleNames() ) ); + } + catch ( MappingException e ) + { + log.error( e.getMessage(), e ); + throw new RedbackServiceException( e.getMessage() ); + } + return Boolean.TRUE; + } + + //------------------ + // utils + //------------------ + + protected void closeLdapConnection( LdapConnection ldapConnection ) + { + if ( ldapConnection != null ) + { + ldapConnection.close(); + } + } + + protected void closeContext( DirContext context ) + { + if ( context != null ) + { + try + { + context.close(); + } + catch ( NamingException e ) + { + log.warn( "skip issue closing context: {}", e.getMessage() ); + } + } + } +}