cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [3/9] git commit: updated refs/heads/4.4 to 8e58bc0
Date Mon, 16 Mar 2015 10:36:57 GMT
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 c5754e693f0272b29fc0aa89278a30ee967f12f9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/4.4
Commit: 6da3d1bd6bad9df670e38d635ed20259a9690ac9
Parents: c698af2
Author: Prachi Damle <prachi.damle@citrix.com>
Authored: Wed Oct 15 14:53:45 2014 -0700
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Mar 16 15:49:27 2015 +0530

----------------------------------------------------------------------
 awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6da3d1bd/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
index 9a10c2e..fe009cd 100644
--- a/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
+++ b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
@@ -23,6 +23,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import com.cloud.utils.db.Encrypt;
+
 @Entity
 @Table(name = "usercredentials")
 public class UserCredentialsVO {
@@ -36,6 +38,7 @@ public class UserCredentialsVO {
     @Column(name = "AccessKey")
     private String accessKey;
 
+    @Encrypt
     @Column(name = "SecretKey")
     private String secretKey;
 


Mime
View raw message