Llloooggg/Jarvis
1
0
Fork 0
mirror of https://github.com/Llloooggg/Jarvis.git synced 2026-03-06 03:56:23 +03:00
Code Issues 21 Packages Projects Releases Wiki Activity

Рефракторинг

Browse Source
This commit is contained in:
Denis Podshivalov
2020-03-15 15:55:58 +03:00
parent 88f99010cf
commit b8c734530b
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
__init__.py
View File

@@ -1,11 +1,14 @@
from flask import render_template, request from flask import Flask, render_template, request
from db_routing import app
import db_routing import db_routing
from flask_httpauth import HTTPBasicAuth from flask_httpauth import HTTPBasicAuth
import os import os
import hashlib import hashlib
app = Flask(__name__, static_folder='static', template_folder='templates')
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db'
if not os.path.exists('./data.db'): if not os.path.exists('./data.db'):
db_routing.db.create_all() db_routing.db.create_all()
auth = HTTPBasicAuth() auth = HTTPBasicAuth()
@@ -21,16 +24,17 @@ def register():
if request.method == 'POST': if request.method == 'POST':
userLogin = request.form['UserLogin'] userLogin = request.form['UserLogin']
userPassw = request.form['UserPassw'] userPassw = request.form['UserPassw']
db_routing.add_user(userLogin, passw_hash(userPassw)) if db_routing.add_user(userLogin, passw_hash(userPassw)):
return render_template('content.html')
return render_template('registration.html') return render_template('registration.html')
@auth.verify_password @auth.verify_password
def verify_password(user_login, user_passw): def verify_password(user_login, user_passw):
user = db_routing.find_user(user_login) User = db_routing.find_user(user_login)
if user: if User:
userSalt = user[2][:32] userSalt = User.UserPassw[:32]
if passw_hash(user_passw, userSalt) == user[2]: if passw_hash(user_passw, userSalt) == User.UserPassw:
return True return True
else: else:
return False return False
@@ -56,4 +60,4 @@ def passw_hash(user_passw, salt=os.urandom(32)):
if __name__ == '__main__': if __name__ == '__main__':
db_routing.app.run() app.run()

6
db_routing.py
View File

@@ -1,9 +1,7 @@
from flask import Flask
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from __init__ import app
app = Flask(__name__, static_folder='static', template_folder='templates')
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db'
db = SQLAlchemy(app) db = SQLAlchemy(app)
@@ -19,8 +17,10 @@ def add_user(user_name, passw_hash):
new_user = User(UserName=user_name, UserPassw=passw_hash) new_user = User(UserName=user_name, UserPassw=passw_hash)
db.session.add(new_user) db.session.add(new_user)
db.session.commit() db.session.commit()
return True
else: else:
print('Логин занят') print('Логин занят')
return False
def find_user(user_name): def find_user(user_name):