1.7.13 http listeners

.gitignore

@@ -5,3 +5,14 @@
 /target
 
 /gnupg
+
+# Intellij IDEA (see https://intellij-support.jetbrains.com/entries/23393067)
+.idea/
+release.properties
+.navigation/
+captures/
+*.iws
+*.iml
+*.ipr
+*~
+*.swp

src/main/java/com/corundumstudio/socketio/AuthorizationListener.java

@@ -18,11 +18,11 @@
 public interface AuthorizationListener {
 
     /**
-     * Checks is client with handshake data is authorized
+     * Checks if client with handshake data is authorized
      *
      * @param data - handshake data
-     * @return - <b>true</b> if client is authorized of <b>false</b> otherwise
+     * @return - <b>AuthorizationResponse</b>
      */
-    boolean isAuthorized(HandshakeData data);
+    AuthorizationResponse authorize(HandshakeData data);
 
 }

src/main/java/com/corundumstudio/socketio/AuthorizationResponse.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2012 Nikita Koksharov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.corundumstudio.socketio;
+
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+public abstract class AuthorizationResponse {
+
+    private final HttpResponseStatus httpResponseStatus;
+
+    protected AuthorizationResponse(HttpResponseStatus httpResponseStatus) {
+        this.httpResponseStatus = httpResponseStatus;
+    }
+
+    public HttpResponseStatus getHttpResponseStatus() {
+        return httpResponseStatus;
+    }
+
+}

src/main/java/com/corundumstudio/socketio/AuthorizedResponse.java

@@ -0,0 +1,56 @@
+/**
+ * Copyright 2012 Nikita Koksharov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.corundumstudio.socketio;
+
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.AsciiString;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/*
+ * Used to authorize client and add data to the client store
+ */
+public class AuthorizedResponse extends AuthorizationResponse {
+
+    private final Map<String, Object> clientData = new HashMap<String, Object>();
+
+    public AuthorizedResponse() {
+        super(HttpResponseStatus.OK);
+    }
+
+    public static AuthorizedResponse OK() {
+        return new AuthorizedResponse();
+    }
+
+    public AuthorizedResponse setClientData(String key, Object value) {
+        clientData.put(key, value);
+        return this;
+    }
+
+    public AuthorizedResponse setClientData(Map<String, Object> map) {
+        clientData.putAll(map);
+        return this;
+    }
+
+
+    public Map<String, Object> getClientData() {
+        return clientData;
+    }
+
+}

src/main/java/com/corundumstudio/socketio/Configuration.java

@@ -15,10 +15,6 @@
  */
 package com.corundumstudio.socketio;
 
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-
 import com.corundumstudio.socketio.handler.SuccessAuthorizationListener;
 import com.corundumstudio.socketio.listener.DefaultExceptionListener;
 import com.corundumstudio.socketio.listener.ExceptionListener;
@@ -27,6 +23,9 @@
 import com.corundumstudio.socketio.store.StoreFactory;
 
 import javax.net.ssl.KeyManagerFactory;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
 
 public class Configuration {
 
@@ -40,8 +39,6 @@ public class Configuration {
     private int workerThreads = 0; // 0 = current_processors_amount * 2
     private boolean useLinuxNativeEpoll;
 
-    private boolean allowCustomRequests = false;
-
     private int upgradeTimeout = 10000;
     private int pingTimeout = 60000;
     private int pingInterval = 25000;
@@ -122,7 +119,6 @@ public Configuration() {
 
         setJsonSupport(new JsonSupportWrapper(conf.getJsonSupport()));
         setContext(conf.getContext());
-        setAllowCustomRequests(conf.isAllowCustomRequests());
 
         setKeyStorePassword(conf.getKeyStorePassword());
         setKeyStore(conf.getKeyStore());
@@ -239,22 +235,6 @@ public void setContext(String context) {
         this.context = context;
     }
 
-    public boolean isAllowCustomRequests() {
-        return allowCustomRequests;
-    }
-
-    /**
-     * Allow to service custom requests differs from socket.io protocol.
-     * In this case it's necessary to add own handler which handle them
-     * to avoid hang connections.
-     * Default is {@code false}
-     *
-     * @param allowCustomRequests - {@code true} to allow
-     */
-    public void setAllowCustomRequests(boolean allowCustomRequests) {
-        this.allowCustomRequests = allowCustomRequests;
-    }
-
     /**
      * SSL key store password
      *
@@ -460,7 +440,7 @@ public void setKeyManagerFactoryAlgorithm(String keyManagerFactoryAlgorithm) {
     /**
      * Set maximum websocket frame content length limit
      *
-     * @param maxContentLength
+     * @param maxFramePayloadLength
      */
     public void setMaxFramePayloadLength(int maxFramePayloadLength) {
         this.maxFramePayloadLength = maxFramePayloadLength;

src/main/java/com/corundumstudio/socketio/HttpParams.java

@@ -0,0 +1,37 @@
+package com.corundumstudio.socketio;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class HttpParams {
+    private final Map<String, List<String>> params;
+
+    public HttpParams(Map<String, List<String>> params) {
+        this.params = params;
+    }
+
+    public Set<String> getNames() {
+        return params.keySet();
+    }
+
+    public String get(String name) {
+        List<String> values = getAll(name);
+        if (values == null || values.isEmpty()) return null;
+
+        return values.get(0);
+    }
+
+    public List<String> getAll(String name) {
+        return params.get(name);
+    }
+
+    public Map<String, List<String>> asMap() {
+        return params;
+    }
+
+    @Override
+    public String toString() {
+        return params.toString();
+    }
+}

src/main/java/com/corundumstudio/socketio/HttpRequestBody.java

@@ -0,0 +1,25 @@
+package com.corundumstudio.socketio;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.CharsetUtil;
+
+import java.nio.charset.Charset;
+
+public class HttpRequestBody {
+
+    private final FullHttpRequest req;
+
+    public HttpRequestBody(FullHttpRequest req) {
+        this.req = req;
+    }
+
+    public String toString() {
+        return toString(CharsetUtil.UTF_8);
+    }
+
+    public String toString(Charset charset) {
+        ByteBuf buffer = req.content();
+        return buffer.toString(charset);
+    }
+}

src/main/java/com/corundumstudio/socketio/HttpRequestSignature.java

@@ -0,0 +1,39 @@
+package com.corundumstudio.socketio;
+
+import io.netty.handler.codec.http.HttpMethod;
+
+public class HttpRequestSignature {
+    private final HttpMethod httpMethod;
+    private final String path;
+
+    public HttpRequestSignature(HttpMethod httpMethod, String path) {
+        this.httpMethod = httpMethod;
+        this.path = path;
+    }
+
+    public HttpMethod getHttpMethod() {
+        return httpMethod;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof HttpRequestSignature)) return false;
+
+        HttpRequestSignature that = (HttpRequestSignature) o;
+
+        if (!httpMethod.equals(that.httpMethod)) return false;
+        return path.equals(that.path);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = httpMethod.hashCode();
+        result = 31 * result + path.hashCode();
+        return result;
+    }
+}