diff --git a/org/w3c/css/servlet/CssValidator.java b/org/w3c/css/servlet/CssValidator.java index c79e3b125..6b42c03cb 100644 --- a/org/w3c/css/servlet/CssValidator.java +++ b/org/w3c/css/servlet/CssValidator.java @@ -22,7 +22,6 @@ import org.w3c.css.parser.CssError; import org.w3c.css.parser.Errors; import org.w3c.css.util.ApplContext; -import org.w3c.css.util.Codecs; import org.w3c.css.util.CssVersion; import org.w3c.css.util.FakeFile; import org.w3c.css.util.HTTPURL; @@ -35,10 +34,12 @@ import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.ServletInputStream; +import javax.servlet.annotation.MultipartConfig; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -47,6 +48,7 @@ import java.net.ProtocolException; import java.net.URL; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** * This class is a servlet to use the validator. @@ -54,6 +56,7 @@ * @version $Revision$ */ @SuppressWarnings("serial") +@MultipartConfig public final class CssValidator extends HttpServlet { final static String texthtml = "text/html"; @@ -529,13 +532,6 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) String vendorExtensionAsWarnings = null; String inputType = "none"; - ServletInputStream in = req.getInputStream(); - - byte[] buf = new byte[2048]; - byte[] general = new byte[65536]; - int count = 0; - int len; - if (req.getParameter("debug") != null) { Util.onDebug = req.getParameter("debug").equals("true"); if (Util.onDebug) { @@ -555,71 +551,62 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) } try { - while ((len = in.readLine(buf, 0, buf.length)) != -1) { - if (len >= 2 && buf[len - 1] == '\n' && buf[len - 2] == '\r') { - len -= 1; - buf[len - 1] = (byte) '\n'; - } - if (len != 0 && buf[len - 1] == '\r') { - buf[len - 1] = (byte) '\n'; - } + if (req.getPart(opt_file) != null) { + file = new FakeFile(req.getPart(opt_file).getSubmittedFileName()); + file.setContentType(req.getPart(opt_file).getContentType()); - if (general.length < (count + len)) { - byte[] old = general; - general = new byte[old.length * 2]; - System.arraycopy(old, 0, general, 0, old.length); - } - System.arraycopy(buf, 0, general, count, len); - count += len; - } - } finally { - in.close(); - } + InputStream is2 = req.getPart(opt_file).getInputStream(); + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - try { - buf = new byte[count]; - System.arraycopy(general, 0, buf, 0, count); - for (Pair pair : Codecs.mpFormDataDecode(buf, req.getContentType())) { - switch (pair.getKey()) { - case opt_file: - file = (FakeFile) pair.getValue(); - break; - case opt_text: - text = (String) pair.getValue(); - break; - case opt_textcharset: - textcharset = (Charset) pair.getValue(); - break; - case opt_lang: - lang = (String) pair.getValue(); - break; - case opt_output: - output = (String) pair.getValue(); - break; - case opt_warning: - warning = (String) pair.getValue(); - break; - case opt_error: - error = (String) pair.getValue(); - break; - case opt_profile: - profile = (String) pair.getValue(); - break; - case opt_usermedium: - usermedium = (String) pair.getValue(); - break; - case opt_vextwarning: - vendorExtensionAsWarnings = (String) pair.getValue(); - break; - case opt_type: - inputType = (String) pair.getValue(); - break; - default: - // log extra parameters? + int nRead; + byte[] data = new byte[16384]; + + while ((nRead = is2.read(data, 0, data.length)) != -1) { + buffer.write(data, 0, nRead); } + + file.write(buffer.toByteArray(), 0, buffer.size()); } - } catch (Exception e) { - System.out.println("Oups! Error in Util/Codecs.java?!?"); + + textcharset = req.getCharacterEncoding() != null ? Charset.forName(req.getCharacterEncoding()) : StandardCharsets.UTF_8; + text = req.getPart(opt_text) != null ? new String( + req.getPart(opt_text).getInputStream().readAllBytes(), + textcharset + ) : text; + lang = req.getPart(opt_lang) != null ? new String( + req.getPart(opt_lang).getInputStream().readAllBytes(), + textcharset + ) : lang; + output = req.getPart(opt_output) != null ? new String( + req.getPart(opt_output).getInputStream().readAllBytes(), + textcharset + ) : output; + warning = req.getPart(opt_warning) != null ? new String( + req.getPart(opt_warning).getInputStream().readAllBytes(), + textcharset + ) : warning; + error = req.getPart(opt_error) != null ? new String( + req.getPart(opt_error).getInputStream().readAllBytes(), + textcharset + ) : error; + profile = req.getPart(opt_profile) != null ? new String( + req.getPart(opt_profile).getInputStream().readAllBytes(), + textcharset + ) : profile; + usermedium = req.getPart(opt_usermedium) != null ? new String( + req.getPart(opt_usermedium).getInputStream().readAllBytes(), + textcharset + ) : usermedium; + vendorExtensionAsWarnings = req.getPart(opt_vextwarning) != null ? new String( + req.getPart(opt_vextwarning).getInputStream().readAllBytes(), + textcharset + ) : vendorExtensionAsWarnings; + inputType = req.getPart(opt_type) != null ? new String( + req.getPart(opt_type).getInputStream().readAllBytes(), + textcharset + ) : inputType; + } catch (IOException e) { + System.out.println("Error getting form data"); e.printStackTrace(); } diff --git a/org/w3c/css/util/Codecs.java b/org/w3c/css/util/Codecs.java deleted file mode 100644 index 5da1bb42c..000000000 --- a/org/w3c/css/util/Codecs.java +++ /dev/null @@ -1,451 +0,0 @@ -// -// $Id$ -// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr) -// -// (c) COPYRIGHT MIT and INRIA, 1997. -// Please first read the full copyright statement in file COPYRIGHT.html -/* - * Be Careful this version is not the original version. - * I modified some sources. Philippe Le Hegaret - * - * @(#)Codecs.java 0.2-2 23/03/1997 - * - * This file is part of the HTTPClient package - * Copyright (C) 1996,1997 Ronald Tschalaer - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA - * - * For questions, suggestions, bug-reports, enhancement-requests etc. - * I may be contacted at: - * - * ronald@innovation.ch - * Ronald.Tschalaer@psi.ch - * - */ - -package org.w3c.css.util; - -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; -import java.nio.charset.CharsetDecoder; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; - -/** - * This class collects various encoders and decoders. - * - * @author Ronald Tschalär - * @version 0.2 (bug fix 2) 23/03/1997 - */ - -public class Codecs { - - /** - * I have problems with multipart/form-data so I integrated auto-debug here - */ - private static boolean debugMode = false; - - // Constructors - - /** - * This class isn't meant to be instantiated. - */ - private Codecs() { - } - - - // Methods - - /** - * This method decodes a multipart/form-data encoded string. The boundary - * is parsed from the cont_type parameter, which must be of the - * form 'multipart/form-data; boundary=...'. - *
Any encoded files are created in the directory specified by - * dir using the encoded filename. - *
Note: Does not handle nested encodings (yet). - *
Example: - * 
-     * NVPair[] opts = Codecs.mpFormDataDecode(resp.getData(),
-     * resp.getHeader("Content-length"),
-     * ".");
-     *
- * Assuming the data received looked something like: - * 
-     * -----------------------------114975832116442893661388290519
-     * Content-Disposition: form-data; name="option"
-     *  
-     * doit
-     * -----------------------------114975832116442893661388290519
-     * Content-Disposition: form-data; name="comment"; filename="comment.txt"
-     *  
-     * Gnus and Gnats are not Gnomes.
-     * -----------------------------114975832116442893661388290519--
-     *
- * you would get one file called comment.txt in the current - * directory, and opts would contain two elements: {"option", "doit"} - * and {"comment", "comment.txt"} - * - * @param data the form-data to decode. - * @param cont_type the content type header (must contain the - * boundary string). - * @return an array of name/value pairs, one for each part; - * the name is the 'name' attribute given in the - * Content-Disposition header; the value is either - * the name of the file if a filename attribute was - * found, or the contents of the part. - * @throws IOException If any file operation fails. - */ - public final static synchronized ArrayList> mpFormDataDecode(byte[] data, - String cont_type) - throws IOException { - - ArrayList> pList = new ArrayList<>(); - - // Find and extract boundary string - String bndstr = getParameter("boundary", cont_type); - if (bndstr == null) { - throw new IOException("\'boundary\' parameter " + - "not found in Content-type: " + cont_type); - } - - byte[] srtbndry = new byte[bndstr.length() + 4], - boundary = new byte[bndstr.length() + 6], - endbndry = new byte[bndstr.length() + 6]; - - srtbndry = ("--" + bndstr + "\n").getBytes(StandardCharsets.ISO_8859_1); - boundary = ("\n--" + bndstr + "\n").getBytes(StandardCharsets.ISO_8859_1); - endbndry = ("\n--" + bndstr + "--").getBytes(StandardCharsets.ISO_8859_1); - - if (debugMode) { - System.err.println("[START OF DATA]"); - printData(data); - System.err.println("[END OF DATA]"); - System.err.print("boundary : "); - printData(srtbndry); - System.err.println(); - printData(boundary); - System.err.println(); - printData(endbndry); - System.err.println(); - } - - - // slurp - - // setup search routines - - int[] bs = Util.compile_search(srtbndry); - int[] bc = Util.compile_search(boundary); - int[] be = Util.compile_search(endbndry); - - - // let's start parsing the actual data - - int start = Util.findStr(srtbndry, bs, data, 0, data.length); - if (start == -1) { // didn't even find the start - if (!debugMode) { - debugMode = true; - mpFormDataDecode(data, cont_type); - return null; - } else { - debugMode = false; - throw new IOException("Starting boundary not found: " + - new String(srtbndry)); - } - } - - start += srtbndry.length; - - boolean done = false; - int idx; - - for (idx = 0; !done; idx++) { - // find end of this part - - int end = Util.findStr(boundary, bc, data, start, data.length); - if (end == -1) { // must be the last part - end = Util.findStr(endbndry, be, data, start, data.length); - if (end == -1) { - /* if (!debugMode) { - debugMode = true; - mpFormDataDecode(data, cont_type); - return null; - } else { - debugMode = false; - System.err.println( "[Ending boundary not found in]" ); - printData(data, start); - System.err.println( "[END DATA BOUNDARY SEARCH]"); - throw new IOException("Ending boundary not found: " + - new String(endbndry)); - */ - end = data.length - 1; - while (end >= 0 && (data[end] == '\n' || data[end] == ' ')) { - end--; - } - end++; - /* } */ - } - done = true; - } - - // parse header(s) - - String hdr, lchdr, name = null, filename = null, cont_disp = null, mimeType = null; - Object value; - - while (true) { - int next = findEOL(data, start) + 1; - - if (next - 1 <= start) break; // empty line -> end of headers - hdr = new String(data, start, next - 1 - start); - - if (debugMode) { - System.err.println(" start = " + start + - " end = " + next); - } - - // handle line continuation - byte ch; - while (next < data.length - 1 && - ((ch = data[next]) == ' ' || ch == '\t')) { - next = findEOL(data, start) + 1; - String result = new String(data, start, next - 1 - start); - hdr += result; - start = next; - } - start = next; - - if (debugMode) { - System.err.println("hdr=" + hdr); - System.err.println("(New) start = " + start + - " end = " + next); - } - - lchdr = hdr.toLowerCase(); - - if (lchdr.startsWith("content-type")) { - mimeType = lchdr.substring("content-type: ".length()); - continue; - } else if (!lchdr.startsWith("content-disposition")) continue; - - int off = lchdr.indexOf("form-data", 20); - - if (off == -1) { - if (!debugMode) { - debugMode = true; - mpFormDataDecode(data, cont_type); - return null; - } else { - debugMode = false; - throw new IOException("Expected \'Content-Disposition: form-data\' in line: " + hdr); - } - } - - name = getParameter("name", hdr); - - if (debugMode) { - System.err.println("[ADD name is " + name + ']'); - } - - if (name == null) { - if (!debugMode) { - debugMode = true; - mpFormDataDecode(data, cont_type); - return null; - } else { - debugMode = false; - throw new IOException("\'name\' parameter not found in header: " + hdr); - } - } - - filename = getParameter("filename", hdr); - if (debugMode) { - System.err.println("[ADD filename is " + filename + ']'); - } - cont_disp = hdr; - } - - start += 1; - - if (debugMode) { - System.err.println("(End) start = " + start + - " end = " + end); - } - - if (start > end) { - if (!debugMode) { - debugMode = true; - mpFormDataDecode(data, cont_type); - return null; - } else { - debugMode = false; - throw new IOException("End of header not found at offset " + end); - } - } - - if (cont_disp == null) { - if (!debugMode) { - debugMode = true; - mpFormDataDecode(data, cont_type); - return null; - } else { - debugMode = false; - throw new IOException("Missing \'Content-Disposition\' header at offset " + start); - } - } - - // handle data for this part - - if (filename != null) { // It's a file - FakeFile file = new FakeFile(filename); - - file.write(data, start, end - start); - file.setContentType(mimeType); - - value = file; - } else { // It's simple data - if (name.equals("text")) { - try { - CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder(); - decoder.decode(ByteBuffer.wrap(data, start, end - start)); - value = new String(data, start, end - start, StandardCharsets.UTF_8); - pList.add(new ImmutablePair<>("textcharset", StandardCharsets.UTF_8)); - } catch (CharacterCodingException ignoredEx) { - value = new String(data, start, end - start, StandardCharsets.ISO_8859_1); - pList.add(new ImmutablePair<>("textcharset", StandardCharsets.ISO_8859_1)); - } - } else { - value = new String(data, start, end - start, StandardCharsets.ISO_8859_1); - } - // value = new String(data, start, end - start); - } - // reserved name for fake text charset - if (!name.equals("textcharset")) { - pList.add(new ImmutablePair<>(name, value)); - } - if (debugMode) { - System.err.println("[ADD " + name + ',' + value + ',' - + value.getClass() + ']'); - } - start = end + boundary.length; - } - return pList; - } - - - /** - * retrieves the value associated with the parameter param in - * a given header string. This is used especially in headers like - * 'Content-type' and 'Content-Disposition'. Here is the syntax it - * expects:
- * ";" param "=" ( token | quoted-string ) - * - * @param param the parameter name - * @param hdr the header value - * @return the value for this parameter, or null if not found. - */ - public final static String getParameter(String param, String hdr) { - int pbeg, // parameter name begin - pend, // parameter name end - vbeg, // parameter value begin - vend = -1, // parameter value end - len = hdr.length(); - - param = param.trim(); - - while (true) { - // mark parameter name - if (debugMode) { - System.err.println("[DEBUG] looks for " + param + " in "); - System.err.println("[" + hdr.substring(vend + 1) + ']'); - } - if (vend == -1) { - pbeg = hdr.indexOf(';', vend + 1); // get ';' - if (pbeg == -1) return null; - } else { - pbeg = vend + 1; - } - while (pbeg < len - 1 - && (Character.isWhitespace(hdr.charAt(pbeg)) || (hdr.charAt(pbeg) == ';'))) { - pbeg++; - } - if (pbeg == len - 1) return null; - pend = hdr.indexOf('=', pbeg + 1); // get '=' - if (pend == -1) return null; - vbeg = pend + 1; - while (Character.isWhitespace(hdr.charAt(--pend))) ; - pend++; - - if (debugMode) { - System.err.println("[DEBUG] p is [" + hdr.substring(pbeg, pend) + "]"); - } - // mark parameter value - - while (vbeg < len && Character.isWhitespace(hdr.charAt(vbeg))) vbeg++; - if (vbeg == len) return null; - - vend = vbeg; - if (hdr.charAt(vbeg) == '\"') { // is a quoted-string - vbeg++; - vend = hdr.indexOf('\"', vbeg); - if (vend == -1) return null; - } else { // is a simple token - vend = hdr.indexOf(';', vbeg); - if (vend == -1) vend = hdr.length(); - while (Character.isWhitespace(hdr.charAt(--vend))) ; - vend++; - } - if (hdr.regionMatches(true, pbeg, param, 0, pend - pbeg)) { - break; // found it - } - } - return hdr.substring(vbeg, vend); - } - - - private static void printData(byte[] data) { - printData(data, 0); - } - - private static void printData(byte[] data, int offset) { - for (int i = offset; i < data.length; i++) { - if (data[i] == '\n' || data[i] == '\r') { - System.err.print("&" + ((int) data[i])); - System.err.println(); - } else { - System.err.print((char) data[i]); - } - } - } - - /** - * Searches for the next LF in an array. - * - * @param arr the byte array to search. - * @param off the offset at which to start the search. - * @return the position of the CR or (arr.length-2) if not found - */ - private final static int findEOL(byte[] arr, int off) { - while (off < arr.length - 1 && - !(arr[off++] == '\n')) ; - return off - 1; - } -} - diff --git a/org/w3c/css/util/Makefile b/org/w3c/css/util/Makefile index 54633f502..aead84eaa 100644 --- a/org/w3c/css/util/Makefile +++ b/org/w3c/css/util/Makefile @@ -1,5 +1,5 @@ SRCS = Messages.java Warning.java\ -Codecs.java NVPair.java Warnings.java\ +NVPair.java Warnings.java\ InvalidParamException.java Util.java\ FakeFile.java Date.java SortedHashtable.java @@ -30,8 +30,6 @@ Warning.class:: Warning.java\ /u/www43/0/w3c/plehegar/Work/Java/org.w3c.css.parser/CssSelectors.class\ /u/www43/0/w3c/plehegar/Work/Java/org.w3c.css.properties/CssProperty.class Util.class:: Util.java -Codecs.class:: Codecs.java\ - /usr/local/java11/lib/classes.zip SortedHashtable.class:: SortedHashtable.java\ /usr/local/java11/lib/classes.zip FakeFile.class:: FakeFile.java\ diff --git a/web.xml b/web.xml index c4064e670..01d9ee0cc 100644 --- a/web.xml +++ b/web.xml @@ -12,6 +12,7 @@ vendorExtensionsAsWarnings true +