You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/17 20:48:31 UTC
[2/3] git commit: updated refs/heads/master to f3afcb0
CLOUDSTACK-8537 refactor registerSSHKeyPair() for legibility and testability reasons
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/968e71ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/968e71ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/968e71ad
Branch: refs/heads/master
Commit: 968e71ad0e49088b5f2f022df29aec02b10a5ede
Parents: 9f02531
Author: Daan Hoogland <da...@gmail.com>
Authored: Tue Jun 9 23:57:00 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Wed Jun 17 20:47:57 2015 +0200
----------------------------------------------------------------------
.../com/cloud/server/ManagementServerImpl.java | 111 +++++++++++++------
1 file changed, 80 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/968e71ad/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 8b9f97f..948a84d 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -947,7 +947,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public boolean archiveEvents(ArchiveEventsCmd cmd) {
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
List<Long> ids = cmd.getIds();
boolean result = true;
List<Long> permittedAccountIds = new ArrayList<Long>();
@@ -974,7 +974,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public boolean deleteEvents(DeleteEventsCmd cmd) {
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
List<Long> ids = cmd.getIds();
boolean result = true;
List<Long> permittedAccountIds = new ArrayList<Long>();
@@ -1098,8 +1098,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Host, Boolean>> listHostsForMigrationOfVM(Long vmId, Long startIndex, Long pageSize) {
- // access check - only root admin can migrate VM
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
if (!_accountMgr.isRootAdmin(caller.getId())) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Caller is not a root admin, permission denied to migrate the VM");
@@ -1276,8 +1275,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public Pair<List<? extends StoragePool>, List<? extends StoragePool>> listStoragePoolsForMigrationOfVolume(Long volumeId) {
- // Access check - only root administrator can migrate volumes.
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
if (!_accountMgr.isRootAdmin(caller.getId())) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Caller is not a root admin, permission denied to migrate the volume");
@@ -1766,7 +1764,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
List<Long> permittedAccounts = new ArrayList<Long>();
ListProjectResourcesCriteria listProjectResourcesCriteria = null;
if (isAllocated) {
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(
cmd.getDomainId(), cmd.isRecursive(), null);
@@ -2259,8 +2257,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
throw new InvalidParameterValueException("ROOT domain can not be edited with a new name");
}
- // check permissions
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
_accountMgr.checkAccess(caller, domain);
// domain name is unique under the parent domain
@@ -3311,7 +3308,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public ArrayList<String> getCloudIdentifierResponse(long userId) {
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
// verify that user exists
User user = _accountMgr.getUserIncludingRemoved(userId);
@@ -3351,7 +3348,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
public Map<String, Object> listCapabilities(ListCapabilitiesCmd cmd) {
Map<String, Object> capabilities = new HashMap<String, Object>();
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
boolean securityGroupsEnabled = false;
boolean elasticLoadBalancerEnabled = false;
boolean KVMSnapshotEnabled = false;
@@ -3417,7 +3414,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public InstanceGroupVO updateVmGroup(UpdateVMGroupCmd cmd) {
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
Long groupId = cmd.getId();
String groupName = cmd.getGroupName();
@@ -3535,7 +3532,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public SSHKeyPair createSSHKeyPair(CreateSSHKeyPairCmd cmd) {
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
String accountName = cmd.getAccountName();
Long domainId = cmd.getDomainId();
Long projectId = cmd.getProjectId();
@@ -3559,7 +3556,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public boolean deleteSSHKeyPair(DeleteSSHKeyPairCmd cmd) {
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
String accountName = cmd.getAccountName();
Long domainId = cmd.getDomainId();
Long projectId = cmd.getProjectId();
@@ -3587,7 +3584,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
String name = cmd.getName();
String fingerPrint = cmd.getFingerprint();
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
List<Long> permittedAccounts = new ArrayList<Long>();
Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(
@@ -3619,35 +3616,87 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
@ActionEvent(eventType = EventTypes.EVENT_REGISTER_SSH_KEYPAIR, eventDescription = "registering ssh keypair", async = true)
public SSHKeyPair registerSSHKeyPair(RegisterSSHKeyPairCmd cmd) {
- Account caller = CallContext.current().getCallingAccount();
+ Account owner = getOwner(cmd);
+ checkForKeyByName(cmd, owner);
+ checkForKeyByPublicKey(cmd, owner);
- Account owner = _accountMgr.finalizeOwner(caller, cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId());
-
- SSHKeyPairVO existingPair = _sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), cmd.getName());
- if (existingPair != null) {
- throw new InvalidParameterValueException("A key pair with name '" + cmd.getName() + "' already exists for this account.");
+ String name = cmd.getName();
+ String key = cmd.getPublicKey();
+ try {
+ key = URLDecoder.decode(key, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ s_logger.warn("key decoding tried invain: " + e.getLocalizedMessage());
}
+ String publicKey = getPublicKeyFromKeyKeyMaterial(key);
+ String fingerprint = getFingerprint(publicKey);
- existingPair = _sshKeyPairDao.findByPublicKey(owner.getAccountId(), owner.getDomainId(), cmd.getPublicKey());
+ return createAndSaveSSHKeyPair(name, fingerprint, publicKey, null, owner);
+ }
+
+ /**
+ * @param cmd
+ * @param owner
+ * @throws InvalidParameterValueException
+ */
+ private void checkForKeyByPublicKey(RegisterSSHKeyPairCmd cmd, Account owner) throws InvalidParameterValueException {
+ SSHKeyPairVO existingPair = _sshKeyPairDao.findByPublicKey(owner.getAccountId(), owner.getDomainId(), cmd.getPublicKey());
if (existingPair != null) {
throw new InvalidParameterValueException("A key pair with name '" + cmd.getPublicKey() + "' already exists for this account.");
}
+ }
- String name = cmd.getName();
- String key = cmd.getPublicKey();
- try {
- key = URLDecoder.decode(key, "UTF-8");
- } catch (UnsupportedEncodingException e) {
+ /**
+ * @param cmd
+ * @param owner
+ * @throws InvalidParameterValueException
+ */
+ private void checkForKeyByName(RegisterSSHKeyPairCmd cmd, Account owner) throws InvalidParameterValueException {
+ SSHKeyPairVO existingPair = _sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), cmd.getName());
+ if (existingPair != null) {
+ throw new InvalidParameterValueException("A key pair with name '" + cmd.getName() + "' already exists for this account.");
}
+ }
+
+ /**
+ * @param publicKey
+ * @return
+ */
+ private String getFingerprint(String publicKey) {
+ String fingerprint = SSHKeysHelper.getPublicKeyFingerprint(publicKey);
+ return fingerprint;
+ }
+
+ /**
+ * @param key
+ * @return
+ * @throws InvalidParameterValueException
+ */
+ private String getPublicKeyFromKeyKeyMaterial(String key) throws InvalidParameterValueException {
String publicKey = SSHKeysHelper.getPublicKeyFromKeyMaterial(key);
if (publicKey == null) {
throw new InvalidParameterValueException("Public key is invalid");
}
+ return publicKey;
+ }
- String fingerprint = SSHKeysHelper.getPublicKeyFingerprint(publicKey);
+ /**
+ * @param cmd
+ * @return
+ */
+ private Account getOwner(RegisterSSHKeyPairCmd cmd) {
+ Account caller = getCaller();
- return createAndSaveSSHKeyPair(name, fingerprint, publicKey, null, owner);
+ Account owner = _accountMgr.finalizeOwner(caller, cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId());
+ return owner;
+ }
+
+ /**
+ * @return
+ */
+ private Account getCaller() {
+ Account caller = CallContext.current().getCallingAccount();
+ return caller;
}
private SSHKeyPair createAndSaveSSHKeyPair(String name, String fingerprint, String publicKey, String privateKey, Account owner) {
@@ -3667,7 +3716,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public String getVMPassword(GetVMPasswordCmd cmd) {
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
UserVmVO vm = _userVmDao.findById(cmd.getId());
if (vm == null) {
@@ -3843,7 +3892,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
private VirtualMachine upgradeStoppedSystemVm(Long systemVmId, Long serviceOfferingId, Map<String, String> customparameters) {
- Account caller = CallContext.current().getCallingAccount();
+ Account caller = getCaller();
VMInstanceVO systemVm = _vmInstanceDao.findByIdTypes(systemVmId, VirtualMachine.Type.ConsoleProxy, VirtualMachine.Type.SecondaryStorageVm);
if (systemVm == null) {