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

268 Commits

Author SHA1 Message Date
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
Prachi Damle 022b9b8f80 Add access for domain wide createAffinityGroup 2014-02-03 18:14:56 -08:00
Prachi Damle a6d07c873c Changes to QuerySelector to list the parent group resources with recursive = true access 2014-02-03 17:49:33 -08:00
Prachi Damle 939b15169c changes to support the domain wide resources for Network 2014-02-03 17:34:03 -08:00
Prachi Damle 09eed3705d Fix for NPE in the dao 2014-01-31 12:00:26 -08:00
Hugo Trippaers 8f10dedce9 Fix findbugs findings and remove dead code 2014-01-31 09:37:16 +01:00
Hiroaki KAWAI b32b49e853 Fix mock socket client/server test. 
Normally a server will bind to 0.0.0.0, which is not an
address that a client can specify to connect to.
127.0.0.1 or ::1 will do.
 2014-01-30 21:11:56 +09:00
Prachi Damle d12422bf68 Add policies to domain group for CreateNetwork usecase for a domain wide shared network 2014-01-29 23:56:25 -08:00
Sanjay Tripathi dfe744c4a9 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-30 13:26:00 +05:30
Prachi Damle ce95f3122b add 'recursive' column to permission table 2014-01-29 23:48:13 -08:00
Min Chen 81323dce5d Add support to grant acl permission to access an individual resource. 2014-01-29 17:59:24 -08:00
Sanjay Tripathi 1c4bbecc4a CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-29 14:07:59 +05:30
Min Chen 0063b60701 Remove ACL permission for a particular entity when it is deleted. The 
hook is currently only done for deleteTemplateCmd.
 2014-01-28 18:17:01 -08:00
Min Chen 72812cdf22 Grant public template permission to domain admin and normal user policy. 2014-01-28 17:41:27 -08:00
Min Chen 748dc1541c Support attaching policy to account. 2014-01-28 10:00:17 -08:00
Prachi Damle 91317dc497 Changes for createDomain - create new group AND createAccount - add account to domain group 2014-01-28 09:48:19 -08:00
Sanjay Tripathi d7ee7a7431 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-28 19:21:10 +05:30
Min Chen d47d4bbd20 Guard NPE due to empty policies. 2014-01-23 18:32:48 -08:00
Min Chen 344d3a37cc Add missing AclApiServiceImpl bean into spring xml. 2014-01-23 18:32:48 -08:00
Prachi Damle af14699c4c fixing the build _ AffinityGroup command changes 2014-01-23 18:17:43 -08:00
Prachi Damle 96a64b933e - Adding OperateEntry during loading of commands 
- Replace ListEntry By OperateEntry
- ApiDispatcher should pass on the API name
 2014-01-23 17:50:59 -08:00
Anshul Gangwar 62ef61794d Fixed check style error 2014-01-23 10:54:09 +05:30
Anshul Gangwar 6ebbec239d CLOUDSTACK-5716: fixed can't type special character in console view 2014-01-23 10:54:09 +05:30
Anshul Gangwar 3e2f7dda9e CLOUDSTACK-5702: Fixed mouse doesn't work for console 2014-01-23 10:54:08 +05:30
Anshul Gangwar 5941ac46d2 CLOUDSTACK-5344 commit for console proxy rdp for hyperv 2014-01-23 10:54:08 +05:30
Prachi Damle 39c0a302b4 Fix the isRootAdmin and isDomainAdmin to return true or false even if the permission is denied by IAM 2014-01-22 13:59:59 -08:00
Min Chen 82bdde70a2 Fix NPE during MS startup. 2014-01-17 18:14:04 -08:00
Prachi Damle b444136166 Adding the correct policyIds for the command permission loading 2014-01-17 16:55:32 -08:00
Min Chen 0ce176c0dd Add in missing resources folder for iam-server. 2014-01-17 16:16:41 -08:00
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Min Chen b725035b22 Fix NPE about accessType in RoleBasedApiAccessChecker.start. 2014-01-14 18:20:32 -08:00
Prachi Damle cc66d03f81 IAMService does not need CallingContext information 2014-01-14 16:34:47 -08:00
Min Chen 6c1849f4bf Fix Spring wiring issues in starting up MS. 2014-01-14 16:20:30 -08:00
Min Chen 6583cb3800 Add listAclGroupsByAccount to QuerySelector adapters and remove 
AclProxyService interface.
 2014-01-14 16:19:25 -08:00
