From 7519b1c4c29e967e6fc9545cb86baa39c640f4d6 Mon Sep 17 00:00:00 2001 From: Bui Date: Fri, 13 Mar 2020 02:45:42 +0000 Subject: [PATCH] account system backend, db rewrite --- .gitignore | 2 + app.py | 348 ++++++++++++++++++++++++------- config.example.json | 4 +- public/src/css/admin.css | 125 +++++++++++ schema.py | 73 +++++++ templates/admin.html | 23 ++ templates/admin_song_detail.html | 87 ++++++++ templates/admin_songs.html | 11 + tools/migrate_db.py | 105 ++++++++++ 9 files changed, 700 insertions(+), 78 deletions(-) create mode 100644 public/src/css/admin.css create mode 100644 schema.py create mode 100644 templates/admin.html create mode 100644 templates/admin_song_detail.html create mode 100644 templates/admin_songs.html create mode 100644 tools/migrate_db.py diff --git a/.gitignore b/.gitignore index 6d44399..3b79d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ $RECYCLE.BIN/ .Trashes .vscode +*.pyc # Directories potentially created on remote AFP share .AppleDB @@ -50,3 +51,4 @@ version.json public/index.html config.json public/assets/song_skins +secret.txt diff --git a/app.py b/app.py index d1ecbe3..569631f 100644 --- a/app.py +++ b/app.py @@ -1,39 +1,65 @@ -#!/usr/bin/env python2 - -from __future__ import division +#!/usr/bin/env python3 +import bcrypt import json -import sqlite3 import re +import schema import os -from flask import Flask, g, jsonify, render_template, request, abort, redirect + +from functools import wraps +from flask import Flask, g, jsonify, render_template, request, abort, redirect, session from flask_caching import Cache +from flask_session import Session from ffmpy import FFmpeg +from pymongo import MongoClient app = Flask(__name__) -try: - app.cache = Cache(app, config={'CACHE_TYPE': 'redis'}) -except RuntimeError: - import tempfile - app.cache = Cache(app, config={'CACHE_TYPE': 'filesystem', 'CACHE_DIR': tempfile.gettempdir()}) +client = MongoClient() + +try: + app.secret_key = open('secret.txt').read().strip() +except FileNotFoundError: + app.secret_key = os.urandom(24).hex() + with open('secret.txt', 'w') as fp: + fp.write(app.secret_key) + fp.close() + +app.config['SESSION_TYPE'] = 'redis' +app.cache = Cache(app, config={'CACHE_TYPE': 'redis'}) +sess = Session() +sess.init_app(app) + +db = client.taiko +db.users.create_index('username', unique=True) -DATABASE = 'taiko.db' DEFAULT_URL = 'https://github.com/bui/taiko-web/' -def get_db(): - db = getattr(g, '_database', None) - if db is None: - db = g._database = sqlite3.connect(DATABASE) - db.row_factory = sqlite3.Row - return db +def api_error(message): + return jsonify({'status': 'error', 'message': message}) -def query_db(query, args=(), one=False): - cur = get_db().execute(query, args) - rv = cur.fetchall() - cur.close() - return (rv[0] if rv else None) if one else rv +def login_required(f): + @wraps(f) + def decorated_function(*args, **kwargs): + if not session.get('username'): + return api_error('not_logged_in') + return f(*args, **kwargs) + return decorated_function + + +def admin_required(f): + @wraps(f) + def decorated_function(*args, **kwargs): + if not session.get('username'): + return abort(403) + + user = db.users.find_one({'username': session.get('username')}) + if user['user_level'] < 100: + return abort(403) + + return f(*args, **kwargs) + return decorated_function def get_config(): @@ -72,13 +98,6 @@ def get_version(): return version -@app.teardown_appcontext -def close_connection(exception): - db = getattr(g, '_database', None) - if db is not None: - db.close() - - @app.route('/') @app.cache.cached(timeout=15) def route_index(): @@ -86,6 +105,33 @@ def route_index(): return render_template('index.html', version=version, config=get_config()) +@app.route('/admin') +@admin_required +def route_admin(): + return redirect('/admin/songs') + + +@app.route('/admin/songs') +@admin_required +def route_admin_songs(): + songs = db.songs.find({}) + return render_template('admin_songs.html', songs=list(songs)) + + +@app.route('/admin/songs/') +@admin_required +def route_admin_songs_id(id): + song = db.songs.find_one({'id': id}) + if not song: + return abort(404) + + categories = list(db.categories.find({})) + song_skins = list(db.song_skins.find({})) + + return render_template('admin_song_detail.html', + song=song, categories=categories, song_skins=song_skins) + + @app.route('/api/preview') @app.cache.cached(timeout=15, query_string=True) def route_api_preview(): @@ -93,12 +139,12 @@ def route_api_preview(): if not song_id or not re.match('^[0-9]+$', song_id): abort(400) - song_row = query_db('select * from songs where id = ? and enabled = 1', (song_id,)) - if not song_row: + song = db.songs.find_one({'id': song_id}) + if not song: abort(400) - song_type = song_row[0]['type'] - prev_path = make_preview(song_id, song_type, song_row[0]['preview']) + song_type = song['type'] + prev_path = make_preview(song_id, song_type, song['preview']) if not prev_path: return redirect(get_config()['songs_baseurl'] + '%s/main.mp3' % song_id) @@ -108,52 +154,30 @@ def route_api_preview(): @app.route('/api/songs') @app.cache.cached(timeout=15) def route_api_songs(): - songs = query_db('select s.*, m.name, m.url from songs s left join makers m on s.maker_id = m.maker_id where enabled = 1') - - raw_categories = query_db('select * from categories') - categories = {} - for cat in raw_categories: - categories[cat['id']] = cat['title'] - - raw_song_skins = query_db('select * from song_skins') - song_skins = {} - for skin in raw_song_skins: - song_skins[skin[0]] = {'name': skin['name'], 'song': skin['song'], 'stage': skin['stage'], 'don': skin['don']} - - songs_out = [] + songs = list(db.songs.find({'enabled': True}, {'_id': False, 'enabled': False})) for song in songs: - song_id = song['id'] - song_type = song['type'] - preview = song['preview'] - - category_out = categories[song['category']] if song['category'] in categories else '' - song_skin_out = song_skins[song['skin_id']] if song['skin_id'] in song_skins else None - maker = None - if song['maker_id'] == 0: - maker = 0 - elif song['maker_id'] and song['maker_id'] > 0: - maker = {'name': song['name'], 'url': song['url'], 'id': song['maker_id']} - - songs_out.append({ - 'id': song_id, - 'title': song['title'], - 'title_lang': song['title_lang'], - 'subtitle': song['subtitle'], - 'subtitle_lang': song['subtitle_lang'], - 'stars': [ - song['easy'], song['normal'], song['hard'], song['oni'], song['ura'] - ], - 'preview': preview, - 'category': category_out, - 'type': song_type, - 'offset': song['offset'], - 'song_skin': song_skin_out, - 'volume': song['volume'], - 'maker': maker, - 'hash': song['hash'] - }) + if song['maker_id']: + if song['maker_id'] == 0: + song['maker'] = 0 + else: + song['maker'] = db.makers.find_one({'id': song['maker_id']}, {'_id': False}) + else: + song['maker'] = None + del song['maker_id'] - return jsonify(songs_out) + if song['category_id']: + song['category'] = db.categories.find_one({'id': song['category_id']})['title'] + else: + song['category'] = None + del song['category_id'] + + if song['skin_id']: + song['song_skin'] = db.song_skins.find_one({'id': song['skin_id']}, {'_id': False, 'id': False}) + else: + song['song_skin'] = None + del song['skin_id'] + + return jsonify(songs) @app.route('/api/config') @@ -163,6 +187,176 @@ def route_api_config(): return jsonify(config) +@app.route('/api/register', methods=['POST']) +def route_api_register(): + if session.get('username'): + return api_error('already_logged_in') + + data = request.get_json() + if not schema.validate(data, schema.register): + return abort(400) + + username = data.get('username', '') + if len(username) > 20 or not re.match('^[a-zA-Z0-9_]{1,20}$', username): + return api_error('invalid_username') + + if db.users.find_one({'username_lower': username.lower()}): + return api_error('username_in_use') + + password = data.get('password', '').encode('utf-8') + if not 8 <= len(password) <= 5000: + return api_error('invalid_password') + + salt = bcrypt.gensalt() + hashed = bcrypt.hashpw(password, salt) + + db.users.insert_one({ + 'username': username, + 'username_lower': username.lower(), + 'password': hashed, + 'display_name': username, + 'user_level': 1 + }) + + session['username'] = username + session.permanent = True + return jsonify({'status': 'ok', 'username': username, 'display_name': username}) + + +@app.route('/api/login', methods=['POST']) +def route_api_login(): + if session.get('username'): + return api_error('already_logged_in') + + data = request.get_json() + if not schema.validate(data, schema.login): + return abort(400) + + username = data.get('username', '') + result = db.users.find_one({'username_lower': username.lower()}) + if not result: + return api_error('invalid_username_password') + + password = data.get('password', '').encode('utf-8') + if not bcrypt.checkpw(password, result['password']): + return api_error('invalid_username_password') + + session['username'] = result['username'] + if data.get('remember'): + session.permanent = True + + return jsonify({'status': 'ok', 'username': result['username'], 'display_name': result['display_name']}) + + +@app.route('/api/logout', methods=['POST']) +@login_required +def route_api_logout(): + session.clear() + return jsonify({'status': 'ok'}) + + +@app.route('/api/account/display_name', methods=['POST']) +@login_required +def route_api_account_display_name(): + data = request.get_json() + if not schema.validate(data, schema.update_display_name): + return abort(400) + + display_name = data.get('display_name', '') + if not display_name or len(display_name) > 20: + return api_error('invalid_display_name') + + db.users.update_one({'username': session.get('username')}, { + '$set': {'display_name': display_name} + }) + + return jsonify({'status': 'ok'}) + + +@app.route('/api/account/password', methods=['POST']) +@login_required +def route_api_account_password(): + data = request.get_json() + if not schema.validate(data, schema.update_password): + return abort(400) + + user = db.users.find_one({'username': session.get('username')}) + current_password = data.get('current_password', '').encode('utf-8') + if not bcrypt.checkpw(current_password, user['password']): + return api_error('current_password_invalid') + + new_password = data.get('new_password', '').encode('utf-8') + if not 8 <= len(new_password) <= 5000: + return api_error('invalid_password') + + salt = bcrypt.gensalt() + hashed = bcrypt.hashpw(new_password, salt) + + db.users.update_one({'username': session.get('username')}, { + '$set': {'password': hashed} + }) + + return jsonify({'status': 'ok'}) + + +@app.route('/api/account/remove', methods=['POST']) +@login_required +def route_api_account_remove(): + data = request.get_json() + if not schema.validate(data, schema.delete_account): + return abort(400) + + user = db.users.find_one({'username': session.get('username')}) + password = data.get('password', '').encode('utf-8') + if not bcrypt.checkpw(password, user['password']): + return api_error('current_password_invalid') + + db.scores.delete_many({'username': session.get('username')}) + db.users.delete_one({'username': session.get('username')}) + + session.clear() + return jsonify({'status': 'ok'}) + + +@app.route('/api/scores/save', methods=['POST']) +@login_required +def route_api_scores_save(): + data = request.get_json() + if not schema.validate(data, schema.scores_save): + return abort(400) + + username = session.get('username') + if data.get('is_import'): + db.scores.delete_many({'username': username}) + + scores = data.get('scores', []) + for score in scores: + db.scores.update_one({'username': username, 'hash': score['hash']}, + {'$set': { + 'username': username, + 'hash': score['hash'], + 'score': score['score'] + }}, upsert=True) + + return jsonify({'success': True}) + + +@app.route('/api/scores/get') +@login_required +def route_api_scores_get(): + username = session.get('username') + + scores = [] + for score in db.scores.find({'username': username}): + scores.append({ + 'hash': score['hash'], + 'score': score['score'] + }) + + user = db.users.find_one({'username': username}) + return jsonify({'scores': scores, 'username': user['username'], 'display_name': user['display_name']}) + + def make_preview(song_id, song_type, preview): song_path = 'public/songs/%s/main.mp3' % song_id prev_path = 'public/songs/%s/preview.mp3' % song_id diff --git a/config.example.json b/config.example.json index 9bfd207..9ec88e4 100644 --- a/config.example.json +++ b/config.example.json @@ -1,4 +1,6 @@ { "songs_baseurl": "", - "assets_baseurl": "" + "assets_baseurl": "", + "email": "", + "_accounts": true } diff --git a/public/src/css/admin.css b/public/src/css/admin.css new file mode 100644 index 0000000..5b2f22d --- /dev/null +++ b/public/src/css/admin.css @@ -0,0 +1,125 @@ +body { + margin: 0; + font-family: 'Noto Sans JP', sans-serif; + background: #FF7F00; + } + + .nav { + margin: 0; + padding: 0; + width: 200px; + background-color: #A01300; + position: fixed; + height: 100%; + overflow: auto; + } + + .nav a { + display: block; + color: #FFF; + padding: 16px; + text-decoration: none; + } + + .nav a.active { + background-color: #4CAF50; + color: white; + } + + .nav a:hover:not(.active) { + background-color: #555; + color: white; + } + +main { + margin-left: 200px; + padding: 1px 16px; + height: 1000px; + } + + @media screen and (max-width: 700px) { + .nav { + width: 100%; + height: auto; + position: relative; + } + .nav a {float: left;} + main {margin-left: 0;} + } + + @media screen and (max-width: 400px) { + .sidebar a { + text-align: center; + float: none; + } + } + + .container { + margin-bottom: 40px; + } + +.song { + background: #F84828; + color: white; + padding: 10px; + font-size: 14pt; + margin: 10px 0; +} + +.song p { + margin: 0; +} + +.song-link { + text-decoration: none; +} + +.song-form { + background: #ff5333; + color: #FFF; + padding: 20px; +} + +.form-field { + background: #555555; + padding: 15px 20px 20px 20px; + margin-bottom: 20px; +} + +.form-field p { + margin: 0; + font-size: 18pt; +} + + .form-field > label { + display: block; +} + +.form-field input { + margin: 5px 0; +} + +.form-field input[type="text"] { + width: 300px; +} + +.form-field input[type="number"] { + width: 50px; +} + +h1 small { + color: #4a4a4a; +} + +.form-field-indent { + margin-left: 20px; +} + +.checkbox { + display: inline-block; +} + +.checkbox input { + margin-right: 3px; + margin-left: 5px; +} \ No newline at end of file diff --git a/schema.py b/schema.py new file mode 100644 index 0000000..1ba0c81 --- /dev/null +++ b/schema.py @@ -0,0 +1,73 @@ +import jsonschema + +def validate(data, schema): + try: + jsonschema.validate(data, schema) + return True + except jsonschema.exceptions.ValidationError: + return False + +register = { + '$schema': 'http://json-schema.org/schema#', + 'type': 'object', + 'properties': { + 'username': {'type': 'string'}, + 'password': {'type': 'string'} + } +} + +login = { + '$schema': 'http://json-schema.org/schema#', + 'type': 'object', + 'properties': { + 'username': {'type': 'string'}, + 'password': {'type': 'string'}, + 'remember': {'type': 'boolean'} + } +} + +update_display_name = { + '$schema': 'http://json-schema.org/schema#', + 'type': 'object', + 'properties': { + 'display_name': {'type': 'string'} + } +} + +update_password = { + '$schema': 'http://json-schema.org/schema#', + 'type': 'object', + 'properties': { + 'current_password': {'type': 'string'}, + 'new_password': {'type': 'string'} + } +} + +delete_account = { + '$schema': 'http://json-schema.org/schema#', + 'type': 'object', + 'properties': { + 'password': {'type': 'string'} + } +} + +scores_save = { + '$schema': 'http://json-schema.org/schema#', + 'type': 'object', + 'properties': { + 'scores': { + 'type': 'array', + 'items': {'$ref': '#/definitions/score'} + }, + 'is_import': {'type': 'boolean'} + }, + 'definitions': { + 'score': { + 'type': 'object', + 'properties': { + 'hash': {'type': 'string'}, + 'score': {'type': 'string'} + } + } + } +} diff --git a/templates/admin.html b/templates/admin.html new file mode 100644 index 0000000..e92ff9a --- /dev/null +++ b/templates/admin.html @@ -0,0 +1,23 @@ + + + + + Taiko Web Admin + + + + + +
+
+ Songs +
+
+ +
+
+ {% block content %}{% endblock %} +
+
+ + diff --git a/templates/admin_song_detail.html b/templates/admin_song_detail.html new file mode 100644 index 0000000..322c835 --- /dev/null +++ b/templates/admin_song_detail.html @@ -0,0 +1,87 @@ +{% extends 'admin.html' %} +{% block content %} +

