summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-09-13 16:37:01 +0200
committerSimon Rettberg2015-09-13 16:37:01 +0200
commitd68ab42fdec2a7263ea4cf9c762a5e7585b7eb40 (patch)
tree5063e70c5441f0d160c1749a300e96d8e0806cf9 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
parent[server] Limit hashqueue length depending on max mem (diff)
downloadtutor-module-d68ab42fdec2a7263ea4cf9c762a5e7585b7eb40.tar.gz
tutor-module-d68ab42fdec2a7263ea4cf9c762a5e7585b7eb40.tar.xz
tutor-module-d68ab42fdec2a7263ea4cf9c762a5e7585b7eb40.zip
[server] Minor tweaks and fixes
- Logging format - Catch unchecked exceptions in web server and return internal server error - fix: insert os-virt-mappings to db
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java')
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
index 765587e9..146f6f5e 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
@@ -46,6 +46,19 @@ public class WebServer extends NanoHTTPD {
return internalServerError();
}
+ // Sanitize
+ if (uri.contains("//")) {
+ uri = uri.replaceAll("//+", "/");
+ }
+
+ try {
+ return handle(session, uri);
+ } catch (Throwable t) {
+ return internalServerError();
+ }
+ }
+
+ private Response handle(IHTTPSession session, String uri) {
// Our special stuff
if (uri.startsWith("/vmchooser/list")) {
return serveVmChooserList();