From a2597ae3e8f6bbfa4912fe6f4aa5e09ef77ba0f0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 19 Apr 2018 14:34:22 +0200 Subject: [PATCH] switch to official nanohttpd releases closes #248 --- app/build.gradle | 7 +- app/libs/binaryDeps/nanohttpd-2.1.0.jar | Bin 32271 -> 0 bytes .../org/fdroid/fdroid/net/LocalHTTPD.java | 27 +- extern/nanohttpd/LICENSE.md | 12 - extern/nanohttpd/core/build.gradle | 14 - .../main/java/fi/iki/elonen/NanoHTTPD.java | 1505 ----------------- 6 files changed, 13 insertions(+), 1552 deletions(-) delete mode 100644 app/libs/binaryDeps/nanohttpd-2.1.0.jar delete mode 100644 extern/nanohttpd/LICENSE.md delete mode 100644 extern/nanohttpd/core/build.gradle delete mode 100644 extern/nanohttpd/core/src/main/java/fi/iki/elonen/NanoHTTPD.java diff --git a/app/build.gradle b/app/build.gradle index 4e8cc3900..07a4e3fdf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,6 +35,7 @@ dependencies { compile 'commons-io:commons-io:2.5' compile 'commons-net:commons-net:3.5' compile 'org.jmdns:jmdns:3.5.3' + compile 'org.nanohttpd:nanohttpd:2.3.1' compile 'ch.acra:acra:4.9.1' compile 'io.reactivex:rxjava:1.1.0' compile 'io.reactivex:rxandroid:0.23.0' @@ -66,10 +67,6 @@ if (!hasProperty('sourceDeps')) { compile 'com.madgag.spongycastle:prov:1.54.0.0' compile 'com.madgag.spongycastle:core:1.54.0.0' - // Fork for F-Droid, including support for https. Not merged into upstream - // yet (seems to be a little unsupported as of late), so not using mavenCentral/jcenter. - compile files('libs/binaryDeps/nanohttpd-2.1.0.jar') - // Upstream doesn't have a binary on mavenCentral, and it is an SVN repo on // Google Code. We include this code directly in this repo, and have made // modifications that should be pushed to anyone who wants to maintain it. @@ -135,7 +132,6 @@ if (!hasProperty('sourceDeps')) { logger.info "Setting up *source* dependencies for F-Droid (because you passed in the -PsourceDeps argument to gradle while building)." dependencies { - compile project(':extern:nanohttpd:core') compile project(':extern:zipsigner') } @@ -145,7 +141,6 @@ if (!hasProperty('sourceDeps')) { description = "Copies .jar and .aar files from subproject dependencies in extern/ to app/libs. Requires the sourceDeps property to be set (\"gradle -PsourceDeps binaryDeps\")" from('../extern/') { - include 'nanohttpd/core/build/libs/nanohttpd-2.1.0.jar' include 'zipsigner/build/libs/zipsigner.jar' } diff --git a/app/libs/binaryDeps/nanohttpd-2.1.0.jar b/app/libs/binaryDeps/nanohttpd-2.1.0.jar deleted file mode 100644 index d19ba71b330cbc625ffadccd726705e03f4fb929..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32271 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�KvComsOlIfj&0jv%eetzv^e18AVr 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 diff --git a/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java index dead4e7ef..4ba03df04 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java +++ b/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java @@ -5,12 +5,13 @@ import android.content.Intent; import android.net.Uri; import android.util.Log; import android.webkit.MimeTypeMap; - +import fi.iki.elonen.NanoHTTPD; import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.localrepo.LocalRepoKeyStore; import org.fdroid.fdroid.views.swap.SwapWorkflowActivity; +import javax.net.ssl.SSLServerSocketFactory; import java.io.File; import java.io.FileInputStream; import java.io.FilenameFilter; @@ -26,10 +27,6 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import javax.net.ssl.SSLServerSocketFactory; - -import fi.iki.elonen.NanoHTTPD; - public class LocalHTTPD extends NanoHTTPD { private static final String TAG = "LocalHTTPD"; @@ -93,10 +90,10 @@ public class LocalHTTPD extends NanoHTTPD { session.parseBody(new HashMap()); } catch (IOException e) { Log.e(TAG, "An error occured while parsing the POST body", e); - return new Response(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, + return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, "Internal server error, check logcat on server for details."); } catch (ResponseException re) { - return new Response(re.getStatus(), MIME_PLAINTEXT, re.getMessage()); + return newFixedLengthResponse(re.getStatus(), MIME_PLAINTEXT, re.getMessage()); } return handlePost(session); @@ -111,13 +108,13 @@ public class LocalHTTPD extends NanoHTTPD { if (!session.getParms().containsKey("repo")) { Log.e(TAG, "Malformed /request-swap request to local repo HTTP server." + " Should have posted a 'repo' parameter."); - return new Response(Response.Status.BAD_REQUEST, MIME_PLAINTEXT, + return newFixedLengthResponse(Response.Status.BAD_REQUEST, MIME_PLAINTEXT, "Requires 'repo' parameter to be posted."); } requestSwap(session.getParms().get("repo")); - return new Response(Response.Status.OK, MIME_PLAINTEXT, "Swap request received."); + return newFixedLengthResponse(Response.Status.OK, MIME_PLAINTEXT, "Swap request received."); } - return new Response(""); + return newFixedLengthResponse(""); } private Response handleGet(IHTTPSession session) { @@ -155,7 +152,7 @@ public class LocalHTTPD extends NanoHTTPD { SSLServerSocketFactory factory = NanoHTTPD.makeSSLSocketFactory( localRepoKeyStore.getKeyStore(), localRepoKeyStore.getKeyManagers()); - makeSecure(factory); + makeSecure(factory, null); } catch (LocalRepoKeyStore.InitException | IOException e) { Log.e(TAG, "Could not enable HTTPS", e); } @@ -209,7 +206,7 @@ public class LocalHTTPD extends NanoHTTPD { } } - Response response = serveFile(headers, f, getMimeTypeForFile(uri)); + Response response = serveFile(headers, f, getAndroidMimeTypeForFile(uri)); return response != null ? response : createResponse(Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, "Error 404, file not found."); @@ -298,19 +295,19 @@ public class LocalHTTPD extends NanoHTTPD { // Announce that the file server accepts partial content requests private Response createResponse(Response.Status status, String mimeType, InputStream message) { - Response res = new Response(status, mimeType, message); + Response res = newChunkedResponse(status, mimeType, message); res.addHeader("Accept-Ranges", "bytes"); return res; } // Announce that the file server accepts partial content requests private Response createResponse(Response.Status status, String mimeType, String message) { - Response res = new Response(status, mimeType, message); + Response res = newFixedLengthResponse(status, mimeType, message); res.addHeader("Accept-Ranges", "bytes"); return res; } - private static String getMimeTypeForFile(String uri) { + private static String getAndroidMimeTypeForFile(String uri) { String type = null; String extension = MimeTypeMap.getFileExtensionFromUrl(uri); if (extension != null) { diff --git a/extern/nanohttpd/LICENSE.md b/extern/nanohttpd/LICENSE.md deleted file mode 100644 index 8dc4ca7c6..000000000 --- a/extern/nanohttpd/LICENSE.md +++ /dev/null @@ -1,12 +0,0 @@ -Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -* Neither the name of the NanoHttpd organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/extern/nanohttpd/core/build.gradle b/extern/nanohttpd/core/build.gradle deleted file mode 100644 index fa98bdbea..000000000 --- a/extern/nanohttpd/core/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: 'java' - -version = '2.1.0' - -sourceCompatibility = 1.7 -targetCompatibility = 1.7 - -jar { - baseName = 'nanohttpd' -} - -repositories { - mavenCentral() -} diff --git a/extern/nanohttpd/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/extern/nanohttpd/core/src/main/java/fi/iki/elonen/NanoHTTPD.java deleted file mode 100644 index d34763ddf..000000000 --- a/extern/nanohttpd/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ /dev/null @@ -1,1505 +0,0 @@ -package fi.iki.elonen; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.Closeable; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.RandomAccessFile; -import java.io.PushbackInputStream; -import java.io.UnsupportedEncodingException; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.SocketException; -import java.net.SocketTimeoutException; -import java.net.URLDecoder; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.TimeZone; - - -import java.security.KeyStore; -import javax.net.ssl.*; - -/** - * A simple, tiny, nicely embeddable HTTP server in Java - *

