Version 0.2

Author: ElusiveSpirit

README.md

@@ -2,7 +2,7 @@ django-dev-protector
 ====================
 The app for freelance developers, that blocks site if needed.  
 
-It can be used in situations when a client don't want to pay your work. The app blocks all requests to the site and shows a template.
+It can be used in situations when a client don't want to pay your work. The app blocks all requests to the site and shows a message of this situation.
 
 Installation
 ------------
@@ -32,21 +32,27 @@ PROTECT_TEMPLATE_NAME = 'django_dev_protector/index.html'
 
 # if redirect url is set, then default template would be  
 # redirects person after 10 sec
-PROTECT_REDIRECT_URL = None
+PROTECT_REDIRECT_URL = 'http://your_client_opponent_site.com/'
 ```
 By default server is unblocked
 
 Usage
 -----
-You must generate and save your hash first
+You save your django SECRET_KEY from settings
 ```
-./manage.py generatehash
+SECRET_KEY = '...
 ```
-After you are able to block
+After you are able to block or unblock site with POST requests
 ```
-http://127.0.0.1:8000/django_dev_protector/<hash>/on/
+{
+  "key": <SECRET_KEY>,
+  "status": true
+}
+POST to http://<your_domain>/django_dev_protector/
+```
+An example
+```
+curl \
+  -H "Content-Type: application/json" \
+  -X POST -d '{"key": "<SECRET_KEY>", "status": true}' \ http://<your_domain>/django_dev_protector/
 ```
- or unblock site with GET requests
- ```
- http://127.0.0.1:8000/django_dev_protector/<hash>/off/
- ```

django_dev_protector/management/__init__.py

@@ -3,21 +3,21 @@
 
 from django.shortcuts import render, redirect
 from django.utils.deprecation import MiddlewareMixin
-from .settings import TEMPLATE_NAME, REDIRECT_URL, PROTECT_STATUS_VARIABLE, PROTECT_HASH_VARIABLE
+from django.conf import settings
+from .settings import TEMPLATE_NAME, REDIRECT_URL, PROTECT_STATUS_VARIABLE
 
 
 class ControlMiddleware(MiddlewareMixin):
     def process_request(self, request):
-        url = match(r'^/django_dev_protector/(?P<hash>\w+)/(?P<status>(on)|(off))/$', request.path)
-        if url and url.group('hash') == environ[PROTECT_HASH_VARIABLE]:
-            if url.group('status') == 'on':
-                status = 'True'
-            else:
-                status = 'False'
-            from .setup import save_status
-            environ[PROTECT_STATUS_VARIABLE] = status
-            save_status(status)
-            return redirect('/')
+        url = match(r'^/django_dev_protector/$', request.path)
+        if url and request.method == 'POST':
+            import json
+            data = json.loads(request.body.decode('utf-8'))
+            if data['key'] == settings.SECRET_KEY:
+                from .setup import save_status
+                environ[PROTECT_STATUS_VARIABLE] = str(data['status'])
+                save_status(str(data['status']))
+                return redirect('/')
 
         if environ.get(PROTECT_STATUS_VARIABLE) == 'True':
             from django.shortcuts import render

django_dev_protector/management/commands/__init__.py

@@ -6,15 +6,12 @@
 PROTECT_STATUS_DEFAULT = False
 
 PROTECT_STATUS_VARIABLE = 'PROTECT_STATUS_VARIABLE'
-PROTECT_HASH_VARIABLE = 'PROTECT_HASH_VARIABLE'
 PROTECT_STATUS_FILE = '/protect_status.conf'
-PROTECT_HASH_FILE = '/protect_hash.conf'
 
 TEMPLATE_NAME = 'django_dev_protector/index.html' if not hasattr(settings, 'PROTECT_TEMPLATE_NAME') else settings.PROTECT_TEMPLATE_NAME
 
 REDIRECT_URL = None if not hasattr(settings, 'PROTECT_REDIRECT_URL') else settings.PROTECT_REDIRECT_URL
 
 
-from django_dev_protector.setup import get_status, get_hash
+from django_dev_protector.setup import get_status
 os.environ[PROTECT_STATUS_VARIABLE] = get_status()
-os.environ[PROTECT_HASH_VARIABLE] = get_hash()

django_dev_protector/management/commands/generatehash.py

@@ -1,10 +1,9 @@
 import os
 
 from .settings import (PROTECT_STATUS_FILE, PROTECT_STATUS_VARIABLE,
-                       PROTECT_STATUS_DEFAULT, DIR_NAME, PROTECT_HASH_FILE)
+                       PROTECT_STATUS_DEFAULT, DIR_NAME)
 
 STATUS_FILE_NAME = DIR_NAME + PROTECT_STATUS_FILE
-HASH_FILE_NAME = DIR_NAME + PROTECT_HASH_FILE
 
 
 def save_to_file(text, file_name):
@@ -42,8 +41,3 @@ def get_status():
         save_status(PROTECT_STATUS_DEFAULT)
         return PROTECT_STATUS_DEFAULT
     return res
-
-
-def get_hash():
-    """Get saved hash from file"""
-    return get_from_file(HASH_FILE_NAME)

django_dev_protector/middleware.py

@@ -1,7 +1,9 @@
+import json
 from django.test import TestCase, Client
+from django.conf import settings
 
 import django_dev_protector.settings
-from django_dev_protector.setup import get_hash, get_status, save_status
+from django_dev_protector.setup import get_status
 
 
 class MiddlewareTests(TestCase):
@@ -10,12 +12,18 @@ def test_block_the_server(self):
         """
         Blocks server by request
         """
-        response = self.client.get('/django_dev_protector/%s/on/' % get_hash())
+        response = self.client.post('/django_dev_protector/', json.dumps({
+            'key': settings.SECRET_KEY,
+            'status': True
+        }), content_type='application/json')
         self.assertEqual(get_status(), 'True')
 
     def test_unblock_the_server(self):
         """
         Unblocks server by request
         """
-        response = self.client.get('/django_dev_protector/%s/off/' % get_hash())
+        response = self.client.post('/django_dev_protector/', json.dumps({
+            'key': settings.SECRET_KEY,
+            'status': False
+        }), content_type='application/json')
         self.assertEqual(get_status(), 'False')

django_dev_protector/protect_hash.conf

@@ -9,6 +9,7 @@
 
 ALLOWED_HOSTS = []
 
+PROTECT_REDIRECT_URL = 'http://ya.ru'
 
 INSTALLED_APPS = [
     'django.contrib.admin',