You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/12 02:38:57 UTC
[6/50] [abbrv] git commit: CS-14796: Error out with
InvalidParameterValueException in UserVmManagerImpl if userdata is not base64
encoded.
CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1c96ef41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1c96ef41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1c96ef41
Branch: refs/heads/javelin
Commit: 1c96ef41c19ce0f0a1e557012b3419973334867a
Parents: a7d2a08
Author: Likitha Shetty <Li...@citrix.com>
Authored: Tue Sep 11 16:57:07 2012 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Tue Sep 11 17:38:27 2012 -0700
----------------------------------------------------------------------
server/src/com/cloud/vm/UserVmManagerImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1c96ef41/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index a1241da..73a60ce 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2558,6 +2558,9 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
private void validateUserData(String userData) {
byte[] decodedUserData = null;
if (userData != null) {
+ if (!Base64.isBase64(userData)) {
+ throw new InvalidParameterValueException("User data is not base64 encoded");
+ }
if (userData.length() >= 2 * MAX_USER_DATA_LENGTH_BYTES) {
throw new InvalidParameterValueException("User data is too long");
}