[cxf] 01/02: moved to Gitbox
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit d3d87c27b6c1f31aa4dcad86707731f1e43b4762 Author: Dennis Kieselhorst AuthorDate: Sat Sep 9 08:20:16 2017 +0200 moved to Gitbox --- etc/cxf.rdf | 4 ++-- pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/cxf.rdf b/etc/cxf.rdf index bc289a4..74238a8 100644 --- a/etc/cxf.rdf +++ b/etc/cxf.rdf @@ -22,8 +22,8 @@ http://projects.apache.org/category/network-server"; /> -https://git-wip-us.apache.org/repos/asf/cxf.git"/> -https://git-wip-us.apache.org/repos/asf?p=cxf.git"/> +https://gitbox.apache.org/repos/asf/cxf.git"/> +https://gitbox.apache.org/repos/asf?p=cxf.git"/> diff --git a/pom.xml b/pom.xml index 8efe4c3..df7d9d3 100644 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,9 @@ http://cxf.apache.org pom - scm:git:http://git-wip-us.apache.org/repos/asf/cxf.git - scm:git:https://git-wip-us.apache.org/repos/asf/cxf.git -https://git-wip-us.apache.org/repos/asf?p=cxf.git;a=summary + scm:git:http://gitbox.apache.org/repos/asf/cxf.git + scm:git:https://gitbox.apache.org/repos/asf/cxf.git +https://gitbox.apache.org/repos/asf?p=cxf.git;a=summary HEAD -- To stop receiving notification emails like this one, please contact "commits@cxf.apache.org" .
[cxf] branch 3.1.x-fixes updated (b64da86 -> eb6fee1)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from b64da86 Recording .gitmergeinfo Changes new d3d87c2 moved to Gitbox new eb6fee1 Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 4 etc/cxf.rdf | 4 ++-- pom.xml | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org" '].
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit eb6fee11eea15e1e018897535d990b4ece5cce92 Author: Dennis Kieselhorst AuthorDate: Sat Sep 9 08:38:38 2017 +0200 Recording .gitmergeinfo Changes --- .gitmergeinfo | 4 1 file changed, 4 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 049d4e5..293fb63 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -77,6 +77,7 @@ B 1d2f3999073b8d46ebe3e1e9f7a532d4b07434b4 B 1d2ff721ef4d63b86035238516afdf1a82855bd9 B 1d4c40d0f87ccaa09b22d0b0da2db2801f69a00b B 1e49510ea71551e543b22f6693307b1436e81db0 +B 1eedb232f7f97f5d8cb3a8ab4dcd67251e073ec1 B 1f68d848874bc2be86d3e77e408f0b9879c1e93c B 1f7241ba6017f1496e9b8aadec5c807ed05e63b4 B 203b5433bc44aa831bdd9b1dd4ab474d192dea6c @@ -226,6 +227,7 @@ B 629af817f4762a12623e76fb7f7baefe98482719 B 62fd990682c0c6ff915356fb9b5f0a32efc20424 B 63daada33c83c7900d5678ad495a0e764b3506de B 64070aa91b4b56155faf7703520a5142fa7a6e36 +B 642b041437ed80889cfbd5fabf8361359d210c6b B 64e17b90635e7acd6f0836ab2bb8f6ede026ecff B 65e1e07fdb810ec9de135530ca3e3d23821836a3 B 66447a377f0b2cafc2f337456b5fd41f832556e0 @@ -546,6 +548,7 @@ B f45612c0a60b63c5cfe7e190c54254e8a77c5e2a B f46d64c8d413ae13cd3baa58ebf691a17e655ba5 B f4d0b2152036c6e57f82d762464f6c96907e0a37 B f51d7557791a6d3ae0bcf7f81ceda30a2c0029d3 +B f5ee3b786e22a081121eeebbba6d02fa9f4e7206 B f66dea949bdc3f136084115aca4e514bad426380 B f6ab9808289930238e3d5bd161239551b2ead00b B f6ce97d4d38446c8336f6f713d0306d52edf6086 @@ -638,6 +641,7 @@ M 2f8a1f7645c30cb40d4f080ce4b4099964028751 M 2f981e098ea265ab504496fbf9ce4564c894bc19 M 3088952a6e3385ee628cf8c91340908ed3a67aa3 M 315a6dc119f7bf0ad1f8f8ee74093327852dc365 +M 31b566c8b028f71099594b5e2c760e856ef53e8d M 33b810d817d064fa60070fb3152b2ceb906c M 33eb378e47cee7d9c2ce0f7cb04cf0d5bcce4ad7 M 34fd320f91d933233aeb364120456f4fa0f220ac -- To stop receiving notification emails like this one, please contact "commits@cxf.apache.org" .
[cxf] branch master updated: set version to 3.2.1-SNAPSHOT (from 3.2.0-SNAPSHOT)
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/master by this push: new 642b041 set version to 3.2.1-SNAPSHOT (from 3.2.0-SNAPSHOT) 642b041 is described below commit 642b041437ed80889cfbd5fabf8361359d210c6b Author: Dennis Kieselhorst AuthorDate: Sat Sep 9 08:36:59 2017 +0200 set version to 3.2.1-SNAPSHOT (from 3.2.0-SNAPSHOT) --- distribution/src/main/release/samples/jax_rs/spark/pom.xml | 8 .../main/release/samples/jax_rs/tracing_opentracing/pom.xml | 12 ++-- osgi/itests-felix/pom.xml| 2 +- rt/rs/security/jcs-parent/jcs/pom.xml| 2 +- rt/rs/security/jcs-parent/pom.xml| 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/spark/pom.xml b/distribution/src/main/release/samples/jax_rs/spark/pom.xml index 01f0e3c..506c2e9 100644 --- a/distribution/src/main/release/samples/jax_rs/spark/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spark/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT ../.. @@ -35,17 +35,17 @@ org.apache.cxf cxf-rt-transports-http-jetty -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-search -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT org.apache.spark diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml index e1821450..a558021 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml @@ -83,33 +83,33 @@ org.apache.cxf cxf-rt-transports-http -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-rs-client -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT org.apache.cxf cxf-integration-tracing-opentracing -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-providers -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT javax.json diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml index cb36cd2..03071b3 100644 --- a/osgi/itests-felix/pom.xml +++ b/osgi/itests-felix/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT ../../parent/pom.xml org.apache.cxf.osgi.itests diff --git a/rt/rs/security/jcs-parent/jcs/pom.xml b/rt/rs/security/jcs-parent/jcs/pom.xml index 21c9e4c..0fa7125 100644 --- a/rt/rs/security/jcs-parent/jcs/pom.xml +++ b/rt/rs/security/jcs-parent/jcs/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT ../../../../../parent/pom.xml diff --git a/rt/rs/security/jcs-parent/pom.xml b/rt/rs/security/jcs-parent/pom.xml index 05fb540..481f680 100644 --- a/rt/rs/security/jcs-parent/pom.xml +++ b/rt/rs/security/jcs-parent/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt-rs-security -3.2.0-SNAPSHOT +3.2.1-SNAPSHOT jcs -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org" '].
[cxf] branch master updated: moved to Gitbox
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/master by this push: new 6ba4265 moved to Gitbox 6ba4265 is described below commit 6ba42650ec5d260aee1414dce83ea6a2b86f00a0 Author: Dennis Kieselhorst AuthorDate: Sat Sep 9 08:20:16 2017 +0200 moved to Gitbox --- etc/cxf.rdf | 4 ++-- pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/cxf.rdf b/etc/cxf.rdf index bc289a4..74238a8 100644 --- a/etc/cxf.rdf +++ b/etc/cxf.rdf @@ -22,8 +22,8 @@ http://projects.apache.org/category/network-server"; /> -https://git-wip-us.apache.org/repos/asf/cxf.git"/> -https://git-wip-us.apache.org/repos/asf?p=cxf.git"/> +https://gitbox.apache.org/repos/asf/cxf.git"/> +https://gitbox.apache.org/repos/asf?p=cxf.git"/> diff --git a/pom.xml b/pom.xml index 376dc64..28f6e10 100644 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,9 @@ http://cxf.apache.org pom - scm:git:http://git-wip-us.apache.org/repos/asf/cxf.git - scm:git:https://git-wip-us.apache.org/repos/asf/cxf.git -https://git-wip-us.apache.org/repos/asf?p=cxf.git;a=summary + scm:git:http://gitbox.apache.org/repos/asf/cxf.git + scm:git:https://gitbox.apache.org/repos/asf/cxf.git +https://gitbox.apache.org/repos/asf?p=cxf.git;a=summary HEAD -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org" '].
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes f269b76c5 -> bfc82958d 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/bfc82958 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bfc82958 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bfc82958 Branch: refs/heads/3.0.x-fixes Commit: bfc82958d2cf329bd622eb80184a0eb88894eb3d Parents: f269b76 Author: Colm O hEigeartaigh Authored: Fri Sep 8 15:45:31 2017 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 8 15:45:31 2017 +0100 -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/bfc82958/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index bb4bf49..7ea563d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1003,6 +1003,7 @@ B 817727ddca9aad39a66f7001bf5f1c959dc7f581 B 81a7a670b8abe2145f51dcee0b8a49c6587603d6 B 81bc682a409806567fc3485157e184e72feaf086 B 81ed24d9802d8d82775e27c3326a58098ee883e8 +B 82581d6d720c0c1db73df0c128b3371ad9d734f8 B 826c9625710b4aac2a3d5bacd3858b57de5e0955 B 82ac9402b836ff58a131ed1c86226072ea267b42 B 82c4bff5276cc32490507fba4cb9d18539d41907 @@ -1410,6 +1411,7 @@ B b5fc90f09c6b039a54564e0825a264310453c550 B b6018a47e19bf98ad405baf51e363eae9972f4dd B b60702df6f4f8a651395999ee7cc583bb89589e3 B b63c63ffeb1f8d4e747ba2e9233be6aa635c00db +B b64da86f676f3ce69100b729a2fc128c72665512 B b6547f75a198e8b345c120b0b4f71f198b044660 B b6577a8fa68235fb8bb0103681906289bcf5e069 B b67537dbace0896073b55b375b8ccdc4cce83365
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes fe33fcedc -> b64da86f6 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/b64da86f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b64da86f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b64da86f Branch: refs/heads/3.1.x-fixes Commit: b64da86f676f3ce69100b729a2fc128c72665512 Parents: 82581d6 Author: Colm O hEigeartaigh Authored: Fri Sep 8 15:45:15 2017 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 8 15:45:15 2017 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b64da86f/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index ad72e81..049d4e5 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -887,6 +887,7 @@ M e92e57c1f14de911cd2315a907443c79e91a94de M ea97f3dd62a3a271faf7f363aca618d921c14abb M eb14ce9206bc43371f149f9d0b1c6e8e2682e5c0 M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e +M ec7a52968e8e4d9e7727a7798b293389c1a3dd29 M ed9298066428c0dfc4590a556876d696a4ba13c0 M edae59057fd9061ee332667e4f2e066d5cad1f31 M ee248ce7a4a1b04bcbddbdcef82d695ccc140160
[2/2] cxf git commit: Add some hooks to either set or get some information relating to the kerberos authentication process
Add some hooks to either set or get some information relating to the kerberos
authentication process
# Conflicts:
#
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
#
rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/82581d6d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/82581d6d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/82581d6d
Branch: refs/heads/3.1.x-fixes
Commit: 82581d6d720c0c1db73df0c128b3371ad9d734f8
Parents: fe33fce
Author: Colm O hEigeartaigh
Authored: Fri Sep 8 15:42:03 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Sep 8 15:45:15 2017 +0100
--
.../jaxrs/security/KerberosAuthenticationFilter.java | 14 --
.../http/auth/AbstractSpnegoAuthSupplier.java | 11 +--
.../cxf/ws/security/kerberos/KerberosClient.java | 6 +-
3 files changed, 22 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/82581d6d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
index 3390104..e3cd617 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
@@ -105,16 +105,13 @@ public class KerberosAuthenticationFilter implements
ContainerRequestFilter {
if (index > 0) {
simpleUserName = simpleUserName.substring(0, index);
}
+Message m = JAXRSUtils.getCurrentMessage();
+m.put(SecurityContext.class, createSecurityContext(simpleUserName,
complexUserName, gssContext));
+
if (!gssContext.getCredDelegState()) {
gssContext.dispose();
gssContext = null;
}
-Message m = JAXRSUtils.getCurrentMessage();
-m.put(SecurityContext.class,
-new KerberosSecurityContext(new
KerberosPrincipal(simpleUserName,
-
complexUserName),
-gssContext));
-
} catch (LoginException e) {
LOG.fine("Unsuccessful JAAS login for the service principal: " +
e.getMessage());
throw ExceptionUtils.toNotAuthorizedException(e,
getFaultResponse());
@@ -127,6 +124,11 @@ public class KerberosAuthenticationFilter implements
ContainerRequestFilter {
}
}
+protected SecurityContext createSecurityContext(String simpleUserName,
String complexUserName,
+GSSContext gssContext) {
+return new KerberosSecurityContext(new
KerberosPrincipal(simpleUserName, complexUserName), gssContext);
+}
+
protected GSSContext createGSSContext() throws GSSException {
boolean useKerberosOid = MessageUtils.isTrue(
messageContext.getContextualProperty(PROPERTY_USE_KERBEROS_OID));
http://git-wip-us.apache.org/repos/asf/cxf/blob/82581d6d/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
index 172d110..f62947e 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
@@ -138,7 +138,9 @@ public abstract class AbstractSpnegoAuthSupplier {
if (delegatedCred != null) {
return context.initSecContext(token, 0, token.length);
}
-
+
+decorateSubject(subject);
+
try {
return (byte[])Subject.doAs(subject, new
CreateServiceTicketAction(context, token));
} catch (PrivilegedActionException e) {
@@ -149,7 +151,12 @@ public abstract class AbstractSpnegoAuthSupplier {
return null;
}
}
-
+
+// Allow subclasses to decorate the Subject if required.
+protected void decorateSubject(Subject subject) {
+
+}
+
protected boolean isCredDelegationRe
cxf git commit: Add some hooks to either set or get some information relating to the kerberos authentication process
Repository: cxf
Updated Branches:
refs/heads/master 4080fbafc -> ec7a52968
Add some hooks to either set or get some information relating to the kerberos
authentication process
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ec7a5296
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ec7a5296
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ec7a5296
Branch: refs/heads/master
Commit: ec7a52968e8e4d9e7727a7798b293389c1a3dd29
Parents: 4080fba
Author: Colm O hEigeartaigh
Authored: Fri Sep 8 15:42:03 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Sep 8 15:42:03 2017 +0100
--
.../jaxrs/security/KerberosAuthenticationFilter.java | 13 -
.../http/auth/AbstractSpnegoAuthSupplier.java | 7 +++
.../cxf/ws/security/kerberos/KerberosClient.java | 6 +-
3 files changed, 20 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec7a5296/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
index 0111022..924057a 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
@@ -105,15 +105,13 @@ public class KerberosAuthenticationFilter implements
ContainerRequestFilter {
if (index > 0) {
simpleUserName = simpleUserName.substring(0, index);
}
+Message m = JAXRSUtils.getCurrentMessage();
+m.put(SecurityContext.class, createSecurityContext(simpleUserName,
complexUserName, gssContext));
+
if (!gssContext.getCredDelegState()) {
gssContext.dispose();
gssContext = null;
}
-Message m = JAXRSUtils.getCurrentMessage();
-m.put(SecurityContext.class,
-new KerberosSecurityContext(new
KerberosPrincipal(simpleUserName,
-
complexUserName),
-gssContext));
} catch (LoginException e) {
LOG.fine("Unsuccessful JAAS login for the service principal: " +
e.getMessage());
@@ -127,6 +125,11 @@ public class KerberosAuthenticationFilter implements
ContainerRequestFilter {
}
}
+protected SecurityContext createSecurityContext(String simpleUserName,
String complexUserName,
+GSSContext gssContext) {
+return new KerberosSecurityContext(new
KerberosPrincipal(simpleUserName, complexUserName), gssContext);
+}
+
protected GSSContext createGSSContext() throws GSSException {
boolean useKerberosOid = PropertyUtils.isTrue(
messageContext.getContextualProperty(PROPERTY_USE_KERBEROS_OID));
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec7a5296/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
index 464610f..2129e29 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
@@ -138,6 +138,8 @@ public abstract class AbstractSpnegoAuthSupplier {
return context.initSecContext(token, 0, token.length);
}
+decorateSubject(subject);
+
try {
return Subject.doAs(subject, new
CreateServiceTicketAction(context, token));
} catch (PrivilegedActionException e) {
@@ -149,6 +151,11 @@ public abstract class AbstractSpnegoAuthSupplier {
}
}
+// Allow subclasses to decorate the Subject if required.
+protected void decorateSubject(Subject subject) {
+
+}
+
protected boolean isCredDelegationRequired(Message message) {
return MessageUtils.getContextualBoolean(message,
PROPERTY_REQUIRE_CRED_DELEGATION, credDelegation);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec7a5296/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
-
cxf-fediz git commit: Adding an option to strip a path comp off from the dynamically calculated issuer uri
Repository: cxf-fediz
Updated Branches:
refs/heads/master bbe3cd4d2 -> 3aa1e51c1
Adding an option to strip a path comp off from the dynamically calculated
issuer uri
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/3aa1e51c
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/3aa1e51c
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/3aa1e51c
Branch: refs/heads/master
Commit: 3aa1e51c19084c93b6e2b6ecc89b0181db137139
Parents: bbe3cd4
Author: Sergey Beryozkin
Authored: Fri Sep 8 11:58:40 2017 +0100
Committer: Sergey Beryozkin
Committed: Fri Sep 8 12:00:11 2017 +0100
--
.../fediz/service/oidc/FedizSubjectCreator.java | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3aa1e51c/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
--
diff --git
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
index 8479895..08e63dc 100644
---
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
+++
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.fediz.service.oidc;
+import java.net.URI;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -51,6 +52,7 @@ import org.opensaml.saml.saml2.core.Issuer;
public class FedizSubjectCreator implements SubjectCreator {
private static final String ROLES_SCOPE = "roles";
+private boolean stripPathFromIssuerUri;
private String issuer;
private long defaultTimeToLive = 3600L;
private Map supportedClaims = Collections.emptyMap();
@@ -133,7 +135,17 @@ public class FedizSubjectCreator implements SubjectCreator
{
String realIssuer = null;
if (issuer.startsWith("/")) {
UriBuilder ub = mc.getUriInfo().getBaseUriBuilder();
-realIssuer = ub.path(issuer).build().toString();
+URI uri = ub.path(issuer).build();
+if (this.stripPathFromIssuerUri) {
+StringBuilder sb = new StringBuilder();
+
sb.append(uri.getScheme()).append("://").append(uri.getHost());
+if (uri.getPort() != -1) {
+sb.append(':').append(uri.getPort());
+}
+realIssuer = sb.toString();
+} else {
+realIssuer = uri.toString();
+}
} else {
realIssuer = issuer;
}
@@ -257,4 +269,8 @@ public class FedizSubjectCreator implements SubjectCreator {
this.supportedClaims = supportedClaims;
}
+public void setStripPathFromIssuerUri(boolean stripPathFromIssuerUri) {
+this.stripPathFromIssuerUri = stripPathFromIssuerUri;
+}
+
}
cxf-fediz git commit: Adding an option to strip a path comp off from the dynamically calculated issuer uri
Repository: cxf-fediz
Updated Branches:
refs/heads/1.4.x-fixes e22353152 -> 81e0b796a
Adding an option to strip a path comp off from the dynamically calculated
issuer uri
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/81e0b796
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/81e0b796
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/81e0b796
Branch: refs/heads/1.4.x-fixes
Commit: 81e0b796a7d4a786197ec5c38d46ae2bc4ad5ffb
Parents: e223531
Author: Sergey Beryozkin
Authored: Fri Sep 8 11:58:40 2017 +0100
Committer: Sergey Beryozkin
Committed: Fri Sep 8 11:58:40 2017 +0100
--
.../fediz/service/oidc/FedizSubjectCreator.java | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/81e0b796/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
--
diff --git
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
index eb495f9..e8ad831 100644
---
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
+++
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.fediz.service.oidc;
+import java.net.URI;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -51,6 +52,7 @@ import org.opensaml.saml.saml2.core.Issuer;
public class FedizSubjectCreator implements SubjectCreator {
private static final String ROLES_SCOPE = "roles";
+private boolean stripPathFromIssuerUri;
private String issuer;
private long defaultTimeToLive = 3600L;
private Map supportedClaims = Collections.emptyMap();
@@ -132,7 +134,17 @@ public class FedizSubjectCreator implements SubjectCreator
{
String realIssuer = null;
if (issuer.startsWith("/")) {
UriBuilder ub = mc.getUriInfo().getBaseUriBuilder();
-realIssuer = ub.path(issuer).build().toString();
+URI uri = ub.path(issuer).build();
+if (this.stripPathFromIssuerUri) {
+StringBuilder sb = new StringBuilder();
+
sb.append(uri.getScheme()).append("://").append(uri.getHost());
+if (uri.getPort() != -1) {
+sb.append(':').append(uri.getPort());
+}
+realIssuer = sb.toString();
+} else {
+realIssuer = uri.toString();
+}
} else {
realIssuer = issuer;
}
@@ -256,4 +268,8 @@ public class FedizSubjectCreator implements SubjectCreator {
this.supportedClaims = supportedClaims;
}
+public void setStripPathFromIssuerUri(boolean stripPathFromIssuerUri) {
+this.stripPathFromIssuerUri = stripPathFromIssuerUri;
+}
+
}
