From 45394fa59cecf9898c09e71e349f107c12478edf Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 24 Dec 2018 20:30:12 +0100 Subject: [PATCH] Cleanup client --- .../ungleichotp.py => ungleichotpclient.py | 5 +- ungleichotpclient/README.md | 28 ---- ungleichotpclient/manage.py | 15 --- ungleichotpclient/restapp/__init__.py | 0 ungleichotpclient/restapp/admin.py | 3 - ungleichotpclient/restapp/apps.py | 5 - .../restapp/migrations/__init__.py | 0 ungleichotpclient/restapp/models.py | 3 - ungleichotpclient/restapp/tests.py | 3 - ungleichotpclient/restapp/views.py | 3 - .../ungleichotpclient/__init__.py | 0 .../ungleichotpclient/settings.py | 122 ------------------ ungleichotpclient/ungleichotpclient/urls.py | 21 --- ungleichotpclient/ungleichotpclient/wsgi.py | 16 --- 14 files changed, 2 insertions(+), 222 deletions(-) rename ungleichotp/ungleichotp.py => ungleichotpclient.py (95%) delete mode 100644 ungleichotpclient/README.md delete mode 100755 ungleichotpclient/manage.py delete mode 100644 ungleichotpclient/restapp/__init__.py delete mode 100644 ungleichotpclient/restapp/admin.py delete mode 100644 ungleichotpclient/restapp/apps.py delete mode 100644 ungleichotpclient/restapp/migrations/__init__.py delete mode 100644 ungleichotpclient/restapp/models.py delete mode 100644 ungleichotpclient/restapp/tests.py delete mode 100644 ungleichotpclient/restapp/views.py delete mode 100644 ungleichotpclient/ungleichotpclient/__init__.py delete mode 100644 ungleichotpclient/ungleichotpclient/settings.py delete mode 100644 ungleichotpclient/ungleichotpclient/urls.py delete mode 100644 ungleichotpclient/ungleichotpclient/wsgi.py diff --git a/ungleichotp/ungleichotp.py b/ungleichotpclient.py similarity index 95% rename from ungleichotp/ungleichotp.py rename to ungleichotpclient.py index 6ffaa31..bb7f41d 100644 --- a/ungleichotp/ungleichotp.py +++ b/ungleichotpclient.py @@ -68,8 +68,7 @@ if __name__ == '__main__': try: - client.verify(args.name, args.realm, args.token) + if client.verify(args.name, args.realm, args.token) == True: + print("Verify ok") except urllib.error.HTTPError as e: print("Failed to verify: {}".format(e)) - - print("Verify ok") diff --git a/ungleichotpclient/README.md b/ungleichotpclient/README.md deleted file mode 100644 index 6843b82..0000000 --- a/ungleichotpclient/README.md +++ /dev/null @@ -1,28 +0,0 @@ -## Run - -Use your favorite uwsgi configuration or - -``` -UNGLEICHOTPSERVER=https://your-server-address/ -UNGLEICHOTPREALM=admin \ -UNGLEICHOTPNAME=sampleapp \ -UNGLEICHOTPSEED=CEKXVG3235PO2HDW \ - python manage.py runserver -``` - -This triple will be used to connect to the - -## Use ## - -curl - -def index(request): - answer = {} - answer['token'] = pyotp.TOTP(settings.UNGLEICHOTP['UNGLEICHOTPSEED']).now() - answer['name'] = settings.UNGLEICHOTP['UNGLEICHOTPNAME'] - answer['realm'] = settings.UNGLEICHOTP['UNGLEICHOTPREALM'] - - return HttpResponse(json.dumps(answer)) - -elif request.method == 'POST': - do_something_else() diff --git a/ungleichotpclient/manage.py b/ungleichotpclient/manage.py deleted file mode 100755 index e833942..0000000 --- a/ungleichotpclient/manage.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python -import os -import sys - -if __name__ == '__main__': - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ungleichotpclient.settings') - try: - from django.core.management import execute_from_command_line - except ImportError as exc: - raise ImportError( - "Couldn't import Django. Are you sure it's installed and " - "available on your PYTHONPATH environment variable? Did you " - "forget to activate a virtual environment?" - ) from exc - execute_from_command_line(sys.argv) diff --git a/ungleichotpclient/restapp/__init__.py b/ungleichotpclient/restapp/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ungleichotpclient/restapp/admin.py b/ungleichotpclient/restapp/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/ungleichotpclient/restapp/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/ungleichotpclient/restapp/apps.py b/ungleichotpclient/restapp/apps.py deleted file mode 100644 index a8e8df5..0000000 --- a/ungleichotpclient/restapp/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class RestappConfig(AppConfig): - name = 'restapp' diff --git a/ungleichotpclient/restapp/migrations/__init__.py b/ungleichotpclient/restapp/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ungleichotpclient/restapp/models.py b/ungleichotpclient/restapp/models.py deleted file mode 100644 index 71a8362..0000000 --- a/ungleichotpclient/restapp/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/ungleichotpclient/restapp/tests.py b/ungleichotpclient/restapp/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/ungleichotpclient/restapp/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/ungleichotpclient/restapp/views.py b/ungleichotpclient/restapp/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/ungleichotpclient/restapp/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/ungleichotpclient/ungleichotpclient/__init__.py b/ungleichotpclient/ungleichotpclient/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ungleichotpclient/ungleichotpclient/settings.py b/ungleichotpclient/ungleichotpclient/settings.py deleted file mode 100644 index 51266e6..0000000 --- a/ungleichotpclient/ungleichotpclient/settings.py +++ /dev/null @@ -1,122 +0,0 @@ -""" -Django settings for ungleichotpclient project. - -Generated by 'django-admin startproject' using Django 2.1.3. - -For more information on this file, see -https://docs.djangoproject.com/en/2.1/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/2.1/ref/settings/ -""" - -import os - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '*6^8e2t$eo+ewr7rpc6ex#08($7ct9gry)rs*(c@0+_#sp(b^*' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - - -# Application definition - -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'rest_framework', - 'restapp' -] - -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] - -ROOT_URLCONF = 'ungleichotpclient.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - ], - }, - }, -] - -WSGI_APPLICATION = 'ungleichotpclient.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/2.1/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -} - - -# Password validation -# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators - -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - - -# Internationalization -# https://docs.djangoproject.com/en/2.1/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/2.1/howto/static-files/ - -STATIC_URL = '/static/' diff --git a/ungleichotpclient/ungleichotpclient/urls.py b/ungleichotpclient/ungleichotpclient/urls.py deleted file mode 100644 index 6187eb4..0000000 --- a/ungleichotpclient/ungleichotpclient/urls.py +++ /dev/null @@ -1,21 +0,0 @@ -"""ungleichotpclient URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/2.1/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: path('', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') -Including another URLconf - 1. Import the include() function: from django.urls import include, path - 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) -""" -from django.contrib import admin -from django.urls import path - -urlpatterns = [ - path('admin/', admin.site.urls), -] diff --git a/ungleichotpclient/ungleichotpclient/wsgi.py b/ungleichotpclient/ungleichotpclient/wsgi.py deleted file mode 100644 index 821194c..0000000 --- a/ungleichotpclient/ungleichotpclient/wsgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -WSGI config for ungleichotpclient project. - -It exposes the WSGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/2.1/howto/deployment/wsgi/ -""" - -import os - -from django.core.wsgi import get_wsgi_application - -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ungleichotpclient.settings') - -application = get_wsgi_application()