Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## master

- [#59](https://github.com/castle/castle-python/pull/59) drop requests min version in ci
- [#56](https://github.com/castle/castle-python/pull/56) drop special ip header behavior

### Breaking Changes:

Expand Down
13 changes: 0 additions & 13 deletions castle/extractors/ip.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,4 @@ def call(self):
if hasattr(self.request, 'ip'):
return self.request.ip

return self.wsgi_request_ip()

def wsgi_request_ip(self):
cf_ip = self.request.environ.get('HTTP_CF_CONNECTING_IP')

if cf_ip:
return cf_ip.split(',')[0]

x_forwarded_for = self.request.environ.get('HTTP_X_FORWARDED_FOR')

if x_forwarded_for:
return x_forwarded_for.split(',')[0]

return self.request.environ.get('REMOTE_ADDR')
24 changes: 0 additions & 24 deletions castle/test/extractors/ip_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,6 @@ def request_with_ip_remote_addr():
return req


def request_with_ip_x_forwarded_for():
req = mock.Mock(spec=['environ'])
req.environ = {'HTTP_X_FORWARDED_FOR': request_ip()}
return req


def request_with_ip_cf_connecting_ip():
req = mock.Mock(spec=['environ'])
req.environ = {'HTTP_CF_CONNECTING_IP': request_ip_next()}
return req


class ExtractorsIpTestCase(unittest.TestCase):
def test_extract_ip(self):
self.assertEqual(ExtractorsIp(request()).call(), request_ip())
Expand All @@ -43,15 +31,3 @@ def test_extract_ip_from_wsgi_request_remote_addr(self):
ExtractorsIp(request_with_ip_remote_addr()).call(),
request_ip()
)

def test_extract_ip_from_wsgi_request_x_forwarded_for(self):
self.assertEqual(
ExtractorsIp(request_with_ip_x_forwarded_for()).call(),
request_ip()
)

def test_extract_ip_from_wsgi_request_cf_connection_ip(self):
self.assertEqual(
ExtractorsIp(request_with_ip_cf_connecting_ip()).call(),
request_ip_next()
)