diff --git a/NOTICE b/NOTICE index 152a7800c..7a9657377 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,11 @@ Apache Jakarta HttpClient Copyright 1999-2007 The Apache Software Foundation +Apache Commons FileUpload +Copyright 2002-2008 The Apache Software Foundation + +Apache Commons IO +Copyright 2001-2008 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). diff --git a/build.xml b/build.xml index 168cfe034..7eb3b918f 100644 --- a/build.xml +++ b/build.xml @@ -187,9 +187,12 @@ + - + + + diff --git a/lib/commons-fileupload-1.2.1.License b/lib/commons-fileupload-1.2.1.License new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/lib/commons-fileupload-1.2.1.License @@ -0,0 +1,202 @@ + + 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. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/lib/commons-fileupload-1.2.1.jar b/lib/commons-fileupload-1.2.1.jar new file mode 100644 index 000000000..aa209b388 Binary files /dev/null and b/lib/commons-fileupload-1.2.1.jar differ diff --git a/lib/commons-io-1.4.License b/lib/commons-io-1.4.License new file mode 100644 index 000000000..43e91eb0b --- /dev/null +++ b/lib/commons-io-1.4.License @@ -0,0 +1,203 @@ + + 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. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + diff --git a/lib/commons-io-1.4.jar b/lib/commons-io-1.4.jar new file mode 100644 index 000000000..133dc6cb3 Binary files /dev/null and b/lib/commons-io-1.4.jar differ diff --git a/lib/servlet-api.License b/lib/servlet-api.License new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/lib/servlet-api.License @@ -0,0 +1,201 @@ + 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. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/lib/servlet-api.jar b/lib/servlet-api.jar new file mode 100644 index 000000000..308fd7a38 Binary files /dev/null and b/lib/servlet-api.jar differ diff --git a/source/de/anomic/http/httpd.java b/source/de/anomic/http/httpd.java index cab3ad112..491ed38bf 100644 --- a/source/de/anomic/http/httpd.java +++ b/source/de/anomic/http/httpd.java @@ -24,6 +24,7 @@ package de.anomic.http; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.CharArrayWriter; import java.io.File; @@ -35,15 +36,24 @@ import java.io.PrintStream; import java.io.UnsupportedEncodingException; import java.net.InetAddress; import java.net.MalformedURLException; +import java.net.URLDecoder; import java.net.URLEncoder; import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Properties; import java.util.StringTokenizer; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.FileUpload; +import org.apache.commons.fileupload.FileUploadBase; +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.RequestContext; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.httpclient.ChunkedInputStream; import de.anomic.data.htmlTools; @@ -126,7 +136,7 @@ public final class httpd implements serverHandler, Cloneable { private int keepAliveRequestCount = 0; // needed for logging - private final serverLog log = new serverLog("HTTPD"); + private final static serverLog log = new serverLog("HTTPD"); // class methods public httpd(final serverSwitch s) { @@ -304,7 +314,7 @@ public final class httpd implements serverHandler, Cloneable { return false; } else if (!this.serverAccountBase64MD5.equals(serverCodings.encodeMD5Hex(auth.trim().substring(6)))) { // wrong password given: ask for authenticate again - serverLog.logInfo("HTTPD", "Wrong log-in for account 'server' in HTTPD.GET " + this.prop.getProperty("PATH") + " from IP " + this.clientIP); + log.logInfo("Wrong log-in for account 'server' in HTTPD.GET " + this.prop.getProperty("PATH") + " from IP " + this.clientIP); this.session.out.write((httpVersion + " 401 log-in required" + serverCore.CRLF_STRING + httpHeader.WWW_AUTHENTICATE + ": Basic realm=\"log-in\"" + serverCore.CRLF_STRING).getBytes()); @@ -848,7 +858,7 @@ public final class httpd implements serverHandler, Cloneable { b.write(Integer.parseInt(s.substring(i + 2, end))); i += end - i; } else { // 'named' smybols - serverLog.logFine("HTTPD", "discovered yet unimplemented HTML entity '" + s.substring(i, end + 1) + "'"); + log.logFine("discovered yet unimplemented HTML entity '" + s.substring(i, end + 1) + "'"); b.write(s.charAt(i)); } } else { @@ -858,134 +868,197 @@ public final class httpd implements serverHandler, Cloneable { return b.toString(); } - public static HashMap parseMultipart(final httpHeader header, final serverObjects args, final InputStream in, final int length) throws IOException { - // this is a quick hack using a previously coded parseMultipart based on a buffer - // should be replaced sometime by a 'right' implementation - - byte[] buffer = null; - - // parsing post request bodies with a given length - if (length != -1) { - buffer = new byte[length]; - int c, a = 0; - while (a < length) { - c = in.read(buffer, a, length - a); - if (c <= 0) break; - a += c; - } - // parsing post request bodies which are gzip content-encoded - } else { - serverByteBuffer bout = new serverByteBuffer(); - serverFileUtils.copy(in,bout); - buffer = bout.getBytes(); - bout.close(); bout = null; - } - - //System.out.println("MULTIPART-BUFFER=" + new String(buffer)); - final HashMap files = parseMultipart(header, args, buffer); - buffer = null; - return files; - } - - public static HashMap parseMultipart(final httpHeader header, final serverObjects args, final byte[] buffer) throws IOException { - // we parse a multipart message and put results into the properties - // find/identify boundary marker - //System.out.println("DEBUG parseMultipart = <<" + new String(buffer) + ">>"); - final String s = header.get(httpHeader.CONTENT_TYPE); - if (s == null) return null; - int q; - int p = s.toLowerCase().indexOf("boundary="); - if (p < 0) throw new IOException("boundary marker in multipart not found"); - // boundaries start with additional leading "--", see RFC1867 - final byte[] boundary = ("--" + s.substring(p + 9)).getBytes(); - - // eat up first boundary - // the buffer must start with a boundary - byte[] line = readLine(0, buffer); - int pos = nextPos; - if ((line == null) || (!(equals(line, 0, boundary, 0, boundary.length)))) - throw new IOException("boundary not recognized: " + ((line == null) ? "NULL" : new String(line, "UTF-8")) + ", boundary = " + new String(boundary)); - - // we need some constants - final byte[] namec = "name=".getBytes(); - final byte[] filenamec = "filename=".getBytes(); - //byte[] semicolonc = (new String(";")).getBytes(); - final byte[] quotec = new byte[] {(byte) '"'}; - - // now loop over boundaries - byte [] name; - byte [] filename; - final HashMap files = new HashMap(); - int argc = 0; - //System.out.println("DEBUG: parsing multipart body:" + new String(buffer)); - while (pos < buffer.length) { // boundary enumerator - // here the 'pos' marker points to the first line in a section after a boundary line - line = readLine(pos, buffer); pos = nextPos; - // termination if line is empty - if (line.length == 0) break; - // find name tag in line - p = indexOf(0, line, namec); - if (p < 0) throw new IOException("tag name in marker section not found: '" + new String(line, "UTF-8") + "'"); // a name tag must always occur - p += namec.length + 1; // first position of name value - q = indexOf(p, line, quotec); - if (q < 0) throw new IOException("missing quote in name tag: '" + new String(line, "UTF-8") + "'"); - name = new byte[q - p]; - java.lang.System.arraycopy(line, p, name, 0, q - p); - // if this line has also a filename attribute, read it - p = indexOf(q, line, filenamec); - if (p > 0) { - p += filenamec.length + 1; // first position of name value - q = indexOf(p, line, quotec); - if (q < 0) throw new IOException("missing quote in filename tag: '" + new String(line) + "'"); - filename = new byte[q - p]; - java.lang.System.arraycopy(line, p, filename, 0, q - p); - } else filename = null; - // we have what we need. more information lines may follow, but we omit parsing them - // we just skip until an empty line is reached - while (pos < buffer.length) { // line skiping - line = readLine(pos, buffer); pos = nextPos; - if ((line == null) || (line.length == 0)) break; - } - // depending on the filename tag exsistence, read now either a value for the name - // or a complete uploaded file - // to know the exact length of the value, we must identify the next boundary - p = indexOf(pos, buffer, boundary); - - // if we can't find another boundary, then this is an error in the input - if (p < 0) { - serverLog.logSevere("HTTPD", "ERROR in PUT body: no ending boundary. probably missing values"); - break; - } - - // we don't know if the value is terminated by LF, CR or CRLF - // (it's suppose to be CRLF, but we want to be lazy about wrong terminations) - if (buffer[p - 2] == serverCore.CR) // ERROR: IndexOutOfBounds: -2 - /* CRLF */ q = p - 2; - else - /* CR or LF only */ q = p - 1; - // the above line is wrong if we uploaded a file that has a CR as it's last byte - // and the client's line termination symbol is only a CR or LF (which would be incorrect) - // the value is between 'pos' and 'q', while the next marker is 'p' - line = new byte[q - pos]; - java.lang.System.arraycopy(buffer, pos, line, 0, q - pos); - // in the 'line' variable we have now either a normal value or an uploadef file - if (filename == null) { - args.put(new String(name, "UTF-8"), new String(line, "UTF-8")); - } else { - // we store the file in a hashtable. - // we use the same key to address the file in the hashtable as we - // use to address the filename in the properties, but without leading '&' - args.put(new String(name, "UTF-8"), new String(filename, "UTF-8")); - files.put(new String(name, "UTF-8"), line); - } - argc++; - // finally, read the next boundary line - line = readLine(p, buffer); - pos = nextPos; - } - header.put("ARGC", Integer.toString(argc)); // store argument count - return files; + /** + * parses the message accordingly to RFC 1867 using "Commons FileUpload" (http://commons.apache.org/fileupload/) + * + * @author danielr + * @since 07.08.2008 + * @param header hier muss ARGC gesetzt werden! + * @param args + * @param in + * @param length + * @return + * @throws IOException + */ + @SuppressWarnings("unchecked") + public static HashMap parseMultipart(final httpHeader header, final serverObjects args, final InputStream in, final int length) throws IOException { + RequestContext request = new yacyContextRequest(header, in); + + if(!FileUploadBase.isMultipartContent(request)) { + throw new IOException("the request is not a multipart-message!"); + } + + FileItemFactory factory = new DiskFileItemFactory(); + FileUpload upload = new FileUpload(factory); + List items; + try { + items = upload.parseRequest(request); + } catch (FileUploadException e) { + throw new IOException("FileUploadException "+e.getMessage()); + } + + final HashMap files = new HashMap(); + int formFieldCount = 0; + for(FileItem item: items) { + if(item.isFormField()) { + // simple text + if(item.getContentType() == null || !item.getContentType().contains("charset")) { + // old yacy clients use their local default charset, on most systems UTF-8 (I hope ;) + args.put(item.getFieldName(), item.getString("UTF-8")); + } else { + // use default encoding (given as header or ISO-8859-1) + args.put(item.getFieldName(), item.getString()); + } + formFieldCount++; + } else { + // file + args.put(item.getFieldName(), item.getName()); + final byte[] fileContent = serverFileUtils.read(item.getInputStream()); + item.getInputStream().close(); + files.put(item.getFieldName(), fileContent); + } + } + header.put("ARGC", String.valueOf(items.size())); // store argument count + + return files; } +// // FIXME this is a quick hack using a previously coded parseMultipart based on a buffer +// // should be replaced sometime by a 'right' implementation +// +// byte[] buffer = null; +// +// // parsing post request bodies with a given length +// if (length != -1) { +// buffer = new byte[length]; +// int c, a = 0; +// while (a < length) { +// c = in.read(buffer, a, length - a); +// if (c <= 0) break; +// a += c; +// } +// // parsing post request bodies which are gzip content-encoded +// } else { +// serverByteBuffer bout = new serverByteBuffer(); +// serverFileUtils.copy(in,bout); +// buffer = bout.getBytes(); +// bout.close(); bout = null; +// } +// +// //System.out.println("MULTIPART-BUFFER=" + new String(buffer)); +// final HashMap files = parseMultipart(header, args, buffer); +// buffer = null; +// return files; +// } +// +// public static HashMap parseMultipart(final httpHeader header, final serverObjects args, final byte[] buffer) throws IOException { +// // we parse a multipart message and put results into the properties +// // find/identify boundary marker +// //System.out.println("DEBUG parseMultipart = <<" + new String(buffer) + ">>"); +// final String s = header.get(httpHeader.CONTENT_TYPE); +// if (s == null) return null; +// int q; +// int p = s.toLowerCase().indexOf("boundary="); +// if (p < 0) throw new IOException("boundary marker in multipart not found"); +// // boundaries start with additional leading "--", see RFC1867 +// final byte[] boundary = ("--" + s.substring(p + 9)).getBytes(); +// +// // eat up first boundary +// // the buffer must start with a boundary +// byte[] line = readLine(0, buffer); +// int pos = nextPos; +// if ((line == null) || (!(equals(line, 0, boundary, 0, boundary.length)))) +// throw new IOException("boundary not recognized: " + ((line == null) ? "NULL" : new String(line, "UTF-8")) + ", boundary = " + new String(boundary)); +// +// // we need some constants +// final byte[] namec = "name=".getBytes(); +// final byte[] filenamec = "filename=".getBytes(); +// //byte[] semicolonc = (new String(";")).getBytes(); +// final byte[] quotec = new byte[] {(byte) '"'}; +// +// // now loop over boundaries +// byte [] name; +// byte [] filename; +// final HashMap files = new HashMap(); +// int argc = 0; +// //System.out.println("DEBUG: parsing multipart body:" + new String(buffer)); +// while (pos < buffer.length) { // boundary enumerator +// // here the 'pos' marker points to the first line in a section after a boundary line +// line = readLine(pos, buffer); pos = nextPos; +// // termination if line is empty +// if (line.length == 0) break; +// // find name tag in line +// p = indexOf(0, line, namec); +// if (p < 0) throw new IOException("tag name in marker section not found: '" + new String(line, "UTF-8") + "'"); // a name tag must always occur +// p += namec.length + 1; // first position of name value +// q = indexOf(p, line, quotec); +// if (q < 0) throw new IOException("missing quote in name tag: '" + new String(line, "UTF-8") + "'"); +// name = new byte[q - p]; +// java.lang.System.arraycopy(line, p, name, 0, q - p); +// // if this line has also a filename attribute, read it +// p = indexOf(q, line, filenamec); +// if (p > 0) { +// p += filenamec.length + 1; // first position of name value +// q = indexOf(p, line, quotec); +// if (q < 0) { +// log.logWarning("quote of filename tag not found, searching in next line"); +// // append next line to this +// final byte[] nextline = readLine(pos, buffer); pos = nextPos; +// final byte[] holeLine = new byte[line.length + nextline.length]; +// System.arraycopy(line, 0, holeLine, 0, line.length); +// System.arraycopy(nextline, 0, holeLine, line.length, nextline.length); +// p = indexOf(q, holeLine, quotec); +// if(p > 0) +// throw new IOException("missing quote in filename tag: '" + new String(line) + "'"); +// } +// filename = new byte[q - p]; +// java.lang.System.arraycopy(line, p, filename, 0, q - p); +// } else filename = null; +// // we have what we need. more information lines may follow, but we omit parsing them +// // we just skip until an empty line is reached +// while (pos < buffer.length) { // line skiping +// line = readLine(pos, buffer); pos = nextPos; +// if ((line == null) || (line.length == 0)) break; +// } +// // depending on the filename tag exsistence, read now either a value for the name +// // or a complete uploaded file +// // to know the exact length of the value, we must identify the next boundary +// p = indexOf(pos, buffer, boundary); +// +// // if we can't find another boundary, then this is an error in the input +// if (p < 0) { +// log.logSevere("ERROR in PUT body: no ending boundary. probably missing values"); +// break; +// } +// +// // we don't know if the value is terminated by LF, CR or CRLF +// // (it's suppose to be CRLF, but we want to be lazy about wrong terminations) +// if (buffer[p - 2] == serverCore.CR) // ERROR: IndexOutOfBounds: -2 +// /* CRLF */ q = p - 2; +// else +// /* CR or LF only */ q = p - 1; +// // the above line is wrong if we uploaded a file that has a CR as it's last byte +// // and the client's line termination symbol is only a CR or LF (which would be incorrect) +// // the value is between 'pos' and 'q', while the next marker is 'p' +// line = new byte[q - pos]; +// java.lang.System.arraycopy(buffer, pos, line, 0, q - pos); +// // in the 'line' variable we have now either a normal value or an uploadef file +// if (filename == null) { +// args.put(new String(name, "UTF-8"), new String(line, "UTF-8")); +// } else { +// // we store the file in a hashtable. +// // we use the same key to address the file in the hashtable as we +// // use to address the filename in the properties, but without leading '&' +// args.put(new String(name, "UTF-8"), new String(filename, "UTF-8")); +// files.put(new String(name, "UTF-8"), line); +// } +// argc++; +// // finally, read the next boundary line +// line = readLine(p, buffer); +// pos = nextPos; +// } +// header.put("ARGC", Integer.toString(argc)); // store argument count +// return files; +// } /* ------------1090358578442 @@ -1008,7 +1081,71 @@ public final class httpd implements serverHandler, Cloneable { */ - static int nextPos = -1; + /** + * wraps the request into a org.apache.commons.fileupload.RequestContext + * + * @author danielr + * @since 07.08.2008 + */ + private static class yacyContextRequest implements RequestContext { + private final httpHeader header; + private final InputStream inStream; + + /** + * creates a new yacyContextRequest + * + * @param header + * @param in + */ + public yacyContextRequest(httpHeader header, InputStream in) { + this.header = header; + this.inStream = in; + } + + /* + * (non-Javadoc) + * + * @see + * org.apache.commons.fileupload.RequestContext#getCharacterEncoding() + */ + @Override + public String getCharacterEncoding() { + return header.getCharacterEncoding(); + } + + /* + * (non-Javadoc) + * + * @see org.apache.commons.fileupload.RequestContext#getContentLength() + */ + @Override + public int getContentLength() { + return (int) header.contentLength(); + } + + /* + * (non-Javadoc) + * + * @see org.apache.commons.fileupload.RequestContext#getContentType() + */ + @Override + public String getContentType() { + return header.get(httpHeader.CONTENT_TYPE); + } + + /* + * (non-Javadoc) + * + * @see org.apache.commons.fileupload.RequestContext#getInputStream() + */ + @Override + public InputStream getInputStream() throws IOException { + return inStream; + } + + } + + static int nextPos = -1; private static byte[] readLine(final int start, final byte[] array) { // read a string from an array; line ending is always CRLF // but we are also fuzzy with that: may also be only CR or LF