Merge pull request #27 from zhuangxm/get-proxy-ip

Get proxy ip

project.clj

@@ -1,4 +1,4 @@
-(defproject clj-rpc "0.2.8"
+(defproject clj-rpc "0.2.9"
             :description "simple rpc using clojure"
             :dependencies [[org.clojure/clojure "1.4.0"]
                            [org.clojure/tools.logging "0.2.3"]

src/clj_rpc/context.clj

@@ -1,13 +1,19 @@
 (ns clj-rpc.context
   (:require [ring.middleware.cookies :as cookies]
-            [clj-rpc.user-data :as data]))
+            [clj-rpc.user-data :as data]
+            [clojure.tools.logging :as logging]))
+
+(defn get-proxy-ip
+  [request]
+  (or (get-in request [:headers "x-forwarded-for"])
+      (get-in request [:headers "x-real-ip"])))
 
 (defn wrap-client-ip
   "let :remote-addr represents the real client ip even though
    the client connects through a proxy server"
   [handler]
   (fn [request]
-    (let [ip-from-proxy (get-in request [:headers "X-Forwarded-For"])
+    (let [ip-from-proxy (get-proxy-ip request)
           request (if ip-from-proxy
                     (assoc request :remote-addr ip-from-proxy)
                     request)]

test/clj_rpc/test/integrate.clj

@@ -133,6 +133,7 @@
           query-get (mk-data-query "fn-get-data")
           query-delete (mk-data-query "fn-delete-data")
           result-save (invoke-data-query query-save)
+          _ (prn result-save)
           cookie-m (get-in result-save [:cookies "hjd-session"])
           cookie (get cookie-m :value)
           _ (prn cookie-m)]