You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2006/05/10 09:53:50 UTC
svn commit: r405669 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/axis2/security/rahas/
security/src/org/apache/axis2/security/
security/src/org/apache/axis2/security/rahas/
security/src/org/apache/axis2/security/trust/impl/
Author: ruchithf
Date: Wed May 10 00:53:48 2006
New Revision: 405669
URL: http://svn.apache.org/viewcvs?rev=405669&view=rev
Log:
Added a few missing javadoc comments
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasCallbackHandler.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuerConfig.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java?rev=405669&r1=405668&r2=405669&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java Wed May 10 00:53:48 2006
@@ -32,10 +32,8 @@
import org.apache.axis2.security.handler.WSSHandlerConstants;
import org.apache.axis2.security.handler.config.InflowConfiguration;
import org.apache.axis2.security.handler.config.OutflowConfiguration;
-import org.apache.axis2.security.rahas.RahasConfiguration;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import java.io.StringWriter;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java?rev=405669&r1=405668&r2=405669&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java Wed May 10 00:53:48 2006
@@ -22,7 +22,6 @@
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.modules.Module;
import org.apache.axis2.security.handler.WSSHandlerConstants;
import org.apache.axis2.security.handler.config.InflowConfiguration;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasCallbackHandler.java?rev=405669&r1=405668&r2=405669&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasCallbackHandler.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasCallbackHandler.java Wed May 10 00:53:48 2006
@@ -25,6 +25,10 @@
import java.io.IOException;
+/**
+ * This is ths callback handler used to extract he secure conversation
+ * session key for a given context identifier
+ */
public class RahasCallbackHandler implements CallbackHandler {
private RahasConfiguration config;
@@ -41,8 +45,11 @@
String id = pc.getIdentifer();
Token tok;
try {
+ //Pick up the token from the token store
tok = this.config.getTokenStore().getToken(id);
+ //Get the secret and set it in the callback object
pc.setKey(tok.getSecret());
+ //Register the security context in the current configuration
this.config.resgisterContext(id);
} catch (Exception e) {
e.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java?rev=405669&r1=405668&r2=405669&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java Wed May 10 00:53:48 2006
@@ -271,6 +271,10 @@
return null;
}
+ /**
+ * Generate the Axis2 parameter representing RahasConfiguration
+ * @return
+ */
public Parameter getParameter() {
Parameter param = new Parameter();
OMElement element = this.getOMElement();
@@ -325,7 +329,15 @@
return elem;
}
-
+ /**
+ * This registers the security context mapping ?e context identifier to
+ * the wsa:Action/soapAction or the service address, depending on the scope.
+ *
+ * @param identifier The security context identifier
+ * @throws RahasException
+ * If scope is "operation" and the wsa:Action is not available.
+ * If scope is "service" and the wsa:To is missing.
+ */
protected void resgisterContext(String identifier) throws RahasException {
this.contextIdentifier = identifier;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java?rev=405669&r1=405668&r2=405669&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java Wed May 10 00:53:48 2006
@@ -42,6 +42,8 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import javax.xml.namespace.QName;
+
import java.security.Principal;
import java.security.SecureRandom;
import java.security.cert.X509Certificate;
@@ -130,6 +132,8 @@
new String[] { SCTIssuerConfig.SCT_ISSUER_CONFIG
.getLocalPart() });
}
+
+ parseEntropyInfo(inMsgCtx.getEnvelope(), config);
if(ENCRYPTED_KEY.equals(config.proofTokenType)) {
SOAPEnvelope responseEnv = this.doEncryptedKey(config,
@@ -151,6 +155,17 @@
}
+ /**
+ * @param envelope
+ * @param config
+ */
+ private void parseEntropyInfo(SOAPEnvelope envelope, SCTIssuerConfig config) {
+ OMElement elem = envelope.getBody().getFirstChildWithName(new QName(Constants.WST_NS, Constants.REQUEST_SECURITY_TOKEN_LN));
+ if(elem != null) {
+ //TODO get the entropy and keysize info
+ }
+ }
+
/**
* @param config
* @param inMsgCtx
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuerConfig.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuerConfig.java?rev=405669&r1=405668&r2=405669&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuerConfig.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuerConfig.java Wed May 10 00:53:48 2006
@@ -44,6 +44,10 @@
protected boolean addRequestedUnattachedRef;
+ protected byte[] requesterEntropy;
+
+ protected int keySize;
+
public SCTIssuerConfig(OMElement elem) throws TrustException {
OMElement proofTokenElem = (OMElement) elem.getFirstChildWithName(
new QName("proofToken"));
@@ -85,5 +89,7 @@
return builder != null ? load(builder.getDocumentElement()) : null;
}
+
+
}