senthor_rails_legacy 0.1.0 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/senthor_rails_legacy/middleware.rb +23 -6
- data/lib/senthor_rails_legacy/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fbbbb985926e92df46b0a0e97096b82bb9764a585d207b43cf07d93a163ab52f
|
|
4
|
+
data.tar.gz: c8b9a5c430c06656a56ef664c27bfd491b8653719345c8d9235c78e4add1fe04
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fa62bd96695d7e71d900617fbe2925f52a5f12808161da3749ea83aa9c7e0b1f6aa2f8f8fadb19d0a5b44768df1fc1bbd4169b6fdadfb7f5d5c85e46ea6990c6
|
|
7
|
+
data.tar.gz: c19152f2d750c014c086d7824f6b77ce516beb71287cde790986448e19d7ddd0ca9596b44e605ede809a56c3e25f66a98cd909a20aaf88b62a1283f72c63bf52
|
|
@@ -16,12 +16,7 @@ module Senthor
|
|
|
16
16
|
return @app.call(env)
|
|
17
17
|
end
|
|
18
18
|
|
|
19
|
-
client_ip =
|
|
20
|
-
request.get_header('HTTP_X_FORWARDED_FOR')&.split(',')&.first&.strip ||
|
|
21
|
-
request.get_header('HTTP_X_REAL_IP') ||
|
|
22
|
-
request.get_header('HTTP_CF_CONNECTING_IP') ||
|
|
23
|
-
request.get_header('REMOTE_ADDR') ||
|
|
24
|
-
'unknown'
|
|
19
|
+
client_ip = client_ip(request)
|
|
25
20
|
|
|
26
21
|
headers = {}
|
|
27
22
|
excluded_headers = %w[
|
|
@@ -77,8 +72,30 @@ module Senthor
|
|
|
77
72
|
]
|
|
78
73
|
end
|
|
79
74
|
|
|
75
|
+
puts "Continue"
|
|
80
76
|
# Otherwise continue as normal
|
|
81
77
|
@app.call(env)
|
|
82
78
|
end
|
|
79
|
+
|
|
80
|
+
def client_ip(request)
|
|
81
|
+
# Try the usual headers in order
|
|
82
|
+
ip = nil
|
|
83
|
+
|
|
84
|
+
if request.respond_to?(:get_header) # Rails 5+
|
|
85
|
+
ip = request.get_header('HTTP_X_FORWARDED_FOR')
|
|
86
|
+
ip = ip.split(',').first.strip if ip && !ip.empty?
|
|
87
|
+
ip ||= request.get_header('HTTP_X_REAL_IP')
|
|
88
|
+
ip ||= request.get_header('HTTP_CF_CONNECTING_IP')
|
|
89
|
+
ip ||= request.get_header('REMOTE_ADDR')
|
|
90
|
+
else # Rails 4
|
|
91
|
+
ip = request.env['HTTP_X_FORWARDED_FOR']
|
|
92
|
+
ip = ip.split(',').first.strip if ip && !ip.empty?
|
|
93
|
+
ip ||= request.env['HTTP_X_REAL_IP']
|
|
94
|
+
ip ||= request.env['HTTP_CF_CONNECTING_IP']
|
|
95
|
+
ip ||= request.env['REMOTE_ADDR']
|
|
96
|
+
end
|
|
97
|
+
|
|
98
|
+
ip || 'unknown'
|
|
99
|
+
end
|
|
83
100
|
end
|
|
84
101
|
end
|