Commit Graph

29860 Commits

Author SHA1 Message Date
Hugo Trippaers 183b248c4e Include a type field in all json configuration objects 2015-03-16 11:35:04 +01:00
Ian Southam 0db157e58f Remove debug code 2015-03-16 11:35:04 +01:00
Ian Southam d868b0521b Correct small typo in error message 2015-03-16 11:35:03 +01:00
Ian Southam bcb760e1e2 Can now read the ips out of the cmdline databag (if present) 2015-03-16 11:35:03 +01:00
Ian Southam 0c8f8d945e Only ip_association files for now 2015-03-16 11:35:03 +01:00
Hugo Trippaers 1f1a9ba8b0 Create a json file for SetNetworkACL 2015-03-16 11:35:03 +01:00
Ian Southam bcbefb2833 Changed from camelCase to json_case 2015-03-16 11:35:03 +01:00
Ian Southam 54b21220db Use json naming standards instead of camelCase 2015-03-16 11:35:02 +01:00
Ian Southam 018b56385c Added cs_ip module
Corrected syntax error in merge.py
2015-03-16 11:35:02 +01:00
Ian Southam a357e12943 Add the Python bits 2015-03-16 11:35:02 +01:00
Leo Simons afd2c21893 Tuning/reformatting/defensible-ing Vagrantfile 2015-03-16 11:35:02 +01:00
Hugo Trippaers 639b24a575 Replace CreateGuestNetwork config script with a json file. 2015-03-16 11:35:01 +01:00
Ian Southam 8d9a4be9dd Remove scripts directory no longer necessary 2015-03-16 11:35:01 +01:00
Ian Southam 72111c3399 Merged cookbooks from vpc branch 2015-03-16 11:35:01 +01:00
Ian Southam ab64c7df6f Added curl to the base install 2015-03-16 11:35:00 +01:00
Ian Southam 0e82637807 Vagrant virtualbox based testing suite 2015-03-16 11:35:00 +01:00
Hugo Trippaers b596be1a82 Add a placeholder for the trigger file 2015-03-16 11:35:00 +01:00
Hugo Trippaers 7afd50d65a This file isn't used, so remove it 2015-03-16 11:34:59 +01:00
Ian Southam 5b82e2059d Cherry-pick of 11c00977f77f45aa7b0c387dc88360eba0819e8a:
----
Author:    Ian Southam <isoutham@schubergphilis.com>

First commit towards moving systemvm to chef based configuration
In this commit

1.  cmdline json databag is created
2.  ip association data bag is created
3.  Basic chef cookbook to manage ips and routes

Conflicts:
	systemvm/patches/debian/config/etc/init.d/cloud-early-config
	systemvm/patches/debian/config/var/chef/cookbooks/README
	tools/appliance/definitions/systemvm64template/postinstall.sh
----
Because we've refactored the systemvm template the change to
postinstall.sh now gets its own chef.sh file.
2015-03-16 11:34:59 +01:00
Hugo Trippaers 9514f259f6 Removed useless array from SetStaticRoutesCmd. 2015-03-16 11:34:59 +01:00
Hugo Trippaers 0f5af91668 Switch ip associations to the new config file system 2015-03-16 11:34:58 +01:00
Hugo Trippaers 4fd616fc0f Make sure the location for the persistant configs exists 2015-03-16 11:34:58 +01:00
Leo Simons f7dd35e1ee CLOUDSTACK-7143: a better fix for kernel upgrade disk space problems
Increase / and /boot a little bit, to the point that there is enough
space on them to do a kernel upgrade. With this I think we can
decrease total disk space usage back down to 2.5GB.

Docs for the preseed config found at
  http://anonscm.debian.org/gitweb/?p=d-i/debian-installer.git;a=blob_plain;f=doc/devel/partman-auto-recipe.txt;hb=HEAD
2015-03-16 11:34:58 +01:00
Rohit Yadav a2aff1ce9d user-authenticators: don't allow empty usernames or passwords
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-16 15:18:22 +05:30
Rohit Yadav a69780b69b user-authenticators: don't allow empty usernames or passwords
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 16e5f5d7d335ec325d995d91234461e99c695ed7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-16 15:17:23 +05:30
Rajani Karuturi 843f6b1691 CLOUDSTACK-5236 : ability to identify where the user is from (ex. LDAP)
Added a source column to the user table.

Source now has only two values UNKNOWN,LDAP with UNKNOWN being the
default and is an enum is com.cloud.User.

When the source is UNKNOWN, the old method of authenticating against all
the available authenticators is used. If a source is available, only
that particular authenticator will be used.

added overloaded methods in AccountService to createUserAccount and
createUser with source specified.

