apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5435 enabled encryption for ldap params

Browse Source
This commit is contained in:
Rajani Karuturi 2013-12-13 17:28:06 +05:30 committed by Kishan Kavala
parent 86dadaaec4
commit 1d5051f60e
5 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java
View File

@ -21,9 +21,11 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import org.apache.commons.lang.StringEscapeUtils; import com.cloud.exception.ConcurrentOperationException;
import org.apache.log4j.Logger; import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseCmd;
@ -37,12 +39,9 @@ import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
import org.apache.cloudstack.ldap.LdapConfiguration; import org.apache.cloudstack.ldap.LdapConfiguration;
import org.apache.cloudstack.ldap.LdapConfigurationVO; import org.apache.cloudstack.ldap.LdapConfigurationVO;
import org.apache.cloudstack.ldap.LdapManager; import org.apache.cloudstack.ldap.LdapManager;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account; import com.cloud.user.Account;
import com.cloud.utils.Pair; import com.cloud.utils.Pair;
@ -68,7 +67,7 @@ public class LDAPConfigCmd extends BaseCmd {
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
//////////////// API parameters ///////////////////// //////////////// API parameters /////////////////////
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
@Parameter(name = ApiConstants.LIST_ALL, type = CommandType.BOOLEAN, description = "If true return current LDAP configuration") @Parameter(name = ApiConstants.LIST_ALL, type = BaseCmd.CommandType.BOOLEAN, description = "If true return current LDAP configuration")
private Boolean listAll; private Boolean listAll;
@Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, description = "Hostname or ip address of the ldap server eg: my.ldap.com") @Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, description = "Hostname or ip address of the ldap server eg: my.ldap.com")
@ -80,19 +79,13 @@ public class LDAPConfigCmd extends BaseCmd {
@Parameter(name = ApiConstants.USE_SSL, type = CommandType.BOOLEAN, description = "Check Use SSL if the external LDAP server is configured for LDAP over SSL.") @Parameter(name = ApiConstants.USE_SSL, type = CommandType.BOOLEAN, description = "Check Use SSL if the external LDAP server is configured for LDAP over SSL.")
private Boolean useSSL; private Boolean useSSL;
@Parameter(name = ApiConstants.SEARCH_BASE, @Parameter(name = ApiConstants.SEARCH_BASE, type = CommandType.STRING, description = "The search base defines the starting point for the search in the directory tree Example: dc=cloud,dc=com.")
type = CommandType.STRING,
description = "The search base defines the starting point for the search in the directory tree Example: dc=cloud,dc=com.")
private String searchBase; private String searchBase;
@Parameter(name = ApiConstants.QUERY_FILTER, @Parameter(name = ApiConstants.QUERY_FILTER, type = CommandType.STRING, description = "You specify a query filter here, which narrows down the users, who can be part of this domain.")
type = CommandType.STRING,
description = "You specify a query filter here, which narrows down the users, who can be part of this domain.")
private String queryFilter; private String queryFilter;
@Parameter(name = ApiConstants.BIND_DN, @Parameter(name = ApiConstants.BIND_DN, type = CommandType.STRING, description = "Specify the distinguished name of a user with the search permission on the directory.")
type = CommandType.STRING,
description = "Specify the distinguished name of a user with the search permission on the directory.")
private String bindDN; private String bindDN;
@Parameter(name = ApiConstants.BIND_PASSWORD, type = CommandType.STRING, description = "Enter the password.") @Parameter(name = ApiConstants.BIND_PASSWORD, type = CommandType.STRING, description = "Enter the password.")
@ -177,8 +170,7 @@ public class LDAPConfigCmd extends BaseCmd {
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
@Override @Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
ResourceAllocationException {
if (getListAll()) { if (getListAll()) {
// return the existing conf // return the existing conf
@ -192,8 +184,7 @@ public class LDAPConfigCmd extends BaseCmd {
String searchBaseConfig = _ldapConfiguration.getBaseDn(); String searchBaseConfig = _ldapConfiguration.getBaseDn();
String bindDnConfig = _ldapConfiguration.getBindPrincipal(); String bindDnConfig = _ldapConfiguration.getBindPrincipal();
for (LdapConfigurationVO ldapConfigurationVO : result.first()) { for (LdapConfigurationVO ldapConfigurationVO : result.first()) {
responses.add(createLDAPConfigResponse(ldapConfigurationVO.getHostname(), ldapConfigurationVO.getPort(), useSSlConfig, null, searchBaseConfig, responses.add(createLDAPConfigResponse(ldapConfigurationVO.getHostname(), ldapConfigurationVO.getPort(), useSSlConfig, null, searchBaseConfig, bindDnConfig));
bindDnConfig));
} }
} }
response.setResponses(responses); response.setResponses(responses);
@ -204,7 +195,7 @@ public class LDAPConfigCmd extends BaseCmd {
} else { } else {
boolean result = updateLDAP(); boolean result = updateLDAP();
if (result) { if (result) {
LDAPConfigResponse lr = createLDAPConfigResponse(getHostname(), getPort(), getUseSSL(), getQueryFilter(), getSearchBase(), getBindDN()); LDAPConfigResponse lr = this.createLDAPConfigResponse(getHostname(), getPort().toString(), getUseSSL(), getQueryFilter(), getSearchBase(), getBindDN());
lr.setResponseName(getCommandName()); lr.setResponseName(getCommandName());
setResponseObject(lr); setResponseObject(lr);
} }
@ -212,10 +203,10 @@ public class LDAPConfigCmd extends BaseCmd {
} }
private LDAPConfigResponse createLDAPConfigResponse(String hostname, Integer port, Boolean useSSL, String queryFilter, String searchBase, String bindDN) { private LDAPConfigResponse createLDAPConfigResponse(String hostname, String port, Boolean useSSL, String queryFilter, String searchBase, String bindDN) {
LDAPConfigResponse lr = new LDAPConfigResponse(); LDAPConfigResponse lr = new LDAPConfigResponse();
lr.setHostname(hostname); lr.setHostname(hostname);
lr.setPort(port.toString()); lr.setPort(port);
lr.setUseSSL(useSSL.toString()); lr.setUseSSL(useSSL.toString());
lr.setQueryFilter(queryFilter); lr.setQueryFilter(queryFilter);
lr.setBindDN(bindDN); lr.setBindDN(bindDN);

13
plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapConfigurationResponse.java
View File

@ -16,11 +16,10 @@
// under the License. // under the License.
package org.apache.cloudstack.api.response; package org.apache.cloudstack.api.response;
import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param; import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
public class LdapConfigurationResponse extends BaseResponse { public class LdapConfigurationResponse extends BaseResponse {
@SerializedName("hostname") @SerializedName("hostname")
@ -29,7 +28,7 @@ public class LdapConfigurationResponse extends BaseResponse {
@SerializedName("port") @SerializedName("port")
@Param(description = "port") @Param(description = "port")
private int port; private String port;
public LdapConfigurationResponse() { public LdapConfigurationResponse() {
super(); super();
@ -40,7 +39,7 @@ public class LdapConfigurationResponse extends BaseResponse {
this.hostname = hostname; this.hostname = hostname;
} }
public LdapConfigurationResponse(final String hostname, final int port) { public LdapConfigurationResponse(final String hostname, final String port) {
this.hostname = hostname; this.hostname = hostname;
this.port = port; this.port = port;
} }
@ -49,7 +48,7 @@ public class LdapConfigurationResponse extends BaseResponse {
return hostname; return hostname;
} }
public int getPort() { public String getPort() {
return port; return port;
} }
@ -57,7 +56,7 @@ public class LdapConfigurationResponse extends BaseResponse {
this.hostname = hostname; this.hostname = hostname;
} }
public void setPort(final int port) { public void setPort(final String port) {
this.port = port; this.port = port;
} }
} }

21
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfigurationVO.java
View File

@ -16,6 +16,10 @@
// under the License. // under the License.
package org.apache.cloudstack.ldap; package org.apache.cloudstack.ldap;
import org.apache.cloudstack.api.InternalIdentity;
import com.cloud.utils.db.Encrypt;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
@ -23,26 +27,27 @@ import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import org.apache.cloudstack.api.InternalIdentity;
@Entity @Entity
@Table(name = "ldap_configuration") @Table(name = "ldap_configuration")
public class LdapConfigurationVO implements InternalIdentity { public class LdapConfigurationVO implements InternalIdentity {
@Column(name = "hostname")
private String hostname;
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id") @Column(name = "id")
private Long id; private Long id;
@Encrypt
@Column(name = "hostname")
private String hostname;
@Encrypt
@Column(name = "port") @Column(name = "port")
private int port; private String port;
public LdapConfigurationVO() { public LdapConfigurationVO() {
} }
public LdapConfigurationVO(final String hostname, final int port) { public LdapConfigurationVO(final String hostname, final String port) {
this.hostname = hostname; this.hostname = hostname;
this.port = port; this.port = port;
} }
@ -56,11 +61,11 @@ public class LdapConfigurationVO implements InternalIdentity {
return id; return id;
} }
public int getPort() { public String getPort() {
return port; return port;
} }
public void setId(final long id) { public void setId(final long id) {
this.id = id; this.id = id;
} }
} }

9
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapManagerImpl.java
View File

@ -24,9 +24,6 @@ import javax.inject.Inject;
import javax.naming.NamingException; import javax.naming.NamingException;
import javax.naming.directory.DirContext; import javax.naming.directory.DirContext;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.api.LdapValidator; import org.apache.cloudstack.api.LdapValidator;
import org.apache.cloudstack.api.command.LDAPConfigCmd; import org.apache.cloudstack.api.command.LDAPConfigCmd;
import org.apache.cloudstack.api.command.LDAPRemoveCmd; import org.apache.cloudstack.api.command.LDAPRemoveCmd;
@ -40,6 +37,8 @@ import org.apache.cloudstack.api.command.LdapUserSearchCmd;
import org.apache.cloudstack.api.response.LdapConfigurationResponse; import org.apache.cloudstack.api.response.LdapConfigurationResponse;
import org.apache.cloudstack.api.response.LdapUserResponse; import org.apache.cloudstack.api.response.LdapUserResponse;
import org.apache.cloudstack.ldap.dao.LdapConfigurationDao; import org.apache.cloudstack.ldap.dao.LdapConfigurationDao;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.InvalidParameterValueException;
import com.cloud.utils.Pair; import com.cloud.utils.Pair;
@ -76,10 +75,10 @@ public class LdapManagerImpl implements LdapManager, LdapValidator {
try { try {
final String providerUrl = "ldap://" + hostname + ":" + port; final String providerUrl = "ldap://" + hostname + ":" + port;
_ldapContextFactory.createBindContext(providerUrl); _ldapContextFactory.createBindContext(providerUrl);
configuration = new LdapConfigurationVO(hostname, port); configuration = new LdapConfigurationVO(hostname, Integer.toString(port));
_ldapConfigurationDao.persist(configuration); _ldapConfigurationDao.persist(configuration);
s_logger.info("Added new ldap server with hostname: " + hostname); s_logger.info("Added new ldap server with hostname: " + hostname);
return new LdapConfigurationResponse(hostname, port); return new LdapConfigurationResponse(hostname, Integer.toString(port));
} catch (final NamingException e) { } catch (final NamingException e) {
throw new InvalidParameterValueException("Unable to bind to the given LDAP server"); throw new InvalidParameterValueException("Unable to bind to the given LDAP server");
} }

2
setup/db/db/schema-421to430.sql
View File

@ -618,7 +618,7 @@ INSERT INTO `cloud`.`configuration`(category, instance, component, name, value,
CREATE TABLE `cloud`.`ldap_configuration` ( CREATE TABLE `cloud`.`ldap_configuration` (
`id` bigint unsigned NOT NULL auto_increment COMMENT 'id', `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
`hostname` varchar(255) NOT NULL COMMENT 'the hostname of the ldap server', `hostname` varchar(255) NOT NULL COMMENT 'the hostname of the ldap server',
`port` int(10) COMMENT 'port that the ldap server is listening on', `port` varchar(255) COMMENT 'port that the ldap server is listening on',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;