You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/10/14 16:38:03 UTC
[1/3] git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 1e3a0ac4a -> b29a4353f
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/41a296bf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41a296bf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41a296bf
Branch: refs/heads/2.7.x-fixes
Commit: 41a296bff9e23c6c240858360f9b20fa36c0bfed
Parents: 789dbab
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Oct 14 15:29:04 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Oct 14 15:29:04 2014 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/41a296bf/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d439cc4..7400fde 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2071,6 +2071,7 @@ M de58d7625dbbe04296f8059849854e55a7b7e3c1
M de6ad4dd59ddd50f4a5f9c1d59fe3e2593f87b68
M de76767fa5f2e72b1cf3cbbb9bfd72e43cb4aab3
M dea8b64b8e92fbe6f9edac76b6fec887d649a3f6
+M df6ca4df02646a755c4baa05f9c2473a2b32f601
M df81f1b567e5867953dfdc13ace5584316ba2994
M dfc20ae3c36d3d1aabbc04a703c0052c08085cf8
M dff49ce97038d04b5f7b5922a0ad41370b9f52d0
[2/3] git commit: [CXF-6051] - "Support sp13:Nonce + sp13:Created in
the UsernameTokenInterceptor"
Posted by co...@apache.org.
[CXF-6051] - "Support sp13:Nonce + sp13:Created in the UsernameTokenInterceptor"
Conflicts:
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/789dbabc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/789dbabc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/789dbabc
Branch: refs/heads/2.7.x-fixes
Commit: 789dbabc9f9126549ce84d7e847c0e3f357478ab
Parents: 1e3a0ac
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Oct 14 15:07:35 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Oct 14 15:29:04 2014 +0100
----------------------------------------------------------------------
.../wss4j/UsernameTokenInterceptor.java | 7 +++++++
.../apache/cxf/systest/ws/ut/DoubleItUt.wsdl | 20 ++++++++++++++++++++
2 files changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/789dbabc/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
index 739544f..d829f3a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
@@ -352,6 +352,13 @@ public class UsernameTokenInterceptor extends AbstractTokenInterceptor {
utBuilder.setPasswordType(WSConstants.PASSWORD_TEXT);
}
+ if (token.isCreated()) {
+ utBuilder.addCreated();
+ }
+ if (token.isNonce()) {
+ utBuilder.addNonce();
+ }
+
utBuilder.setUserInfo(userName, password);
return utBuilder;
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/789dbabc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl
index 8300bf2..d07e72d 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl
@@ -308,7 +308,27 @@
</wsp:All>
</wsp:ExactlyOne>
</wsp:Policy>
+<<<<<<< HEAD
+=======
+ <wsp:Policy wsu:Id="DoubleItPlaintextSupportingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SupportingTokens>
+ <wsp:Policy>
+ <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssUsernameToken10/>
+ <sp13:Created/>
+ <sp13:Nonce/>
+ </wsp:Policy>
+ </sp:UsernameToken>
+ </wsp:Policy>
+ </sp:SupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+>>>>>>> df6ca4d... [CXF-6051] - "Support sp13:Nonce + sp13:Created in the UsernameTokenInterceptor"
<wsp:Policy wsu:Id="DoubleItHashedPolicy">
<wsp:ExactlyOne>
<wsp:All>
[3/3] git commit: Fixing build
Posted by co...@apache.org.
Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b29a4353
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b29a4353
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b29a4353
Branch: refs/heads/2.7.x-fixes
Commit: b29a4353f4cc819e8a866fcbab789e1050efd2ad
Parents: 41a296b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Oct 14 15:37:48 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Oct 14 15:37:48 2014 +0100
----------------------------------------------------------------------
.../apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b29a4353/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
index d829f3a..64a33e2 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
@@ -352,10 +352,10 @@ public class UsernameTokenInterceptor extends AbstractTokenInterceptor {
utBuilder.setPasswordType(WSConstants.PASSWORD_TEXT);
}
- if (token.isCreated()) {
+ if (token.isRequireCreated()) {
utBuilder.addCreated();
}
- if (token.isNonce()) {
+ if (token.isRequireNonce()) {
utBuilder.addNonce();
}