etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,607 Commits 323 Branches 325 Tags 912 MiB
Commit Graph

329 Commits

Author SHA1 Message Date
Rajani Karuturi d2ef7295f9 volume upload: sending the preshared key to ssvm 
sending the key to ssvm in the secondary storage setup command
saving it in a file on ssvm
 2014-11-28 16:40:20 +05:30
Laszlo Hornyak 3577423da9 removed executable flags from java classes 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:49:01 +01:00
Nitin Mehta e87bb20d0c CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started. 2014-11-14 13:35:40 -08:00
Nitin Mehta 3907bc6f9d CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started. 2014-11-14 13:18:27 -08:00
Santhosh Edukulla 1aef5cba66 Fixed Coverity Issues 2014-11-03 16:45:30 +05:30
Hugo Trippaers 4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Sheng Yang 57c4841403 CLOUDSTACK-7814: Fix default passphrase for keystores 
In upgrade case, the db.properties file is not changed, but the following commit
would require passphrase for keystore in it, thus result in error(NPE in fact
due to there is no such properity).

commit 918c320438
Author: Upendra Moturi <upendra.moturi@sungard.com>
Date: Fri Jun 20 11:41:58 2014 +0530
CLOUDSTACK-6847.Link.java and console proxy files have hardcoded value

This commit fix it by put default value for passphrases, also set correct
passphrase if fail-safe keystore is used.
 2014-10-28 16:25:52 -07:00
Anthony Xu 70112bd145 CLOUDSTACK-7761: 
Revert "when system VM ping times out, stop system VM"

This reverts commit ee23be1942.
 2014-10-21 17:19:57 -07:00
Santhosh Edukulla efe1e0a544 Fixed coverity and other resource leak issues 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-10-16 12:19:51 +05:30
Santhosh Edukulla 350ac4c4b0 Fixed Resource Leaks 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-10-13 17:51:02 +05:30
Nitin Mehta ce90837357 CLOUDSTACK-6826: Improving the download url expiration where the expiration work would be handled by the ssvm that has the corresponding symlink created on it. In case it doesnt exist, then would be any one of the ssvm in the zone. 
Also when the ssvm is destroyed all the download urls are expired to be cleaned up in the next run by the new ssvm.
 2014-10-10 16:28:48 -07:00
Anthony Xu 847e1e47ae when system VM ping times out, stop system VM 2014-09-30 12:35:44 -07:00
Anshul Gangwar 4c9507d21e CLOUDSTACK-6898: [Hyper-V] fixed rdp console freezing during reboot. 
Console was freezing because we read data from socket in blocking mode.
During reboot it was blocking infintely.
To fix issue, now we are reading data in non-blocking mode.
In non-blocking mode I set the timeout to 5 seconds.
 2014-09-10 11:32:51 +05:30
Hugo Trippaers dc3f0cbc63 Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02:00
Min Chen 902a9c5b70 CLOUDSTACK-7266: Deleting account is not cleaning the snapshot entries 
in secondary storage.
 2014-08-25 16:09:48 -07:00
Sanjay Tripathi 1354605073 CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI guestOS on VMware host. 
This fix is to correct the JP keyboard mapping for VMs with windows and centOS GUI
and CLI OS on VMware hypervisor. Also fixed some known issues on centOS CLI on XS
hypervisor. Fix is not causing any regression.
 2014-08-20 14:34:28 +05:30
Kishan Kavala c09888fcb5 CLOUDSTACK-7237 : Added TAR image processor for templates with tar extension 2014-08-06 18:03:02 +05:30
Santhosh Edukulla 64b9ca0a35 Fixed a coverity reported concurrency issue 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-08-05 17:16:09 +05:30
Santhosh Edukulla b371356abc Fixed coverity issues reported 2014-07-31 21:19:57 +05:30
Santhosh Edukulla a7e3861f5e Fixed Coverity Issues 2014-07-31 16:57:20 +05:30
Santhosh Edukulla 6133bda642 Fixed Coverity Issues Reported 2014-07-31 16:36:05 +05:30
Hugo Trippaers 49f60ca744 Fix a coverity issue about unchecked returns and make the code flow a 
litle bit more easy to follow.
 2014-07-28 14:42:42 +02:00