- *

- * NanoHTTPD - *

Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias

- *

- *

- * Features + limitations: - *

    - *

    - *

  • Only one Java file
    • - *
  • Java 5 compatible
    • - *
  • Released as open source, Modified BSD licence
    • - *
  • No fixed config files, logging, authorization etc. (Implement yourself if you need them.)
    • - *
  • Supports parameter parsing of GET and POST methods (+ rudimentary PUT support in 1.25)
    • - *
  • Supports both dynamic content and file serving
    • - *
  • Supports file upload (since version 1.2, 2010)
    • - *
  • Supports partial content (streaming)
    • - *
  • Supports ETags
    • - *
  • Never caches anything
    • - *
  • Doesn't limit bandwidth, request time or simultaneous connections
    • - *
  • Default code serves files and shows all HTTP parameters and headers
    • - *
  • File server supports directory listing, index.html and index.htm
    • - *
  • File server supports partial content (streaming)
    • - *
  • File server supports ETags
    • - *
  • File server does the 301 redirection trick for directories without '/'
    • - *
  • File server supports simple skipping for files (continue download)
    • - *
  • File server serves also very long files without memory overhead
    • - *
  • Contains a built-in list of most common mime types
    • - *
  • All header names are converted lowercase so they don't vary between browsers/clients
    • - *

    - *

- *

- *

- * How to use: - *

    - *

    - *

  • Subclass and implement serve() and embed to your own program
    • - *

    - *

- *

