From fbcdb13d251bdbb2ef1f95badee26b8b4b170be2 Mon Sep 17 00:00:00 2001 From: Victor Nike Date: Fri, 16 Oct 2015 11:03:47 +0300 Subject: Fix: Issue #243 : NanoHttpd throws an exception if temp directory doesn't exist #243 --- core/src/main/java/fi/iki/elonen/NanoHTTPD.java | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'core/src/main/java') diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index b63f467..603b95b 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -33,6 +33,15 @@ package fi.iki.elonen; * #L% */ +import fi.iki.elonen.NanoHTTPD.Response.IStatus; +import fi.iki.elonen.NanoHTTPD.Response.Status; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLServerSocket; +import javax.net.ssl.SSLServerSocketFactory; +import javax.net.ssl.TrustManagerFactory; + import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -84,16 +93,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPOutputStream; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLServerSocket; -import javax.net.ssl.SSLServerSocketFactory; -import javax.net.ssl.TrustManagerFactory; - -import fi.iki.elonen.NanoHTTPD.Response.IStatus; -import fi.iki.elonen.NanoHTTPD.Response.Status; - /** * A simple, tiny, nicely embeddable HTTP server in Java *

@@ -430,6 +429,10 @@ public abstract class NanoHTTPD { public DefaultTempFileManager() { this.tmpdir = System.getProperty("java.io.tmpdir"); + File dir = new File(tmpdir); + if (!dir.exists()) { + dir.mkdirs(); + } this.tempFiles = new ArrayList(); } -- cgit v1.2.3 From 39935521d2b5d8b09cf2261240b7e5f1bd51b026 Mon Sep 17 00:00:00 2001 From: Victor Nike Date: Fri, 16 Oct 2015 13:12:37 +0300 Subject: Fix: strange compilation error --- core/src/main/java/fi/iki/elonen/NanoHTTPD.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/src/main/java') diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index 603b95b..b15c1a9 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -1104,7 +1104,7 @@ public abstract class NanoHTTPD { /** * HTTP response. Return one of these from serve(). */ - public static class Response implements Closeable { + public static class Response implements java.io.Closeable { public interface IStatus { -- cgit v1.2.3 From cd2779c430690b6ca793d1fafdff0edb0497a686 Mon Sep 17 00:00:00 2001 From: ritchie Date: Fri, 16 Oct 2015 16:09:16 +0200 Subject: little imp correction and more test coverage #243 --- core/src/main/java/fi/iki/elonen/NanoHTTPD.java | 34 ++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'core/src/main/java') diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index b15c1a9..20fbc79 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -33,15 +33,6 @@ package fi.iki.elonen; * #L% */ -import fi.iki.elonen.NanoHTTPD.Response.IStatus; -import fi.iki.elonen.NanoHTTPD.Response.Status; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLServerSocket; -import javax.net.ssl.SSLServerSocketFactory; -import javax.net.ssl.TrustManagerFactory; - import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -93,6 +84,16 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPOutputStream; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLServerSocket; +import javax.net.ssl.SSLServerSocketFactory; +import javax.net.ssl.TrustManagerFactory; + +import fi.iki.elonen.NanoHTTPD.Response.IStatus; +import fi.iki.elonen.NanoHTTPD.Response.Status; + /** * A simple, tiny, nicely embeddable HTTP server in Java *

@@ -387,8 +388,8 @@ public abstract class NanoHTTPD { private final OutputStream fstream; - public DefaultTempFile(String tempdir) throws IOException { - this.file = File.createTempFile("NanoHTTPD-", "", new File(tempdir)); + public DefaultTempFile(File tempdir) throws IOException { + this.file = File.createTempFile("NanoHTTPD-", "", tempdir); this.fstream = new FileOutputStream(this.file); } @@ -423,15 +424,14 @@ public abstract class NanoHTTPD { */ public static class DefaultTempFileManager implements TempFileManager { - private final String tmpdir; + private final File tmpdir; private final List tempFiles; public DefaultTempFileManager() { - this.tmpdir = System.getProperty("java.io.tmpdir"); - File dir = new File(tmpdir); - if (!dir.exists()) { - dir.mkdirs(); + this.tmpdir = new File(System.getProperty("java.io.tmpdir")); + if (!tmpdir.exists()) { + tmpdir.mkdirs(); } this.tempFiles = new ArrayList(); } @@ -1104,7 +1104,7 @@ public abstract class NanoHTTPD { /** * HTTP response. Return one of these from serve(). */ - public static class Response implements java.io.Closeable { + public static class Response implements Closeable { public interface IStatus { -- cgit v1.2.3 From a86bc4b8d23f1d481ea7781f86b88eeb2e3e2546 Mon Sep 17 00:00:00 2001 From: ritchie Date: Sun, 18 Oct 2015 10:06:17 +0200 Subject: encoded multipart requests #240 --- core/src/main/java/fi/iki/elonen/NanoHTTPD.java | 30 +++++++++++++++---------- 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'core/src/main/java') diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index 20fbc79..847aee2 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -467,6 +467,14 @@ public abstract class NanoHTTPD { } } + private static final String CHARSET_REGEX = "[ |\t]*(charset)[ |\t]*=[ |\t]*['|\"]?([^\"^'^;]*)['|\"]?"; + + private static final Pattern CHARSET_PATTERN = Pattern.compile(CHARSET_REGEX, Pattern.CASE_INSENSITIVE); + + private static final String BOUNDARY_REGEX = "[ |\t]*(boundary)[ |\t]*=[ |\t]*['|\"]?([^\"^'^;]*)['|\"]?"; + + private static final Pattern BOUNDARY_PATTERN = Pattern.compile(BOUNDARY_REGEX, Pattern.CASE_INSENSITIVE); + private static final String CONTENT_DISPOSITION_REGEX = "([ |\t]*Content-Disposition[ |\t]*:)(.*)"; private static final Pattern CONTENT_DISPOSITION_PATTERN = Pattern.compile(CONTENT_DISPOSITION_REGEX, Pattern.CASE_INSENSITIVE); @@ -588,7 +596,7 @@ public abstract class NanoHTTPD { /** * Decodes the Multipart Body data and put it into Key/Value pairs. */ - private void decodeMultipartFormData(String boundary, ByteBuffer fbuf, Map parms, Map files) throws ResponseException { + private void decodeMultipartFormData(String boundary, String encoding, ByteBuffer fbuf, Map parms, Map files) throws ResponseException { try { int[] boundary_idxs = getBoundaryPositions(fbuf, boundary.getBytes()); if (boundary_idxs.length < 2) { @@ -602,7 +610,7 @@ public abstract class NanoHTTPD { int len = (fbuf.remaining() < MAX_HEADER_SIZE) ? fbuf.remaining() : MAX_HEADER_SIZE; fbuf.get(part_header_buff, 0, len); ByteArrayInputStream bais = new ByteArrayInputStream(part_header_buff, 0, len); - BufferedReader in = new BufferedReader(new InputStreamReader(bais, Charset.forName("US-ASCII"))); + BufferedReader in = new BufferedReader(new InputStreamReader(bais, Charset.forName(encoding))); // First line is boundary string String mpline = in.readLine(); @@ -647,7 +655,7 @@ public abstract class NanoHTTPD { // Read the part into a string byte[] data_bytes = new byte[part_data_end - part_data_start]; fbuf.get(data_bytes); - parms.put(part_name, new String(data_bytes)); + parms.put(part_name, new String(data_bytes, encoding)); } else { // Read it into a file String path = saveTmpFile(fbuf, part_data_start, part_data_end - part_data_start, file_name); @@ -985,15 +993,8 @@ public abstract class NanoHTTPD { throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Content type is multipart/form-data but boundary missing. Usage: GET /example/file.html"); } - - String boundaryStartString = "boundary="; - int boundaryContentStart = contentTypeHeader.indexOf(boundaryStartString) + boundaryStartString.length(); - String boundary = contentTypeHeader.substring(boundaryContentStart, contentTypeHeader.length()); - if (boundary.startsWith("\"") && boundary.endsWith("\"")) { - boundary = boundary.substring(1, boundary.length() - 1); - } - - decodeMultipartFormData(boundary, fbuf, this.parms, files); + decodeMultipartFormData(getAttributeFromContentHeader(contentTypeHeader, BOUNDARY_PATTERN, null), // + getAttributeFromContentHeader(contentTypeHeader, CHARSET_PATTERN, "US-ASCII"), fbuf, this.parms, files); } else { byte[] postBytes = new byte[fbuf.remaining()]; fbuf.get(postBytes); @@ -1016,6 +1017,11 @@ public abstract class NanoHTTPD { } } + private String getAttributeFromContentHeader(String contentTypeHeader, Pattern pattern, String defaultValue) { + Matcher matcher = pattern.matcher(contentTypeHeader); + return matcher.find() ? matcher.group(2) : defaultValue; + } + /** * Retrieves the content of a sent file and saves it to a temporary * file. The full path to the saved file is returned. -- cgit v1.2.3