import com.google.zxing.ReaderException;
import com.google.zxing.Result;
import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
-import com.google.zxing.client.result.ParsedResult;
-import com.google.zxing.client.result.ResultParser;
import com.google.zxing.common.GlobalHistogramBinarizer;
import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.multi.GenericMultipleBarcodeReader;
+import com.google.zxing.multi.MultipleBarcodeReader;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.lang.StringEscapeUtils;
import org.apache.http.Header;
import org.apache.http.HttpMessage;
import org.apache.http.HttpResponse;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
+import java.awt.color.CMMException;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.net.SocketException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Hashtable;
import java.util.List;
*/
public final class DecodeServlet extends HttpServlet {
+ // No real reason to let people upload more than a 2MB image
private static final long MAX_IMAGE_SIZE = 2000000L;
+ // No real reason to deal with more than maybe 2 megapixels
+ private static final int MAX_PIXELS = 1 << 21;
private static final Logger log = Logger.getLogger(DecodeServlet.class.getName());
static {
HINTS = new Hashtable<DecodeHintType, Object>(5);
HINTS.put(DecodeHintType.TRY_HARDER, Boolean.TRUE);
- Collection<BarcodeFormat> possibleFormats = new Vector<BarcodeFormat>();
+ Collection<BarcodeFormat> possibleFormats = new Vector<BarcodeFormat>(17);
possibleFormats.add(BarcodeFormat.UPC_A);
possibleFormats.add(BarcodeFormat.UPC_E);
possibleFormats.add(BarcodeFormat.EAN_8);
possibleFormats.add(BarcodeFormat.EAN_13);
possibleFormats.add(BarcodeFormat.CODE_39);
+ possibleFormats.add(BarcodeFormat.CODE_93);
possibleFormats.add(BarcodeFormat.CODE_128);
+ //possibleFormats.add(BarcodeFormat.CODABAR);
possibleFormats.add(BarcodeFormat.ITF);
possibleFormats.add(BarcodeFormat.RSS14);
possibleFormats.add(BarcodeFormat.QR_CODE);
throws ServletException, IOException {
String imageURIString = request.getParameter("u");
if (imageURIString == null || imageURIString.length() == 0) {
+ log.fine("URI was empty");
response.sendRedirect("badurl.jspx");
return;
}
+ imageURIString = imageURIString.trim();
+
if (!(imageURIString.startsWith("http://") || imageURIString.startsWith("https://"))) {
imageURIString = "http://" + imageURIString;
}
try {
imageURI = new URI(imageURIString);
} catch (URISyntaxException urise) {
+ log.fine("URI was not valid: " + imageURIString);
response.sendRedirect("badurl.jspx");
return;
}
getResponse = client.execute(getRequest);
} catch (IllegalArgumentException iae) {
// Thrown if hostname is bad or null
+ log.fine(iae.toString());
getRequest.abort();
response.sendRedirect("badurl.jspx");
return;
- } catch (SocketException se) {
- // Thrown if hostname is bad or null
- getRequest.abort();
- response.sendRedirect("badurl.jspx");
- return;
- } catch (UnknownHostException uhe) {
+ } catch (IOException ioe) {
+ // Encompasses lots of stuff, including
+ // java.net.SocketException, java.net.UnknownHostException,
+ // javax.net.ssl.SSLPeerUnverifiedException,
+ // org.apache.http.NoHttpResponseException,
+ // org.apache.http.client.ClientProtocolException,
+ log.fine(ioe.toString());
getRequest.abort();
response.sendRedirect("badurl.jspx");
return;
}
if (getResponse.getStatusLine().getStatusCode() != HttpServletResponse.SC_OK) {
+ log.fine("Unsuccessful return code: " + getResponse.getStatusLine().getStatusCode());
response.sendRedirect("badurl.jspx");
return;
}
if (!isSizeOK(getResponse)) {
+ log.fine("Too large");
response.sendRedirect("badimage.jspx");
return;
}
throws ServletException, IOException {
if (!ServletFileUpload.isMultipartContent(request)) {
+ log.fine("File upload was not multipart");
response.sendRedirect("badimage.jspx");
return;
}
is.close();
}
} else {
+ log.fine("Too large");
response.sendRedirect("badimage.jspx");
}
break;
}
}
} catch (FileUploadException fue) {
+ log.fine(fue.toString());
response.sendRedirect("badimage.jspx");
}
private static void processStream(InputStream is, ServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
- BufferedImage image = ImageIO.read(is);
+ BufferedImage image;
+ try {
+ image = ImageIO.read(is);
+ } catch (IOException ioe) {
+ log.fine(ioe.toString());
+ // Includes javax.imageio.IIOException
+ response.sendRedirect("badimage.jspx");
+ return;
+ } catch (CMMException cmme) {
+ log.fine(cmme.toString());
+ // Have seen this in logs
+ response.sendRedirect("badimage.jspx");
+ return;
+ } catch (IllegalArgumentException iae) {
+ log.fine(iae.toString());
+ // Have seen this in logs for some JPEGs
+ response.sendRedirect("badimage.jspx");
+ return;
+ }
if (image == null) {
+ response.sendRedirect("badimage.jspx");
+ return;
+ }
+ if (image.getHeight() <= 1 || image.getWidth() <= 1 ||
+ image.getHeight() * image.getWidth() > MAX_PIXELS) {
+ log.fine("Dimensions too large: " + image.getWidth() + 'x' + image.getHeight());
response.sendRedirect("badimage.jspx");
return;
}
Reader reader = new MultiFormatReader();
LuminanceSource source = new BufferedImageLuminanceSource(image);
BinaryBitmap bitmap = new BinaryBitmap(new GlobalHistogramBinarizer(source));
- Result result = null;
+ Collection<Result> results = new ArrayList<Result>(1);
ReaderException savedException = null;
try {
- // Look for pure barcode
- result = reader.decode(bitmap, HINTS_PURE);
+ // Look for multiple barcodes
+ MultipleBarcodeReader multiReader = new GenericMultipleBarcodeReader(reader);
+ Result[] theResults = multiReader.decodeMultiple(bitmap, HINTS);
+ if (theResults != null) {
+ results.addAll(Arrays.asList(theResults));
+ }
} catch (ReaderException re) {
savedException = re;
}
- if (result == null) {
+ if (results.isEmpty()) {
+ try {
+ // Look for pure barcode
+ Result theResult = reader.decode(bitmap, HINTS_PURE);
+ if (theResult != null) {
+ results.add(theResult);
+ }
+ } catch (ReaderException re) {
+ savedException = re;
+ }
+ }
+
+ if (results.isEmpty()) {
try {
// Look for normal barcode in photo
- result = reader.decode(bitmap, HINTS);
+ Result theResult = reader.decode(bitmap, HINTS);
+ if (theResult != null) {
+ results.add(theResult);
+ }
} catch (ReaderException re) {
savedException = re;
}
}
- if (result == null) {
+ if (results.isEmpty()) {
try {
// Try again with other binarizer
BinaryBitmap hybridBitmap = new BinaryBitmap(new HybridBinarizer(source));
- result = reader.decode(hybridBitmap, HINTS);
+ Result theResult = reader.decode(hybridBitmap, HINTS);
+ if (theResult != null) {
+ results.add(theResult);
+ }
} catch (ReaderException re) {
savedException = re;
}
}
- if (result == null) {
+ if (results.isEmpty()) {
handleException(savedException, response);
return;
}
response.setCharacterEncoding("UTF8");
Writer out = new OutputStreamWriter(response.getOutputStream(), "UTF8");
try {
- out.write(result.getText());
+ for (Result result : results) {
+ out.write(result.getText());
+ out.write('\n');
+ }
} finally {
out.close();
}
} else {
- request.setAttribute("result", result);
- byte[] rawBytes = result.getRawBytes();
- if (rawBytes != null) {
- request.setAttribute("rawBytesString", arrayToString(rawBytes));
- } else {
- request.setAttribute("rawBytesString", "(Not applicable)");
- }
- String text = result.getText();
- if (text != null) {
- request.setAttribute("text", StringEscapeUtils.escapeXml(text));
- } else {
- request.setAttribute("text", "(Not applicable)");
- }
- ParsedResult parsedResult = ResultParser.parseResult(result);
- request.setAttribute("parsedResult", parsedResult);
- String displayResult = parsedResult.getDisplayResult();
- if (displayResult != null) {
- request.setAttribute("displayResult", StringEscapeUtils.escapeXml(displayResult));
- } else {
- request.setAttribute("displayResult", "(Not applicable)");
- }
+ request.setAttribute("results", results);
request.getRequestDispatcher("decoderesult.jspx").forward(request, response);
}
}
return true;
}
- private static String arrayToString(byte[] bytes) {
- int length = bytes.length;
- StringBuilder result = new StringBuilder(length << 2);
- int i = 0;
- while (i < length) {
- int max = Math.min(i + 8, length);
- for (int j = i; j < max; j++) {
- int value = bytes[j] & 0xFF;
- result.append(Integer.toHexString(value / 16));
- result.append(Integer.toHexString(value % 16));
- result.append(' ');
- }
- result.append('\n');
- i += 8;
- }
- for (int j = i - 8; j < length; j++) {
- result.append(Integer.toHexString(bytes[j] & 0xFF));
- result.append(' ');
- }
- return result.toString();
- }
-
@Override
public void destroy() {
log.config("DecodeServlet shutting down...");
projects / zxing.git / blobdiff