(cherry picked from commit 5da733072e)
2015-03-16 14:53:53 +05:30
Rajani Karuturi 3de5d9db5f volume upload: Restart of MS leads to loss of browser uploaded templates
on restart of management server, template sync runs. It checks for
templates in ssvm using the uniquename. If it doesnt find any, cleans
the directory. In case of uploaded templates, these are getting saved
using name instead on uniquename and hence template sync cant find them
and does cleanup. Using uniquename in template.properties now.
2015-03-16 12:45:24 +05:30
Bharat Kumar 2783cf540b CLOUDSTACK-7348 InvalidParameter Exception while executing scale vm.
We do not throw the exceptions any more, so added info in the logs to say
what happend to this command.

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 659edb4d9b)
2015-03-16 12:37:45 +05:30
Rajani Karuturi 5da733072e CLOUDSTACK-5236 : ability to identify where the user is from (ex. LDAP)
Added a source column to the user table.

Source now has only two values UNKNOWN,LDAP with UNKNOWN being the
default and is an enum is com.cloud.User.

When the source is UNKNOWN, the old method of authenticating against all
the available authenticators is used. If a source is available, only
that particular authenticator will be used.

added overloaded methods in AccountService to createUserAccount and
createUser with source specified.
2015-03-16 12:35:37 +05:30
Bharat Kumar 659edb4d9b CLOUDSTACK-7348 InvalidParameter Exception while executing scale vm.
We do not throw the exceptions any more, so added info in the logs to say
what happend to this command.

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2015-03-16 12:34:43 +05:30
Rohit Yadav c8901a7990 utils: use a better extended implementation of SSLSocketFactory
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b4a5a32a74)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 17:32:07 +05:30
Rohit Yadav b4a5a32a74 utils: use a better extended implementation of SSLSocketFactory
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 17:31:30 +05:30
Rohit Yadav 6c71d3bae1 ui: if session cookie exists, use it to set global session holder and invalidate it
The 19e3c0168e commit breaks SAML login and any
login where redirection is used.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b79f13ccb5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:02:27 +05:30
Jayapal 2f1863cae0 Avoid logging password when adding srx device
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a1cc43fee2876463c2ca65e9e9d7e81be48a136e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:02:27 +05:30
Nitin Mehta 765622658a Avoid distributing private key for realhostip.com
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d94a5720ef)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:02:27 +05:30
Harikrishna Patnala ac1a2207ef CS-17504: Weak SSL ciphers supported by the management server
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 20a63c409d52b2c3dffc8ea58dd25ffb7e55d0e8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	packaging/centos63/cloud.spec
2015-03-13 15:02:27 +05:30
Jessica Wang a308f37232 CS-18149: UI - no longer store sessionKey in cookie. After
... this change, opening the 2nd browser window (of the same
domain) will show login screen (i.e. user has to enter
credentials again) and will cause the 1st browser window
session timeout.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 19e3c0168e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:02:27 +05:30
Min Chen b9d624dae0 CS-19734:Session cookie is exposed to scripts.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0b5b9c91e4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:02:27 +05:30
Prachi Damle 64816dbfbd CS-20680: The user's secret key is not encrypted in the UserCredentialsVO class
Changes:
-Added annotation to encrypt the secret key while persisting to the DB

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit c5754e693f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:02:27 +05:30
Min Chen 6ccb9b1fc3 Error message exposes domain Id when deployVirtualMachine() is attempted on a shared network to which the user doesnot have access to.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0d36f2e4b5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:02:26 +05:30
Brian Federle 5608982c43 Fix encoding for user account label in header
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit bfcdbeca29)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:02:26 +05:30
Rohit Yadav b79f13ccb5 ui: if session cookie exists, use it to set global session holder and invalidate it
The 19e3c0168e commit breaks SAML login and any
login where redirection is used.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:01:51 +05:30
Jayapal 32fe64ce1b Avoid logging password when adding srx device
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:01:06 +05:30
Sanjay Tripathi 3d411dc616 Fixed simulator and vmware NPE issue. 2015-03-13 14:59:34 +05:30
Nitin Mehta d94a5720ef Avoid distributing private key for realhostip.com
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 13:33:48 +05:30
Harikrishna Patnala f947fad197 CS-17504: Weak SSL ciphers supported by the management server
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 13:25:33 +05:30
Jessica Wang 19e3c0168e CS-18149: UI - no longer store sessionKey in cookie. After
... this change, opening the 2nd browser window (of the same
domain) will show login screen (i.e. user has to enter
credentials again) and will cause the 1st browser window
session timeout.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 13:14:42 +05:30
Min Chen 0b5b9c91e4 CS-19734:Session cookie is exposed to scripts.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 12:51:06 +05:30
Prachi Damle c5754e693f CS-20680: The user's secret key is not encrypted in the UserCredentialsVO class
Changes:
-Added annotation to encrypt the secret key while persisting to the DB

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 12:50:19 +05:30
Min Chen 0d36f2e4b5 Error message exposes domain Id when deployVirtualMachine() is attempted on a shared network to which the user doesnot have access to.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 12:47:56 +05:30