cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: updated refs/heads/4.1 to a65c36a
Date Tue, 28 May 2013 13:14:51 GMT
Updated Branches:
  refs/heads/4.1 7f8b4773e -> a65c36a39


CLOUDSTACK-528: Config value has to be encrypted for Hidden category configs


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a65c36a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a65c36a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a65c36a3

Branch: refs/heads/4.1
Commit: a65c36a39138308f95049a815fa99f4da0bbde1a
Parents: 7f8b477
Author: Kishan Kavala <kishan@cloud.com>
Authored: Fri May 24 11:09:33 2013 +0530
Committer: Chip Childers <chipchilders@apache.org>
Committed: Tue May 28 09:14:38 2013 -0400

----------------------------------------------------------------------
 .../src/com/cloud/upgrade/dao/Upgrade302to40.java  |   41 +++++++++++++++
 setup/db/db/schema-302to40.sql                     |    3 -
 2 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a65c36a3/server/src/com/cloud/upgrade/dao/Upgrade302to40.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade302to40.java b/server/src/com/cloud/upgrade/dao/Upgrade302to40.java
index ecda872..6f31fdd 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade302to40.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade302to40.java
@@ -18,6 +18,7 @@
 package com.cloud.upgrade.dao;
 
 import java.io.File;
+import java.io.UnsupportedEncodingException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -72,6 +73,7 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade
{
         fixForeignKeys(conn);
         setupExternalNetworkDevices(conn);
         fixZoneUsingExternalDevices(conn);
+        encryptConfig(conn);
     }
 
     @Override
@@ -1079,4 +1081,43 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade
{
             s_logger.info("Successfully upgraded networks using F5 and SRX devices to have
a entry in the network_external_lb_device_map and network_external_firewall_device_map");
         }
     }
+
+    private void encryptConfig(Connection conn){
+        //Encrypt config params and change category to Hidden
+        s_logger.debug("Encrypting Config values");
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            pstmt = conn.prepareStatement("select name, value from `cloud`.`configuration`
where name in ('router.ram.size', 'secondary.storage.vm', 'security.hash.key') and category
<> 'Hidden'");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                String name = rs.getString(1);
+                String value = rs.getString(2);
+                if (value == null) {
+                    continue;
+                }
+                String encryptedValue = DBEncryptionUtil.encrypt(value);
+                pstmt = conn.prepareStatement("update `cloud`.`configuration` set value=?,
category = 'Hidden' where name=?");
+                pstmt.setBytes(1, encryptedValue.getBytes("UTF-8"));
+                pstmt.setString(2, name);
+                pstmt.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable encrypt configuration values ", e);
+        } catch (UnsupportedEncodingException e) {
+            throw new CloudRuntimeException("Unable encrypt configuration values ", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+        s_logger.debug("Done encrypting Config values");
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a65c36a3/setup/db/db/schema-302to40.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-302to40.sql b/setup/db/db/schema-302to40.sql
index 7fa7348..832228c 100644
--- a/setup/db/db/schema-302to40.sql
+++ b/setup/db/db/schema-302to40.sql
@@ -114,9 +114,6 @@ UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router
 UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.template.id';
 UPDATE `cloud`.`configuration` set category='Advanced' where name='capacity.skipcounting.hours';
 UPDATE `cloud`.`configuration` set category='Advanced' where name='use.local.storage';
-UPDATE `cloud`.`configuration` set category='Hidden' where name='router.ram.size';
-UPDATE `cloud`.`configuration` set category='Hidden' where name='secondary.storage.vm';
-UPDATE `cloud`.`configuration` set category='Hidden' where name='security.hash.key';
 UPDATE `cloud`.`configuration` set description = 'Percentage (as a value between 0 and 1)
of local storage utilization above which alerts will be sent about low local storage available.'
where name = 'cluster.localStorage.capacity.notificationthreshold';
 
 DELETE FROM `cloud`.`configuration` WHERE name='direct.agent.pool.size';


Mime
View raw message