[2/2] cxf-fediz git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/f4d00969
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/f4d00969
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/f4d00969
Branch: refs/heads/1.2.x-fixes
Commit: f4d00969f3df4089e6ec5ae264219b2dc36c46e0
Parents: afe146a
Author: Colm O hEigeartaigh
Authored: Tue Dec 22 16:52:28 2015 +
Committer: Colm O hEigeartaigh
Committed: Tue Dec 22 16:52:28 2015 +
--
.../java/org/apache/cxf/fediz/systests/idp/IdpTest.java | 10 --
1 file changed, 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f4d00969/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
--
diff --git
a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index 3e3d2ea..f9948f5 100644
--- a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
+++ b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
@@ -345,8 +345,6 @@ public class IdpTest {
} catch (FailingHttpStatusCodeException ex) {
Assert.assertEquals(ex.getStatusCode(), 400);
}
-
-webClient.close();
}
// Send an unknown wa value
@@ -375,8 +373,6 @@ public class IdpTest {
} catch (FailingHttpStatusCodeException ex) {
Assert.assertEquals(ex.getStatusCode(), 400);
}
-
-webClient.close();
}
// Send an unknown whr value
@@ -405,8 +401,6 @@ public class IdpTest {
} catch (FailingHttpStatusCodeException ex) {
Assert.assertEquals(ex.getStatusCode(), 500);
}
-
-webClient.close();
}
// Send an unknown wtrealm value
@@ -435,8 +429,6 @@ public class IdpTest {
} catch (FailingHttpStatusCodeException ex) {
Assert.assertEquals(ex.getStatusCode(), 400);
}
-
-webClient.close();
}
// Send an malformed wreply value
@@ -465,7 +457,5 @@ public class IdpTest {
} catch (FailingHttpStatusCodeException ex) {
Assert.assertEquals(ex.getStatusCode(), 400);
}
-
-webClient.close();
}
}
[2/2] cxf-fediz git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/5a225d15
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/5a225d15
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/5a225d15
Branch: refs/heads/1.2.x-fixes
Commit: 5a225d15df038dd1275cec6ccc24c142519ef365
Parents: c933293
Author: Colm O hEigeartaigh
Authored: Fri Jul 31 14:37:22 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Jul 31 14:37:22 2015 +0100
--
.../core/federation/FederationResponseTest.java | 26 ++--
1 file changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5a225d15/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
--
diff --git
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
index 125a2ec..c833d0e 100644
---
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
+++
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
@@ -75,9 +75,9 @@ import org.apache.wss4j.common.saml.bean.ConditionsBean;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
-import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.message.WSSecEncrypt;
+import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.junit.AfterClass;
@@ -928,12 +928,12 @@ public class FederationResponseTest {
Element token2 = assertion1.toDOM(doc);
// Now modify the first Signature to point to the other Element
-Element sig1 = XMLUtils.findElement(token1, "Signature",
WSConstants.SIG_NS);
-Element sig2 = XMLUtils.findElement(token2, "Signature",
WSConstants.SIG_NS);
+Element sig1 = WSSecurityUtil.findElement(token1, "Signature",
WSConstants.SIG_NS);
+Element sig2 = WSSecurityUtil.findElement(token2, "Signature",
WSConstants.SIG_NS);
sig1.getParentNode().replaceChild(sig2.cloneNode(true), sig1);
List requestedTokenElements =
-XMLUtils.findElements(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_13_NS);
+WSSecurityUtil.findElements(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_13_NS);
Assert.assertEquals(2, requestedTokenElements.size());
requestedTokenElements.get(0).appendChild(token1);
requestedTokenElements.get(1).appendChild(token2);
@@ -981,7 +981,7 @@ public class FederationResponseTest {
Element token2 = assertion2.toDOM(doc);
List requestedTokenElements =
-XMLUtils.findElements(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_13_NS);
+WSSecurityUtil.findElements(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_13_NS);
Assert.assertEquals(2, requestedTokenElements.size());
requestedTokenElements.get(0).appendChild(token1);
requestedTokenElements.get(1).appendChild(token2);
@@ -1376,10 +1376,10 @@ public class FederationResponseTest {
Document doc = STSUtil.toSOAPPart(STSUtil.SAMPLE_RSTR_COLL_MSG);
Element token = assertion.toDOM(doc);
-Element e = XMLUtils.findElement(doc, "RequestedSecurityToken",
+Element e = WSSecurityUtil.findElement(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_13_NS);
if (e == null) {
-e = XMLUtils.findElement(doc, "RequestedSecurityToken",
+e = WSSecurityUtil.findElement(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_2005_02_NS);
}
e.appendChild(token);
@@ -1513,10 +1513,10 @@ public class FederationResponseTest {
issueDateTime = issueDateTime.plusSeconds(1);
token.setAttributeNS(null, "IssueInstant", issueDateTime.toString());
-Element e = XMLUtils.findElement(doc, "RequestedSecurityToken",
+Element e = WSSecurityUtil.findElement(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_13_NS);
if (e == null) {
-e = XMLUtils.findElement(doc, "RequestedSecurityToken",
+e = WSSecurityUtil.findElement(doc, "RequestedSecurityToken",
[2/2] cxf-fediz git commit: Fixing merge
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/90431dbb Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/90431dbb Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/90431dbb Branch: refs/heads/1.2.x-fixes Commit: 90431dbbf9e66f4443f7ddcefd24bc6c9746036f Parents: 22d8ad9 Author: Colm O hEigeartaigh Authored: Fri Apr 21 11:01:01 2017 +0100 Committer: Colm O hEigeartaigh Committed: Fri Apr 21 11:01:01 2017 +0100 -- release_notes.txt | 24 +--- 1 file changed, 1 insertion(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/90431dbb/release_notes.txt -- diff --git a/release_notes.txt b/release_notes.txt index 8531aea..219bf5b 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,4 +1,4 @@ -Apache CXF Fediz 1.2.2 Release Notes +Apache CXF Fediz 1.2.4 Release Notes 1. Overview @@ -63,28 +63,6 @@ N.A. 8. Specific issues, features, and improvements fixed in this version -Release Notes - CXF-Fediz - Version 1.3.2 - -Bug - -[FEDIZ-185] - Make one of passiveRequestorEndpoint or passiveRequestorEndpointConstraint mandatory in the IDP -[FEDIZ-189] - Add support for absolute URLs in the logoutRedirectTo parameter -[FEDIZ-191] - The HomeRealmReminder cookie is not deleted after logout in the IdP -[FEDIZ-194] - NPE when restarting Fediz OIDC after using dynamic registration - -Improvement - -[FEDIZ-173] - Cors support for js OIDC Implicit Flow -[FEDIZ-183] - Support logging out in the plugins via the "wa" parameter -[FEDIZ-186] - Add new logoutRedirectToConstraint plugin configuration parameter -[FEDIZ-193] - Add a way to support additional top level domains when registering OIDC clients -[FEDIZ-200] - Make one of logoutEndpoint or logoutEndpointConstraint mandatory in the IDP - -Task - -[FEDIZ-174] - Update CXF version to 3.1.8-SNAPSHOT - - Release Notes - CXF-Fediz - Version 1.2.4 Bug
[2/2] cxf-fediz git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d71f3286
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d71f3286
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d71f3286
Branch: refs/heads/1.2.x-fixes
Commit: d71f3286cd12e2540ee520a4d3f0611e74a4bfaa
Parents: 219cb39
Author: Colm O hEigeartaigh
Authored: Fri Jun 10 13:54:11 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Jun 10 13:54:11 2016 +0100
--
.../AudienceRestrictionTest.java| 10 +-
.../AudienceRestrictionTest.java| 210 ---
.../test/resources/fediz_config_aud_restr.xml | 61 --
3 files changed, 4 insertions(+), 277 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d71f3286/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
--
diff --git
a/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
b/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
index d9822cb..654a4f6 100644
---
a/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
+++
b/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
@@ -39,7 +39,7 @@ import org.apache.catalina.LifecycleState;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.IOUtils;
-import org.apache.cxf.fediz.tomcat7.FederationAuthenticator;
+import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.junit.AfterClass;
@@ -129,9 +129,9 @@ public class AudienceRestrictionTest {
content = content.replaceAll("\\$\\{idp.https.port\\}", "" +
idpHttpsPort);
File f2 = new File(baseDir +
"/test-classes/fediz_config_aud_restr.xml");
-try (FileOutputStream outputStream = new FileOutputStream(f2))
{
-IOUtils.write(content, outputStream, "UTF-8");
-}
+FileOutputStream outputStream = new FileOutputStream(f2);
+IOUtils.write(content, outputStream, "UTF-8");
+outputStream.close();
}
FederationAuthenticator fa = new FederationAuthenticator();
@@ -203,8 +203,6 @@ public class AudienceRestrictionTest {
} catch (FailingHttpStatusCodeException ex) {
Assert.assertEquals(ex.getStatusCode(), 401);
}
-
-webClient.close();
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d71f3286/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
--
diff --git
a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
deleted file mode 100644
index 673b868..000
---
a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
+++ /dev/null
@@ -1,210 +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;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-
-import org.apache.catalina.Context;
-import org.ap
