You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/07/08 12:13:41 UTC
git commit: updated refs/heads/master to 24e9797
Updated Branches:
refs/heads/master 814630c54 -> 24e979780
CLOUDSTACK-3112. UserCredentials that is injected in AuthenticationHandler is not picked up
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24e97978
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24e97978
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24e97978
Branch: refs/heads/master
Commit: 24e9797807a1cad684592ce47a75475752f8e2bb
Parents: 814630c
Author: Likitha Shetty <li...@citrix.com>
Authored: Mon Jul 8 15:35:29 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Mon Jul 8 15:37:57 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24e97978/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
index 0406084..41aacb3 100644
--- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
+++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
@@ -39,13 +39,13 @@ import org.w3c.dom.NodeList;
import com.cloud.bridge.model.UserCredentialsVO;
import com.cloud.bridge.persist.dao.UserCredentialsDao;
+import com.cloud.bridge.persist.dao.UserCredentialsDaoImpl;
import com.cloud.bridge.service.UserContext;
import com.cloud.bridge.util.AuthenticationUtils;
public class AuthenticationHandler implements Handler {
protected final static Logger logger = Logger.getLogger(AuthenticationHandler.class);
- @Inject protected UserCredentialsDao ucDao;
private DocumentBuilderFactory dbf = null;
protected HandlerDescription handlerDesc = new HandlerDescription( "EC2AuthenticationHandler" );
@@ -117,9 +117,7 @@ public class AuthenticationHandler implements Handler {
logger.debug( "X509 cert's uniqueId: " + uniqueId );
// -> find the Cloud API key and the secret key from the cert's uniqueId
- /* UserCredentialsDao credentialDao = new UserCredentialsDao();
- UserCredentials cloudKeys = credentialDao.getByCertUniqueId( uniqueId );
- */
+ UserCredentialsDao ucDao = new UserCredentialsDaoImpl();
UserCredentialsVO cloudKeys = ucDao.getByCertUniqueId(uniqueId);
if ( null == cloudKeys ) {
logger.error( "Cert does not map to Cloud API keys: " + uniqueId );