Compare commits

...

No commits in common. "old" and "master" have entirely different histories.
old ... master

16 changed files with 181 additions and 142 deletions

8
.gitignore vendored
View file

@ -1,5 +1,3 @@
tmp/
__pycache__
*.swp
src/gpg/keys
database.db
*.sqlite3
*.pyc
__pycache__/

View file

@ -1,4 +0,0 @@
Mirkoserver
===========
The API server part for Mirkowelle.

View file

@ -1,6 +0,0 @@
#!/bin/bash
sudo apt-get update
sudo apt-get install python3 python python3-pip python3-dev python3-sqlite -y
sudo pip3 -r requirements.txt

21
manage.py Executable file
View file

@ -0,0 +1,21 @@
#!/usr/bin/env python
"""Django's command-line utility for administrative tasks."""
import os
import sys
def main():
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mirkoserver.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)
if __name__ == '__main__':
main()

120
mirkoserver/settings.py Normal file
View file

@ -0,0 +1,120 @@
"""
Django settings for mirkoserver project.
Generated by 'django-admin startproject' using Django 2.2.7.
For more information on this file, see
https://docs.djangoproject.com/en/2.2/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/2.2/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.2/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'lg76^&&h3fo9u9@(y8p+4o5$dd$ak6f+qo)69ko)9+&^ni$%ik'
# 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',
]
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 = 'mirkoserver.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 = 'mirkoserver.wsgi.application'
# Database
# https://docs.djangoproject.com/en/2.2/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.2/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.2/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.2/howto/static-files/
STATIC_URL = '/static/'

21
mirkoserver/urls.py Normal file
View file

@ -0,0 +1,21 @@
"""mirkoserver URL Configuration
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/2.2/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),
]

16
mirkoserver/wsgi.py Normal file
View file

@ -0,0 +1,16 @@
"""
WSGI config for mirkoserver 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.2/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mirkoserver.settings')
application = get_wsgi_application()

View file

@ -1,4 +0,0 @@
gunicorn
psutil
gnupg

View file

@ -1,3 +0,0 @@
[Server]
bind = 127.0.0.1
port = 4567

View file

@ -1,17 +0,0 @@
import configparser
class SetupException(Exception):
def __str__(self):
return "Seems like config.cfg has not been created yet or contains serious errors."
def getSetting(section, setting, path = "config.cfg"):
try:
config = configparser.RawConfigParser()
config.read(path)
try:
return int(config.get(section, setting))
except:
return config.get(section, setting)
except:
return False

Binary file not shown.

View file

@ -1,27 +0,0 @@
import sqlite3, random, string
class Database:
def __init__(this):
this.path = "database.db"
this.conn = sqlite3.connect(this.path)
this.cur = this.conn.cursor()
def commit(this):
this.conn.commit()
def execute(this, sql):
this.cur.execute(sql)
this.commit()
def close(this):
this.conn.close()
def getInstructions(this, cid):
this.cur.execute("SELECT ins FROM instructions WHERE cid=?", (cid,))
return this.cur.fetchone()[0]
def addInstructions(this, pname, ins):
cid = "".join(random.choice(string.ascii_lowercase) for i in range(20))
this.cur.execute("INSERT INTO instructions VALUES (?,?,?)", (cid, pname, ins))
this.commit()
return cid

View file

@ -1,12 +0,0 @@
import config, gnupg
gpgObj = gnupg.GPG(homedir='gpg/keys')
def hasPrivate():
return len(gpg.list_keys(True)) > 0
def genPrivate():
return gpgObj.gen_key(gpgObj.gen_key_input(key_type="RSA", key_length=4096,
name_real=config.getSetting("Server", "name"),
name_comment="",
name_email=config.getSetting("Server", "mail")))

View file

@ -1,12 +0,0 @@
#!/bin/bash
if [ ! -f database.db ]; then
if [ -f database.dist.db ]; then
cp database.dist.db database.db
else
echo "Database file does not exist and cannot be created."
exit 1
fi
fi
gunicorn server:api

View file

@ -1,52 +0,0 @@
import cgi, config, database, os, sys, urllib.parse
def getCode(cid):
dbObj = database.Database()
ins = dbObj.getInstructions(cid)
dbObj.close()
return ins
def api(env, start_response):
if env["PATH_INFO"] == "/env" or env["PATH_INFO"].startswith("/env/"):
start_response('200 OK', [('Content-Type', 'text/html')])
yield '<h1>FastCGI Environment</h1>'.encode()
yield '<table>'.encode()
for k, v in sorted(env.items()):
try:
yield ('<tr><th>%s</th><td>%s</td></tr>' % (cgi.escape(k), cgi.escape(v))).encode()
except:
pass
yield '</table>'.encode()
elif env["REQUEST_METHOD"] == "GET" and not config.getSetting("Server", "allowGet"):
start_response('405 Method Not Allowed', [])
yield '<h1>405 Method Not Allowed</h1>'.encode()
yield '<p>GET requests to this API are not allowed.</p>'.encode()
elif env["REQUEST_METHOD"] != "POST":
start_response('405 Method Not Allowed', [])
yield '<h1>405 Method Not Allowed</h1>'.encode()
yield '<p>Only POST requests to this API are allowed.</p>'.encode()
else:
data = urllib.parse.parse_qs(env['wsgi.input'].readline().decode(), True)
for key, value in data.items():
if key == "iget":
for val in value:
code = getCode(val)
if code is not None:
start_response('200 Success', [])
yield(code.encode())
return
else:
start_response('404 Not Found', [])
yield '<h1>404 Not Found</h1>'.encode()
return
start_response('400 Bad Request', [])
yield '<h1>400 Bad Request</h1>'.encode()