aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Hawke <paul.hawke@gmail.com>2013-01-12 14:21:03 -0600
committerPaul Hawke <paul.hawke@gmail.com>2013-01-12 14:21:03 -0600
commitdf674ca7f11cee6336b66271c50476f389e0ff4b (patch)
treefa7ff37259a72afa24065c300440fc542ae948f3 /src
parent9a5230be46a5962c0f19262a8756970bab473eef (diff)
downloadnanohttpd-df674ca7f11cee6336b66271c50476f389e0ff4b.tar.gz
Code cleanup
Diffstat (limited to 'src')
-rw-r--r--src/main/java/fi/iki/elonen/HelloServer.java4
-rw-r--r--src/main/java/fi/iki/elonen/NanoHTTPD.java79
-rw-r--r--src/main/java/fi/iki/elonen/SimpleWebServer.java35
3 files changed, 54 insertions, 64 deletions
diff --git a/src/main/java/fi/iki/elonen/HelloServer.java b/src/main/java/fi/iki/elonen/HelloServer.java
index 962c8d8..370b88b 100644
--- a/src/main/java/fi/iki/elonen/HelloServer.java
+++ b/src/main/java/fi/iki/elonen/HelloServer.java
@@ -8,11 +8,11 @@ import java.util.*;
*/
public class HelloServer extends NanoHTTPD {
private HelloServer() {
- super(8080, new File("."));
+ super(8080);
}
@Override
- public Response serve(String uri, METHOD method, Map<String, String> header, Map<String, String> parms, Map<String, String> files) {
+ public Response serve(String uri, Method method, Map<String, String> header, Map<String, String> parms, Map<String, String> files) {
System.out.println(method + " '" + uri + "' ");
String msg = "<html><body><h1>Hello server</h1>\n";
diff --git a/src/main/java/fi/iki/elonen/NanoHTTPD.java b/src/main/java/fi/iki/elonen/NanoHTTPD.java
index 3aee0ed..740cb24 100644
--- a/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -3,18 +3,8 @@ package fi.iki.elonen;
import java.io.*;
import java.net.ServerSocket;
import java.net.Socket;
-import java.net.URLEncoder;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.TimeZone;
+import java.util.*;
/**
* A simple, tiny, nicely embeddable HTTP 1.0 (partially 1.1) server in Java
@@ -63,11 +53,11 @@ import java.util.TimeZone;
* See the end of the source file for distribution license (Modified BSD licence)
*/
public abstract class NanoHTTPD {
- public enum METHOD {
+ public enum Method {
GET, PUT, POST, DELETE;
- static METHOD lookup(String method) {
- for (METHOD m : METHOD.values()) {
+ static Method lookup(String method) {
+ for (Method m : Method.values()) {
if (m.toString().equalsIgnoreCase(method)) {
return m;
}
@@ -83,7 +73,6 @@ public abstract class NanoHTTPD {
public static final String MIME_HTML = "text/html";
public static final String MIME_DEFAULT_BINARY = "application/octet-stream";
- private final File myRootDir;
private final int myPort;
private ServerSocket myServerSocket;
private Thread myThread;
@@ -91,9 +80,8 @@ public abstract class NanoHTTPD {
/**
* Constructs an HTTP server on given port.
*/
- public NanoHTTPD(int port, File wwwroot) {
+ public NanoHTTPD(int port) {
this.myPort = port;
- this.myRootDir = wwwroot;
}
/**
@@ -133,13 +121,6 @@ public abstract class NanoHTTPD {
}
/**
- * Return the HTTP root directory for this server
- */
- public File getRootDir() {
- return myRootDir;
- }
-
- /**
* Override this to customize the server.
* <p/>
* <p/>
@@ -151,7 +132,7 @@ public abstract class NanoHTTPD {
* @param header Header entries, percent decoded
* @return HTTP response, see class Response for details
*/
- public abstract Response serve(String uri, METHOD method, Map<String, String> header, Map<String, String> parms, Map<String, String> files);
+ public abstract Response serve(String uri, Method method, Map<String, String> header, Map<String, String> parms, Map<String, String> files);
/**
* Handles one session, i.e. parses the HTTP request and returns the response.
@@ -200,9 +181,9 @@ public abstract class NanoHTTPD {
// Decode the header into parms and header java properties
decodeHeader(hin, pre, parms, header);
- METHOD method = METHOD.lookup(pre.getProperty("method"));
+ Method method = Method.lookup(pre.getProperty("method"));
if (method == null) {
- sendError(Response.HTTP_STATUS.BAD_REQUEST, "BAD REQUEST: Syntax error.");
+ sendError(Response.Status.BAD_REQUEST, "BAD REQUEST: Syntax error.");
}
String uri = pre.getProperty("uri");
@@ -253,7 +234,7 @@ public abstract class NanoHTTPD {
// If the method is POST, there may be parameters
// in data section, too, read it:
- if (METHOD.POST.equals(method)) {
+ if (Method.POST.equals(method)) {
String contentType = "";
String contentTypeHeader = header.get("content-type");
StringTokenizer st = new StringTokenizer(contentTypeHeader, "; ");
@@ -264,13 +245,13 @@ public abstract class NanoHTTPD {
if ("multipart/form-data".equalsIgnoreCase(contentType)) {
// Handle multipart/form-data
if (!st.hasMoreTokens()) {
- sendError(Response.HTTP_STATUS.BAD_REQUEST,
+ sendError(Response.Status.BAD_REQUEST,
"BAD REQUEST: Content type is multipart/form-data but boundary missing. Usage: GET /example/file.html");
}
String boundaryExp = st.nextToken();
st = new StringTokenizer(boundaryExp, "=");
if (st.countTokens() != 2) {
- sendError(Response.HTTP_STATUS.BAD_REQUEST,
+ sendError(Response.Status.BAD_REQUEST,
"BAD REQUEST: Content type is multipart/form-data but boundary syntax error. Usage: GET /example/file.html");
}
st.nextToken();
@@ -291,13 +272,13 @@ public abstract class NanoHTTPD {
}
}
- if (METHOD.PUT.equals(method))
+ if (Method.PUT.equals(method))
files.put("content", saveTmpFile(fbuf, 0, f.size()));
// Ok, now do the serve()
Response r = serve(uri, method, header, parms, files);
if (r == null)
- sendError(Response.HTTP_STATUS.INTERNAL_ERROR, "SERVER INTERNAL ERROR: Serve() returned a null response.");
+ sendError(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: Serve() returned a null response.");
else
sendResponse(r.status, r.mimeType, r.header, r.data);
@@ -305,7 +286,7 @@ public abstract class NanoHTTPD {
is.close();
} catch (IOException ioe) {
try {
- sendError(Response.HTTP_STATUS.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
+ sendError(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
} catch (Throwable ignored) {
}
} catch (InterruptedException ie) {
@@ -327,13 +308,13 @@ public abstract class NanoHTTPD {
StringTokenizer st = new StringTokenizer(inLine);
if (!st.hasMoreTokens()) {
- sendError(Response.HTTP_STATUS.BAD_REQUEST, "BAD REQUEST: Syntax error. Usage: GET /example/file.html");
+ sendError(Response.Status.BAD_REQUEST, "BAD REQUEST: Syntax error. Usage: GET /example/file.html");
}
pre.put("method", st.nextToken());
if (!st.hasMoreTokens()) {
- sendError(Response.HTTP_STATUS.BAD_REQUEST, "BAD REQUEST: Missing URI. Usage: GET /example/file.html");
+ sendError(Response.Status.BAD_REQUEST, "BAD REQUEST: Missing URI. Usage: GET /example/file.html");
}
String uri = st.nextToken();
@@ -362,7 +343,7 @@ public abstract class NanoHTTPD {
pre.put("uri", uri);
} catch (IOException ioe) {
- sendError(Response.HTTP_STATUS.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
+ sendError(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
}
}
@@ -377,7 +358,7 @@ public abstract class NanoHTTPD {
String mpline = in.readLine();
while (mpline != null) {
if (!mpline.contains(boundary)) {
- sendError(Response.HTTP_STATUS.BAD_REQUEST,
+ sendError(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++;
@@ -393,7 +374,7 @@ public abstract class NanoHTTPD {
if (mpline != null) {
String contentDisposition = item.get("content-disposition");
if (contentDisposition == null) {
- sendError(Response.HTTP_STATUS.BAD_REQUEST,
+ sendError(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, "; ");
@@ -423,7 +404,7 @@ public abstract class NanoHTTPD {
}
} else {
if (boundarycount > bpositions.length) {
- sendError(Response.HTTP_STATUS.INTERNAL_ERROR, "Error processing request");
+ sendError(Response.Status.INTERNAL_ERROR, "Error processing request");
}
int offset = stripMultipartHeaders(fbuf, bpositions[boundarycount - 2]);
String path = saveTmpFile(fbuf, offset, bpositions[boundarycount - 1] - offset - 4);
@@ -438,7 +419,7 @@ public abstract class NanoHTTPD {
}
}
} catch (IOException ioe) {
- sendError(Response.HTTP_STATUS.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
+ sendError(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
}
}
@@ -543,7 +524,7 @@ public abstract class NanoHTTPD {
}
return sb.toString();
} catch (Exception e) {
- sendError(Response.HTTP_STATUS.BAD_REQUEST, "BAD REQUEST: Bad percent-encoding.");
+ sendError(Response.Status.BAD_REQUEST, "BAD REQUEST: Bad percent-encoding.");
return null;
}
}
@@ -570,7 +551,7 @@ public abstract class NanoHTTPD {
/**
* Returns an error message as a HTTP response and throws InterruptedException to stop further request processing.
*/
- private void sendError(Response.HTTP_STATUS status, String msg) throws InterruptedException {
+ private void sendError(Response.Status status, String msg) throws InterruptedException {
sendResponse(status, MIME_PLAINTEXT, null, new ByteArrayInputStream(msg.getBytes()));
throw new InterruptedException();
}
@@ -578,7 +559,7 @@ public abstract class NanoHTTPD {
/**
* Sends given response to the socket.
*/
- private void sendResponse(Response.HTTP_STATUS status, String mime, Map<String, String> header, InputStream data) {
+ private void sendResponse(Response.Status status, String mime, Map<String, String> header, InputStream data) {
SimpleDateFormat gmtFrmt = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US);
gmtFrmt.setTimeZone(TimeZone.getTimeZone("GMT"));
@@ -644,7 +625,7 @@ public abstract class NanoHTTPD {
/**
* Some HTTP response status codes
*/
- public enum HTTP_STATUS {
+ public enum Status {
OK(200, "OK"),
CREATED(201, "Created"),
NO_CONTENT(204, "No Content"),
@@ -658,7 +639,7 @@ public abstract class NanoHTTPD {
RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"),
INTERNAL_ERROR(500, "Internal Server Error");
- HTTP_STATUS(int requestStatus, String descr) {
+ Status(int requestStatus, String descr) {
this.requestStatus = requestStatus;
this.descr = descr;
}
@@ -673,13 +654,13 @@ public abstract class NanoHTTPD {
* Default constructor: response = HTTP_OK, mime = MIME_HTML and your supplied message
*/
public Response(String msg) {
- this(Response.HTTP_STATUS.OK, MIME_HTML, msg);
+ this(Status.OK, MIME_HTML, msg);
}
/**
* Basic constructor.
*/
- public Response(HTTP_STATUS status, String mimeType, InputStream data) {
+ public Response(Status status, String mimeType, InputStream data) {
this.status = status;
this.mimeType = mimeType;
this.data = data;
@@ -688,7 +669,7 @@ public abstract class NanoHTTPD {
/**
* Convenience method that makes an InputStream out of given text.
*/
- public Response(HTTP_STATUS status, String mimeType, String txt) {
+ public Response(Status status, String mimeType, String txt) {
this.status = status;
this.mimeType = mimeType;
try {
@@ -708,7 +689,7 @@ public abstract class NanoHTTPD {
/**
* HTTP status code after processing, e.g. "200 OK", HTTP_OK
*/
- public HTTP_STATUS status;
+ public Status status;
/**
* MIME type of content, e.g. "text/html"
diff --git a/src/main/java/fi/iki/elonen/SimpleWebServer.java b/src/main/java/fi/iki/elonen/SimpleWebServer.java
index e044577..6358692 100644
--- a/src/main/java/fi/iki/elonen/SimpleWebServer.java
+++ b/src/main/java/fi/iki/elonen/SimpleWebServer.java
@@ -10,6 +10,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
+import static fi.iki.elonen.NanoHTTPD.Response.Status.*;
+
public class SimpleWebServer extends NanoHTTPD {
/**
* Hashtable mapping (String)FILENAME_EXTENSION -> (String)MIME_TYPE
@@ -69,8 +71,15 @@ public class SimpleWebServer extends NanoHTTPD {
+ "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
+ "OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.";
+ private File rootDir;
+
public SimpleWebServer(int port, File wwwroot) {
- super(port, wwwroot);
+ super(port);
+ this.rootDir = wwwroot;
+ }
+
+ public File getRootDir() {
+ return rootDir;
}
/**
@@ -103,7 +112,7 @@ public class SimpleWebServer extends NanoHTTPD {
// Make sure we won't die of an exception later
if (!homeDir.isDirectory())
- res = new Response(Response.HTTP_STATUS.INTERNAL_ERROR, MIME_PLAINTEXT, "INTERNAL ERRROR: serveFile(): given homeDir is not a directory.");
+ res = new Response(INTERNAL_ERROR, MIME_PLAINTEXT, "INTERNAL ERRROR: serveFile(): given homeDir is not a directory.");
if (res == null) {
// Remove URL arguments
@@ -113,12 +122,12 @@ public class SimpleWebServer extends NanoHTTPD {
// Prohibit getting out of current directory
if (uri.startsWith("src/main") || uri.endsWith("src/main") || uri.contains("../"))
- res = new Response(Response.HTTP_STATUS.FORBIDDEN, MIME_PLAINTEXT, "FORBIDDEN: Won't serve ../ for security reasons.");
+ res = new Response(FORBIDDEN, MIME_PLAINTEXT, "FORBIDDEN: Won't serve ../ for security reasons.");
}
File f = new File(homeDir, uri);
if (res == null && !f.exists())
- res = new Response(Response.HTTP_STATUS.NOT_FOUND, MIME_PLAINTEXT, "Error 404, file not found.");
+ res = new Response(NOT_FOUND, MIME_PLAINTEXT, "Error 404, file not found.");
// List the directory, if necessary
if (res == null && f.isDirectory()) {
@@ -126,7 +135,7 @@ public class SimpleWebServer extends NanoHTTPD {
// directory, send a redirect.
if (!uri.endsWith("/")) {
uri += "/";
- res = new Response(Response.HTTP_STATUS.REDIRECT, MIME_HTML, "<html><body>Redirected: <a href=\"" + uri + "\">" + uri
+ res = new Response(REDIRECT, MIME_HTML, "<html><body>Redirected: <a href=\"" + uri + "\">" + uri
+ "</a></body></html>");
res.addHeader("Location", uri);
}
@@ -181,7 +190,7 @@ public class SimpleWebServer extends NanoHTTPD {
msg += "</body></html>";
res = new Response(msg);
} else {
- res = new Response(Response.HTTP_STATUS.FORBIDDEN, MIME_PLAINTEXT, "FORBIDDEN: No directory listing.");
+ res = new Response(FORBIDDEN, MIME_PLAINTEXT, "FORBIDDEN: No directory listing.");
}
}
}
@@ -221,7 +230,7 @@ public class SimpleWebServer extends NanoHTTPD {
long fileLen = f.length();
if (range != null && startFrom >= 0) {
if (startFrom >= fileLen) {
- res = new Response(Response.HTTP_STATUS.RANGE_NOT_SATISFIABLE, MIME_PLAINTEXT, "");
+ res = new Response(RANGE_NOT_SATISFIABLE, MIME_PLAINTEXT, "");
res.addHeader("Content-Range", "bytes 0-0/" + fileLen);
res.addHeader("ETag", etag);
} else {
@@ -240,23 +249,23 @@ public class SimpleWebServer extends NanoHTTPD {
};
fis.skip(startFrom);
- res = new Response(Response.HTTP_STATUS.PARTIAL_CONTENT, mime, fis);
+ res = new Response(PARTIAL_CONTENT, mime, fis);
res.addHeader("Content-Length", "" + dataLen);
res.addHeader("Content-Range", "bytes " + startFrom + "-" + endAt + "/" + fileLen);
res.addHeader("ETag", etag);
}
} else {
if (etag.equals(header.get("if-none-match")))
- res = new Response(Response.HTTP_STATUS.NOT_MODIFIED, mime, "");
+ res = new Response(NOT_MODIFIED, mime, "");
else {
- res = new Response(Response.HTTP_STATUS.OK, mime, new FileInputStream(f));
+ res = new Response(OK, mime, new FileInputStream(f));
res.addHeader("Content-Length", "" + fileLen);
res.addHeader("ETag", etag);
}
}
}
} catch (IOException ioe) {
- res = new Response(Response.HTTP_STATUS.FORBIDDEN, MIME_PLAINTEXT, "FORBIDDEN: Reading file failed.");
+ res = new Response(FORBIDDEN, MIME_PLAINTEXT, "FORBIDDEN: Reading file failed.");
}
res.addHeader("Accept-Ranges", "bytes"); // Announce that the file server accepts partial content requestes
@@ -264,7 +273,7 @@ public class SimpleWebServer extends NanoHTTPD {
}
@Override
- public Response serve(String uri, METHOD method, Map<String, String> header, Map<String, String> parms, Map<String, String> files) {
+ public Response serve(String uri, Method method, Map<String, String> header, Map<String, String> parms, Map<String, String> files) {
System.out.println(method + " '" + uri + "' ");
Iterator<String> e = header.keySet().iterator();
@@ -308,7 +317,7 @@ public class SimpleWebServer extends NanoHTTPD {
break;
}
- NanoHTTPD server = new SimpleWebServer(port, wwwroot);
+ SimpleWebServer server = new SimpleWebServer(port, wwwroot);
try {
server.start();
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 09:31:02 +0000