fixes bug 1374371 - disable tokens middle if not ENABLE_TOKENS_AUTHEN… (

#181)

* fixes bug 1374371 - disable tokens middle if not ENABLE_TOKENS_AUTHENTICATION

* Revert "Update simplejson from 3.10.0 to 3.11.0 (#178)"

This reverts commit 0a937f1.

requirements.txt

@@ -212,26 +212,26 @@ datadog==0.16.0 \
 decorator==4.0.11 \
     --hash=sha256:73cbaadb8bc4e3c65fe1100773d56331a2d756cc0f5c7b9d8d5d5223fe04f600 \
     --hash=sha256:953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76
-simplejson==3.11.0 \
-    --hash=sha256:678dac4e374fbf8d0e75e45066b66a9bcfb39fb2928ec846b5c069b8322509a2 \
-    --hash=sha256:5843ab70d38774b3d22ee29aeb7a7a6b786be82b67c275e0aa93a46daf11d491 \
-    --hash=sha256:2817dba6e53e620391939f931dfc1b7a8a971ba9703c2e1152812eba9bce1703 \
-    --hash=sha256:fdc9497160c02cbd855f0cc209f0c4948f0901c3096bcdb5809b2aa3b000c13d \
-    --hash=sha256:d9c3e6709696f8d1a2c51085481ae44bddb7d577cd497c767cb401e3c47f3864 \
-    --hash=sha256:a72e30bcb74c3264d00972b46b7cce7ec76f647a31cf9aa0bb2da193fce2d270 \
-    --hash=sha256:7d87c4205e6909a051b37555a166b797395194d27494a9d10a08216e797f64f0 \
-    --hash=sha256:dae0921bcdc4fef041ef4a3f20e2aa9c098fc4c8e16357f3a46acd129f4f06aa \
-    --hash=sha256:eac1290383d12cdf1dd652fcb75d64cd2f0e0b2498b7b957e6a7362d9197caff \
-    --hash=sha256:47c6e9bcb702ba033bec127a84cd888b8a046babb08652704d742712e4ad48d3 \
-    --hash=sha256:3d399d3d1e96416f4553cb44243ba1ce2c441b6741eed1484ada7ab28fadbc35 \
-    --hash=sha256:7e9ef99adf318f1a767be13b1f0151b1cd2613218650564ccc897394a08f5ca9 \
-    --hash=sha256:7b4fc15220afb837854b5f9ee5f957ce2b8db51a1b5d4857b66c1f1845910248 \
-    --hash=sha256:d6668e4f267eaef182b2c7408b516e4564a889066bf23b377f3057b5807dbb8a \
-    --hash=sha256:8af1ff070cd22ac7a96f97ce9cbfa340204657fac7042c26ba1c339a0e488a9e \
-    --hash=sha256:8c95fa7e9573ce55bfa25db10f4992adc39c81d5850ac7f3a0f832d80ab15556 \
-    --hash=sha256:23c908e4865bb709d951653a5e4112268dc9c8019a875c083f669d37e4569433 \
-    --hash=sha256:d3000de238a52f524204d5c14d0019d6121e4080be5feb8b34007e8edc71e42a \
-    --hash=sha256:912392f82fa8fe81edba4dd62034833d7b456423169f61588a60ef2fbadc41ad
+simplejson==3.10.0 \
+    --hash=sha256:8b478dd885fd7184d38797939ccd508e7feb77875058a94e5f09a4e0c67a53c2 \
+    --hash=sha256:7a8daeaea5d8b846a7cd6d76aa1006cc15c2f51eba3abafd6948824ef166ba60 \
+    --hash=sha256:4485d1e310e9b97b29b21a011e1d929ac3c239966f6b8c504c1db63873a15967 \
+    --hash=sha256:ea38d82c16e998ea9f3aee26d54816d3c560e5e3a075a56c54aef7263412f12e \
+    --hash=sha256:2ed3362bf59563855054551924c1f01d3876f1f4286d3b2bed88be1a9eac40c3 \
+    --hash=sha256:b26455e86d5f7b8e7344c3992a48e32e11b01e26e57cd09c6ce4c94b9b5067f0 \
+    --hash=sha256:3f43000ccde55f0ba8d46dd18a8dd71c72b48c7103d9ec56b077fe8de0ec686d \
+    --hash=sha256:84c4eb240c9697719a22a1b92dbe3b16d8ee484726b89f823bbf831d94a9ec86 \
+    --hash=sha256:3a2a1e74b2b2feae27c8d1ec991544424dad4d0402152359cb79505983fc10f5 \
+    --hash=sha256:d0509648b2074bf5a66c9d6ad3ee6d3711cc035fe38756cd02df93af2187f31b \
+    --hash=sha256:953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2 \
+    --hash=sha256:b1e260204d712059cb1f60e86f1f28b72570380b74d1cd550aac1903169d9f74 \
+    --hash=sha256:18d2f00229c8aa364a29d112d6fe7d7e988d6c0917578ac2907532698154836a \
+    --hash=sha256:9ed51dc5cffa6366aad2e1e7d7ce65954b32092dc0585a591726da14c418adbd \
+    --hash=sha256:0dc3afa149746b4e7551471ff868135c92d7b68b8ac37225388fac29127d836b \
+    --hash=sha256:ddff7c3745a75cbd98b2d148eebbd739d7d18dfb537a857b02774cc09a333129 \
+    --hash=sha256:e633def17eedd2d202437daeb8fda6f379d51a34de8b809800e2737d3e7363f9 \
+    --hash=sha256:370f2b68a93fb533b537dfacc13300928f794e7dbdf7c72769d80432ea71631a \
+    --hash=sha256:7e6f55c72388afa83c38fda0d5dab710f364476b661d8b5441ab79c1d402e9be
 msgpack-python==0.4.8 \
     --hash=sha256:1a2b19df0f03519ec7f19f826afb935b202d8979b0856c6fb3dc28955799f886 \
     --hash=sha256:637b012c9ea021de7a7a75d6ff5e82cfef6694babd7e14bb9a3adcb2a5bd52f0 \

tecken/tokens/middleware.py

@@ -3,6 +3,7 @@
 from django import http
 from django.contrib import auth
 from django.conf import settings
+from django.core.exceptions import MiddlewareNotUsed
 from django.utils.deprecation import MiddlewareMixin
 
 from .models import Token
@@ -13,10 +14,13 @@
 
 class APITokenAuthenticationMiddleware(MiddlewareMixin):
 
-    def process_request(self, request):
+    def __init__(self):
         if not settings.ENABLE_TOKENS_AUTHENTICATION:  # pragma: no cover
             logger.warn('API Token authentication disabled')
-            return
+            raise MiddlewareNotUsed
+
+    def process_request(self, request):
+
         key = request.META.get('HTTP_AUTH_TOKEN')
         if not key:
             return