cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From frankzh...@apache.org
Subject git commit: updated refs/heads/4.2 to 6d5435e
Date Mon, 22 Jul 2013 22:34:37 GMT
Updated Branches:
  refs/heads/4.2 db9fa40bf -> 6d5435e98


Adding encryption flag

CLOUDSTACK-3308
UCS:DB: UCS Manager password should not get stored in plain text.


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

Branch: refs/heads/4.2
Commit: 6d5435e98fd74aa969ec06a87a71eda995b0814b
Parents: db9fa40
Author: Amogh Vasekar <amoghvasekar@amoghs.citrite.net>
Authored: Fri Jul 19 16:17:45 2013 -0700
Committer: frank <frank.zhang@citrix.com>
Committed: Mon Jul 22 15:35:49 2013 -0700

----------------------------------------------------------------------
 .../ucs/src/com/cloud/ucs/database/UcsManagerVO.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d5435e9/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java
index 416ba95..45abf23 100644
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java
@@ -5,9 +5,9 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing,
 // software distributed under the License is distributed on an
 // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,6 +27,8 @@ import javax.persistence.Table;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
+import com.cloud.utils.db.Encrypt;
+
 @Entity
 @Table(name="ucs_manager")
 public class UcsManagerVO implements InternalIdentity, Identity {
@@ -50,16 +52,19 @@ public class UcsManagerVO implements InternalIdentity, Identity {
     @Column(name="username")
 	private String username;
 
+    @Encrypt
     @Column(name="password")
 	private String password;
 
-	public long getId() {
+	@Override
+    public long getId() {
 		return id;
 	}
 	public void setId(long id) {
 		this.id = id;
 	}
-	public String getUuid() {
+	@Override
+    public String getUuid() {
 		return uuid;
 	}
 	public void setUuid(String uuid) {


Mime
View raw message