all: get rid of individual requirements file, remove version from every module

passbook/admin/__init__.py

@@ -1,2 +0,0 @@
-"""passbook admin"""
-__version__ = '0.2.6-beta'

passbook/admin/requirements.txt

@@ -1,2 +0,0 @@
-django-rest-framework
-drf_yasg

passbook/api/__init__.py

@@ -1,2 +0,0 @@
-"""passbook api"""
-__version__ = '0.2.6-beta'

passbook/api/requirements.txt

@@ -1,3 +0,0 @@
-djangorestframework==3.9.4
-drf_yasg
-django-filters

passbook/app_gw/__init__.py

@@ -1,2 +0,0 @@
-"""passbook Application Security Gateway Header"""
-__version__ = '0.2.6-beta'

passbook/app_gw/requirements.txt

@@ -1,7 +0,0 @@
-django-revproxy
-urllib3[secure]
-channels
-service_identity
-websocket-client
-daphne<2.3.0
-asgiref~=2.3

passbook/audit/__init__.py

@@ -1,2 +0,0 @@
-"""passbook audit Header"""
-__version__ = '0.2.6-beta'

passbook/captcha_factor/__init__.py

@@ -1,2 +0,0 @@
-"""passbook captcha_factor Header"""
-__version__ = '0.2.6-beta'

passbook/captcha_factor/requirements.txt

@@ -1 +0,0 @@
-django-recaptcha

passbook/core/nginx.conf

@@ -0,0 +1,66 @@
+user  nginx;
+worker_processes  1;
+
+error_log  stderr warn;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format json_combined escape=json
+        '{'
+            '"time_local":"$time_local",'
+            '"remote_addr":"$remote_addr",'
+            '"remote_user":"$remote_user",'
+            '"request":"$request",'
+            '"status": "$status",'
+            '"body_bytes_sent":"$body_bytes_sent",'
+            '"request_time":"$request_time",'
+            '"http_referrer":"$http_referer",'
+            '"http_user_agent":"$http_user_agent"'
+        '}';
+
+    access_log /dev/stdout json_combined;
+
+    sendfile        on;
+    tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    server {
+
+        server_name _;
+
+        gzip on;
+        gzip_types application/javascript image/* text/css;
+        gunzip on;
+        add_header X-passbook-Version 0.2.6-beta;
+        add_header Vary X-passbook-Version;
+        root /static/;
+
+        location /_/healthz {
+            return 204;
+        }
+        location ~* \.(jpg|jpeg|png|gif|ico)$ {
+            expires 30d;
+        }
+        location ~* \.(css|js)$ {
+            expires 7d;
+        }
+
+    }
+
+    server {
+
+        listen 8080;
+
+        location = /stub_status {
+            stub_status;
+        }
+    }
+}

passbook/hibp_policy/__init__.py

@@ -1,2 +0,0 @@
-"""passbook hibp_policy"""
-__version__ = '0.2.6-beta'

passbook/ldap/__init__.py

@@ -1,2 +0,0 @@
-"""Passbook ldap app Header"""
-__version__ = '0.2.6-beta'

passbook/ldap/requirements.txt

@@ -1 +0,0 @@
-ldap3

passbook/lib/__init__.py

@@ -1,2 +0,0 @@
-"""passbook lib"""
-__version__ = '0.2.6-beta'

passbook/oauth_client/__init__.py

@@ -1,2 +0,0 @@
-"""passbook oauth_client Header"""
-__version__ = '0.2.6-beta'

passbook/oauth_client/requirements.txt

@@ -1,2 +0,0 @@
-requests_oauthlib>=0.4.2
-oauthlib>=2.0.6

passbook/oauth_provider/__init__.py

@@ -1,2 +0,0 @@
-"""passbook oauth_provider Header"""
-__version__ = '0.2.6-beta'

passbook/oauth_provider/requirements.txt

@@ -1,2 +0,0 @@
-django-oauth-toolkit
-django-cors-middleware

passbook/oidc_provider/migrations/0002_auto_20190709_1416.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.2.3 on 2019-07-09 14:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('passbook_oidc_provider', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='openidprovider',
+            options={'verbose_name': 'OpenID Provider', 'verbose_name_plural': 'OpenID Providers'},
+        ),
+    ]

passbook/oidc_provider/requirements.txt

@@ -1 +0,0 @@
-django-oidc-provider

passbook/otp/__init__.py

@@ -1,2 +0,0 @@
-"""passbook otp Header"""
-__version__ = '0.2.6-beta'

passbook/otp/requirements.txt

@@ -1,2 +0,0 @@
-django_otp
-qrcode

passbook/password_expiry_policy/__init__.py

@@ -1,2 +0,0 @@
-"""passbook password_expiry"""
-__version__ = '0.2.6-beta'

passbook/root/requirements.txt

@@ -1,15 +0,0 @@
-celery
-colorlog
-cherrypy
-django-ipware
-django-model-utils
-django-redis
-django>=2.0
-djangorestframework
-idna<2.8,>=2.5
-markdown
-psycopg2
-PyYAML
-sentry-sdk
-pip
-urllib3<1.25,>=1.21.1

passbook/saml_idp/__init__.py

@@ -1,2 +0,0 @@
-"""passbook saml_idp Header"""
-__version__ = '0.2.6-beta'

passbook/saml_idp/requirements.txt

@@ -1,5 +0,0 @@
-beautifulsoup4>=4.6.0
-lxml>=3.8.0
-signxml
-defusedxml
-PyCryptodome

passbook/suspicious_policy/__init__.py

@@ -1,2 +0,0 @@
-"""passbook suspicious_policy"""
-__version__ = '0.2.6-beta'

passbook/suspicious_policy/signals.py

@@ -13,9 +13,11 @@ LOGGER = getLogger(__name__)
 
 def update_score(request, username, amount):
     """Update score for IP and User"""
-    remote_ip, _ = get_client_ip(request)
-    if not remote_ip:
-        remote_ip = '255.255.255.255'
+    remote_ip = '255.255.255.255'
+    if 'ip' in request:
+        remote_ip = request['ip']
+    elif request:
+        remote_ip, _ = get_client_ip(request)
     ip_score, _ = IPScore.objects.update_or_create(ip=remote_ip)
     ip_score.score += amount
     ip_score.save()