[GitHub] struts pull request #110: updated javadoc after changing to enum
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/110 updated javadoc after changing to enum You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4686-javadoc Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/110.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #110 commit 7873eb910eeb9094be409d02be6950f9883fba45 Author: Stefaan Dutry Date: 2016-09-15T17:26:12Z updated javadoc after changing to enum --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #111: replaced String constants for marking status with ...
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/111 replaced String constants for marking status with enum You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts CycleDetectorEnum Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/111.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #111 commit 45c113eaa98554ab1ca8d3d184968095e1ac3cca Author: Stefaan Dutry Date: 2016-09-16T06:17:38Z replaced constants for marking status with enum --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #111: replaced String constants for marking status with enum
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/111 registerd jira issue [WW-4689](https://issues.apache.org/jira/browse/WW-4689) --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #112: WW-4690 added version to jshint-maven-plugin
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/112 WW-4690 added version to jshint-maven-plugin [issue WW-4690](https://issues.apache.org/jira/browse/WW-4690) You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4690 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/112.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #112 commit ef1754710d5ace96c82c7f0f79ced1d7cb38c444 Author: Stefaan Dutry Date: 2016-09-18T07:31:37Z WW-4690 added version to jshint-maven-plugin --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #126: WW-4770 Fixes problem with dojo.version
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/126 WW-4770 Fixes problem with dojo.version You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts issue/WW-4770 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/126.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #126 commit 9e8627ca669ec566bbedd638fc6010e8ae364160 Author: Stefaan Dutry Date: 2017-03-24T20:34:31Z WW-4770 Fixes problem with dojo.version --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras pull request #3: added module for extra result types
GitHub user sdutry opened a pull request: https://github.com/apache/struts-extras/pull/3 added module for extra result types This is still work in progress. The reason i'm already having it as pull request is because any input is welcome. related to WW-4774 ## So far - `HttpsOffloadAwareServletRedirectResult` - checks `X-Forwarded-Proto` header ## TODO - support official `Forwarded` header - `HttpsOffloadAwareServletActionRedirectResult` - add `struts-plugin.xml` file with result type definitions - add `README.md` You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts-extras httpsfix Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts-extras/pull/3.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #3 commit 1a64217f87566831864371622673951d29dca79a Author: Stefaan Dutry Date: 2017-03-27T21:20:48Z added HttpsOffloadAwareServletRedirectResult commit 7879bafe58fd7d82d8e31f34dd88736e337f0a12 Author: Stefaan Dutry Date: 2017-03-27T21:25:40Z used spaces for indentation --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request:
https://github.com/apache/struts-extras/pull/3#discussion_r108343668
--- Diff:
struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/HttpsOffloadAwareServletRedirectResult.java
---
@@ -0,0 +1,145 @@
+/*
+ * $Id$
+ *
+ * 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.struts2.result;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.result.ServletRedirectResult;
+import org.apache.struts2.views.util.UrlHelper;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.inject.Inject;
+
+public class HttpsOffloadAwareServletRedirectResult extends
ServletRedirectResult {
+private static final long serialVersionUID = -5384946213381645549L;
+private static final Logger LOG =
LogManager.getLogger(HttpsOffloadAwareServletRedirectResult.class);
+
+private UrlHelper urlHelper;
+
+@Inject
+public void setUrlHelper(UrlHelper urlHelper) {
+this.urlHelper = urlHelper;
+}
+
+/**
+ * Redirects to the location specified by calling
+ * {@link HttpServletResponse#sendRedirect(String)}.
+ *
+ * @param finalLocation
+ *the location to redirect to.
+ * @param invocation
+ *an encapsulation of the action execution state.
+ * @throws Exception
+ * if an error occurs when redirecting.
+ */
+protected void doExecute(String finalLocation, ActionInvocation
invocation) throws Exception {
+ActionContext ctx = invocation.getInvocationContext();
+HttpServletRequest request = (HttpServletRequest)
ctx.get(ServletActionContext.HTTP_REQUEST);
+HttpServletResponse response = (HttpServletResponse)
ctx.get(ServletActionContext.HTTP_RESPONSE);
+
+if (isPathUrl(finalLocation)) {
+if (!finalLocation.startsWith("/")) {
+ActionMapping mapping = actionMapper.getMapping(request,
Dispatcher.getInstance().getConfigurationManager());
+String namespace = null;
+if (mapping != null) {
+namespace = mapping.getNamespace();
+}
+
+if ((namespace != null) && (namespace.length() > 0) &&
(!"/".equals(namespace))) {
+finalLocation = namespace + "/" + finalLocation;
+} else {
+finalLocation = "/" + finalLocation;
+}
+}
+
+// if the URL's are relative to the servlet context, append the
+// servlet context path
+if (prependServletContext && (request.getContextPath() != null)
+&& (request.getContextPath().length() > 0)) {
+finalLocation = request.getContextPath() + finalLocation;
+}
+
+finalLocation = fixSchemeIfNeeded(finalLocation, request);
+}
+ResultConfig resultConfig =
invocation.getProxy().getConfig().getResults().get(invocation.getResultCode());
+if (resultConfig != null) {
+Map resultConfigParams =
resultConfig.getParams();
+
+List prohibitedResultParams =
getProhibitedResult
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request:
https://github.com/apache/struts-extras/pull/3#discussion_r108343998
--- Diff:
struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/HttpsOffloadAwareServletRedirectResult.java
---
@@ -0,0 +1,145 @@
+/*
+ * $Id$
+ *
+ * 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.struts2.result;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.result.ServletRedirectResult;
+import org.apache.struts2.views.util.UrlHelper;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.inject.Inject;
+
+public class HttpsOffloadAwareServletRedirectResult extends
ServletRedirectResult {
+private static final long serialVersionUID = -5384946213381645549L;
+private static final Logger LOG =
LogManager.getLogger(HttpsOffloadAwareServletRedirectResult.class);
+
+private UrlHelper urlHelper;
+
+@Inject
+public void setUrlHelper(UrlHelper urlHelper) {
+this.urlHelper = urlHelper;
+}
+
+/**
+ * Redirects to the location specified by calling
+ * {@link HttpServletResponse#sendRedirect(String)}.
+ *
+ * @param finalLocation
+ *the location to redirect to.
+ * @param invocation
+ *an encapsulation of the action execution state.
+ * @throws Exception
+ * if an error occurs when redirecting.
+ */
+protected void doExecute(String finalLocation, ActionInvocation
invocation) throws Exception {
+ActionContext ctx = invocation.getInvocationContext();
+HttpServletRequest request = (HttpServletRequest)
ctx.get(ServletActionContext.HTTP_REQUEST);
+HttpServletResponse response = (HttpServletResponse)
ctx.get(ServletActionContext.HTTP_RESPONSE);
+
+if (isPathUrl(finalLocation)) {
+if (!finalLocation.startsWith("/")) {
+ActionMapping mapping = actionMapper.getMapping(request,
Dispatcher.getInstance().getConfigurationManager());
+String namespace = null;
+if (mapping != null) {
+namespace = mapping.getNamespace();
+}
+
+if ((namespace != null) && (namespace.length() > 0) &&
(!"/".equals(namespace))) {
+finalLocation = namespace + "/" + finalLocation;
+} else {
+finalLocation = "/" + finalLocation;
+}
+}
+
+// if the URL's are relative to the servlet context, append the
+// servlet context path
+if (prependServletContext && (request.getContextPath() != null)
+&& (request.getContextPath().length() > 0)) {
+finalLocation = request.getContextPath() + finalLocation;
+}
+
+finalLocation = fixSchemeIfNeeded(finalLocation, request);
+}
+ResultConfig resultConfig =
invocation.getProxy().getConfig().getResults().get(invocation.getResultCode());
+if (resultConfig != null) {
+Map resultConfigParams =
resultConfig.getParams();
+
+List prohibitedResultParams =
getProhibitedResult
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request:
https://github.com/apache/struts-extras/pull/3#discussion_r108344564
--- Diff:
struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/HttpsOffloadAwareServletRedirectResult.java
---
@@ -0,0 +1,145 @@
+/*
+ * $Id$
+ *
+ * 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.struts2.result;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.result.ServletRedirectResult;
+import org.apache.struts2.views.util.UrlHelper;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.inject.Inject;
+
+public class HttpsOffloadAwareServletRedirectResult extends
ServletRedirectResult {
+private static final long serialVersionUID = -5384946213381645549L;
+private static final Logger LOG =
LogManager.getLogger(HttpsOffloadAwareServletRedirectResult.class);
+
+private UrlHelper urlHelper;
+
+@Inject
+public void setUrlHelper(UrlHelper urlHelper) {
+this.urlHelper = urlHelper;
+}
+
+/**
+ * Redirects to the location specified by calling
+ * {@link HttpServletResponse#sendRedirect(String)}.
+ *
+ * @param finalLocation
+ *the location to redirect to.
+ * @param invocation
+ *an encapsulation of the action execution state.
+ * @throws Exception
+ * if an error occurs when redirecting.
+ */
+protected void doExecute(String finalLocation, ActionInvocation
invocation) throws Exception {
+ActionContext ctx = invocation.getInvocationContext();
+HttpServletRequest request = (HttpServletRequest)
ctx.get(ServletActionContext.HTTP_REQUEST);
+HttpServletResponse response = (HttpServletResponse)
ctx.get(ServletActionContext.HTTP_RESPONSE);
+
+if (isPathUrl(finalLocation)) {
+if (!finalLocation.startsWith("/")) {
+ActionMapping mapping = actionMapper.getMapping(request,
Dispatcher.getInstance().getConfigurationManager());
+String namespace = null;
+if (mapping != null) {
+namespace = mapping.getNamespace();
+}
+
+if ((namespace != null) && (namespace.length() > 0) &&
(!"/".equals(namespace))) {
+finalLocation = namespace + "/" + finalLocation;
+} else {
+finalLocation = "/" + finalLocation;
+}
+}
+
+// if the URL's are relative to the servlet context, append the
+// servlet context path
+if (prependServletContext && (request.getContextPath() != null)
+&& (request.getContextPath().length() > 0)) {
+finalLocation = request.getContextPath() + finalLocation;
+}
+
+finalLocation = fixSchemeIfNeeded(finalLocation, request);
+}
+ResultConfig resultConfig =
invocation.getProxy().getConfig().getResults().get(invocation.getResultCode());
+if (resultConfig != null) {
+Map resultConfigParams =
resultConfig.getParams();
+
+List prohibitedResultParams =
getProhibitedResult
[GitHub] struts-extras issue #3: added module for extra result types
Github user sdutry commented on the issue: https://github.com/apache/struts-extras/pull/3 @lukaszlenart I think i might be about where i would end up without extra input. Could you (or anyone else) please do another review. Seeing as the issue where this idea originated from has been closed now, should i create an issue in the JIRA issue tracking system? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request: https://github.com/apache/struts-extras/pull/3#discussion_r108511395 --- Diff: struts2-custom-results-plugin/README.md --- @@ -0,0 +1,42 @@ +# Apache Struts 2 Extras - custom results plugin + +[](http://www.apache.org/licenses/LICENSE-2.0.html) + +This plugin provides additional result types. + +## Supported versions + +This plugin can be used with the Apache Struts versions 2.5.x . + +## Result Type categories + +### SSL offloading support + +These result types are made to support redirecting under the https protocol while being behind a SSL offloading proxy. + + Result Types + +# sslOffloadRedirect + +This Result Type should replace the `redirect` Result Type. +It takes into account 2 ways of detecting the offloading: +- `X-Forwarded-Proto` header (de-facto standard header) +- `proto` attribute of the `Forwarded` header ( [RFC7239](https://tools.ietf.org/html/rfc7239) ) + +# sslOffloadRedirectAction + +This Result Type should replace the `redirectAction` Result Type. +It takes into account 2 ways of detecting the offloading: +- `X-Forwarded-Proto` header (de-facto standard header) +- `proto` attribute of the `Forwarded` header ( [RFC7239](https://tools.ietf.org/html/rfc7239) ) + + struts packages + +# ssl-offload + +Only thing this package does is defining the result types so that they can be used. + +# ssl-offload-default + +Merely combines the `struts-default` package and the `ssl-offload` package. --- End diff -- I have no problem with adding this. But given that the `ssl-offload` package's only purpose is to define those results, i'm kind of not getting the point of it. I think i'll just add both ways as an example. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request: https://github.com/apache/struts-extras/pull/3#discussion_r108515221 --- Diff: struts2-custom-results-plugin/pom.xml --- @@ -0,0 +1,104 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + +org.apache.struts +struts-master +10 + + +4.0.0 + +struts2-custom-results-plugin +1.2-SNAPSHOT +jar +struts2 custom results plugin + + +This plugin defines some additional result types + + + +UTF-8 + + + + scm:git:git://git.apache.org/struts-extras.git + scm:git:https://git-wip-us.apache.org/repos/asf/struts-extras.git +http://git.apache.org/struts-extras.git +HEAD + + + +JIRA +https://issues.apache.org/jira/browse/WW + + + +Jenkins +https://builds.apache.org/hudson/view/S-Z/view/Struts + + +mail + +dev@struts.apache.org + + + + + + + + +org.apache.struts +struts2-core +2.5.10.1 --- End diff -- made optional --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request: https://github.com/apache/struts-extras/pull/3#discussion_r108515260 --- Diff: struts2-custom-results-plugin/pom.xml --- @@ -0,0 +1,104 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + +org.apache.struts +struts-master +10 + + +4.0.0 + +struts2-custom-results-plugin +1.2-SNAPSHOT +jar +struts2 custom results plugin + + +This plugin defines some additional result types + + + +UTF-8 + + + + scm:git:git://git.apache.org/struts-extras.git + scm:git:https://git-wip-us.apache.org/repos/asf/struts-extras.git +http://git.apache.org/struts-extras.git +HEAD + + + +JIRA +https://issues.apache.org/jira/browse/WW + + + +Jenkins +https://builds.apache.org/hudson/view/S-Z/view/Struts + + +mail + +dev@struts.apache.org + + + + + + + + +org.apache.struts +struts2-core +2.5.10.1 + + + +org.apache.logging.log4j +log4j-api +2.8 + --- End diff -- made optional --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request: https://github.com/apache/struts-extras/pull/3#discussion_r108515374 --- Diff: struts2-custom-results-plugin/pom.xml --- @@ -0,0 +1,104 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + +org.apache.struts +struts-master +10 + + +4.0.0 + +struts2-custom-results-plugin +1.2-SNAPSHOT +jar +struts2 custom results plugin + + +This plugin defines some additional result types + + + +UTF-8 + + + + scm:git:git://git.apache.org/struts-extras.git + scm:git:https://git-wip-us.apache.org/repos/asf/struts-extras.git +http://git.apache.org/struts-extras.git +HEAD + + + +JIRA +https://issues.apache.org/jira/browse/WW + + + +Jenkins +https://builds.apache.org/hudson/view/S-Z/view/Struts + + +mail + +dev@struts.apache.org + + + + + + + + +org.apache.struts +struts2-core +2.5.10.1 + + + +org.apache.logging.log4j +log4j-api +2.8 + + + +javax.servlet +servlet-api +2.4 +provided + + + + + + + +org.apache.maven.plugins +maven-compiler-plugin + +1.6 +1.6 --- End diff -- changed to 1.7 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request: https://github.com/apache/struts-extras/pull/3#discussion_r108515624 --- Diff: struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/SslOffloadAwareServletActionRedirectResult.java --- @@ -0,0 +1,123 @@ +/* + * $Id$ --- End diff -- `$id$` tag removed --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request: https://github.com/apache/struts-extras/pull/3#discussion_r108515681 --- Diff: struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/SslOffloadAwareServletRedirectResult.java --- @@ -0,0 +1,188 @@ +/* + * $Id$ --- End diff -- `$id` tag removed --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request:
https://github.com/apache/struts-extras/pull/3#discussion_r108516053
--- Diff:
struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/SslOffloadAwareServletRedirectResult.java
---
@@ -0,0 +1,188 @@
+/*
+ * $Id$
+ *
+ * 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.struts2.result;
+
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.result.ServletRedirectResult;
+import org.apache.struts2.views.util.UrlHelper;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.inject.Inject;
+
+public class SslOffloadAwareServletRedirectResult extends
ServletRedirectResult {
+private static final long serialVersionUID = -5384946213381645549L;
+private static final Logger LOG =
LogManager.getLogger(SslOffloadAwareServletRedirectResult.class);
+private static final Pattern FORWARDED_PROTO_PARAM_HTTPS =
Pattern.compile("[^;]proto=https[$;]");
+
+private UrlHelper urlHelper;
+
+@Inject
+public void setUrlHelper(UrlHelper urlHelper) {
+this.urlHelper = urlHelper;
+}
+
+public SslOffloadAwareServletRedirectResult() {
+super();
+}
+
+public SslOffloadAwareServletRedirectResult(String location) {
+this(location, null);
+}
+
+public SslOffloadAwareServletRedirectResult(String location, String
anchor) {
+super(location, anchor);
+}
+
+/**
+ * Redirects to the location specified by calling
+ * {@link HttpServletResponse#sendRedirect(String)}.
+ *
+ * @param finalLocation
+ *the location to redirect to.
+ * @param invocation
+ *an encapsulation of the action execution state.
+ * @throws Exception
+ * if an error occurs when redirecting.
+ */
+protected void doExecute(String finalLocation, ActionInvocation
invocation) throws Exception {
+ActionContext ctx = invocation.getInvocationContext();
+HttpServletRequest request = (HttpServletRequest)
ctx.get(ServletActionContext.HTTP_REQUEST);
+HttpServletResponse response = (HttpServletResponse)
ctx.get(ServletActionContext.HTTP_RESPONSE);
+
+if (isPathUrl(finalLocation)) {
+if (!finalLocation.startsWith("/")) {
+ActionMapping mapping = actionMapper.getMapping(request,
Dispatcher.getInstance().getConfigurationManager());
+String namespace = null;
+if (mapping != null) {
+namespace = mapping.getNamespace();
+}
+
+if ((namespace != null) && (namespace.length() > 0) &&
(!"/".equals(namespace))) {
+finalLocation = namespace + "/" + finalLocation;
+} else {
+finalLocation = "/" + finalLocation;
+}
+}
+
+// if the URL's are relative to the servlet context, append the
+// servlet context path
+if (prependServletContext && (request.getContextPath() != null)
[GitHub] struts-extras pull request #3: added module for extra result types
Github user sdutry commented on a diff in the pull request: https://github.com/apache/struts-extras/pull/3#discussion_r108519883 --- Diff: struts2-custom-results-plugin/README.md --- @@ -0,0 +1,42 @@ +# Apache Struts 2 Extras - custom results plugin + +[](http://www.apache.org/licenses/LICENSE-2.0.html) + +This plugin provides additional result types. + +## Supported versions + +This plugin can be used with the Apache Struts versions 2.5.x . + +## Result Type categories + +### SSL offloading support + +These result types are made to support redirecting under the https protocol while being behind a SSL offloading proxy. + + Result Types + +# sslOffloadRedirect + +This Result Type should replace the `redirect` Result Type. +It takes into account 2 ways of detecting the offloading: +- `X-Forwarded-Proto` header (de-facto standard header) +- `proto` attribute of the `Forwarded` header ( [RFC7239](https://tools.ietf.org/html/rfc7239) ) + +# sslOffloadRedirectAction + +This Result Type should replace the `redirectAction` Result Type. +It takes into account 2 ways of detecting the offloading: +- `X-Forwarded-Proto` header (de-facto standard header) +- `proto` attribute of the `Forwarded` header ( [RFC7239](https://tools.ietf.org/html/rfc7239) ) + + struts packages + +# ssl-offload + +Only thing this package does is defining the result types so that they can be used. + +# ssl-offload-default + +Merely combines the `struts-default` package and the `ssl-offload` package. --- End diff -- Added information on how to get the result types available to you. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-extras issue #3: added module for extra result types
Github user sdutry commented on the issue: https://github.com/apache/struts-extras/pull/3 @lukaszlenart Am i allowed to merge this now? Or does this need to be reviewed and approved by someone else first? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #127: Drop deprecated logging layer
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/127 Drop deprecated logging layer WW-4763 You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4763 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/127.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #127 commit 9e86d0087592257fe432c04bfeab169d19c6099b Author: Stefaan Dutry Date: 2017-03-29T07:42:03Z Drop deprecated logging layer --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #127: Drop deprecated logging layer
Github user sdutry closed the pull request at: https://github.com/apache/struts/pull/127 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #127: Drop deprecated logging layer
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/127 > Did you notice that this targets Struts 2.6 Oops, didn't notice that. Best to just close this pull request then for now i guess. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-site pull request #5: cleaned up hello-world-using-struts2 page
GitHub user sdutry opened a pull request: https://github.com/apache/struts-site/pull/5 cleaned up hello-world-using-struts2 page Tried cleaning up the hello-world-using-struts2 page. - It's still missing a couple of links that were in the original page Is there a way to view the rendered HTML page result while working on a page? You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts-site hello-world-page Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts-site/pull/5.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #5 commit d876161c0db576c762a28a66b5acd5fdf486230e Author: Stefaan Dutry Date: 2017-04-01T06:57:34Z cleaned up hello-world-using-struts2 page --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-site pull request #6: cleaned up using-tags page
GitHub user sdutry opened a pull request: https://github.com/apache/struts-site/pull/6 cleaned up using-tags page You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts-site using-tags Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts-site/pull/6.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #6 commit c7dbd78bb3be461f9fa2cc949d36744677c36be7 Author: Stefaan Dutry Date: 2017-04-01T07:38:11Z cleaned up using-tags page --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-site pull request #7: Cleaned up some of the markdown files
GitHub user sdutry opened a pull request: https://github.com/apache/struts-site/pull/7 Cleaned up some of the markdown files Not stating that they're perfect, but it should be an improved starting point at least You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts-site cleanup Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts-site/pull/7.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #7 commit 4322cf858254448b51261ec169a5b2de82c4b986 Author: Stefaan Dutry Date: 2017-04-01T15:33:52Z cleaned up coding actions page commit 1454da1df367e271a3e8bb74393f34dbbe7d6deb Author: Stefaan Dutry Date: 2017-04-01T16:02:07Z cleaned up processing forms page commit f2cb6c602d7e28f039775bf9b4467442e99491a4 Author: Stefaan Dutry Date: 2017-04-01T16:03:17Z removed space from code block commit d7ba877e4db101d60f2f0e4604d7fa958e204e0e Author: Stefaan Dutry Date: 2017-04-01T18:24:29Z cleaned up the form-validation page commit bb095a3f489fd9d3ee5d1519f54a475fda7a17b0 Author: Stefaan Dutry Date: 2017-04-01T18:51:52Z cleaned up message-resource-files page commit e6a5ffd8547e34b2c9cdbb3b08ad4e81987fb7e2 Author: Stefaan Dutry Date: 2017-04-01T19:10:52Z cleaned exception-handling page commit a4163950514267543f092ba6ea065bea54749554 Author: Stefaan Dutry Date: 2017-04-01T19:22:05Z cleaned up debugging-struts page --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-site pull request #8: cleaned up remaining getting-started pages
GitHub user sdutry opened a pull request: https://github.com/apache/struts-site/pull/8 cleaned up remaining getting-started pages You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts-site cleanup Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts-site/pull/8.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #8 commit b72962e39f6d65a931dfae9dad9a5d3f251948a9 Author: Stefaan Dutry Date: 2017-04-02T13:18:28Z cleaned up annotations page commit f73b9c7c63282fb9036388e8c91a58e536a1f32d Author: Stefaan Dutry Date: 2017-04-02T13:34:13Z cleaned up introducing-interceptors page commit c7614476981b5fca3041bd572c5b2ee55c649898 Author: Stefaan Dutry Date: 2017-04-02T13:50:17Z cleaned up unit-testing page commit dc2f4ccb7a2f5a4de460785b96d5e7875ab9bcc9 Author: Stefaan Dutry Date: 2017-04-02T14:00:37Z cleaned up http-session page commit d797f52cd6f08749b990b90169a9f29056707825 Author: Stefaan Dutry Date: 2017-04-02T14:05:13Z cleaned up preperable-interface page commit 44c0a2a447300cc7f44d43d41f1ec43d0827a05c Author: Stefaan Dutry Date: 2017-04-02T14:11:51Z cleaned up exclued-parameters page --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts-site pull request #9: updated how-to-create-a-struts2-web-application...
GitHub user sdutry opened a pull request: https://github.com/apache/struts-site/pull/9 updated how-to-create-a-struts2-web-application page to current example application Tried updating this page to more reflect the application inside the struts-examples git repo. * `log4j2` * assuming `mvn` command available everywhere * removing reference to seperate xwork2 dependency You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts-site updategettingstarted Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts-site/pull/9.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #9 commit 4ca26c060faa4c1ccf5765837dd0062b6161eb2a Author: Stefaan Dutry Date: 2017-04-17T09:37:29Z updated page to current example application --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #132: WW-4780 : upgraded version of log4j2 to 2.8.2
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/132 WW-4780 : upgraded version of log4j2 to 2.8.2 You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4780 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/132.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #132 commit 11cccb68a90edb73ce183c4bb735cb458bfe9ec5 Author: Stefaan Dutry Date: 2017-04-20T20:06:20Z upgraded version of log4j2 to 2.8.2 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #132: WW-4780 : upgraded version of log4j2 to 2.8.2
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/132 @lukaszlenart I know they can. I just like having the confirmation from the automated build tools (jenkins and travis) that i didn't break the builds before committing. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #136: WW-4793 only add JBossFileManager when supported
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/136 WW-4793 only add JBossFileManager when supported You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4793 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/136.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #136 commit f7beeacf400ec6bdb27a7d67deb3b55dcc0f5dac Author: Stefaan Dutry Date: 2017-05-01T05:54:19Z added utility innerclass for checking support commit 4be974a482a2894b677ee4d2292ec778dfcd429e Author: Stefaan Dutry Date: 2017-05-01T06:00:54Z only add JBossFileManager when it's supported commit b140218cf2c7c634a6c42cd859d6d3b81cb5c290 Author: Stefaan Dutry Date: 2017-05-01T06:06:11Z removed redundant logger declaration --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #136: WW-4793 only add JBossFileManager when supported
Github user sdutry commented on a diff in the pull request:
https://github.com/apache/struts/pull/136#discussion_r114154579
--- Diff:
core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java ---
@@ -210,4 +187,33 @@ private void addIfAbsent(List urls, URL fileUrl) {
}
}
+public static class JBossFileManagerSupportUtil {
--- End diff --
@aleksandr-m
Good point, let me change that.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #136: WW-4793 only add JBossFileManager when supported
Github user sdutry commented on a diff in the pull request:
https://github.com/apache/struts/pull/136#discussion_r114157280
--- Diff:
core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java ---
@@ -210,4 +187,33 @@ private void addIfAbsent(List urls, URL fileUrl) {
}
}
+public static class JBossFileManagerSupportUtil {
--- End diff --
@aleksandr-m
Changed to static methods.
(don't know why i didn't just do that from the start)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #136: WW-4793 only add JBossFileManager when supported
Github user sdutry closed the pull request at: https://github.com/apache/struts/pull/136 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #136: WW-4793 only add JBossFileManager when supported
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/136 Given the input on the issue, this pull request should not be merged. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #149: WW-4821 Upgrade Commons IO to 2.5
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/149 WW-4821 Upgrade Commons IO to 2.5 You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4821 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/149.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #149 commit f9e4fe483630dd0e9b37acdca4e0db5479110b56 Author: Stefaan Dutry Date: 2017-07-23T08:38:16Z WW-4821 Upgrade Commons IO to 2.5 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #150: WW-4819 fixed commons-collections groupId in depen...
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/150 WW-4819 fixed commons-collections groupId in dependency management You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4819 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/150.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #150 commit 06c858386760687e276bb5bd310996ad633990a2 Author: Stefaan Dutry Date: 2017-07-24T21:19:58Z WW-4819 fixed commons-collections groupId in dependency management --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #151: WW-4818 change default Multipart validation regex ...
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/151 WW-4818 change default Multipart validation regex to comply with RFC1341 You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4818 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/151.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #151 commit 68d52dbe42aebc8e24379ebfaf4f306dd261b91c Author: Stefaan Dutry Date: 2017-07-25T11:05:07Z WW-4818 change default Multipart validation regex to comply with RFC1341 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #151: WW-4818 change default Multipart validation regex ...
Github user sdutry commented on a diff in the pull request:
https://github.com/apache/struts/pull/151#discussion_r129281083
--- Diff: core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
---
@@ -88,7 +88,7 @@
*/
public static final String REQUEST_POST_METHOD = "POST";
-public static final String MULTIPART_FORM_DATA_REGEX =
"^multipart\\/form-data(; boundary=[\\-a-zA-Z0-9]{1,70})?";
+public static final String MULTIPART_FORM_DATA_REGEX =
"^multipart/form-data(; boundary=[0-9a-zA-Z'()+_,\\-./:=?]{1,70})?";
--- End diff --
not within the square brackets according to my knowledge
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #151: WW-4818 change default Multipart validation regex ...
Github user sdutry commented on a diff in the pull request:
https://github.com/apache/struts/pull/151#discussion_r129282110
--- Diff: core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
---
@@ -88,7 +88,7 @@
*/
public static final String REQUEST_POST_METHOD = "POST";
-public static final String MULTIPART_FORM_DATA_REGEX =
"^multipart\\/form-data(; boundary=[\\-a-zA-Z0-9]{1,70})?";
+public static final String MULTIPART_FORM_DATA_REGEX =
"^multipart/form-data(; boundary=[0-9a-zA-Z'()+_,\\-./:=?]{1,70})?";
--- End diff --
you are correct about the `-` needing to be escaped , but that's the only
one i escaped. (they're in the order they're mentioned in RFC1341 (so i moved
the `-` backwards in the pattern)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #151: WW-4818 change default Multipart validation regex ...
Github user sdutry commented on a diff in the pull request:
https://github.com/apache/struts/pull/151#discussion_r129283402
--- Diff: core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
---
@@ -88,7 +88,7 @@
*/
public static final String REQUEST_POST_METHOD = "POST";
-public static final String MULTIPART_FORM_DATA_REGEX =
"^multipart\\/form-data(; boundary=[\\-a-zA-Z0-9]{1,70})?";
+public static final String MULTIPART_FORM_DATA_REGEX =
"^multipart/form-data(; boundary=[0-9a-zA-Z'()+_,\\-./:=?]{1,70})?";
--- End diff --
Ok, i'll add some tests to confirm the pattern is correct.
(Or if needed to correct it)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #151: WW-4818 change default Multipart validation regex to comp...
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/151 @lukaszlenart I added 2 simple tests. - one containing all the special allowed characters - another one containing a single not-allowed character Please feel free to tell me what other test-cases you want added. (for example, any specific characters you want tested?) --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #151: WW-4818 change default Multipart validation regex to comp...
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/151 @lukaszlenart Am i allowed to merge this or is there more work/checks that needs to happen first? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #152: WW-4826 upgrade to ASM version 5.2
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/152 WW-4826 upgrade to ASM version 5.2 You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4826 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/152.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #152 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #156: WW-4834 Improve RegEx used to validate URLs
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/156 WW-4834 Improve RegEx used to validate URLs changed the regex according to https://github.com/apache/struts/commit/8df5a897f61f3ef45c36fdd9275e9ae4516c#commitcomment-23414493 Can anyone tell me if the optional `#` on line 54 is needed? You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4834 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/156.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #156 commit 9d47af6ffa355977b5acc713e6d1f25fac260a28 Author: Stefaan Dutry Date: 2017-08-01T15:33:53Z WW-4834 Improve RegEx used to validate URLs --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #157: WW-4834 fixed faulty regex
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/157 WW-4834 fixed faulty regex You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4834 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/157.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #157 commit 8a04e80f01350c90f053d71366d5e0c2186fded5 Author: Stefaan Dutry Date: 2017-08-02T07:31:11Z WW-4834 fixed faulty regex --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #157: WW-4834 fixed faulty regex
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/157 Ok, I will wait. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #157: WW-4834 fixed faulty regex
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/157 > After the commit above, any IP with 3 digits in the last octet will not pass validation You are right, i forgot the grouping (meaning the or statements mean something completely different), i'll fix this ASAP > The expression did not seem to work at all until I escaped the slashes, changing / to \/ I don't see why this would be. I am not aware that a "/" is a special sign inside a java string or java RegEx. Or is it because this same regex is used in javascript regex validation (where the '/' sign does mean something). I'll change it back ASAP too --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #157: WW-4834 fixed faulty regex
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/157 @lukaszlenart Sorry for breaking it in the first place. That wasn't my intention. Do you want me to merge this now, or am i still overlooking stuff? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #159: WW-4834 Improve RegEx used to validate URLs
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/159 WW-4834 Improve RegEx used to validate URLs You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4834-support-2-3 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/159.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #159 commit 3fddfb6eb562d597c935084e9e81d43ed6bcd02c Author: Stefaan Dutry Date: 2017-08-04T11:58:31Z WW-4834 Improve RegEx used to validate URLs --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #159: WW-4834 Improve RegEx used to validate URLs
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/159 see #157 and #156 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts issue #159: WW-4834 Improve RegEx used to validate URLs
Github user sdutry commented on the issue: https://github.com/apache/struts/pull/159 @lukaszlenart i copied the regex after the changes from #157 . So it should be the same. Feel free to check. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
[GitHub] struts pull request #166: WW-4851 Upgrade to Log4j2 2.9.0
GitHub user sdutry opened a pull request: https://github.com/apache/struts/pull/166 WW-4851 Upgrade to Log4j2 2.9.0 You can merge this pull request into a Git repository by running: $ git pull https://github.com/sdutry/struts WW-4851 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/166.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #166 commit bca42a2091588117c1df6e365b24cca00be4c417 Author: Stefaan Dutry Date: 2017-09-06T18:28:00Z WW-4851 Upgrade to Log4j2 2.9.0 --- - To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