Alex Huang 68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management 
of keys out of management server
 2014-01-14 13:11:35 -08:00
Prachi Damle fac9f2da0f Adding messageBus events for adding and removal of an account. 2014-01-13 22:12:39 -08:00
Prachi Damle 6cd121fe7b RootAdmin and DomainAdmin access check via IAM 2014-01-10 17:06:10 -08:00
Min Chen 43f0f901dd Remove VO and DAO from cloud-engine-schema. 2014-01-10 15:57:39 -08:00
Min Chen e42a262f6c Remove old APIs and old security checker plugins. Also use QuerySelector 
adapater in ACL search routine.
 2014-01-10 14:54:31 -08:00
Alex Huang 5fb6edd684 Changed the package to name to org.apache.cloudstack 2014-01-09 16:12:26 -08:00
Alex Huang ae8560b195 Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse. 2014-01-09 16:12:25 -08:00
Prachi Damle 2ee1ad16e9 Fixing unit tests for cloud-iam 2014-01-06 14:18:05 -08:00
Min Chen 7114d49c14 Some cleanup on AclApiService and remove array copy in some 
implementations of IAMServiceImpl
 2014-01-06 13:27:29 -08:00
Min Chen e02e19a6f1 Make AclApiServiceTest pass without changing ApiServerService signature. 2014-01-06 10:43:01 -08:00
Prachi Damle 28b81e423e Changing the access checkers to work with IAM server 2014-01-05 21:41:39 -08:00
Min Chen d374cd5a2c Add Unit Testcases for AclApiService. 2014-01-03 17:18:44 -08:00
Prachi Damle e5b4a1d869 Moved the loading of commands.properties to the IAM plugin 2014-01-02 18:39:18 -08:00
Min Chen dd8dcd9492 Implementing listAclGroup and listAclPolicy API based on iam plugin 
model without using db views. AclGroupJoinVO and AclPolicyJoinVO can be
removed later.
 2014-01-02 16:18:29 -08:00
Donal Lafferty 48c47101aa CLOUDSTACK-5344: Updated to allow rdp console to access hyper-v vm virtual framebuffer. 2014-01-02 13:06:10 +05:30
Min Chen d9be7bb968 Move ACL response class into iam plugin, also fix AclAPiService to 
invoke IAMService method to hide internal IAM schema.
 2013-12-27 17:17:54 -08:00
Prachi Damle 08122c9adb - Added basic unit test for IAMService 
- Removed Event geenration annotations from IAM server
 2013-12-27 16:06:06 -08:00
Min Chen 01e6f47d41 Move ACL APIs from server to plugin. Server can have its own APIs for 
standalone use (compared to integration with CloudStack), which can be
done at later phase.
 2013-12-27 15:09:31 -08:00
Sanjay Tripathi f6b063de79 CLOUDSTACK-4973: Specified keyboard language is not showing as default in consoleView passed during deployVM. 2013-12-27 18:17:22 +05:30
Min Chen c950651fe2 Use IAMService to implement QuerySelector adapter. 2013-12-26 19:53:49 -08:00
Min Chen e280095536 Fix build issue for cloud-plugin-iam. 2013-12-26 17:56:10 -08:00
Prachi Damle 2543fbe846 Adding new IAM service under services. There are two modules to this component: 
part a) plugin - This contains all adapter implementations and components necessary to interact with CloudStack.

part b) server - This contains IAM interfaces that are not aware of any CloudStack entities, they are pure IAM interface that can be implemented in varied ways.
The default implementation provided just works on DB and generic Dao layer.
But these interfaces can be implemented using connectors interacting with LDAP or AD.
 2013-12-26 15:17:13 -08:00
Edison Su 9947e688c4 CS-18564: create template from snapshot failed, due to the volume(the 
snapshot created from) is deleted.
 2013-12-20 12:45:02 -08:00
Marcus Sorensen 95364a4022 CLOUDSTACK-5531 
Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM.
 2013-12-16 14:32:51 -07:00
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Min Chen 5dccaa1832 CLOUDSTACK-5454: Delete previous template and snapshot after migrating 
NFS to S3 throws Error.
 2013-12-11 16:54:40 -08:00
wilderrodrigues d19688103b Fixing coverity issues related to resource leak on FileInputStream being created anonymously 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2013-11-27 12:51:44 +01:00
Alex Huang 433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00