110swag / flashy-backend

Authored by Andrew Buss 2015-05-29 03:07:10 -0700

Exists in master

Showing 3 changed files with 15 additions and 2 deletions Side-by-side Diff

	1	+class SetRemoteAddrFromForwardedFor(object):
	2	+ def process_request(self, request):
	3	+ try:
	4	+ real_ip = request.META['HTTP_X_FORWARDED_FOR']
	5	+ except KeyError:
	6	+ pass
	7	+ else:
	8	+ # HTTP_X_FORWARDED_FOR can be a comma-separated list of IPs.
	9	+ # Take just the first one.
	10	+ real_ip = real_ip.split(",")[0]
	11	+ request.META['REMOTE_ADDR'] = real_ip

...	...	@@ -27,7 +27,7 @@
27	27
28	28	def log_event(request, event=''):
29	29	getLogger('flashy.events').info(
30		- '%s %s %s %s' % (request.META['REMOTE_ADDR'], str(request.user), request.META.get('PATH', ''), event))
	30	+ '%s %s %s %s' % (request.META['REMOTE_ADDR'], str(request.user), request.path, event))
31	31
32	32
33	33	class SectionViewSet(ReadOnlyModelViewSet):

...	...	@@ -36,6 +36,7 @@
36	36	WEBSOCKET_URL = '/ws/'
37	37
38	38	MIDDLEWARE_CLASSES = (
	39	+ 'flashcards.middleware.SetRemoteAddrFromForwardedFor',
39	40	'django.contrib.sessions.middleware.SessionMiddleware',
40	41	'django.middleware.common.CommonMiddleware',
41	42	'django.middleware.csrf.CsrfViewMiddleware',
...	...	@@ -44,6 +45,7 @@
44	45	'django.contrib.messages.middleware.MessageMiddleware',
45	46	'django.middleware.clickjacking.XFrameOptionsMiddleware',
46	47	'django.middleware.security.SecurityMiddleware',
	48	+
47	49	)
48	50
49	51	ROOT_URLCONF = 'flashy.urls'
...	...	@@ -144,7 +146,7 @@
144	146	},
145	147	},
146	148	'loggers': {
147		- 'django.request': {
	149	+ 'django': {
148	150	'handlers': ['file'],
149	151	'level': 'DEBUG',
150	152	'propagate': True,