{{ song.title }} (ID: {{ song.id }})

+
+
+ +
+ +
+ +
+

Title

+ + + + + + + + + + + + +
+ +
+

Subtitle

+ + + + + + + + + + + + +
+ +
+

Courses

+ + + + + + + + + + + + + + + +
+ +
+

+ +
+ +
+

+ +
+ +
+

+ +
+ + +
+
+{% endblock %} diff --git a/templates/admin_songs.html b/templates/admin_songs.html new file mode 100644 index 0000000..eb55425 --- /dev/null +++ b/templates/admin_songs.html @@ -0,0 +1,11 @@ +{% extends 'admin.html' %} +{% block content %} +

Songs

+{% for song in songs %} + +
+

{{ song.title }}

+
+ +{% endfor %} +{% endblock %} diff --git a/tools/migrate_db.py b/tools/migrate_db.py new file mode 100644 index 0000000..7ae71c6 --- /dev/null +++ b/tools/migrate_db.py @@ -0,0 +1,105 @@ +#!/usr/bin/env python3 +# Migrate old SQLite taiko.db to MongoDB + +import sqlite3 +from pymongo import MongoClient + +client = MongoClient() +#client.drop_database('taiko') +db = client.taiko +sqdb = sqlite3.connect('taiko.db') +sqdb.row_factory = sqlite3.Row +curs = sqdb.cursor() + +def migrate_songs(): + curs.execute('select * from songs') + rows = curs.fetchall() + + for row in rows: + song = { + 'id': row['id'], + 'title': row['title'], + 'title_lang': {'ja': row['title']}, + 'subtitle': row['subtitle'], + 'subtitle_lang': {'ja': row['subtitle']}, + 'courses': {'easy': None, 'normal': None, 'hard': None, 'oni': None, 'ura': None}, + 'enabled': True if row['enabled'] else False, + 'category_id': row['category'], + 'type': row['type'], + 'offset': row['offset'], + 'skin_id': row['skin_id'], + 'preview': row['preview'], + 'volume': row['volume'], + 'maker_id': row['maker_id'], + 'hash': row['hash'], + 'order': row['id'] + } + + for diff in ['easy', 'normal', 'hard', 'oni', 'ura']: + if row[diff]: + spl = row[diff].split(' ') + branch = False + if len(spl) > 1 and spl[1] == 'B': + branch = True + + song['courses'][diff] = {'stars': int(spl[0]), 'branch': branch} + + if row['title_lang']: + langs = row['title_lang'].splitlines() + for lang in langs: + spl = lang.split(' ', 1) + if spl[0] in ['ja', 'en', 'cn', 'tw', 'ko']: + song['title_lang'][spl[0]] = spl[1] + else: + song['title_lang']['en'] = lang + + if row['subtitle_lang']: + langs = row['subtitle_lang'].splitlines() + for lang in langs: + spl = lang.split(' ', 1) + if spl[0] in ['ja', 'en', 'cn', 'tw', 'ko']: + song['subtitle_lang'][spl[0]] = spl[1] + else: + song['subtitle_lang']['en'] = lang + + db.songs.insert_one(song) + +def migrate_makers(): + curs.execute('select * from makers') + rows = curs.fetchall() + + for row in rows: + db.makers.insert_one({ + 'id': row['maker_id'], + 'name': row['name'], + 'url': row['url'] + }) + +def migrate_categories(): + curs.execute('select * from categories') + rows = curs.fetchall() + + for row in rows: + db.categories.insert_one({ + 'id': row['id'], + 'title': row['title'] + }) + +def migrate_song_skins(): + curs.execute('select * from song_skins') + rows = curs.fetchall() + + for row in rows: + db.song_skins.insert_one({ + 'id': row['id'], + 'name': row['name'], + 'song': row['song'], + 'stage': row['stage'], + 'don': row['don'] + }) + +if __name__ == '__main__': + migrate_songs() + migrate_makers() + migrate_categories() + migrate_song_skins()