From fc9e14dd5df90eed90702fd173445ac55f33c7b8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 30 Dec 2018 18:10:45 +0100 Subject: [PATCH] Restructure -> easier checkout on app server --- .gitignore | 1 + ungleichotpserver/manage.py => manage.py | 0 .../otpauth => otpauth}/__init__.py | 0 .../otpauth => otpauth}/admin.py | 0 .../otpauth => otpauth}/apps.py | 0 .../migrations/0001_initial.py | 0 .../migrations/__init__.py | 0 .../otpauth => otpauth}/models.py | 0 .../otpauth => otpauth}/serializer.py | 0 .../otpauth => otpauth}/tests.py | 0 .../otpauth => otpauth}/views.py | 0 requests/gendata.py | 45 ------------------- .../requirements.txt => requirements.txt | 0 .../{ungleichotpserver => }/__init__.py | 0 .../settings/__init__.py | 0 .../{ungleichotpserver => }/settings/dev.py | 0 .../{ungleichotpserver => }/settings/prod.py | 0 .../{ungleichotpserver => }/urls.py | 0 .../{ungleichotpserver => }/wsgi.py | 0 19 files changed, 1 insertion(+), 45 deletions(-) rename ungleichotpserver/manage.py => manage.py (100%) rename {ungleichotpserver/otpauth => otpauth}/__init__.py (100%) rename {ungleichotpserver/otpauth => otpauth}/admin.py (100%) rename {ungleichotpserver/otpauth => otpauth}/apps.py (100%) rename {ungleichotpserver/otpauth => otpauth}/migrations/0001_initial.py (100%) rename {ungleichotpserver/otpauth => otpauth}/migrations/__init__.py (100%) rename {ungleichotpserver/otpauth => otpauth}/models.py (100%) rename {ungleichotpserver/otpauth => otpauth}/serializer.py (100%) rename {ungleichotpserver/otpauth => otpauth}/tests.py (100%) rename {ungleichotpserver/otpauth => otpauth}/views.py (100%) delete mode 100644 requests/gendata.py rename ungleichotpserver/requirements.txt => requirements.txt (100%) rename ungleichotpserver/{ungleichotpserver => }/__init__.py (100%) rename ungleichotpserver/{ungleichotpserver => }/settings/__init__.py (100%) rename ungleichotpserver/{ungleichotpserver => }/settings/dev.py (100%) rename ungleichotpserver/{ungleichotpserver => }/settings/prod.py (100%) rename ungleichotpserver/{ungleichotpserver => }/urls.py (100%) rename ungleichotpserver/{ungleichotpserver => }/wsgi.py (100%) diff --git a/.gitignore b/.gitignore index 6cc828e..d2265c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ venv/ db.sqlite3 +aux/ diff --git a/ungleichotpserver/manage.py b/manage.py similarity index 100% rename from ungleichotpserver/manage.py rename to manage.py diff --git a/ungleichotpserver/otpauth/__init__.py b/otpauth/__init__.py similarity index 100% rename from ungleichotpserver/otpauth/__init__.py rename to otpauth/__init__.py diff --git a/ungleichotpserver/otpauth/admin.py b/otpauth/admin.py similarity index 100% rename from ungleichotpserver/otpauth/admin.py rename to otpauth/admin.py diff --git a/ungleichotpserver/otpauth/apps.py b/otpauth/apps.py similarity index 100% rename from ungleichotpserver/otpauth/apps.py rename to otpauth/apps.py diff --git a/ungleichotpserver/otpauth/migrations/0001_initial.py b/otpauth/migrations/0001_initial.py similarity index 100% rename from ungleichotpserver/otpauth/migrations/0001_initial.py rename to otpauth/migrations/0001_initial.py diff --git a/ungleichotpserver/otpauth/migrations/__init__.py b/otpauth/migrations/__init__.py similarity index 100% rename from ungleichotpserver/otpauth/migrations/__init__.py rename to otpauth/migrations/__init__.py diff --git a/ungleichotpserver/otpauth/models.py b/otpauth/models.py similarity index 100% rename from ungleichotpserver/otpauth/models.py rename to otpauth/models.py diff --git a/ungleichotpserver/otpauth/serializer.py b/otpauth/serializer.py similarity index 100% rename from ungleichotpserver/otpauth/serializer.py rename to otpauth/serializer.py diff --git a/ungleichotpserver/otpauth/tests.py b/otpauth/tests.py similarity index 100% rename from ungleichotpserver/otpauth/tests.py rename to otpauth/tests.py diff --git a/ungleichotpserver/otpauth/views.py b/otpauth/views.py similarity index 100% rename from ungleichotpserver/otpauth/views.py rename to otpauth/views.py diff --git a/requests/gendata.py b/requests/gendata.py deleted file mode 100644 index 9c17164..0000000 --- a/requests/gendata.py +++ /dev/null @@ -1,45 +0,0 @@ -import json -import pyotp -import urllib.request -import urllib.parse - -serverurl="http://localhost:8000/ungleichotp/verify/" -totp=pyotp.TOTP("PZKBPTHDGSLZBKIZ") - -to_send={} -to_send['name'] = "info@ungleich.ch" -to_send['verifyname'] = to_send['name'] - -to_send['token'] = totp.now() -to_send['verifytoken'] = to_send['token'] - -to_send['realm'] = "ungleich-admin" -to_send['verifyrealm'] = to_send['realm'] - -data = json.dumps(to_send) -print(data) - -with open("outdata", "w") as fd: - fd.write(data) - fd.write("\n") - - -# Post to test server! -#data = urllib.parse.urlencode(bytes(data, encoding="utf-8")) -#data = urllib.parse.urlencode(to_send) -#data = bytes(data, encoding="utf-8") -data = data.encode("utf-8") - -print(data) - -req = urllib.request.Request(url=serverurl, data=data, headers={'Content-Type': 'application/json'}, method='POST') - -print(req) - -with urllib.request.urlopen(req) as f: - print(f.status) - - if f.status == 200: - print("all good") - print(f.reason) - print(f.getcode()) diff --git a/ungleichotpserver/requirements.txt b/requirements.txt similarity index 100% rename from ungleichotpserver/requirements.txt rename to requirements.txt diff --git a/ungleichotpserver/ungleichotpserver/__init__.py b/ungleichotpserver/__init__.py similarity index 100% rename from ungleichotpserver/ungleichotpserver/__init__.py rename to ungleichotpserver/__init__.py diff --git a/ungleichotpserver/ungleichotpserver/settings/__init__.py b/ungleichotpserver/settings/__init__.py similarity index 100% rename from ungleichotpserver/ungleichotpserver/settings/__init__.py rename to ungleichotpserver/settings/__init__.py diff --git a/ungleichotpserver/ungleichotpserver/settings/dev.py b/ungleichotpserver/settings/dev.py similarity index 100% rename from ungleichotpserver/ungleichotpserver/settings/dev.py rename to ungleichotpserver/settings/dev.py diff --git a/ungleichotpserver/ungleichotpserver/settings/prod.py b/ungleichotpserver/settings/prod.py similarity index 100% rename from ungleichotpserver/ungleichotpserver/settings/prod.py rename to ungleichotpserver/settings/prod.py diff --git a/ungleichotpserver/ungleichotpserver/urls.py b/ungleichotpserver/urls.py similarity index 100% rename from ungleichotpserver/ungleichotpserver/urls.py rename to ungleichotpserver/urls.py diff --git a/ungleichotpserver/ungleichotpserver/wsgi.py b/ungleichotpserver/wsgi.py similarity index 100% rename from ungleichotpserver/ungleichotpserver/wsgi.py rename to ungleichotpserver/wsgi.py