From 5b9224f29020c00e245fc634f24b30dcece0a85a Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Fri, 17 Aug 2012 11:42:31 +0530
Subject: [PATCH] CS-16041. Not able to deploy Vms using base64 encoded
 userdata. Relaxed the validation applied on userdata. Reviewed by: Prachi

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 24a9134544f..72e605610fb 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2563,7 +2563,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
     private void validateUserData(String userData) {
         byte[] decodedUserData = null;
         if (userData != null) {
-            if ( !userData.matches("^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)$")) {
+            if ( !org.apache.commons.codec.binary.Base64.isBase64(userData)) {
                 throw new InvalidParameterValueException("User data is not base64 encoded", null);
             }
             if (userData.length() >= 2 * MAX_USER_DATA_LENGTH_BYTES) {