From cd4a0deaa82c9c4abbade44425cdb1dbe2dd1b11 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Thu, 26 May 2011 15:46:59 +0100
Subject: [PATCH] Simplify the API authenticator

---
 app/api/auth.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/api/auth.py b/app/api/auth.py
index f7da4d4..2355525 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -4,23 +4,17 @@ from api.models import AuthAPIKey
 
 
 class APIKeyAuthentication(object):
+    """ Validats a request by API key passed as a GET parameter """
 
     def is_authenticated(self, request):
-
-        params = {}
-        for key, value in request.GET.items():
-            params[key.lower()] = value
-
-        if 'apikey' in params:
-            try:
-                keyobj = AuthAPIKey.objects.get(key=params['apikey'])
-            except:
-                keyobj = None
-
+        try:
+            keyobj = AuthAPIKey.objects.get(key=request.GET.get('apikey', None))
+        except AuthAPIKey.DoesNotExist:
+            pass
+        else:
             if keyobj and keyobj.active:
                 request.user = AnonymousUser()
                 return True
-
         return False
 
     def challenge(self):