Merge pull request #5 from Red5/feature/supported-headers-update

Feature/supported headers update

Author: mondain

pom.xml

@@ -9,7 +9,7 @@
     <artifactId>websocket</artifactId>
     <packaging>jar</packaging>
     <name>websocket</name>
-    <version>1.9</version>
+    <version>1.10</version>
     <description>Red5 WebSocket plugin</description>
     <url>https://github.com/Red5/red5-websocket</url>
     <organization>

src/main/java/org/red5/net/websocket/Constants.java

@@ -46,6 +46,12 @@ public class Constants {
     public final static String HTTP_HEADER_ORIGIN = "Origin";
 
     public final static String HTTP_HEADER_USERAGENT = "User-Agent";
+    
+    public final static String WS_HEADER_FORWARDED = "X-Forwarded-For";
+    
+    public final static String WS_HEADER_REAL_IP = "X-Real-IP";
+    
+    public final static String WS_HEADER_GENERIC_PREFIX = "X-";
 
     public static final String URI_QS_PARAMETERS = "querystring-parameters";
 

src/main/java/org/red5/net/websocket/codec/WebSocketDecoder.java

@@ -291,7 +291,7 @@ public void operationComplete(IoFuture future) {
                     });
                     throw new WebSocketException("Handshake failed, missing plugin");
                 }
-            } else if (request[i].contains(Constants.WS_HEADER_KEY)) {
+            }else if (request[i].contains(Constants.WS_HEADER_KEY)) {
                 map.put(Constants.WS_HEADER_KEY, extractHeaderValue(request[i]));
             } else if (request[i].contains(Constants.WS_HEADER_VERSION)) {
                 map.put(Constants.WS_HEADER_VERSION, extractHeaderValue(request[i]));
@@ -307,10 +307,26 @@ public void operationComplete(IoFuture future) {
                 conn.setOrigin(extractHeaderValue(request[i]));
             } else if (request[i].contains(Constants.HTTP_HEADER_USERAGENT)) {
                 map.put(Constants.HTTP_HEADER_USERAGENT, extractHeaderValue(request[i]));
+            }else if (request[i].startsWith(Constants.WS_HEADER_GENERIC_PREFIX)) {
+            	map.put(getHeaderName(request[i]), extractHeaderValue(request[i]));
             }
         }
         return map;
     }
+    
+    
+    
+    /**
+     * Returns the trimmed header name.
+     * 
+     * @param requestHeader
+     * @return value
+     */
+    private String getHeaderName(String requestHeader){
+    	return requestHeader.substring(0, requestHeader.indexOf(':')).trim();
+    }
+    
+    
 
     /**
      * Returns the trimmed header value.