Hugo Trippaers 669aebf1bc Fix CID 1128968 Iterator modified during loop 2014-07-25 11:58:16 +02:00
Hugo Trippaers 885e08d476 Fix CID 1114611 Check the right variable 2014-07-24 12:21:38 +02:00
Hugo Trippaers fc23c70a1f Fix CID 1116481 Widening should happen before calculation 2014-07-04 16:48:30 +02:00
Hugo Trippaers cc913cf0bb Fix CID 1116497 Resource leak 2014-07-04 13:50:33 +02:00
Logan B 736bf540e8 Changed logic for copying snapshot from S3 to NFS staging store to prevent needless failure. 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-20 22:37:21 +02:00
Upendra Moturi 918c320438 CLOUDSTACK-6847.Link.java and console proxy files have hardcoded value 2014-06-20 12:07:50 +02:00
Nitin Mehta 8b6dc7ce2f CLOUDSTACK-6824: In case there is a failure to delete the soft link of a download url, dont bail out since there can be cases such as destroy ssvm where the soft links do not exist any more. 
(cherry picked from commit 7333016722)
 2014-06-02 17:55:09 -07:00
Nitin Mehta 5393387bbd CLOUDSTACK-6599: 
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls
 2014-05-30 10:48:42 -07:00
Min Chen ba848087f8 Disable IAM feature from 4.4 release. 2014-05-22 18:27:08 -07:00
Min Chen 5c3858b504 CLOUDSTACK-6617: [Automation] detach / resize volume test cases failing 
with permission error.
 2014-05-09 18:47:51 -07:00
Min Chen 5f8641e908 CLOUDSTACK-6600: fix a bug in IAM cache in constructing cache key. 2014-05-09 18:47:37 -07:00
Min Chen 218158b9ab CLOUDSTACK-6600:IAM Security checker needs to have cache to improve 
checkAccess performance.
 2014-05-08 17:56:20 -07:00
Min Chen b42ad3ccaa CLOUDSTACK-6533: IAM - Templates - Public templates do not have 
permissions to be used by ROOT group.
 2014-05-01 15:57:27 -07:00
Min Chen 6af1a2919b CLOUDSTACK-6501:IAM - DomainAdmin - When listVirtualMachines is used 
with listall=true and account and domainId , Vms owned by the account
account is not listed.
 2014-04-28 11:11:27 -07:00
Prachi Damle 9514c9e045 CLOUDSTACK-6349: IAM - No error message presented to the user , when 
invalid password is provided.

- AccountManager now works using accountId instead of accountType in
following methods too:
- isResourceDomainAdmin()
- isAdmin()
 2014-04-28 11:10:50 -07:00
Nitin Mehta 1d45b75298 CLOUDSTACK-6499: 
Made changes so that uploading custom certificate works for ssvm.
    1. Reboot ssvm only when private key is passed meaning the server cert is passed. This is because while uploading the server cert is the last to be uploaded. And we want to propagate the entire chain once uploading is done.
    2. Change the SecStorageSetupCommand sent to ssvm so that it also carries the root cert apart from having the chain and the server cert and key.
    3. Change ssvm agent code to be able to configure root cert to the java key store.
    4. Change ssvm configure ssl script to insert the chain certs correctly.
    5. Fix order of chain certificates for apache webserver in SSVM
    6. Remove double encoding and decoding for uploadCustomCertificate API from UI and server code respectively, so that API call without UI works fine
    7. Java 1.7 - disable using SNI since copyTemplate doesnt work for SSL.
 2014-04-24 17:27:02 -07:00
Min Chen bc525d2236 CLOUDSTACK-6428:IAM - Domain Admin - When his sub-domainId is passed to 
the listVirtualMachine command, Vms from all the domains are being
listed.
 2014-04-17 18:32:57 -07:00
Min Chen 5d59fc7f5a Fix RoleBasedQuerySelector to handle new listAll semantics. If 
listAll=true, show all resources that caller (or impersonater) has
ListEntry access type; otherwise, show all resources that caller (or
impersonater) has UseEntry access type.
 2014-04-17 18:06:07 -07:00
Prachi Damle 7819775bb8 CLOUDSTACK-6330 [Automation] createRemoteAccessVpn call fails with access permission error 
- Correcting the EntityType for PublicIpAddress entity
- Adding the EntityType in the @APICommand for *IPAddrCmds
 2014-04-17 17:54:57 -07:00