- * See the separate "LICENSE.md" file for the distribution license (Modified BSD licence) - */ -public abstract class NanoHTTPD { - /** - * Maximum time to wait on Socket.getInputStream().read() (in milliseconds) - * This is required as the Keep-Alive HTTP connections would otherwise - * block the socket reading thread forever (or as long the browser is open). - */ - public static final int SOCKET_READ_TIMEOUT = 5000; - /** - * Common mime type for dynamic content: plain text - */ - public static final String MIME_PLAINTEXT = "text/plain"; - /** - * Common mime type for dynamic content: html - */ - public static final String MIME_HTML = "text/html"; - /** - * Pseudo-Parameter to use to store the actual query string in the parameters map for later re-processing. - */ - private static final String QUERY_STRING_PARAMETER = "NanoHttpd.QUERY_STRING"; - private final String hostname; - private final int myPort; - private ServerSocket myServerSocket; - private Set openConnections = new HashSet(); - private SSLServerSocketFactory sslServerSocketFactory; - private Thread myThread; - /** - * Pluggable strategy for asynchronously executing requests. - */ - private AsyncRunner asyncRunner; - /** - * Pluggable strategy for creating and cleaning up temporary files. - */ - private TempFileManagerFactory tempFileManagerFactory; - - /** - * Constructs an HTTP server on given port. - */ - public NanoHTTPD(int port) { - this(null, port); - } - - /** - * Constructs an HTTP server on given hostname and port. - */ - public NanoHTTPD(String hostname, int port) { - this.hostname = hostname; - this.myPort = port; - setTempFileManagerFactory(new DefaultTempFileManagerFactory()); - setAsyncRunner(new DefaultAsyncRunner()); - } - - private static final void safeClose(Closeable closeable) { - if (closeable != null) { - try { - closeable.close(); - } catch (IOException e) { - } - } - } - - private static final void safeClose(Socket closeable) { - if (closeable != null) { - try { - closeable.close(); - } catch (IOException e) { - } - } - } - - private static final void safeClose(ServerSocket closeable) { - if (closeable != null) { - try { - closeable.close(); - } catch (IOException e) { - } - } - } - - /** - * Creates an SSLSocketFactory for HTTPS. - * - * Pass a KeyStore resource with your certificate and passphrase - */ - public static SSLServerSocketFactory makeSSLSocketFactory(String keyAndTrustStoreClasspathPath, char[] passphrase) throws IOException { - SSLServerSocketFactory res = null; - try { - KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType()); - InputStream keystoreStream = NanoHTTPD.class.getResourceAsStream(keyAndTrustStoreClasspathPath); - keystore.load(keystoreStream, passphrase); - TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - trustManagerFactory.init(keystore); - KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); - keyManagerFactory.init(keystore, passphrase); - SSLContext ctx = SSLContext.getInstance("TLS"); - ctx.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null); - res = ctx.getServerSocketFactory(); - } catch (Exception e) { - throw new IOException(e.getMessage()); - } - return res; - } - - /** - * Creates an SSLSocketFactory for HTTPS. - * - * Pass a loaded KeyStore and a loaded KeyManagerFactory. - * These objects must properly loaded/initialized by the caller. - */ - public static SSLServerSocketFactory makeSSLSocketFactory(KeyStore loadedKeyStore, KeyManagerFactory loadedKeyFactory) throws IOException { - SSLServerSocketFactory res = null; - try { - TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - trustManagerFactory.init(loadedKeyStore); - SSLContext ctx = SSLContext.getInstance("TLS"); - ctx.init(loadedKeyFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null); - res = ctx.getServerSocketFactory(); - } catch (Exception e) { - throw new IOException(e.getMessage()); - } - return res; - } - - /** - * Creates an SSLSocketFactory for HTTPS. - * - * Pass a loaded KeyStore and an array of loaded KeyManagers. - * These objects must properly loaded/initialized by the caller. - */ - public static SSLServerSocketFactory makeSSLSocketFactory(KeyStore loadedKeyStore, KeyManager[] keyManagers) throws IOException { - SSLServerSocketFactory res = null; - try { - TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - trustManagerFactory.init(loadedKeyStore); - SSLContext ctx = SSLContext.getInstance("TLS"); - ctx.init(keyManagers, trustManagerFactory.getTrustManagers(), null); - res = ctx.getServerSocketFactory(); - } catch (Exception e) { - throw new IOException(e.getMessage()); - } - return res; - } - - /** - * Call before start() to serve over HTTPS instead of HTTP - */ - public void makeSecure(SSLServerSocketFactory sslServerSocketFactory) { - this.sslServerSocketFactory = sslServerSocketFactory; - } - - /** - * Start the server. - * - * @throws IOException if the socket is in use. - */ - public void start() throws IOException { - if (sslServerSocketFactory != null) { - SSLServerSocket ss = (SSLServerSocket) sslServerSocketFactory.createServerSocket(); - ss.setNeedClientAuth(false); - myServerSocket = ss; - } else { - myServerSocket = new ServerSocket(); - } - - myServerSocket.bind((hostname != null) ? new InetSocketAddress(hostname, myPort) : new InetSocketAddress(myPort)); - - myThread = new Thread(new Runnable() { - @Override - public void run() { - do { - try { - final Socket finalAccept = myServerSocket.accept(); - registerConnection(finalAccept); - finalAccept.setSoTimeout(SOCKET_READ_TIMEOUT); - final InputStream inputStream = finalAccept.getInputStream(); - asyncRunner.exec(new Runnable() { - @Override - public void run() { - OutputStream outputStream = null; - try { - outputStream = finalAccept.getOutputStream(); - TempFileManager tempFileManager = tempFileManagerFactory.create(); - HTTPSession session = new HTTPSession(tempFileManager, inputStream, outputStream, finalAccept.getInetAddress()); - while (!finalAccept.isClosed()) { - session.execute(); - } - } catch (Exception e) { - // When the socket is closed by the client, we throw our own SocketException - // to break the "keep alive" loop above. If the exception was anything other - // than the expected SocketException OR a SocketTimeoutException, print the - // stacktrace - if (!(e instanceof SocketException && "NanoHttpd Shutdown".equals(e.getMessage())) && - !(e instanceof SocketTimeoutException)) { - e.printStackTrace(); - } - } finally { - safeClose(outputStream); - safeClose(inputStream); - safeClose(finalAccept); - unRegisterConnection(finalAccept); - } - } - }); - } catch (IOException e) { - } - } while (!myServerSocket.isClosed()); - } - }); - myThread.setDaemon(true); - myThread.setName("NanoHttpd Main Listener"); - myThread.start(); - } - - /** - * Stop the server. - */ - public void stop() { - try { - safeClose(myServerSocket); - closeAllConnections(); - myThread.join(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers that a new connection has been set up. - * - * @param socket - * the {@link Socket} for the connection. - */ - public synchronized void registerConnection(Socket socket) { - openConnections.add(socket); - } - - /** - * Registers that a connection has been closed - * - * @param socket - * the {@link Socket} for the connection. - */ - public synchronized void unRegisterConnection(Socket socket) { - openConnections.remove(socket); - } - - /** - * Forcibly closes all connections that are open. - */ - public synchronized void closeAllConnections() { - for (Socket socket : openConnections) { - safeClose(socket); - } - } - - public final int getListeningPort() { - return myServerSocket == null ? -1 : myServerSocket.getLocalPort(); - } - - public final boolean wasStarted() { - return myServerSocket != null && myThread != null; - } - - public final boolean isAlive() { - return wasStarted() && !myServerSocket.isClosed() && myThread.isAlive(); - } - - /** - * Override this to customize the server. - *

- *

- * (By default, this delegates to serveFile() and allows directory listing.) - * - * @param uri Percent-decoded URI without parameters, for example "/index.cgi" - * @param method "GET", "POST" etc. - * @param parms Parsed, percent decoded parameters from URI and, in case of POST, data. - * @param headers Header entries, percent decoded - * @return HTTP response, see class Response for details - */ - @Deprecated - public Response serve(String uri, Method method, Map headers, Map parms, - Map files) { - return new Response(Response.Status.NOT_FOUND, MIME_PLAINTEXT, "Not Found"); - } - - /** - * Override this to customize the server. - *

- *

- * (By default, this delegates to serveFile() and allows directory listing.) - * - * @param session The HTTP session - * @return HTTP response, see class Response for details - */ - public Response serve(IHTTPSession session) { - Map files = new HashMap(); - Method method = session.getMethod(); - if (Method.PUT.equals(method) || Method.POST.equals(method)) { - try { - session.parseBody(files); - } catch (IOException ioe) { - return new Response(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage()); - } catch (ResponseException re) { - return new Response(re.getStatus(), MIME_PLAINTEXT, re.getMessage()); - } - } - - Map parms = session.getParms(); - parms.put(QUERY_STRING_PARAMETER, session.getQueryParameterString()); - return serve(session.getUri(), method, session.getHeaders(), parms, files); - } - - /** - * Decode percent encoded String values. - * - * @param str the percent encoded String - * @return expanded form of the input, for example "foo%20bar" becomes "foo bar" - */ - protected String decodePercent(String str) { - String decoded = null; - try { - decoded = URLDecoder.decode(str, "UTF8"); - } catch (UnsupportedEncodingException ignored) { - } - return decoded; - } - - /** - * Decode parameters from a URL, handing the case where a single parameter name might have been - * supplied several times, by return lists of values. In general these lists will contain a single - * element. - * - * @param parms original NanoHttpd parameters values, as passed to the serve() method. - * @return a map of String (parameter name) to List<String> (a list of the values supplied). - */ - protected Map> decodeParameters(Map parms) { - return this.decodeParameters(parms.get(QUERY_STRING_PARAMETER)); - } - - /** - * Decode parameters from a URL, handing the case where a single parameter name might have been - * supplied several times, by return lists of values. In general these lists will contain a single - * element. - * - * @param queryString a query string pulled from the URL. - * @return a map of String (parameter name) to List<String> (a list of the values supplied). - */ - protected Map> decodeParameters(String queryString) { - Map> parms = new HashMap>(); - if (queryString != null) { - StringTokenizer st = new StringTokenizer(queryString, "&"); - while (st.hasMoreTokens()) { - String e = st.nextToken(); - int sep = e.indexOf('='); - String propertyName = (sep >= 0) ? decodePercent(e.substring(0, sep)).trim() : decodePercent(e).trim(); - if (!parms.containsKey(propertyName)) { - parms.put(propertyName, new ArrayList()); - } - String propertyValue = (sep >= 0) ? decodePercent(e.substring(sep + 1)) : null; - if (propertyValue != null) { - parms.get(propertyName).add(propertyValue); - } - } - } - return parms; - } - - // ------------------------------------------------------------------------------- // - // - // Threading Strategy. - // - // ------------------------------------------------------------------------------- // - - /** - * Pluggable strategy for asynchronously executing requests. - * - * @param asyncRunner new strategy for handling threads. - */ - public void setAsyncRunner(AsyncRunner asyncRunner) { - this.asyncRunner = asyncRunner; - } - - // ------------------------------------------------------------------------------- // - // - // Temp file handling strategy. - // - // ------------------------------------------------------------------------------- // - - /** - * Pluggable strategy for creating and cleaning up temporary files. - * - * @param tempFileManagerFactory new strategy for handling temp files. - */ - public void setTempFileManagerFactory(TempFileManagerFactory tempFileManagerFactory) { - this.tempFileManagerFactory = tempFileManagerFactory; - } - - /** - * HTTP Request methods, with the ability to decode a String back to its enum value. - */ - public enum Method { - GET, PUT, POST, DELETE, HEAD, OPTIONS; - - static Method lookup(String method) { - for (Method m : Method.values()) { - if (m.toString().equalsIgnoreCase(method)) { - return m; - } - } - return null; - } - } - - /** - * Pluggable strategy for asynchronously executing requests. - */ - public interface AsyncRunner { - void exec(Runnable code); - } - - /** - * Factory to create temp file managers. - */ - public interface TempFileManagerFactory { - TempFileManager create(); - } - - // ------------------------------------------------------------------------------- // - - /** - * Temp file manager. - *

- *

Temp file managers are created 1-to-1 with incoming requests, to create and cleanup - * temporary files created as a result of handling the request.

- */ - public interface TempFileManager { - TempFile createTempFile() throws Exception; - - void clear(); - } - - /** - * A temp file. - *

- *

Temp files are responsible for managing the actual temporary storage and cleaning - * themselves up when no longer needed.

- */ - public interface TempFile { - OutputStream open() throws Exception; - - void delete() throws Exception; - - String getName(); - } - - /** - * Default threading strategy for NanoHttpd. - *

- *

By default, the server spawns a new Thread for every incoming request. These are set - * to daemon status, and named according to the request number. The name is - * useful when profiling the application.

- */ - public static class DefaultAsyncRunner implements AsyncRunner { - private long requestCount; - - @Override - public void exec(Runnable code) { - ++requestCount; - Thread t = new Thread(code); - t.setDaemon(true); - t.setName("NanoHttpd Request Processor (#" + requestCount + ")"); - t.start(); - } - } - - /** - * Default strategy for creating and cleaning up temporary files. - *

- *

This class stores its files in the standard location (that is, - * wherever java.io.tmpdir points to). Files are added - * to an internal list, and deleted when no longer needed (that is, - * when clear() is invoked at the end of processing a - * request).

- */ - public static class DefaultTempFileManager implements TempFileManager { - private final String tmpdir; - private final List tempFiles; - - public DefaultTempFileManager() { - tmpdir = System.getProperty("java.io.tmpdir"); - tempFiles = new ArrayList(); - } - - @Override - public TempFile createTempFile() throws Exception { - DefaultTempFile tempFile = new DefaultTempFile(tmpdir); - tempFiles.add(tempFile); - return tempFile; - } - - @Override - public void clear() { - for (TempFile file : tempFiles) { - try { - file.delete(); - } catch (Exception ignored) { - } - } - tempFiles.clear(); - } - } - - /** - * Default strategy for creating and cleaning up temporary files. - *

- *

By default, files are created by File.createTempFile() in - * the directory specified.

- */ - public static class DefaultTempFile implements TempFile { - private File file; - private OutputStream fstream; - - public DefaultTempFile(String tempdir) throws IOException { - file = File.createTempFile("NanoHTTPD-", "", new File(tempdir)); - fstream = new FileOutputStream(file); - } - - @Override - public OutputStream open() throws Exception { - return fstream; - } - - @Override - public void delete() throws Exception { - safeClose(fstream); - file.delete(); - } - - @Override - public String getName() { - return file.getAbsolutePath(); - } - } - - /** - * HTTP response. Return one of these from serve(). - */ - public static class Response { - /** - * HTTP status code after processing, e.g. "200 OK", HTTP_OK - */ - private IStatus status; - /** - * MIME type of content, e.g. "text/html" - */ - private String mimeType; - /** - * Data of the response, may be null. - */ - private InputStream data; - /** - * Headers for the HTTP response. Use addHeader() to add lines. - */ - private Map header = new HashMap(); - /** - * The request method that spawned this response. - */ - private Method requestMethod; - /** - * Use chunkedTransfer - */ - private boolean chunkedTransfer; - - /** - * Default constructor: response = HTTP_OK, mime = MIME_HTML and your supplied message - */ - public Response(String msg) { - this(Status.OK, MIME_HTML, msg); - } - - /** - * Basic constructor. - */ - public Response(IStatus status, String mimeType, InputStream data) { - this.status = status; - this.mimeType = mimeType; - this.data = data; - } - - /** - * Convenience method that makes an InputStream out of given text. - */ - public Response(IStatus status, String mimeType, String txt) { - this.status = status; - this.mimeType = mimeType; - try { - this.data = txt != null ? new ByteArrayInputStream(txt.getBytes("UTF-8")) : null; - } catch (java.io.UnsupportedEncodingException uee) { - uee.printStackTrace(); - } - } - - /** - * Adds given line to the header. - */ - public void addHeader(String name, String value) { - header.put(name, value); - } - - /** - * Sends given response to the socket. - */ - protected void send(OutputStream outputStream) { - String mime = mimeType; - SimpleDateFormat gmtFrmt = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US); - gmtFrmt.setTimeZone(TimeZone.getTimeZone("GMT")); - - try { - if (status == null) { - throw new Error("sendResponse(): Status can't be null."); - } - PrintWriter pw = new PrintWriter(outputStream); - pw.print("HTTP/1.1 " + status.getDescription() + " \r\n"); - - if (mime != null) { - pw.print("Content-Type: " + mime + "\r\n"); - } - - if (header == null || header.get("Date") == null) { - pw.print("Date: " + gmtFrmt.format(new Date()) + "\r\n"); - } - - if (header != null) { - for (String key : header.keySet()) { - String value = header.get(key); - pw.print(key + ": " + value + "\r\n"); - } - } - - sendConnectionHeaderIfNotAlreadyPresent(pw, header); - - if (requestMethod != Method.HEAD && chunkedTransfer) { - sendAsChunked(outputStream, pw); - } else { - sendAsFixedLength(outputStream, pw); - } - outputStream.flush(); - safeClose(data); - } catch (IOException ioe) { - // Couldn't write? No can do. - } - } - - protected void sendConnectionHeaderIfNotAlreadyPresent(PrintWriter pw, Map header) { - boolean connectionAlreadySent = false; - for (String headerName : header.keySet()) { - connectionAlreadySent |= headerName.equalsIgnoreCase("connection"); - } - if (!connectionAlreadySent) { - pw.print("Connection: keep-alive\r\n"); - } - } - - private void sendAsChunked(OutputStream outputStream, PrintWriter pw) throws IOException { - pw.print("Transfer-Encoding: chunked\r\n"); - pw.print("\r\n"); - pw.flush(); - int BUFFER_SIZE = 16 * 1024; - byte[] CRLF = "\r\n".getBytes(); - byte[] buff = new byte[BUFFER_SIZE]; - int read; - while ((read = data.read(buff)) > 0) { - outputStream.write(String.format("%x\r\n", read).getBytes()); - outputStream.write(buff, 0, read); - outputStream.write(CRLF); - } - outputStream.write(String.format("0\r\n\r\n").getBytes()); - } - - private void sendAsFixedLength(OutputStream outputStream, PrintWriter pw) throws IOException { - int pending = data != null ? data.available() : 0; // This is to support partial sends, see serveFile() - pw.print("Content-Length: "+pending+"\r\n"); - - pw.print("\r\n"); - pw.flush(); - - if (requestMethod != Method.HEAD && data != null) { - int BUFFER_SIZE = 16 * 1024; - byte[] buff = new byte[BUFFER_SIZE]; - while (pending > 0) { - int read = data.read(buff, 0, ((pending > BUFFER_SIZE) ? BUFFER_SIZE : pending)); - if (read <= 0) { - break; - } - outputStream.write(buff, 0, read); - - pending -= read; - } - } - } - - public IStatus getStatus() { - return status; - } - - public void setStatus(Status status) { - this.status = status; - } - - public String getMimeType() { - return mimeType; - } - - public void setMimeType(String mimeType) { - this.mimeType = mimeType; - } - - public InputStream getData() { - return data; - } - - public void setData(InputStream data) { - this.data = data; - } - - public Method getRequestMethod() { - return requestMethod; - } - - public void setRequestMethod(Method requestMethod) { - this.requestMethod = requestMethod; - } - - public void setChunkedTransfer(boolean chunkedTransfer) { - this.chunkedTransfer = chunkedTransfer; - } - - public interface IStatus { - int getRequestStatus(); - String getDescription(); - } - - /** - * Some HTTP response status codes - */ - public enum Status implements IStatus { - SWITCH_PROTOCOL(101, "Switching Protocols"), OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"), NO_CONTENT(204, "No Content"), PARTIAL_CONTENT(206, "Partial Content"), REDIRECT(301, - "Moved Permanently"), NOT_MODIFIED(304, "Not Modified"), BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401, - "Unauthorized"), FORBIDDEN(403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), RANGE_NOT_SATISFIABLE(416, - "Requested Range Not Satisfiable"), INTERNAL_ERROR(500, "Internal Server Error"); - private final int requestStatus; - private final String description; - - Status(int requestStatus, String description) { - this.requestStatus = requestStatus; - this.description = description; - } - - @Override - public int getRequestStatus() { - return this.requestStatus; - } - - @Override - public String getDescription() { - return "" + this.requestStatus + " " + description; - } - } - } - - public static final class ResponseException extends Exception { - - private final Response.Status status; - - public ResponseException(Response.Status status, String message) { - super(message); - this.status = status; - } - - public ResponseException(Response.Status status, String message, Exception e) { - super(message, e); - this.status = status; - } - - public Response.Status getStatus() { - return status; - } - } - - /** - * Default strategy for creating and cleaning up temporary files. - */ - private class DefaultTempFileManagerFactory implements TempFileManagerFactory { - @Override - public TempFileManager create() { - return new DefaultTempFileManager(); - } - } - - /** - * Handles one session, i.e. parses the HTTP request and returns the response. - */ - public interface IHTTPSession { - void execute() throws IOException; - - Map getParms(); - - Map getHeaders(); - - /** - * @return the path part of the URL. - */ - String getUri(); - - String getQueryParameterString(); - - Method getMethod(); - - InputStream getInputStream(); - - CookieHandler getCookies(); - - /** - * Adds the files in the request body to the files map. - * @arg files - map to modify - */ - void parseBody(Map files) throws IOException, ResponseException; - } - - protected class HTTPSession implements IHTTPSession { - public static final int BUFSIZE = 8192; - private final TempFileManager tempFileManager; - private final OutputStream outputStream; - private PushbackInputStream inputStream; - private int splitbyte; - private int rlen; - private String uri; - private Method method; - private Map parms; - private Map headers; - private CookieHandler cookies; - private String queryParameterString; - - public HTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) { - this.tempFileManager = tempFileManager; - this.inputStream = new PushbackInputStream(inputStream, BUFSIZE); - this.outputStream = outputStream; - } - - public HTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream, InetAddress inetAddress) { - this.tempFileManager = tempFileManager; - this.inputStream = new PushbackInputStream(inputStream, BUFSIZE); - this.outputStream = outputStream; - String remoteIp = inetAddress.isLoopbackAddress() || inetAddress.isAnyLocalAddress() ? "127.0.0.1" : inetAddress.getHostAddress().toString(); - headers = new HashMap(); - - headers.put("remote-addr", remoteIp); - headers.put("http-client-ip", remoteIp); - } - - @Override - public void execute() throws IOException { - try { - // Read the first 8192 bytes. - // The full header should fit in here. - // Apache's default header limit is 8KB. - // Do NOT assume that a single read will get the entire header at once! - byte[] buf = new byte[BUFSIZE]; - splitbyte = 0; - rlen = 0; - { - int read = -1; - try { - read = inputStream.read(buf, 0, BUFSIZE); - } catch (Exception e) { - safeClose(inputStream); - safeClose(outputStream); - throw new SocketException("NanoHttpd Shutdown"); - } - if (read == -1) { - // socket was been closed - safeClose(inputStream); - safeClose(outputStream); - throw new SocketException("NanoHttpd Shutdown"); - } - while (read > 0) { - rlen += read; - splitbyte = findHeaderEnd(buf, rlen); - if (splitbyte > 0) - break; - read = inputStream.read(buf, rlen, BUFSIZE - rlen); - } - } - - if (splitbyte < rlen) { - inputStream.unread(buf, splitbyte, rlen - splitbyte); - } - - parms = new HashMap(); - if(null == headers) { - headers = new HashMap(); - } - - // Create a BufferedReader for parsing the header. - BufferedReader hin = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(buf, 0, rlen))); - - // Decode the header into parms and header java properties - Map pre = new HashMap(); - decodeHeader(hin, pre, parms, headers); - - method = Method.lookup(pre.get("method")); - if (method == null) { - throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Syntax error."); - } - - uri = pre.get("uri"); - - cookies = new CookieHandler(headers); - - // Ok, now do the serve() - Response r = serve(this); - if (r == null) { - throw new ResponseException(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: Serve() returned a null response."); - } else { - cookies.unloadQueue(r); - r.setRequestMethod(method); - r.send(outputStream); - } - } catch (SocketException e) { - // throw it out to close socket object (finalAccept) - throw e; - } catch (SocketTimeoutException ste) { - // treat socket timeouts the same way we treat socket exceptions - // i.e. close the stream & finalAccept object by throwing the - // exception up the call stack. - throw ste; - } catch (IOException ioe) { - Response r = new Response(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage()); - r.send(outputStream); - safeClose(outputStream); - } catch (ResponseException re) { - Response r = new Response(re.getStatus(), MIME_PLAINTEXT, re.getMessage()); - r.send(outputStream); - safeClose(outputStream); - } finally { - tempFileManager.clear(); - } - } - - @Override - public void parseBody(Map files) throws IOException, ResponseException { - RandomAccessFile randomAccessFile = null; - BufferedReader in = null; - try { - - randomAccessFile = getTmpBucket(); - - long size; - if (headers.containsKey("content-length")) { - size = Integer.parseInt(headers.get("content-length")); - } else if (splitbyte < rlen) { - size = rlen - splitbyte; - } else { - size = 0; - } - - // Now read all the body and write it to f - byte[] buf = new byte[512]; - while (rlen >= 0 && size > 0) { - rlen = inputStream.read(buf, 0, (int)Math.min(size, 512)); - size -= rlen; - if (rlen > 0) { - randomAccessFile.write(buf, 0, rlen); - } - } - - // Get the raw body as a byte [] - ByteBuffer fbuf = randomAccessFile.getChannel().map(FileChannel.MapMode.READ_ONLY, 0, randomAccessFile.length()); - randomAccessFile.seek(0); - - // Create a BufferedReader for easily reading it as string. - InputStream bin = new FileInputStream(randomAccessFile.getFD()); - in = new BufferedReader(new InputStreamReader(bin)); - - // If the method is POST, there may be parameters - // in data section, too, read it: - if (Method.POST.equals(method)) { - String contentType = ""; - String contentTypeHeader = headers.get("content-type"); - - StringTokenizer st = null; - if (contentTypeHeader != null) { - st = new StringTokenizer(contentTypeHeader, ",; "); - if (st.hasMoreTokens()) { - contentType = st.nextToken(); - } - } - - if ("multipart/form-data".equalsIgnoreCase(contentType)) { - // Handle multipart/form-data - if (!st.hasMoreTokens()) { - 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); - } - - decodeMultipartData(boundary, fbuf, in, parms, files); - } else { - // Handle application/x-www-form-urlencoded - String postLine = ""; - StringBuilder postLineBuffer = new StringBuilder(); - char pbuf[] = new char[512]; - int read = in.read(pbuf); - while (read >= 0 && !postLine.endsWith("\r\n")) { - postLine = String.valueOf(pbuf, 0, read); - postLineBuffer.append(postLine); - read = in.read(pbuf); - } - postLine = postLineBuffer.toString().trim(); - decodeParms(postLine, parms); - } - } else if (Method.PUT.equals(method)) { - files.put("content", saveTmpFile(fbuf, 0, fbuf.limit())); - } - } finally { - safeClose(randomAccessFile); - safeClose(in); - } - } - - /** - * Decodes the sent headers and loads the data into Key/value pairs - */ - private void decodeHeader(BufferedReader in, Map pre, Map parms, Map headers) - throws ResponseException { - try { - // Read the request line - String inLine = in.readLine(); - if (inLine == null) { - return; - } - - StringTokenizer st = new StringTokenizer(inLine); - if (!st.hasMoreTokens()) { - throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Syntax error. Usage: GET /example/file.html"); - } - - pre.put("method", st.nextToken()); - - if (!st.hasMoreTokens()) { - throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Missing URI. Usage: GET /example/file.html"); - } - - String uri = st.nextToken(); - - // Decode parameters from the URI - int qmi = uri.indexOf('?'); - if (qmi >= 0) { - decodeParms(uri.substring(qmi + 1), parms); - uri = decodePercent(uri.substring(0, qmi)); - } else { - uri = decodePercent(uri); - } - - // If there's another token, it's protocol version, - // followed by HTTP headers. Ignore version but parse headers. - // NOTE: this now forces header names lowercase since they are - // case insensitive and vary by client. - if (st.hasMoreTokens()) { - String line = in.readLine(); - while (line != null && line.trim().length() > 0) { - int p = line.indexOf(':'); - if (p >= 0) - headers.put(line.substring(0, p).trim().toLowerCase(Locale.US), line.substring(p + 1).trim()); - line = in.readLine(); - } - } - - pre.put("uri", uri); - } catch (IOException ioe) { - throw new ResponseException(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage(), ioe); - } - } - - /** - * Decodes the Multipart Body data and put it into Key/Value pairs. - */ - private void decodeMultipartData(String boundary, ByteBuffer fbuf, BufferedReader in, Map parms, - Map files) throws ResponseException { - try { - int[] bpositions = getBoundaryPositions(fbuf, boundary.getBytes()); - int boundarycount = 1; - String mpline = in.readLine(); - while (mpline != null) { - if (!mpline.contains(boundary)) { - throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Content type is multipart/form-data but next chunk does not start with boundary. Usage: GET /example/file.html"); - } - boundarycount++; - Map item = new HashMap(); - mpline = in.readLine(); - while (mpline != null && mpline.trim().length() > 0) { - int p = mpline.indexOf(':'); - if (p != -1) { - item.put(mpline.substring(0, p).trim().toLowerCase(Locale.US), mpline.substring(p + 1).trim()); - } - mpline = in.readLine(); - } - if (mpline != null) { - String contentDisposition = item.get("content-disposition"); - if (contentDisposition == null) { - throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Content type is multipart/form-data but no content-disposition info found. Usage: GET /example/file.html"); - } - StringTokenizer st = new StringTokenizer(contentDisposition, ";"); - Map disposition = new HashMap(); - while (st.hasMoreTokens()) { - String token = st.nextToken().trim(); - int p = token.indexOf('='); - if (p != -1) { - disposition.put(token.substring(0, p).trim().toLowerCase(Locale.US), token.substring(p + 1).trim()); - } - } - String pname = disposition.get("name"); - pname = pname.substring(1, pname.length() - 1); - - String value = ""; - if (item.get("content-type") == null) { - while (mpline != null && !mpline.contains(boundary)) { - mpline = in.readLine(); - if (mpline != null) { - int d = mpline.indexOf(boundary); - if (d == -1) { - value += mpline; - } else { - value += mpline.substring(0, d - 2); - } - } - } - } else { - if (boundarycount > bpositions.length) { - throw new ResponseException(Response.Status.INTERNAL_ERROR, "Error processing request"); - } - int offset = stripMultipartHeaders(fbuf, bpositions[boundarycount - 2]); - String path = saveTmpFile(fbuf, offset, bpositions[boundarycount - 1] - offset - 4); - files.put(pname, path); - value = disposition.get("filename"); - value = value.substring(1, value.length() - 1); - do { - mpline = in.readLine(); - } while (mpline != null && !mpline.contains(boundary)); - } - parms.put(pname, value); - } - } - } catch (IOException ioe) { - throw new ResponseException(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage(), ioe); - } - } - - /** - * Find byte index separating header from body. It must be the last byte of the first two sequential new lines. - */ - private int findHeaderEnd(final byte[] buf, int rlen) { - int splitbyte = 0; - while (splitbyte + 3 < rlen) { - if (buf[splitbyte] == '\r' && buf[splitbyte + 1] == '\n' && buf[splitbyte + 2] == '\r' && buf[splitbyte + 3] == '\n') { - return splitbyte + 4; - } - splitbyte++; - } - return 0; - } - - /** - * Find the byte positions where multipart boundaries start. - */ - private int[] getBoundaryPositions(ByteBuffer b, byte[] boundary) { - int matchcount = 0; - int matchbyte = -1; - List matchbytes = new ArrayList(); - for (int i = 0; i < b.limit(); i++) { - if (b.get(i) == boundary[matchcount]) { - if (matchcount == 0) - matchbyte = i; - matchcount++; - if (matchcount == boundary.length) { - matchbytes.add(matchbyte); - matchcount = 0; - matchbyte = -1; - } - } else { - i -= matchcount; - matchcount = 0; - matchbyte = -1; - } - } - int[] ret = new int[matchbytes.size()]; - for (int i = 0; i < ret.length; i++) { - ret[i] = matchbytes.get(i); - } - return ret; - } - - /** - * Retrieves the content of a sent file and saves it to a temporary file. The full path to the saved file is returned. - */ - private String saveTmpFile(ByteBuffer b, int offset, int len) { - String path = ""; - if (len > 0) { - FileOutputStream fileOutputStream = null; - try { - TempFile tempFile = tempFileManager.createTempFile(); - ByteBuffer src = b.duplicate(); - fileOutputStream = new FileOutputStream(tempFile.getName()); - FileChannel dest = fileOutputStream.getChannel(); - src.position(offset).limit(offset + len); - dest.write(src.slice()); - path = tempFile.getName(); - } catch (Exception e) { // Catch exception if any - throw new Error(e); // we won't recover, so throw an error - } finally { - safeClose(fileOutputStream); - } - } - return path; - } - - private RandomAccessFile getTmpBucket() { - try { - TempFile tempFile = tempFileManager.createTempFile(); - return new RandomAccessFile(tempFile.getName(), "rw"); - } catch (Exception e) { - throw new Error(e); // we won't recover, so throw an error - } - } - - /** - * It returns the offset separating multipart file headers from the file's data. - */ - private int stripMultipartHeaders(ByteBuffer b, int offset) { - int i; - for (i = offset; i < b.limit(); i++) { - if (b.get(i) == '\r' && b.get(++i) == '\n' && b.get(++i) == '\r' && b.get(++i) == '\n') { - break; - } - } - return i + 1; - } - - /** - * Decodes parameters in percent-encoded URI-format ( e.g. "name=Jack%20Daniels&pass=Single%20Malt" ) and - * adds them to given Map. NOTE: this doesn't support multiple identical keys due to the simplicity of Map. - */ - private void decodeParms(String parms, Map p) { - if (parms == null) { - queryParameterString = ""; - return; - } - - queryParameterString = parms; - StringTokenizer st = new StringTokenizer(parms, "&"); - while (st.hasMoreTokens()) { - String e = st.nextToken(); - int sep = e.indexOf('='); - if (sep >= 0) { - p.put(decodePercent(e.substring(0, sep)).trim(), - decodePercent(e.substring(sep + 1))); - } else { - p.put(decodePercent(e).trim(), ""); - } - } - } - - @Override - public final Map getParms() { - return parms; - } - - public String getQueryParameterString() { - return queryParameterString; - } - - @Override - public final Map getHeaders() { - return headers; - } - - @Override - public final String getUri() { - return uri; - } - - @Override - public final Method getMethod() { - return method; - } - - @Override - public final InputStream getInputStream() { - return inputStream; - } - - @Override - public CookieHandler getCookies() { - return cookies; - } - } - - public static class Cookie { - private String n, v, e; - - public Cookie(String name, String value, String expires) { - n = name; - v = value; - e = expires; - } - - public Cookie(String name, String value) { - this(name, value, 30); - } - - public Cookie(String name, String value, int numDays) { - n = name; - v = value; - e = getHTTPTime(numDays); - } - - public String getHTTPHeader() { - String fmt = "%s=%s; expires=%s"; - return String.format(fmt, n, v, e); - } - - public static String getHTTPTime(int days) { - Calendar calendar = Calendar.getInstance(); - SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US); - dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); - calendar.add(Calendar.DAY_OF_MONTH, days); - return dateFormat.format(calendar.getTime()); - } - } - - /** - * Provides rudimentary support for cookies. - * Doesn't support 'path', 'secure' nor 'httpOnly'. - * Feel free to improve it and/or add unsupported features. - * - * @author LordFokas - */ - public class CookieHandler implements Iterable { - private HashMap cookies = new HashMap(); - private ArrayList queue = new ArrayList(); - - public CookieHandler(Map httpHeaders) { - String raw = httpHeaders.get("cookie"); - if (raw != null) { - String[] tokens = raw.split(";"); - for (String token : tokens) { - String[] data = token.trim().split("="); - if (data.length == 2) { - cookies.put(data[0], data[1]); - } - } - } - } - - @Override public Iterator iterator() { - return cookies.keySet().iterator(); - } - - /** - * Read a cookie from the HTTP Headers. - * - * @param name The cookie's name. - * @return The cookie's value if it exists, null otherwise. - */ - public String read(String name) { - return cookies.get(name); - } - - /** - * Sets a cookie. - * - * @param name The cookie's name. - * @param value The cookie's value. - * @param expires How many days until the cookie expires. - */ - public void set(String name, String value, int expires) { - queue.add(new Cookie(name, value, Cookie.getHTTPTime(expires))); - } - - public void set(Cookie cookie) { - queue.add(cookie); - } - - /** - * Set a cookie with an expiration date from a month ago, effectively deleting it on the client side. - * - * @param name The cookie name. - */ - public void delete(String name) { - set(name, "-delete-", -30); - } - - /** - * Internally used by the webserver to add all queued cookies into the Response's HTTP Headers. - * - * @param response The Response object to which headers the queued cookies will be added. - */ - public void unloadQueue(Response response) { - for (Cookie cookie : queue) { - response.addHeader("Set-Cookie", cookie.getHTTPHeader()); - } - } - } -}