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/05 23:40:46 UTC
[1/4] git commit: Cleanup of some of the Tomcat session stuff
Repository: cxf-fediz
Updated Branches:
refs/heads/master 308c39f5a -> e75a5c1ad
Cleanup of some of the Tomcat session stuff
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/72a1b9cb
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/72a1b9cb
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/72a1b9cb
Branch: refs/heads/master
Commit: 72a1b9cb62157768b575926f0a97448e3b959a7d
Parents: 4373b96
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Oct 1 10:02:48 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Oct 1 10:02:48 2014 +0100
----------------------------------------------------------------------
.../cxf/fediz/tomcat/FederationAuthenticator.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/72a1b9cb/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
----------------------------------------------------------------------
diff --git a/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
index 40d0538..9b741f1 100644
--- a/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
+++ b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
@@ -217,6 +217,14 @@ public class FederationAuthenticator extends FormAuthenticator {
HttpSession httpSession = request.getSession(false);
String uri = request.getRequestURI();
if (httpSession != null && uri.equals(contextName + logoutUrl)) {
+ Session session = request.getSessionInternal();
+
+ // Cleanup session
+ if (session != null) {
+ session.removeNote(FEDERATION_NOTE);
+ session.setPrincipal(null);
+ request.getSession().removeAttribute(SECURITY_TOKEN);
+ }
httpSession.invalidate();
FedizProcessor wfProc =
@@ -319,7 +327,6 @@ public class FederationAuthenticator extends FormAuthenticator {
LOG.debug("Token already expired. Clean up and redirect");
session.removeNote(FEDERATION_NOTE);
- session.removeNote(Constants.FORM_PRINCIPAL_NOTE);
session.setPrincipal(null);
request.getSession().removeAttribute(SECURITY_TOKEN);
@@ -355,10 +362,13 @@ public class FederationAuthenticator extends FormAuthenticator {
LOG.debug("Restore request from session '"
+ session.getIdInternal() + "'");
}
+
+ // Get principal from session, register, and then remove it
principal = (Principal)session.getNote(Constants.FORM_PRINCIPAL_NOTE);
register(request, response, principal,
FederationConstants.WSFED_METHOD, null, null);
-
+ request.removeNote(Constants.FORM_PRINCIPAL_NOTE);
+
if (restoreRequest(request, session)) {
if (LOG.isDebugEnabled()) {
LOG.debug("Proceed to restored request");
[4/4] git commit: Updating wss4j version
Posted by co...@apache.org.
Updating wss4j version
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e75a5c1a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e75a5c1a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e75a5c1a
Branch: refs/heads/master
Commit: e75a5c1adcdf0277f9f544278a172fc44b7b5d06
Parents: d9d36f2
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Sun Oct 5 22:40:21 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Sun Oct 5 22:40:21 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e75a5c1a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b8e01e..fdd8209 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<spring.version>3.2.6.RELEASE</spring.version>
<spring.security.version>3.1.4.RELEASE</spring.security.version>
<tomcat.version>7.0.54</tomcat.version>
- <wss4j.version>2.0.2-SNAPSHOT</wss4j.version>
+ <wss4j.version>2.0.2</wss4j.version>
<xalan.version>2.7.2</xalan.version>
<bval.version>0.5</bval.version>
[2/4] git commit: Removing unused file
Posted by co...@apache.org.
Removing unused file
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d9ed77f7
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d9ed77f7
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d9ed77f7
Branch: refs/heads/master
Commit: d9ed77f71d3bf17e91bcbfc33cd60d487c5c5331
Parents: 72a1b9c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Oct 1 11:47:35 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Oct 1 11:47:35 2014 +0100
----------------------------------------------------------------------
.../integrationtests/federation/Server.java | 46 --------------------
1 file changed, 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d9ed77f7/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/Server.java
----------------------------------------------------------------------
diff --git a/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/Server.java b/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/Server.java
deleted file mode 100644
index 9aae187..0000000
--- a/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/Server.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.fediz.integrationtests.federation;
-
-import java.net.URL;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-
-public class Server extends AbstractBusTestServerBase {
-
- public Server() {
-
- }
-
- protected void run() {
- URL busFile = Server.class.getResource("cxf-service.xml");
- Bus busLocal = new SpringBusFactory().createBus(busFile);
- BusFactory.setDefaultBus(busLocal);
- setBus(busLocal);
-
- try {
- new Server();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
[3/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf-fediz
Posted by co...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf-fediz
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d9d36f2c
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d9d36f2c
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d9d36f2c
Branch: refs/heads/master
Commit: d9d36f2c4476e3362ebb9fbccb081389edb7e237
Parents: d9ed77f 308c39f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Sat Oct 4 23:42:28 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Sat Oct 4 23:42:28 2014 +0100
----------------------------------------------------------------------
services/idp/README.txt | 20 +++++++++++
.../WEB-INF/federation-validate-request.xml | 15 ++++++--
services/idp/src/main/webapp/WEB-INF/web.xml | 10 ++++++
.../src/main/resources/stsEncryption.properties | 5 +++
services/sts/src/main/resources/stsencrypt.jks | Bin 0 -> 32 bytes
.../src/main/webapp/WEB-INF/cxf-transport.xml | 35 +++++++++++++++----
6 files changed, 75 insertions(+), 10 deletions(-)
----------------------------------------------------------------------