Changeset 773:bf439ae8d130

Timestamp:

01/15/12 02:36:22 (4 months ago)

Author:

xeraph

Branch:

default

Message:

fixed and implemented more servlet request methods

Location:

kraken-httpd/src/main/java/org/krakenapps/httpd/impl

Files:

• Request.java (modified) (19 diffs)
• ServletRegistryImpl.java (modified) (1 diff)

kraken-httpd/src/main/java/org/krakenapps/httpd/impl/Request.java

@@ -25 +25 @@
 import java.nio.charset.Charset;
 import java.security.Principal;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -33 +34 @@
 import java.util.Map;
 
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
 import javax.servlet.AsyncContext;
 import javax.servlet.DispatcherType;
@@ -52 +55 @@
 import org.jboss.netty.handler.codec.http.HttpMethod;
 import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.ssl.SslHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57 +61 @@
 @SuppressWarnings("rawtypes")
 public class Request implements HttpServletRequest {
+        private final String contextPath = "";
         private ChannelHandlerContext ctx;
+        private boolean secure;
         private HttpRequest req;
         private String servletPath;
@@ -64 +70 @@
         private ServletInputStream is;
         private Map<String, Object> attributes = new HashMap<String, Object>();
-        private Map<String, String> parameters = new HashMap<String, String>();
+        private Map<String, List<String>> parameters = new HashMap<String, List<String>>();
         private Cookie[] cookies;
+        private List<Locale> locales = new ArrayList<Locale>();
         private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
@@ -74 +81 @@
                 this.pathInfo = pathInfo;
                 this.queryString = "";
+
+                SslHandler sslHandler = (SslHandler) ctx.getPipeline().get("ssl");
+                this.secure = sslHandler != null;
+                if (secure) {
+                        SSLSession session = sslHandler.getEngine().getSession();
+                        String cipherSuite = session.getCipherSuite();
+                        try {
+                                setAttribute("javax.servlet.request.X509Certificate", session.getPeerCertificateChain());
+                        } catch (SSLPeerUnverifiedException e) {
+                        }
+
+                        setAttribute("javax.servlet.request.cipher_suite", cipherSuite);
+                        setAttribute("javax.servlet.request.key_size", deduceKeyLength(cipherSuite));
+                }
 
                 ChannelBuffer content = req.getContent();
@@ -111 +132 @@
                 }
 
+                List<String> langs = req.getHeaders(HttpHeaders.Names.ACCEPT_LANGUAGE);
+                if (langs != null)
+                        for (String lang : langs)
+                                locales.add(new Locale(lang));
+
+                // see servlet spec section 3.9
+                if (langs.size() == 0)
+                        locales.add(Locale.getDefault());
+
                 setAttribute("netty.channel", ctx.getChannel());
+        }
+
+        private int deduceKeyLength(String cipherSuite) {
+                if (cipherSuite.equals("IDEA_CBC"))
+                        return 128;
+                if (cipherSuite.equals("RC2_CBC_40"))
+                        return 40;
+                if (cipherSuite.equals("RC4_40"))
+                        return 40;
+                if (cipherSuite.equals("RC4_128"))
+                        return 128;
+                if (cipherSuite.equals("DES40_CBC"))
+                        return 40;
+                if (cipherSuite.equals("DES_CBC"))
+                        return 56;
+                if (cipherSuite.equals("3DES_EDE_CBC"))
+                        return 168;
+                return 0;
         }
 
@@ -127 +175 @@
                                         value = null;
 
