From 79532359126f0a1bc17b38ad24c5344b69a96a4c Mon Sep 17 00:00:00 2001 From: wangjiacai Date: Wed, 19 Apr 2023 22:50:55 +0800 Subject: [PATCH] implement activation code --- instance/config.yaml | 2 +- project/__init__.py | 3 +++ project/auth.py | 51 +++++++++++++++++++++++++++++++++--- project/smtp.py | 4 +-- project/templates/base.html | 2 +- project/templates/index.html | 28 +++++++++++++++++--- 6 files changed, 79 insertions(+), 11 deletions(-) diff --git a/instance/config.yaml b/instance/config.yaml index 71defbb..b7d098b 100644 --- a/instance/config.yaml +++ b/instance/config.yaml @@ -1,5 +1,5 @@ app: - NAME: APP_NAME + NAME: web-gpt SECRET_KEY: SOME_RANDOM_STRING HOMEPAGE_NOTICE: | 1. 此网站基于openAI的API提供服务 diff --git a/project/__init__.py b/project/__init__.py index 4444dd0..3285d2e 100644 --- a/project/__init__.py +++ b/project/__init__.py @@ -20,6 +20,7 @@ def create_app(): print("config file path: ", config_file) with open(config_file) as config_file: conf = yaml.safe_load(config_file) + app.config['NAME'] = conf['app']['NAME'] app.config['SECRET_KEY'] = conf['app']['SECRET_KEY'] app.config['LOGGING_LEVEL'] = conf['app']['LOGGING_LEVEL'] app.config['SQLALCHEMY_DATABASE_URI'] = conf['app']['SQLALCHEMY_DATABASE_URI'] @@ -30,6 +31,8 @@ def create_app(): app.config['OPENAI_PROMPT'] = conf['openai']['PROMPT'] app.config['mail'] = conf['mail'] + app.add_template_global(app.config['NAME'], "web_title") + db.init_app(app) login_manager = LoginManager() login_manager.login_view = 'auth.login' diff --git a/project/auth.py b/project/auth.py index 5faebc2..c0a1acc 100644 --- a/project/auth.py +++ b/project/auth.py @@ -1,14 +1,38 @@ from flask_login import login_user, logout_user -from flask import Blueprint, render_template, redirect, url_for, request, flash +from flask import Blueprint, render_template, redirect, url_for, request, flash, current_app from werkzeug.security import generate_password_hash, check_password_hash from flask_login import login_required, current_user, login_manager from .models import User, Conversation from . import db import time +import hashlib auth = Blueprint('auth', __name__) +def hash_to_digit(instr: str) -> str: + outstr = hashlib.md5(instr.encode('utf-8')).hexdigest() + outstr = f"{int(outstr, 16) % 1000000:0>6d}" + return outstr + + +def gen_activation_code(email: str) -> str: + current_time_slot = int(time.time() // 60) + s = email + current_app.config['SECRET_KEY'] + str(current_time_slot) + activation_code = hash_to_digit(s) + return activation_code + + +def check_activation_code(email: str, activation_code: str) -> bool: + current_time_slot = int(time.time() // 60) + for time_slot in range(current_time_slot-10, current_time_slot+1): + s = email + current_app.config['SECRET_KEY'] + str(time_slot) + expected_code = hash_to_digit(s) + if expected_code == activation_code: + return True + return False + + @auth.route('/login') def login(): return render_template('login.html') @@ -35,6 +59,22 @@ def login_post(): return redirect(url_for('main.index')) +@auth.route('/activate', methods=['POST']) +@login_required +def activate(): + activation_code = request.form.get('activation_code') + if check_activation_code(current_user.email, activation_code): + account = User.query.filter_by( + id=current_user.id, email=current_user.email, name=current_user.name).first() + if account: + if db.session.query(User).filter(User.id == account.id).update({"isActivated": True}) and not db.session.commit(): + time.sleep(0.05) + return redirect(url_for('main.index')) + time.sleep(1) + flash("激活码不匹配") + return redirect(url_for('main.index')) + + @auth.route('/signup') def signup(): return render_template('signup.html') @@ -53,12 +93,12 @@ def signup_post(): flash('此邮箱已注册！') return redirect(url_for('auth.signup')) if not (email): - flash('Email missing!') + flash('请输入邮箱！') return redirect(url_for('auth.signup')) if not (name): name = email if not (password): - flash('Password missing!') + flash('请输入密码') return redirect(url_for('auth.signup')) # create a new user with the form data. Hash the password so the plaintext version isn't saved. new_user = User(email=email, @@ -74,6 +114,11 @@ def signup_post(): # add the new user to the database db.session.add(new_user) db.session.commit() + + activation_code = gen_activation_code(new_user.email) + from . import smtp + smtp.sendmail(new_user.email, "web-gpt激活码", "欢迎注册。您的激活码是："+activation_code) + return redirect(url_for('auth.login')) diff --git a/project/smtp.py b/project/smtp.py index ffe5079..c5b4f12 100644 --- a/project/smtp.py +++ b/project/smtp.py @@ -3,9 +3,9 @@ import logging from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.header import Header -from . import app +from flask import current_app -mail_config = app['mail'] +mail_config = current_app.config['mail'] logger = logging.getLogger('waitress') diff --git a/project/templates/base.html b/project/templates/base.html index e9da319..7adfd5a 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -6,7 +6,7 @@ - Flask + {{ web_title }} + {% with messages = get_flashed_messages() %} + {% if messages %}
{{ messages[0] }}
{% endif %} + {% endwith %} {% if user and user.is_authenticated %} {% if user.isActivated %} {% else %} -

您的账号暂未激活，请等待管理员激活此账号。

+
+
+

您的账号暂未激活。

+

如未收到激活码邮件，请联系管理员处理

+
+
+
+
+ +
+
+ +
+ +
+
{% endif %} {% else %} @@ -24,9 +47,6 @@ {% endif %} - {% with messages = get_flashed_messages() %} - {% if messages %}
{{ messages[0] }}
{% endif %} - {% endwith %}
{% if homepage_notice %}

公告栏