Prachi Damle c387d983a3 All BaseAsyncCreateCmd commands will also be grouped into "OperateEntry" accesstype 2014-04-17 17:54:36 -07:00
Min Chen da13165743 Change AccountManagerImpl.checkAccess to invoke SecurityChecker 
interface that takes multiple controlled entities.
 2014-04-17 17:53:01 -07:00
Ding Yuan c031eb7d38 CLOUDSTACK-6242: exception handling improvements 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-04-15 08:07:15 +02:00
Marcus Sorensen 11f5bdd78d CLOUDSTACK-6191 Add support for specifying volume provisioning 
type (thin, sparse, fat) in disk/compute offerings.

Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski
 2014-04-10 09:23:04 -06:00
Prachi Damle df302bdb3e Split the Root Admin policy to allow 'ListEntry' access for listing resources for scope 'all', but 'UseEntry' access only within Account scope 
Same with Domain Admin policy
 2014-04-04 16:38:29 -07:00
Prachi Damle 897e0d3abe SecurityChecker can accept multiple ControlledEntity 2014-04-04 16:38:29 -07:00
Prachi Damle 6a9d6f8796 RoleBasedEntityAccessChecker should skip Project resources. IAM does not support Projects yet. 2014-03-28 18:56:30 -07:00
edison 8583b70f2a CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed. 2014-03-28 16:22:49 -07:00
Prachi Damle 4e61e49143 CLOUDSTACK-6303 [Automation] [UI] Account creation hang in UI 
Changes:
- Caused due to a MySql error during 'Project' account cleanup. The MySql error hits a deadlock bug in the MessageBus code that does not release the lock/decrement the counter Eventually all callers on the MessageBus end up waiting to enter
- This fixes the account cleanup MySql error.
 2014-03-28 14:35:00 -07:00
Daan Hoogland 8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Prachi Damle acfdd519be IAMEntityType change in the test after merge 2014-03-19 11:00:25 -07:00
Prachi Damle c3ee01cca1 More changes to support 'readOnly' access 2014-03-19 11:00:23 -07:00
Prachi Damle e09f97aa63 Adding support for 'readOnly' access. AccessType.ListEntry introduced. 2014-03-19 11:00:20 -07:00
Min Chen ae1d6a771b Remove IAMEntityType to use existing VO interface class to annotate 
entityType.
 2014-03-17 17:19:55 -07:00
Hugo Trippaers 4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Prachi Damle d9696b26e1 After merge, fix isRootAdmin() calls to use accountId instead of type 2014-03-13 13:28:40 -07:00
Min Chen 99bdc8d875 Merge branch 'master' into rbac. 2014-03-13 11:05:03 -07:00
Min Chen f2d4b4d60e Use IAMService to populate group-account association for system/admin 
account to solve unit test failure.
 2014-03-11 16:31:03 -07:00
Min Chen b554d4ac1f Fix issues found through FindBugs. 2014-03-11 11:49:48 -07:00
Prachi Damle 1c85af3193 A production/QA Setup does not populate the admin and SYSTEM accounts during database setup. So IAM plugin needs to insert the necessary group <-> account map in the DB during startup 2014-03-10 17:30:00 -07:00
Min Chen 748c090b29 Fix unapproved licens issue. 2014-03-10 11:27:10 -07:00
John Kinsella 09c375379d CLOUDSTACK-6204: removing realhostip dependency 
Moving default transport for console proxy, SSVM to http.

See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.

jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.

Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
 2014-03-09 13:46:57 -07:00
Min Chen 48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Min Chen 922cdc0dd1 Fix unapproved licens issue. 2014-03-05 14:31:28 -08:00
Min Chen 63e3eea790 CLOUDSTACK-5920: enable build of IAM services in pom.xml. 2014-03-05 09:40:56 -08:00
Min Chen c28450c1cd CLOUDSTACK-5920: IAM service plugin. 2014-03-05 09:40:55 -08:00
Min Chen adb29b2140 CLOUDSTACK-5920: IAM service server. 2014-03-05 09:40:55 -08:00
Alena Prokharchyk 5a8d165afa CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic 
Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java
	engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
 2014-03-04 15:37:52 -08:00