-                                parameters.put(name, value);
+                                List<String> values = new ArrayList<String>();
+                                if (!parameters.containsKey(name))
+                                        parameters.put(name, values);
+                                else
+                                        values = parameters.get(name);
+
+                                values.add(value);
                                 logger.trace("kraken webconsole: param name [{}], value [{}]", name, value);
                         } else {
@@ -150 +204 @@
 
         @Override
+        public boolean isSecure() {
+                return secure;
+        }
+
+        // TODO: parse should be deferred for character encoding support
+        @Override
+        public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
+        }
+
+        @Override
         public Object getAttribute(String name) {
                 return attributes.get(name);
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public Enumeration getAttributeNames() {
                 return Collections.enumeration(attributes.keySet());
+        }
+
+        @Override
+        public void setAttribute(String name, Object o) {
+                attributes.put(name, o);
+        }
+
+        @Override
+        public void removeAttribute(String name) {
+                attributes.remove(name);
         }
 
@@ -188 +263 @@
         @Override
         public String getParameter(String name) {
-                return parameters.get(name);
-        }
-
+                String[] values = getParameterValues(name);
+                if (values == null || values.length == 0)
+                        return null;
+                return values[0];
+        }
+
+        @Override
+        public Map<String, String[]> getParameterMap() {
+                Map<String, String[]> m = new HashMap<String, String[]>();
+                for (String key : parameters.keySet())
+                        m.put(key, (String[]) parameters.get(key).toArray());
+                return m;
+        }
+
+        @SuppressWarnings("unchecked")
         @Override
         public Enumeration getParameterNames() {
@@ -198 +285 @@
         @Override
         public String[] getParameterValues(String name) {
-                return (String[]) parameters.values().toArray();
+                List<String> values = parameters.get(name);
+                if (values == null)
+                        return null;
+
+                return (String[]) values.toArray();
         }
 
@@ -215 +306 @@
         public String getRealPath(String path) {
                 return null;
+        }
+
+        @Override
+        public String getLocalName() {
+                return null;
+        }
+
+        @Override
+        public String getLocalAddr() {
+                return ((InetSocketAddress) ctx.getChannel().getLocalAddress()).getAddress().getHostAddress();
+        }
+
+        @Override
+        public int getLocalPort() {
+                return ((InetSocketAddress) ctx.getChannel().getLocalAddress()).getPort();
         }
 
@@ -258 +364 @@
 
         @Override
-        public void setAttribute(String name, Object o) {
-                attributes.put(name, o);
-        }
-
-        @Override
         public String getAuthType() {
                 String auth = req.getHeader(HttpHeaders.Names.AUTHORIZATION);
@@ -275 +376 @@
         }
 
+        @SuppressWarnings("unchecked")
+        @Override
+        public Enumeration getHeaderNames() {
+                return Collections.enumeration(req.getHeaderNames());
+        }
+
+        @Override
+        public String getHeader(String name) {
+                return req.getHeader(name);
+        }
+
+        @Override
+        public Enumeration<String> getHeaders(String name) {
+                return Collections.enumeration(req.getHeaders(name));
+        }
+
         @Override
         public long getDateHeader(String name) {
                 try {
-                        long value = Long.parseLong(req.getHeader(name));
-                        return value;
+                        return Long.parseLong(req.getHeader(name));
                 } catch (NumberFormatException e) {
-                        return -1;
-                }
-        }
-
-        @Override
-        public String getHeader(String name) {
-                return req.getHeader(name);
-        }
-
-        @Override
-        public Enumeration getHeaderNames() {
-                return Collections.enumeration(req.getHeaderNames());
+                        throw new IllegalArgumentException(e);
+                }
         }
 
@@ -306 +412 @@
 
         @Override
+        public String getQueryString() {
+                return queryString;
+        }
+
+        @Override
+        public String getRemoteUser() {
+                return null;
+        }
+
+        @Override
+        public String getRequestURI() {
+                return contextPath + servletPath + pathInfo;
+        }
+
+        @Override
+        public String getRequestedSessionId() {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public String getContextPath() {
+                return contextPath;
+        }
+
+        @Override
+        public String getServletPath() {
+                return servletPath;
+        }
+
+        @Override
         public String getPathInfo() {
                 return pathInfo;
@@ -316 +453 @@
         @Override
         public String getPathTranslated() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public String getQueryString() {
-                return queryString;
-        }
-
-        @Override
-        public String getRemoteUser() {
-                return null;
-        }
-
-        @Override
-        public String getRequestURI() {
-                return servletPath + pathInfo;
-        }
-
-        @Override
-        public String getRequestedSessionId() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public String getServletPath() {
-                return servletPath;
+                // it must return null if local file system path cannot be determined
+                return null;
+        }
+
+        @Override
+        public Enumeration<Locale> getLocales() {
+                return Collections.enumeration(locales);
+        }
+
+        @Override
+        public Locale getLocale() {
+                return locales.get(0);
         }
 
@@ -381 +502 @@
 
         @Override
-        public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
-                // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public Map<String, String[]> getParameterMap() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public void removeAttribute(String name) {
-                // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public Locale getLocale() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public Enumeration<Locale> getLocales() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public boolean isSecure() {
-                // TODO Auto-generated method stub
-                return false;
-        }
-
-        @Override
         public RequestDispatcher getRequestDispatcher(String path) {
                 // TODO Auto-generated method stub
@@ -423 +508 @@
 
         @Override
-        public String getLocalName() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public String getLocalAddr() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public int getLocalPort() {
-                // TODO Auto-generated method stub
-                return 0;
-        }
-
-        @Override
         public ServletContext getServletContext() {
-                // TODO Auto-generated method stub
                 return null;
         }
@@ -483 +549 @@
 
         @Override
-        public Enumeration<String> getHeaders(String name) {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public String getContextPath() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
         public boolean isUserInRole(String role) {
                 // TODO Auto-generated method stub

kraken-httpd/src/main/java/org/krakenapps/httpd/impl/ServletRegistryImpl.java

@@ -71 +71 @@
                         prefix = dir;
 
+                // TODO: For now, it does not comply with servlet spec. see section 3.5
                 // longest match
                 for (int i = 0; i < tokens.length; i++) {