You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/06/17 10:04:55 UTC
[cxf-fediz] branch master updated (3c967e4 -> a8bd0b8)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git.
from 3c967e4 Upgrade CXF to 3.3.x
new 4ba415a Update Spring Web Flow
new a8bd0b8 Switch to StringEscapeUtils from commons-text
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:
pom.xml | 2 +-
services/idp-core/pom.xml | 5 +++++
.../org/apache/cxf/fediz/service/idp/beans/TokenSerializer.java | 3 ++-
.../fediz/service/oidc/clients/ClientRegistrationService.java | 2 +-
.../service/oidc/logout/LogoutRedirectConstraintHandler.java | 3 +--
services/oidc/src/main/webapp/WEB-INF/views/client.jsp | 2 +-
services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp | 2 +-
services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp | 2 +-
.../src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp | 2 +-
.../oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp | 2 +-
systests/webapps/simpleWebapp/pom.xml | 9 +++++++--
.../java/org/apache/cxf/fediz/example/FederationServlet.java | 4 ++--
12 files changed, 24 insertions(+), 14 deletions(-)
[cxf-fediz] 01/02: Update Spring Web Flow
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit 4ba415a0624248ff62bb1142fc48ab28777cfabf
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Jun 17 11:43:24 2019 +0300
Update Spring Web Flow
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4f437c5..f002da3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<spring.version>4.3.22.RELEASE</spring.version>
<spring-ldap-core.version>2.3.2.RELEASE</spring-ldap-core.version>
<spring.security.version>4.2.11.RELEASE</spring.security.version>
- <spring-webflow.version>2.4.8.RELEASE</spring-webflow.version>
+ <spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
<tomcat.version>9.0.20</tomcat.version>
<wss4j.version>2.2.2</wss4j.version>
[cxf-fediz] 02/02: Switch to StringEscapeUtils from commons-text
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit a8bd0b8eca5168084d2d5ac9086e573e20fa572d
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Jun 17 13:04:02 2019 +0300
Switch to StringEscapeUtils from commons-text
---
services/idp-core/pom.xml | 5 +++++
.../org/apache/cxf/fediz/service/idp/beans/TokenSerializer.java | 3 ++-
.../fediz/service/oidc/clients/ClientRegistrationService.java | 2 +-
.../service/oidc/logout/LogoutRedirectConstraintHandler.java | 3 +--
services/oidc/src/main/webapp/WEB-INF/views/client.jsp | 2 +-
services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp | 2 +-
services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp | 2 +-
.../src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp | 2 +-
.../oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp | 2 +-
systests/webapps/simpleWebapp/pom.xml | 9 +++++++--
.../java/org/apache/cxf/fediz/example/FederationServlet.java | 4 ++--
11 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/services/idp-core/pom.xml b/services/idp-core/pom.xml
index dd25126..ebc9e93 100644
--- a/services/idp-core/pom.xml
+++ b/services/idp-core/pom.xml
@@ -157,6 +157,11 @@
<version>${commons.lang.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${commons.text.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/TokenSerializer.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/TokenSerializer.java
index e044943..cee51b2 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/TokenSerializer.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/TokenSerializer.java
@@ -30,6 +30,7 @@ import javax.xml.transform.stream.StreamResult;
import org.w3c.dom.Element;
+import org.apache.commons.text.StringEscapeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -57,7 +58,7 @@ public class TokenSerializer {
}
String serializedToken = sw.toString();
- return org.apache.commons.lang3.StringEscapeUtils.escapeXml11(serializedToken);
+ return StringEscapeUtils.escapeXml11(serializedToken);
}
return null;
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
index 6327edf..b9a5f77 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
@@ -51,7 +51,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.validator.routines.DomainValidator;
import org.apache.commons.validator.routines.DomainValidator.ArrayType;
import org.apache.commons.validator.routines.UrlValidator;
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutRedirectConstraintHandler.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutRedirectConstraintHandler.java
index 273d96b..4b508ad 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutRedirectConstraintHandler.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutRedirectConstraintHandler.java
@@ -29,7 +29,6 @@ import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.fediz.core.spi.ReplyConstraintCallback;
import org.apache.cxf.fediz.service.oidc.handler.hrd.ApplicationContextProvider;
import org.apache.cxf.rs.security.oauth2.common.Client;
@@ -73,7 +72,7 @@ public class LogoutRedirectConstraintHandler implements CallbackHandler {
for (int i = 0; i < uris.size(); i++) {
uris.set(i, "\\Q" + uris.get(i) + "\\E");
}
- return Pattern.compile("(" + StringUtils.join(uris, "|") + ")");
+ return Pattern.compile("(" + String.join("|", uris) + ")");
}
}
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
index d5274e0..b1ff4c5 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
@@ -5,7 +5,7 @@
<%@ page import="java.util.TimeZone"%>
<%@ page import="javax.servlet.http.HttpServletRequest" %>
<%@ page import="org.apache.cxf.fediz.service.oidc.CSRFUtils" %>
-<%@ page import="org.apache.commons.lang3.StringEscapeUtils" %>
+<%@ page import="org.apache.commons.text.StringEscapeUtils" %>
<%
Client client = (Client)request.getAttribute("data");
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp b/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp
index b8fd3d1..02947f9 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp
@@ -8,7 +8,7 @@
<%@ page import="javax.servlet.http.HttpServletRequest" %>
<%@ page import="org.apache.cxf.fediz.service.oidc.CSRFUtils" %>
<%@ page import="org.apache.cxf.fediz.service.oidc.clients.ClientCodeGrants" %>
-<%@ page import="org.apache.commons.lang3.StringEscapeUtils" %>
+<%@ page import="org.apache.commons.text.StringEscapeUtils" %>
<%
ClientCodeGrants tokens = (ClientCodeGrants)request.getAttribute("data");
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
index b5a76fc..807d6af 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
@@ -9,7 +9,7 @@
<%@ page import="javax.servlet.http.HttpServletRequest" %>
<%@ page import="org.apache.cxf.fediz.service.oidc.CSRFUtils" %>
<%@ page import="org.apache.cxf.fediz.service.oidc.clients.ClientTokens" %>
-<%@ page import="org.apache.commons.lang3.StringEscapeUtils" %>
+<%@ page import="org.apache.commons.text.StringEscapeUtils" %>
<%
ClientTokens tokens = (ClientTokens)request.getAttribute("data");
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp b/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
index 4ea6c2a..6fc7065 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
@@ -2,7 +2,7 @@
<%@ page import="java.util.List" %>
<%@ page import="org.apache.cxf.rs.security.oauth2.common.OAuthAuthorizationData" %>
<%@ page import="org.apache.cxf.rs.security.oauth2.common.OAuthPermission" %>
-<%@ page import="org.apache.commons.lang3.StringEscapeUtils" %>
+<%@ page import="org.apache.commons.text.StringEscapeUtils" %>
<%
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp b/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
index 4fa7600..3339030 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
@@ -6,7 +6,7 @@
<%@ page import="java.util.TimeZone"%>
<%@ page import="javax.servlet.http.HttpServletRequest" %>
<%@ page import="org.apache.cxf.fediz.service.oidc.clients.RegisteredClients" %>
-<%@ page import="org.apache.commons.lang3.StringEscapeUtils" %>
+<%@ page import="org.apache.commons.text.StringEscapeUtils" %>
<%
Collection<Client> regs = ((RegisteredClients)request.getAttribute("data")).getClients();
diff --git a/systests/webapps/simpleWebapp/pom.xml b/systests/webapps/simpleWebapp/pom.xml
index 89e5a51..cc05f21 100644
--- a/systests/webapps/simpleWebapp/pom.xml
+++ b/systests/webapps/simpleWebapp/pom.xml
@@ -50,12 +50,17 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${commons.text.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
<!-- Name of the generated WAR file -->
diff --git a/systests/webapps/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/systests/webapps/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 3b6f56b..f58aec4 100644
--- a/systests/webapps/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/systests/webapps/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -38,7 +38,7 @@ import javax.xml.transform.stream.StreamResult;
import org.w3c.dom.Element;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.FedizPrincipal;
@@ -100,7 +100,7 @@ public class FederationServlet extends HttpServlet {
transformer.transform(new DOMSource(el),
new StreamResult(buffer));
token = buffer.toString();
- out.println("<p>" + StringEscapeUtils.escapeXml(token));
+ out.println("<p>" + StringEscapeUtils.escapeXml11(token));
} catch (Exception ex) {
out.println("<p>Failed to transform cached element to string: " + ex.toString());
}