CLOUDSTACK-7085, CLOUDSTACK-7084: disallow empty passwords Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> (cherry picked from commit e5cd75790a64e4ba2e8bef83affabe6db4de8acd) Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b7073c7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b7073c7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b7073c7 Branch: refs/heads/hotfix/scp-exception Commit: 2b7073c73f5468cdb653309185af6200aff0b6e1 Parents: 1a6df6f Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Mon Feb 16 15:31:22 2015 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Mon Feb 16 15:34:06 2015 +0530 ---------------------------------------------------------------------- .../cloudstack/api/command/admin/account/CreateAccountCmd.java | 4 ++++ .../apache/cloudstack/api/command/admin/user/CreateUserCmd.java | 4 ++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b7073c7/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java index 50d67d9..ec3090f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java @@ -31,6 +31,7 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.context.CallContext; +import org.apache.commons.lang.StringUtils; import com.cloud.user.Account; import com.cloud.user.UserAccount; @@ -174,6 +175,9 @@ public class CreateAccountCmd extends BaseCmd { @Override public void execute() { + if (StringUtils.isEmpty(getPassword())) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Empty passwords are not allowed"); + } CallContext.current().setEventDetails("Account Name: " + getAccountName() + ", Domain Id:" + getDomainId()); UserAccount userAccount = _accountService.createUserAccount(getUsername(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimeZone(), getAccountName(), getAccountType(), http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b7073c7/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java index 8f223ac..122fd43 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java @@ -25,6 +25,7 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.context.CallContext; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import com.cloud.user.Account; @@ -149,6 +150,9 @@ public class CreateUserCmd extends BaseCmd { @Override public void execute() { + if (StringUtils.isEmpty(getPassword())) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Empty passwords are not allowed"); + } CallContext.current().setEventDetails("UserName: " + getUserName() + ", FirstName :" + getFirstName() + ", LastName: " + getLastName()); User user = _accountService.createUser(getUserName(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimezone(), getAccountName(), getDomainId(),
