mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Encrypting password values that are stored in the cluster_details table
This commit is contained in:
parent
b957933a0e
commit
023c2e4f59
@ -22,6 +22,7 @@ import java.util.Map;
|
|||||||
|
|
||||||
import javax.ejb.Local;
|
import javax.ejb.Local;
|
||||||
|
|
||||||
|
import com.cloud.utils.crypt.DBEncryptionUtil;
|
||||||
import com.cloud.utils.db.GenericDaoBase;
|
import com.cloud.utils.db.GenericDaoBase;
|
||||||
import com.cloud.utils.db.SearchBuilder;
|
import com.cloud.utils.db.SearchBuilder;
|
||||||
import com.cloud.utils.db.SearchCriteria;
|
import com.cloud.utils.db.SearchCriteria;
|
||||||
@ -31,12 +32,12 @@ import com.cloud.utils.db.Transaction;
|
|||||||
public class ClusterDetailsDaoImpl extends GenericDaoBase<ClusterDetailsVO, Long> implements ClusterDetailsDao {
|
public class ClusterDetailsDaoImpl extends GenericDaoBase<ClusterDetailsVO, Long> implements ClusterDetailsDao {
|
||||||
protected final SearchBuilder<ClusterDetailsVO> ClusterSearch;
|
protected final SearchBuilder<ClusterDetailsVO> ClusterSearch;
|
||||||
protected final SearchBuilder<ClusterDetailsVO> DetailSearch;
|
protected final SearchBuilder<ClusterDetailsVO> DetailSearch;
|
||||||
|
|
||||||
protected ClusterDetailsDaoImpl() {
|
protected ClusterDetailsDaoImpl() {
|
||||||
ClusterSearch = createSearchBuilder();
|
ClusterSearch = createSearchBuilder();
|
||||||
ClusterSearch.and("clusterId", ClusterSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
|
ClusterSearch.and("clusterId", ClusterSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
|
||||||
ClusterSearch.done();
|
ClusterSearch.done();
|
||||||
|
|
||||||
DetailSearch = createSearchBuilder();
|
DetailSearch = createSearchBuilder();
|
||||||
DetailSearch.and("clusterId", DetailSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
|
DetailSearch.and("clusterId", DetailSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
|
||||||
DetailSearch.and("name", DetailSearch.entity().getName(), SearchCriteria.Op.EQ);
|
DetailSearch.and("name", DetailSearch.entity().getName(), SearchCriteria.Op.EQ);
|
||||||
@ -48,32 +49,40 @@ public class ClusterDetailsDaoImpl extends GenericDaoBase<ClusterDetailsVO, Long
|
|||||||
SearchCriteria<ClusterDetailsVO> sc = DetailSearch.create();
|
SearchCriteria<ClusterDetailsVO> sc = DetailSearch.create();
|
||||||
sc.setParameters("clusterId", clusterId);
|
sc.setParameters("clusterId", clusterId);
|
||||||
sc.setParameters("name", name);
|
sc.setParameters("name", name);
|
||||||
|
|
||||||
return findOneIncludingRemovedBy(sc);
|
ClusterDetailsVO detail = findOneIncludingRemovedBy(sc);
|
||||||
|
if("password".equals(name) && detail != null){
|
||||||
|
detail.setValue(DBEncryptionUtil.decrypt(detail.getValue()));
|
||||||
|
}
|
||||||
|
return detail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<String, String> findDetails(long clusterId) {
|
public Map<String, String> findDetails(long clusterId) {
|
||||||
SearchCriteria<ClusterDetailsVO> sc = ClusterSearch.create();
|
SearchCriteria<ClusterDetailsVO> sc = ClusterSearch.create();
|
||||||
sc.setParameters("clusterId", clusterId);
|
sc.setParameters("clusterId", clusterId);
|
||||||
|
|
||||||
List<ClusterDetailsVO> results = search(sc, null);
|
List<ClusterDetailsVO> results = search(sc, null);
|
||||||
Map<String, String> details = new HashMap<String, String>(results.size());
|
Map<String, String> details = new HashMap<String, String>(results.size());
|
||||||
for (ClusterDetailsVO result : results) {
|
for (ClusterDetailsVO result : results) {
|
||||||
details.put(result.getName(), result.getValue());
|
if("password".equals(result.getName())){
|
||||||
|
details.put(result.getName(), DBEncryptionUtil.decrypt(result.getValue()));
|
||||||
|
} else {
|
||||||
|
details.put(result.getName(), result.getValue());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return details;
|
return details;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void deleteDetails(long clusterId) {
|
public void deleteDetails(long clusterId) {
|
||||||
SearchCriteria sc = ClusterSearch.create();
|
SearchCriteria sc = ClusterSearch.create();
|
||||||
sc.setParameters("clusterId", clusterId);
|
sc.setParameters("clusterId", clusterId);
|
||||||
|
|
||||||
List<ClusterDetailsVO> results = search(sc, null);
|
List<ClusterDetailsVO> results = search(sc, null);
|
||||||
for (ClusterDetailsVO result : results) {
|
for (ClusterDetailsVO result : results) {
|
||||||
remove(result.getId());
|
remove(result.getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -84,9 +93,13 @@ public class ClusterDetailsDaoImpl extends GenericDaoBase<ClusterDetailsVO, Long
|
|||||||
SearchCriteria<ClusterDetailsVO> sc = ClusterSearch.create();
|
SearchCriteria<ClusterDetailsVO> sc = ClusterSearch.create();
|
||||||
sc.setParameters("clusterId", clusterId);
|
sc.setParameters("clusterId", clusterId);
|
||||||
expunge(sc);
|
expunge(sc);
|
||||||
|
|
||||||
for (Map.Entry<String, String> detail : details.entrySet()) {
|
for (Map.Entry<String, String> detail : details.entrySet()) {
|
||||||
ClusterDetailsVO vo = new ClusterDetailsVO(clusterId, detail.getKey(), detail.getValue());
|
String value = detail.getValue();
|
||||||
|
if("password".equals(detail.getKey())){
|
||||||
|
value = DBEncryptionUtil.encrypt(value);
|
||||||
|
}
|
||||||
|
ClusterDetailsVO vo = new ClusterDetailsVO(clusterId, detail.getKey(), value);
|
||||||
persist(vo);
|
persist(vo);
|
||||||
}
|
}
|
||||||
txn.commit();
|
txn.commit();
|
||||||
@ -100,10 +113,10 @@ public class ClusterDetailsDaoImpl extends GenericDaoBase<ClusterDetailsVO, Long
|
|||||||
sc.setParameters("clusterId", clusterId);
|
sc.setParameters("clusterId", clusterId);
|
||||||
sc.setParameters("name", name);
|
sc.setParameters("name", name);
|
||||||
expunge(sc);
|
expunge(sc);
|
||||||
|
|
||||||
ClusterDetailsVO vo = new ClusterDetailsVO(clusterId, name, value);
|
ClusterDetailsVO vo = new ClusterDetailsVO(clusterId, name, value);
|
||||||
persist(vo);
|
persist(vo);
|
||||||
txn.commit();
|
txn.commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user