Change the "nobody" gid to of -2 "short" (not int)...

[gigi.git] / src / org / cacert / gigi / Launcher.java

diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java
index 4753025442d22b0895c2c24e103bc5e6e3c44d69..6c234909f5714b3fe55df18cf6bac43afcf44c21 100644 (file)
--- a/src/org/cacert/gigi/Launcher.java
+++ b/src/org/cacert/gigi/Launcher.java
@@ -7,7 +7,6 @@ import java.util.Properties;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.TrustManagerFactory;
-
 import org.cacert.gigi.natives.SetUID;
 import org.cacert.gigi.util.CipherInfo;
 import org.eclipse.jetty.server.Connector;
@@ -21,6 +20,7 @@ import org.eclipse.jetty.server.SessionManager;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.server.handler.ResourceHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -56,7 +56,7 @@ public class Launcher {
                if (connector.getPort() <= 1024
                                && !System.getProperty("os.name").toLowerCase().contains("win")) {
                        SetUID uid = new SetUID();
-                       if (!uid.setUid(-2, -2).getSuccess()) {
+                       if (!uid.setUid(65536 - 2, 65536 - 2).getSuccess()) {
                                Log.getLogger(Launcher.class).warn("Couldn't set uid!");
                        }
                }
@@ -71,12 +71,16 @@ public class Launcher {
                return servlet;
        }
 
-       private static ContextHandler generateStaticContext() {
-               ResourceHandler rh = new ResourceHandler();
+       private static Handler generateStaticContext() {
+               final ResourceHandler rh = new ResourceHandler();
                rh.setResourceBase("static");
+               HandlerWrapper hw = new PolicyRedirector();
+               hw.setHandler(rh);
+
                ContextHandler ch = new ContextHandler();
-               ch.setHandler(rh);
                ch.setContextPath("/static");
+               ch.setHandler(hw);
+
                return ch;
        }