From 7eda1745a44e45fe7f6750d162dae67668bc9062 Mon Sep 17 00:00:00 2001 From: jdyer1 Date: Mon, 30 Oct 2023 10:46:35 -0500 Subject: [PATCH] WW-5141 remove code for "pell multipart plugin" --- plugins/pell-multipart/README.md | 2 - plugins/pell-multipart/pom.xml | 45 ----- .../multipart/PellMultiPartRequest.java | 164 ----------------- .../src/main/resources/LICENSE.txt | 174 ------------------ .../src/main/resources/NOTICE.txt | 5 - .../src/main/resources/struts-plugin.xml | 28 --- plugins/pell-multipart/src/site/site.xml | 56 ------ 7 files changed, 474 deletions(-) delete mode 100644 plugins/pell-multipart/README.md delete mode 100644 plugins/pell-multipart/pom.xml delete mode 100644 plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java delete mode 100644 plugins/pell-multipart/src/main/resources/LICENSE.txt delete mode 100644 plugins/pell-multipart/src/main/resources/NOTICE.txt delete mode 100644 plugins/pell-multipart/src/main/resources/struts-plugin.xml delete mode 100644 plugins/pell-multipart/src/site/site.xml diff --git a/plugins/pell-multipart/README.md b/plugins/pell-multipart/README.md deleted file mode 100644 index 0372995e8..000000000 --- a/plugins/pell-multipart/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Struts 2 Pell Multipart plugin -This plugin is deprecated and it will be removed soon, **please do not use it**! diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml deleted file mode 100644 index 2b8cc9adc..000000000 --- a/plugins/pell-multipart/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.struts - struts2-plugins - 6.4.0-SNAPSHOT - - - struts2-pell-multipart-plugin - jar - DEPRECATED: Struts 2 Pell Multipart Plugin - since 6.2.0 - - - - opensymphony - pell-multipart - 2.1.5 - provided - - - - UTF-8 - - diff --git a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java deleted file mode 100644 index d8284f61b..000000000 --- a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java +++ /dev/null @@ -1,164 +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.struts2.dispatcher.multipart; - -import http.utils.multipartrequest.ServletMultipartRequest; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import jakarta.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; - -/** - * Multipart form data request adapter for Jason Pell's multipart utils package. - */ -public class PellMultiPartRequest extends AbstractMultiPartRequest { - - private static final Logger LOG = LogManager.getLogger(PellMultiPartRequest.class); - - private ServletMultipartRequest multi; - - /** - * Creates a new request wrapper to handle multi-part data using methods adapted from Jason Pell's - * multipart classes (see class description). - * - * @param saveDir the directory to save off the file - * @param servletRequest the request containing the multipart - */ - public void parse(HttpServletRequest servletRequest, String saveDir) throws IOException { - //this needs to be synchronised, as we should not change the encoding at the same time as - //calling the constructor. See javadoc for MultipartRequest.setEncoding(). - synchronized (this) { - setEncoding(); - if (maxSize != null && maxSize > -1) { - int intMaxSize = (maxSize >= Integer.MAX_VALUE ? Integer.MAX_VALUE : maxSize.intValue()); - multi = new ServletMultipartRequest(servletRequest, saveDir, intMaxSize); - } else { - multi = new ServletMultipartRequest(servletRequest, saveDir); - } - } - } - - public Enumeration getFileParameterNames() { - return multi.getFileParameterNames(); - } - - public String[] getContentType(String fieldName) { - return new String[]{multi.getContentType(fieldName)}; - } - - public UploadedFile[] getFile(String fieldName) { - return new UploadedFile[]{StrutsUploadedFile.Builder.create(multi.getFile(fieldName)) - .withContentType(multi.getContentType(fieldName)) - .withOriginalName(multi.getFileSystemName(fieldName)) - .build() - }; - } - - public String[] getFileNames(String fieldName) { - - // TODO - not sure about this - is this the filename of the actual file or - // TODO - the uploaded filename as provided by the browser? - // TODO - Not sure what version of Pell this class uses as it doesn't seem to be the latest - return new String[]{multi.getFile(fieldName).getName()}; - } - - public String[] getFilesystemName(String fieldName) { - return new String[]{multi.getFileSystemName(fieldName)}; - } - - public String getParameter(String name) { - return multi.getURLParameter(name); - } - - public Enumeration getParameterNames() { - return multi.getParameterNames(); - } - - public String[] getParameterValues(String name) { - Enumeration enumeration = multi.getURLParameters(name); - - if (!enumeration.hasMoreElements()) { - return null; - } - - List values = new ArrayList(); - - while (enumeration.hasMoreElements()) { - values.add((String) enumeration.nextElement()); - } - - return values.toArray(new String[values.size()]); - } - - /** - * Sets the encoding for the uploaded params. This needs to be set if you are using character sets other than - * ASCII. - *

- * The encoding is looked up from the configuration setting 'struts.i18n.encoding'. This is usually set in - * default.properties & struts.properties. - *

- */ - private void setEncoding() { - String encoding = null; - - try { - encoding = defaultEncoding; - - if (encoding != null) { - //NB: This should never be called at the same time as the constructor for - //ServletMultiPartRequest, as it can cause problems. - //See javadoc for MultipartRequest.setEncoding() - http.utils.multipartrequest.MultipartRequest.setEncoding(encoding); - } else { - http.utils.multipartrequest.MultipartRequest.setEncoding("UTF-8"); - } - } catch (IllegalArgumentException e) { - if (LOG.isInfoEnabled()) { - LOG.info("Could not get encoding property 'struts.i18n.encoding' for file upload. Using system default"); - } - } catch (UnsupportedEncodingException e) { - LOG.error("Encoding " + encoding + " is not a valid encoding. Please check your struts.properties file."); - } - } - - /* (non-Javadoc) - * @see org.apache.struts2.dispatcher.multipart.MultiPartRequest#cleanUp() - */ - public void cleanUp() { - Enumeration fileParameterNames = multi.getFileParameterNames(); - while (fileParameterNames != null && fileParameterNames.hasMoreElements()) { - String inputValue = (String) fileParameterNames.nextElement(); - UploadedFile[] files = getFile(inputValue); - for (UploadedFile currentFile : files) { - LOG.debug("Removing file {} {}", inputValue, currentFile); - if ((currentFile != null) && currentFile.isFile()) { - if (!currentFile.delete()) { - LOG.warn("Resource Leaking: Could not remove uploaded file [{}]", currentFile.getAbsolutePath()); - } - } - } - } - } - -} diff --git a/plugins/pell-multipart/src/main/resources/LICENSE.txt b/plugins/pell-multipart/src/main/resources/LICENSE.txt deleted file mode 100644 index dd5b3a58a..000000000 --- a/plugins/pell-multipart/src/main/resources/LICENSE.txt +++ /dev/null @@ -1,174 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. diff --git a/plugins/pell-multipart/src/main/resources/NOTICE.txt b/plugins/pell-multipart/src/main/resources/NOTICE.txt deleted file mode 100644 index bfba90c29..000000000 --- a/plugins/pell-multipart/src/main/resources/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Struts -Copyright 2000-2011 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/plugins/pell-multipart/src/main/resources/struts-plugin.xml b/plugins/pell-multipart/src/main/resources/struts-plugin.xml deleted file mode 100644 index 2640ad485..000000000 --- a/plugins/pell-multipart/src/main/resources/struts-plugin.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - diff --git a/plugins/pell-multipart/src/site/site.xml b/plugins/pell-multipart/src/site/site.xml deleted file mode 100644 index 54fdcf4f4..000000000 --- a/plugins/pell-multipart/src/site/site.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - org.apache.maven.skins - maven-fluido-skin - ${fluido-skin.version} - - - Apache Software Foundation - http://www.apache.org/images/asf-logo.gif - http://www.apache.org/ - - - Apache Struts - http://struts.apache.org/img/struts-logo.svg - http://struts.apache.org/ - - - - - - - - - - - - - - -