Author: veithen
Date: Sat Jan 14 12:48:54 2017
New Revision: 1778764
URL: http://svn.apache.org/viewvc?rev=1778764&view=rev
Log:
Fix formatting.
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/resources/org/apache/rampart/policy/builders/kerberosConfig.policy
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/RampartKerberosTest.java
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosDelegation.xml
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportKeytab.xml
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportPWCB.xml
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/KerberosTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/KerberosTokenBuilder.java
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Sat Jan 14 12:48:54 2017
@@ -869,16 +869,16 @@ public abstract class BindingBuilder {
}
String password = krbConfig.getPrincipalPassword();
- if (password == null) {
+ if (password == null) {
CallbackHandler handler = RampartUtil.getPasswordCB(rmd);
if (handler != null) {
- if (user == null) {
+ if (user == null) {
log.debug("Password callback is configured but no user
value is specified in the configuration");
throw new RampartException("userMissing");
- }
-
- //TODO We do not have a separate usage type for Kerberos token,
let's use custom token
+ }
+
+ //TODO We do not have a separate usage type for Kerberos
token, let's use custom token
WSPasswordCallback[] cb = { new WSPasswordCallback(user,
WSPasswordCallback.CUSTOM_TOKEN) };
try {
handler.handle(cb);
@@ -913,15 +913,14 @@ public abstract class BindingBuilder {
}
}
else {
- OMElement upnClaim =
addressingIdentity.getFirstChildWithName(AddressingConstants.QNAME_IDENTITY_UPN);
- if (upnClaim != null) {
- principalName = upnClaim.getText();
- isUsernameServiceNameForm = true;
+ OMElement upnClaim =
addressingIdentity.getFirstChildWithName(AddressingConstants.QNAME_IDENTITY_UPN);
+ if (upnClaim != null) {
+ principalName = upnClaim.getText();
+ isUsernameServiceNameForm = true;
if (log.isDebugEnabled()) {
log.debug("Found UPN identity claim: " +
principalName);
}
- }
- else if (log.isDebugEnabled()) {
+ } else if (log.isDebugEnabled()) {
log.debug(String.format("Neither SPN nor UPN identity
claim found in %s EPR element for endpoint %s.",
addressingIdentity.getQName().toString(), endpoint.getName()));
}
}
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
Sat Jan 14 12:48:54 2017
@@ -146,7 +146,7 @@ public class TransportBindingBuilder ext
handleSecureConversationTokens(rmd,
(SecureConversationToken) token);
signatureValues.add(doSecureConversationSignature(rmd,
token, signdParts));
} else if (token instanceof KerberosToken) {
- signatureValues.add(doKerberosTokenSignature(rmd,
(KerberosToken)token, signdParts));
+ signatureValues.add(doKerberosTokenSignature(rmd,
(KerberosToken)token, signdParts));
}
}
}
@@ -316,7 +316,7 @@ public class TransportBindingBuilder ext
//TODO Shall we always include a timestamp?
if (this.timestampElement != null) {
- sigParts.add(new WSEncryptionPart(rmd.getTimestampId()));
+ sigParts.add(new WSEncryptionPart(rmd.getTimestampId()));
}
if (signdParts != null) {
@@ -335,33 +335,32 @@ public class TransportBindingBuilder ext
}
}
- try {
- KerberosSecurity kerberosBst = addKerberosToken(rmd, token);
- kerberosBst.setID("Id-" + kerberosBst.hashCode());
-
- WSSecSignature sign = new WSSecSignature();
- sign.setSignatureAlgorithm(SignatureMethod.HMAC_SHA1);
-
- if (token.isRequiresKeyIdentifierReference()) {
-
sign.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER);
-
- byte[] digestBytes =
WSSecurityUtil.generateDigest(kerberosBst.getToken());
- sign.setCustomTokenId(Base64.encode(digestBytes));
-
sign.setCustomTokenValueType(WSConstants.WSS_KRB_KI_VALUE_TYPE);
- }
- else {
- sign.setKeyIdentifierType(WSConstants.CUSTOM_SYMM_SIGNING);
-
- sign.setCustomTokenId(kerberosBst.getID());
- sign.setCustomTokenValueType(kerberosBst.getValueType());
- }
-
- SecretKey secretKey = kerberosBst.getSecretKey();
- sign.setSecretKey(secretKey.getEncoded());
-
- sign.prepare(doc, null, rmd.getSecHeader());
-
-
WSSecurityUtil.prependChildElement(rmd.getSecHeader().getSecurityHeader(),
kerberosBst.getElement());
+ try {
+ KerberosSecurity kerberosBst = addKerberosToken(rmd, token);
+ kerberosBst.setID("Id-" + kerberosBst.hashCode());
+
+ WSSecSignature sign = new WSSecSignature();
+ sign.setSignatureAlgorithm(SignatureMethod.HMAC_SHA1);
+
+ if (token.isRequiresKeyIdentifierReference()) {
+ sign.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER);
+
+ byte[] digestBytes =
WSSecurityUtil.generateDigest(kerberosBst.getToken());
+ sign.setCustomTokenId(Base64.encode(digestBytes));
+
sign.setCustomTokenValueType(WSConstants.WSS_KRB_KI_VALUE_TYPE);
+ } else {
+ sign.setKeyIdentifierType(WSConstants.CUSTOM_SYMM_SIGNING);
+
+ sign.setCustomTokenId(kerberosBst.getID());
+ sign.setCustomTokenValueType(kerberosBst.getValueType());
+ }
+
+ SecretKey secretKey = kerberosBst.getSecretKey();
+ sign.setSecretKey(secretKey.getEncoded());
+
+ sign.prepare(doc, null, rmd.getSecHeader());
+
+
WSSecurityUtil.prependChildElement(rmd.getSecHeader().getSecurityHeader(),
kerberosBst.getElement());
List<Reference> referenceList = sign.addReferencesToSign(sigParts,
rmd.getSecHeader());
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java
Sat Jan 14 12:48:54 2017
@@ -49,82 +49,82 @@ import org.xml.sax.SAXException;
public class KerberosConfigBuilderTest extends TestCase {
- public static final String KERBEROS_CONFIG_POLICY_FILE =
"kerberosConfig.policy";
-
- private static Logger log =
LoggerFactory.getLogger(KerberosConfigBuilderTest.class);
-
+ public static final String KERBEROS_CONFIG_POLICY_FILE =
"kerberosConfig.policy";
+
+ private static Logger log =
LoggerFactory.getLogger(KerberosConfigBuilderTest.class);
+
public void testBuildKerberosConfig() throws WSSPolicyException {
- Policy kerberosConfigPolicy = loadKerberosConfigPolicy();
- assertNotNull(String.format("Failed to parse policy file: %s",
KERBEROS_CONFIG_POLICY_FILE), kerberosConfigPolicy);
-
- Iterator<List<Assertion>> iter = kerberosConfigPolicy.getAlternatives();
-
- assertTrue(String.format("No policy alternatives found in policy file:
%s", KERBEROS_CONFIG_POLICY_FILE), iter.hasNext());
-
+ Policy kerberosConfigPolicy = loadKerberosConfigPolicy();
+ assertNotNull(String.format("Failed to parse policy file: %s",
KERBEROS_CONFIG_POLICY_FILE), kerberosConfigPolicy);
+
+ Iterator<List<Assertion>> iter =
kerberosConfigPolicy.getAlternatives();
+
+ assertTrue(String.format("No policy alternatives found in policy file:
%s", KERBEROS_CONFIG_POLICY_FILE), iter.hasNext());
+
//Process policy and build policy data
- RampartPolicyData policyData = RampartPolicyBuilder.build(iter.next());
+ RampartPolicyData policyData = RampartPolicyBuilder.build(iter.next());
- RampartConfig rampartConfig = policyData.getRampartConfig();
- assertNotNull(String.format("No rampartConfig found in policy file:
%s", KERBEROS_CONFIG_POLICY_FILE), rampartConfig);
- KerberosConfig kerberosConfig = rampartConfig.getKerberosConfig();
- assertNotNull(String.format("No kerberosConfig found in policy file:
%s", KERBEROS_CONFIG_POLICY_FILE), kerberosConfig);
-
- assertEquals("Kerberos jaas context name not configured as expected.",
"alice", kerberosConfig.getJaasContext());
- assertEquals("Kerberos principal name not configured as expected.",
"alice", kerberosConfig.getPrincipalName());
- assertEquals("Kerberos principal password not configured as expected.",
"changeit", kerberosConfig.getPrincipalPassword());
- assertEquals("Kerberos service principal name not configured as
expected.", "bob/example.com", kerberosConfig.getServicePrincipalName());
- assertEquals("Kerberos token decoder class not configured as
expected.", "org.foo.KerberosTokenDecoderImpl",
kerberosConfig.getKerberosTokenDecoderClass());
- assertTrue("Request for Kerberos credential delegation is expected to
be enabled.", kerberosConfig.isRequstCredentialDelegation());
+ RampartConfig rampartConfig = policyData.getRampartConfig();
+ assertNotNull(String.format("No rampartConfig found in policy file:
%s", KERBEROS_CONFIG_POLICY_FILE), rampartConfig);
+ KerberosConfig kerberosConfig = rampartConfig.getKerberosConfig();
+ assertNotNull(String.format("No kerberosConfig found in policy file:
%s", KERBEROS_CONFIG_POLICY_FILE), kerberosConfig);
+
+ assertEquals("Kerberos jaas context name not configured as expected.",
"alice", kerberosConfig.getJaasContext());
+ assertEquals("Kerberos principal name not configured as expected.",
"alice", kerberosConfig.getPrincipalName());
+ assertEquals("Kerberos principal password not configured as
expected.", "changeit", kerberosConfig.getPrincipalPassword());
+ assertEquals("Kerberos service principal name not configured as
expected.", "bob/example.com", kerberosConfig.getServicePrincipalName());
+ assertEquals("Kerberos token decoder class not configured as
expected.", "org.foo.KerberosTokenDecoderImpl",
kerberosConfig.getKerberosTokenDecoderClass());
+ assertTrue("Request for Kerberos credential delegation is expected to
be enabled.", kerberosConfig.isRequstCredentialDelegation());
}
public void testSerializeKerberosConfig() throws XMLStreamException,
SAXException, IOException, XpathException {
- Policy kerberosConfigPolicy = loadKerberosConfigPolicy();
- assertNotNull(String.format("Failed to parse policy file: %s",
KERBEROS_CONFIG_POLICY_FILE), kerberosConfigPolicy);
-
- //serialize the kerberos config policy
+ Policy kerberosConfigPolicy = loadKerberosConfigPolicy();
+ assertNotNull(String.format("Failed to parse policy file: %s",
KERBEROS_CONFIG_POLICY_FILE), kerberosConfigPolicy);
+
+ //serialize the kerberos config policy
StringWriter writer = new StringWriter();
XMLStreamWriter streamWriter = null;
try {
- streamWriter =
XMLOutputFactory.newInstance().createXMLStreamWriter(writer);
- kerberosConfigPolicy.serialize(streamWriter);
+ streamWriter =
XMLOutputFactory.newInstance().createXMLStreamWriter(writer);
+ kerberosConfigPolicy.serialize(streamWriter);
}
finally {
- if (streamWriter != null) {
- streamWriter.close();
- }
+ if (streamWriter != null) {
+ streamWriter.close();
+ }
}
-
+
InputStream kerberosConfigStream = null;
try {
- kerberosConfigStream =
this.getClass().getResourceAsStream(KERBEROS_CONFIG_POLICY_FILE);
- XMLUnit.setIgnoreWhitespace(true);
+ kerberosConfigStream =
this.getClass().getResourceAsStream(KERBEROS_CONFIG_POLICY_FILE);
+ XMLUnit.setIgnoreWhitespace(true);
XMLAssert.assertXMLEqual("Serialized rampart:kerberosConfig
element does not match the initial one.", new
InputSource(kerberosConfigStream), new InputSource(new
StringReader(writer.toString())));
}
finally {
- closeStream(kerberosConfigStream);
+ closeStream(kerberosConfigStream);
}
}
private Policy loadKerberosConfigPolicy() {
- InputStream kerberosConfigStream = null;
- try {
- kerberosConfigStream =
this.getClass().getResourceAsStream(KERBEROS_CONFIG_POLICY_FILE);
- PolicyBuilder builder = new PolicyBuilder();
- return builder.getPolicy(kerberosConfigStream);
- }
- finally {
- closeStream(kerberosConfigStream);
- }
+ InputStream kerberosConfigStream = null;
+ try {
+ kerberosConfigStream =
this.getClass().getResourceAsStream(KERBEROS_CONFIG_POLICY_FILE);
+ PolicyBuilder builder = new PolicyBuilder();
+ return builder.getPolicy(kerberosConfigStream);
+ }
+ finally {
+ closeStream(kerberosConfigStream);
+ }
}
private void closeStream(InputStream in) {
- if (in != null) {
- try {
- in.close();
- }
- catch (IOException e) {
- log.error("Failed to close input stream.", e);
- }
- }
+ if (in != null) {
+ try {
+ in.close();
+ }
+ catch (IOException e) {
+ log.error("Failed to close input stream.", e);
+ }
+ }
}
}
\ No newline at end of file
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/resources/org/apache/rampart/policy/builders/kerberosConfig.policy
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/resources/org/apache/rampart/policy/builders/kerberosConfig.policy?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/resources/org/apache/rampart/policy/builders/kerberosConfig.policy
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/resources/org/apache/rampart/policy/builders/kerberosConfig.policy
Sat Jan 14 12:48:54 2017
@@ -5,7 +5,7 @@
<rampart:timestampPrecisionInMilliseconds>true</rampart:timestampPrecisionInMilliseconds>
<rampart:timestampTTL>300</rampart:timestampTTL>
<rampart:timestampMaxSkew>300</rampart:timestampMaxSkew>
-
<rampart:timestampStrict>false</rampart:timestampStrict>
+ <rampart:timestampStrict>false</rampart:timestampStrict>
<rampart:nonceLifeTime>300</rampart:nonceLifeTime>
<rampart:kerberosConfig>
<rampart:jaasContext>alice</rampart:jaasContext>
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml
Sat Jan 14 12:48:54 2017
@@ -315,7 +315,7 @@
<jar
jarfile="target/test-resources/rampart_service_repo/services/SecureServiceSC6.aar"
basedir="target/temp-ramp" />
<!-- Kerberos Services -->
- <copy
overwrite="yes"
file="src/test/resources/rampart/kerberos/KerberosOverTransportKeytab.xml"
tofile="target/temp-ramp/META-INF/services.xml" />
+ <copy overwrite="yes"
file="src/test/resources/rampart/kerberos/KerberosOverTransportKeytab.xml"
tofile="target/temp-ramp/META-INF/services.xml" />
<jar
jarfile="target/test-resources/rampart_service_repo/services/KerberosOverTransportKeytab.aar"
basedir="target/temp-ramp" />
<copy overwrite="yes"
file="src/test/resources/rampart/kerberos/KerberosOverTransportPWCB.xml"
tofile="target/temp-ramp/META-INF/services.xml" />
@@ -692,15 +692,15 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-codec-standalone</artifactId>
- <version>1.0.0-M33</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-extras-codec-api</artifactId>
- <version>1.0.0-M33</version>
- </dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
+ <version>1.0.0-M33</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-extras-codec-api</artifactId>
+ <version>1.0.0-M33</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/RampartKerberosTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/RampartKerberosTest.java?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/RampartKerberosTest.java
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/RampartKerberosTest.java
Sat Jan 14 12:48:54 2017
@@ -210,60 +210,60 @@ public class RampartKerberosTest extends
* @throws IOException
*/
protected File generateKerberosConf() throws IOException {
- File tmpDir = new File("target" + File.separator + "tmp");
- if (!tmpDir.exists() && !tmpDir.mkdirs()) {
- throw new RuntimeException("Failed to create temp directory: "
+ tmpDir.getAbsolutePath());
- }
-
- File krb5ConfTemplate = new File(KERBEROS_CONF_TEMPLATE);
- if (!krb5ConfTemplate.exists()) {
- throw new IllegalArgumentException("Cannot find kerberos
configuration file template: " + krb5ConfTemplate.getAbsolutePath());
- }
-
- FileInputStream krb5ConfTemplateIn = null;
- String krb5ConfContent;
- try {
- krb5ConfTemplateIn = new FileInputStream(krb5ConfTemplate);
- krb5ConfContent = IOUtils.toString(krb5ConfTemplateIn);
- }
- finally {
- IOUtils.closeQuietly(krb5ConfTemplateIn);
- }
-
- if (krb5ConfContent.indexOf(KERBEROS_CONF_KDC_PORT_TOKEN) ==
-1) {
- throw new
IllegalArgumentException(String.format("Cannot find any %s token in kerberos
configuration file template: %s",
- KERBEROS_CONF_KDC_PORT_TOKEN,
krb5ConfTemplate.getAbsolutePath()));
- }
-
- krb5ConfContent =
krb5ConfContent.replace(KERBEROS_CONF_KDC_PORT_TOKEN,
String.valueOf(KerberosServer.getPort()));
-
- File krb5Conf = new File(tmpDir, this.getClass().getSimpleName() +
"_krb5.conf");
- FileOutputStream krb5ConfOut = null;
- try {
- krb5ConfOut = new FileOutputStream(krb5Conf);
- IOUtils.write(krb5ConfContent, krb5ConfOut);
- }
- finally {
- IOUtils.closeQuietly(krb5ConfOut);
- }
-
- return krb5Conf;
+ File tmpDir = new File("target" + File.separator + "tmp");
+ if (!tmpDir.exists() && !tmpDir.mkdirs()) {
+ throw new RuntimeException("Failed to create temp directory: " +
tmpDir.getAbsolutePath());
+ }
+
+ File krb5ConfTemplate = new File(KERBEROS_CONF_TEMPLATE);
+ if (!krb5ConfTemplate.exists()) {
+ throw new IllegalArgumentException("Cannot find kerberos
configuration file template: " + krb5ConfTemplate.getAbsolutePath());
+ }
+
+ FileInputStream krb5ConfTemplateIn = null;
+ String krb5ConfContent;
+ try {
+ krb5ConfTemplateIn = new FileInputStream(krb5ConfTemplate);
+ krb5ConfContent = IOUtils.toString(krb5ConfTemplateIn);
+ }
+ finally {
+ IOUtils.closeQuietly(krb5ConfTemplateIn);
+ }
+
+ if (krb5ConfContent.indexOf(KERBEROS_CONF_KDC_PORT_TOKEN) == -1) {
+ throw new IllegalArgumentException(String.format("Cannot find any
%s token in kerberos configuration file template: %s",
+ KERBEROS_CONF_KDC_PORT_TOKEN,
krb5ConfTemplate.getAbsolutePath()));
+ }
+
+ krb5ConfContent =
krb5ConfContent.replace(KERBEROS_CONF_KDC_PORT_TOKEN,
String.valueOf(KerberosServer.getPort()));
+
+ File krb5Conf = new File(tmpDir, this.getClass().getSimpleName() +
"_krb5.conf");
+ FileOutputStream krb5ConfOut = null;
+ try {
+ krb5ConfOut = new FileOutputStream(krb5Conf);
+ IOUtils.write(krb5ConfContent, krb5ConfOut);
+ }
+ finally {
+ IOUtils.closeQuietly(krb5ConfOut);
+ }
+
+ return krb5Conf;
}
- /* (non-Javadoc)
- * @see org.apache.rampart.AbstractRampartTest#isEnableHttp()
- */
- @Override
- protected boolean isEnableHttp() {
- //Kerberos test does not use http
- return false;
- }
+ /* (non-Javadoc)
+ * @see org.apache.rampart.AbstractRampartTest#isEnableHttp()
+ */
+ @Override
+ protected boolean isEnableHttp() {
+ //Kerberos test does not use http
+ return false;
+ }
- /* (non-Javadoc)
- * @see org.apache.rampart.AbstractRampartTest#isEnableHttps()
- */
- @Override
- protected boolean isEnableHttps() {
- return true;
- }
+ /* (non-Javadoc)
+ * @see org.apache.rampart.AbstractRampartTest#isEnableHttps()
+ */
+ @Override
+ protected boolean isEnableHttps() {
+ return true;
+ }
}
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java
Sat Jan 14 12:48:54 2017
@@ -53,8 +53,8 @@ import org.slf4j.LoggerFactory;
*/
public class KerberosServer {
- private static final Logger logger =
LoggerFactory.getLogger(KerberosServer.class);
-
+ private static final Logger logger =
LoggerFactory.getLogger(KerberosServer.class);
+
/**
* The used DirectoryService instance
*/
@@ -77,8 +77,8 @@ public class KerberosServer {
* @throws Exception
*/
public static synchronized void startKerberosServer() throws Exception {
- int kdcPort = PortAllocator.allocatePort();
-
+ int kdcPort = PortAllocator.allocatePort();
+
DatagramSocket datagramSocket = new DatagramSocket(kdcPort);
datagramSocket.setReuseAddress(true);
datagramSocket.close();
@@ -156,24 +156,24 @@ public class KerberosServer {
* @throws IllegalArgumentException If server or respective transport are
not initialized
*/
public static synchronized int getPort() throws IllegalArgumentException {
- if (kdcServer == null) {
- throw new IllegalStateException("Kerberos server is not
initialized");
- }
-
- Transport[] transports = kdcServer.getTransports();
- if (transports == null || transports.length == 0) {
- throw new IllegalStateException("Kerberos server does not
configure any transports");
- }
-
- for (Transport transport : transports) {
- if (transport instanceof UdpTransport) {
- return transport.getPort();
- }
- }
-
- throw new IllegalStateException(
- String.format("Cannot identify Kerberos server port.
List of transports does not contain an %s instance",
- UdpTransport.class.getName()));
+ if (kdcServer == null) {
+ throw new IllegalStateException("Kerberos server is not
initialized");
+ }
+
+ Transport[] transports = kdcServer.getTransports();
+ if (transports == null || transports.length == 0) {
+ throw new IllegalStateException("Kerberos server does not
configure any transports");
+ }
+
+ for (Transport transport : transports) {
+ if (transport instanceof UdpTransport) {
+ return transport.getPort();
+ }
+ }
+
+ throw new IllegalStateException(
+ String.format("Cannot identify Kerberos server port. List of
transports does not contain an %s instance",
+ UdpTransport.class.getName()));
}
/**
@@ -181,34 +181,34 @@ public class KerberosServer {
* @throws Exception
*/
public static synchronized void stopKerberosServer() throws Exception {
- logger.info("Stop called");
- try {
- if (directoryService != null) {
- try {
- directoryService.shutdown();
- }
- finally {
- try {
-
FileUtils.deleteDirectory(workDir);
- }
- catch (IOException e) {
- logger.error("Failed to delete
Apache DS working directory: " + workDir.getAbsolutePath() , e);
- }
- }
- directoryService = null;
- }
- }
- finally {
- if (kdcServer != null) {
- kdcServer.stop();
- kdcServer = null;
- }
-
+ logger.info("Stop called");
+ try {
+ if (directoryService != null) {
+ try {
+ directoryService.shutdown();
+ }
+ finally {
+ try {
+ FileUtils.deleteDirectory(workDir);
+ }
+ catch (IOException e) {
+ logger.error("Failed to delete Apache DS working
directory: " + workDir.getAbsolutePath() , e);
+ }
+ }
+ directoryService = null;
+ }
+ }
+ finally {
+ if (kdcServer != null) {
+ kdcServer.stop();
+ kdcServer = null;
+ }
+
if (provider != null) {
//restore BC position
Security.removeProvider("BC");
Security.insertProviderAt(provider, providerPos);
}
- }
+ }
}
}
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosDelegation.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosDelegation.xml?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosDelegation.xml
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosDelegation.xml
Sat Jan 14 12:48:54 2017
@@ -5,10 +5,10 @@
<parameter locked="false"
name="ServiceClass">org.apache.rampart.KerberosDelegationService</parameter>
- <transports>
- <transport>https</transport>
- </transports>
-
+ <transports>
+ <transport>https</transport>
+ </transports>
+
<operation name="echo">
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
<actionMapping>urn:echo</actionMapping>
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportKeytab.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportKeytab.xml?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportKeytab.xml
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportKeytab.xml
Sat Jan 14 12:48:54 2017
@@ -5,10 +5,10 @@
<parameter locked="false"
name="ServiceClass">org.apache.rampart.Service</parameter>
- <transports>
- <transport>https</transport>
- </transports>
-
+ <transports>
+ <transport>https</transport>
+ </transports>
+
<operation name="echo">
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
<actionMapping>urn:echo</actionMapping>
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportPWCB.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportPWCB.xml?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportPWCB.xml
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/resources/rampart/kerberos/KerberosOverTransportPWCB.xml
Sat Jan 14 12:48:54 2017
@@ -5,10 +5,10 @@
<parameter locked="false"
name="ServiceClass">org.apache.rampart.Service</parameter>
- <transports>
- <transport>https</transport>
- </transports>
-
+ <transports>
+ <transport>https</transport>
+ </transports>
+
<operation name="echo">
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
<actionMapping>urn:echo</actionMapping>
@@ -63,7 +63,7 @@
<wsaw:UsingAddressing />
<rampart:RampartConfig
xmlns:rampart="http://ws.apache.org/rampart/policy";>
- <rampart:user>alice</rampart:user>
+ <rampart:user>alice</rampart:user>
<rampart:passwordCallbackClass>org.apache.rampart.PWCallback</rampart:passwordCallbackClass>
<rampart:kerberosConfig>
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/KerberosTokenBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/KerberosTokenBuilder.java?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/KerberosTokenBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/KerberosTokenBuilder.java
Sat Jan 14 12:48:54 2017
@@ -42,8 +42,8 @@ public class KerberosTokenBuilder implem
* @see org.apache.neethi.builders.AssertionBuilder#build(java.lang.Object,
* org.apache.neethi.AssertionBuilderFactory)
*/
- public Assertion build(OMElement element, AssertionBuilderFactory arg1)
- throws IllegalArgumentException {
+ public Assertion build(OMElement element, AssertionBuilderFactory arg1)
+ throws IllegalArgumentException {
KerberosToken kerberosToken = new KerberosToken(SPConstants.SP_V11);
OMElement policyElement = element.getFirstElement();
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/KerberosTokenBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/KerberosTokenBuilder.java?rev=1778764&r1=1778763&r2=1778764&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/KerberosTokenBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/KerberosTokenBuilder.java
Sat Jan 14 12:48:54 2017
@@ -42,8 +42,8 @@ public class KerberosTokenBuilder implem
* @see org.apache.neethi.builders.AssertionBuilder#build(java.lang.Object,
* org.apache.neethi.AssertionBuilderFactory)
*/
- public Assertion build(OMElement element, AssertionBuilderFactory arg1)
- throws IllegalArgumentException {
+ public Assertion build(OMElement element, AssertionBuilderFactory arg1)
+ throws IllegalArgumentException {
KerberosToken kerberosToken = new KerberosToken(SPConstants.SP_V12);
OMElement policyElement = element.getFirstElement();