Min Chen 056d21e14b Fix bugs found from marvin test. 2014-03-04 11:16:45 -08:00
Min Chen 61b47850f2 Bug fix identified by marvin test. 2014-03-03 17:26:16 -08:00
Min Chen e5d722654a Rename IAMEntityType.AclGroup and AclPolicy. 2014-03-02 16:06:29 -08:00
Min Chen 7e4c3b0e92 Pass UUID for scopeId in addIAMPermissionToIAMPolicyCmd and 
removeIAMPermissionFromIAMPolicyCmd.
 2014-03-02 15:56:02 -08:00
Kelven Yang dfb9f49117 Remove inner retry loop when CPVM tries to reconnect to host 2014-02-28 15:35:58 -08:00
Min Chen 9f47466fea Fix some issues in renaming iam api, also fix marvin library. 2014-02-26 17:30:34 -08:00
Prachi Damle 45a96e4e4c renaming Acl to IAM in module.properties for the plugin 2014-02-25 17:02:41 -08:00
Prachi Damle 57b687e8b6 Renaming all beans in the xml files to use IAM insteda of Acl 2014-02-25 16:58:42 -08:00
Prachi Damle 6309887800 iam/server changes: Rename Acl to IAM 2014-02-25 16:43:25 -08:00
Prachi Damle 187f9cd0a2 iam/plugin: Rename Acl to IAM everywhere 2014-02-25 16:43:23 -08:00
Prachi Damle b2ba6c05b4 Renaming plugin packages to 'iam' instead if 'acl' 2014-02-25 16:43:20 -08:00
Min Chen 26e92af62d Rename IAM api and response package name so that they are following 
convention used by ApiXmlDocWriter.
 2014-02-18 16:08:06 -08:00
Hugo Trippaers f1139848e5 Slight optimization, don't run checkstyle on container or non-java projects. 2014-02-18 12:24:11 +01:00
Min Chen ebfe947f41 Fixed some bugs encountered in testing iam-plugin apis. 2014-02-14 15:04:29 -08:00
Min Chen 586ee74000 Clean up SecurityChecker.AccessType and modify code to use them 
consistently.
 2014-02-14 11:23:05 -08:00
Hugo Trippaers 97bad4f9b3 Fix checkstyle and license issues 2014-02-14 18:37:47 +01:00
Ian Southam 33c2c87287 Findbugs finding 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-02-14 18:37:46 +01:00
miguelaferreira 1237bf3222 Fix findbugs findings in cloudstack-service-console-proxy-rdpclient 
Findings:
- 32 int shifted by an amount not in range -31..31:
	The shifts by 32 bits don't actually have any effect on the value
	(as shown by the tests)
- possible null pointer dereference
- repeated conditional test
- field only ever set to null
	All other uses of the field were to check if it was null,
	which it was, so it was removed

Other actions:
- Upgrade jUnit to version 4
- Add PowerMock dependency

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-02-14 18:37:46 +01:00
Hugo Trippaers cc6938e3a8 Findbugs : Fix several "of concern" findings. 2014-02-14 18:37:46 +01:00
Min Chen 4b75fa806a Fix a NPE bug in listAclPolicies. 2014-02-13 17:57:49 -08:00
Min Chen 5bfc75cac9 Fix test build failure. 2014-02-13 11:21:07 -08:00
Min Chen 5854c0bbeb Fix Path cannot be null error in creating ACL Policy. 2014-02-11 22:45:57 -08:00
Min Chen 97ec3f6628 Fix an AclEntityType cast bug. 2014-02-11 22:26:52 -08:00
Min Chen 63e42d3c47 Handle scopeId=-1 properly, which indicates current caller domain or 
account.
 2014-02-07 15:56:03 -08:00
Min Chen 0b5b861994 Fix a bug in listParentAclGroups to handle empty parent group case. 2014-02-07 14:13:56 -08:00
Min Chen 3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Anshul Gangwar 13e0f293ed CLOUDSTACK-6001: Fixed hyperv vm console not working for 3 minutes after migration. 2014-02-06 13:47:38 +05:30
Min Chen 7c0170e3e9 Hook up IAM update for updateTemplatePermission api. 2014-02-05 16:04:13 -08:00
Alex Huang 54f32a8e46 Moved the controlling logic for secondary storage vm into place 2014-02-05 01:39:17 +00:00
Alex Huang 4be3b99337 Moved the secondary storage service into its own server directory 2014-02-05 01:38:24 +00:00
Prachi Damle f84375442e Merge branch 'master' into rbac 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
 2014-02-04 12:07:32 -08:00