|
|
@ -28,10 +28,10 @@ from flask import Blueprint, jsonify
|
|
|
|
from flask import request, redirect, send_from_directory, make_response, flash, abort, url_for
|
|
|
|
from flask import request, redirect, send_from_directory, make_response, flash, abort, url_for
|
|
|
|
from flask import session as flask_session
|
|
|
|
from flask import session as flask_session
|
|
|
|
from flask_babel import gettext as _
|
|
|
|
from flask_babel import gettext as _
|
|
|
|
from flask_babel import lazy_gettext as N_
|
|
|
|
|
|
|
|
from flask_babel import get_locale
|
|
|
|
from flask_babel import get_locale
|
|
|
|
from flask_login import login_user, logout_user, login_required, current_user
|
|
|
|
from flask_login import login_user, logout_user, login_required, current_user
|
|
|
|
from flask_limiter import RateLimitExceeded
|
|
|
|
from flask_limiter import RateLimitExceeded
|
|
|
|
|
|
|
|
from flask_limiter.util import get_remote_address
|
|
|
|
from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
|
|
|
|
from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
|
|
|
|
from sqlalchemy.sql.expression import text, func, false, not_, and_, or_
|
|
|
|
from sqlalchemy.sql.expression import text, func, false, not_, and_, or_
|
|
|
|
from sqlalchemy.orm.attributes import flag_modified
|
|
|
|
from sqlalchemy.orm.attributes import flag_modified
|
|
|
@ -1223,57 +1223,70 @@ def send_to_ereader(book_id, book_format, convert):
|
|
|
|
|
|
|
|
|
|
|
|
# ################################### Login Logout ##################################################################
|
|
|
|
# ################################### Login Logout ##################################################################
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@web.route('/register', methods=['POST'])
|
|
|
|
@web.route('/register', methods=['GET', 'POST'])
|
|
|
|
@limiter.limit("40/day", key_func=get_remote_address)
|
|
|
|
def register():
|
|
|
|
@limiter.limit("3/minute", key_func=get_remote_address)
|
|
|
|
|
|
|
|
def register_post():
|
|
|
|
if not config.config_public_reg:
|
|
|
|
if not config.config_public_reg:
|
|
|
|
abort(404)
|
|
|
|
abort(404)
|
|
|
|
|
|
|
|
to_save = request.form.to_dict()
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
limiter.check()
|
|
|
|
|
|
|
|
except RateLimitExceeded:
|
|
|
|
|
|
|
|
flash(_(u"Please wait one minute to register next user"), category="error")
|
|
|
|
|
|
|
|
return render_title_template('register.html', config=config, title=_("Register"), page="register")
|
|
|
|
if current_user is not None and current_user.is_authenticated:
|
|
|
|
if current_user is not None and current_user.is_authenticated:
|
|
|
|
return redirect(url_for('web.index'))
|
|
|
|
return redirect(url_for('web.index'))
|
|
|
|
if not config.get_mail_server_configured():
|
|
|
|
if not config.get_mail_server_configured():
|
|
|
|
flash(_("Oops! Email server is not configured, please contact your administrator."), category="error")
|
|
|
|
flash(_("Oops! Email server is not configured, please contact your administrator."), category="error")
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
|
|
|
|
nickname = to_save.get("email", "").strip() if config.config_register_email else to_save.get('name')
|
|
|
|
|
|
|
|
if not nickname or not to_save.get("email"):
|
|
|
|
|
|
|
|
flash(_("Oops! Please complete all fields."), category="error")
|
|
|
|
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
nickname = check_username(nickname)
|
|
|
|
|
|
|
|
email = check_email(to_save.get("email", ""))
|
|
|
|
|
|
|
|
except Exception as ex:
|
|
|
|
|
|
|
|
flash(str(ex), category="error")
|
|
|
|
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
|
|
|
|
|
|
|
|
if request.method == "POST":
|
|
|
|
content = ub.User()
|
|
|
|
to_save = request.form.to_dict()
|
|
|
|
if check_valid_domain(email):
|
|
|
|
nickname = to_save.get("email", "").strip() if config.config_register_email else to_save.get('name')
|
|
|
|
content.name = nickname
|
|
|
|
if not nickname or not to_save.get("email"):
|
|
|
|
content.email = email
|
|
|
|
flash(_("Oops! Please complete all fields."), category="error")
|
|
|
|
password = generate_random_password()
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
content.password = generate_password_hash(password)
|
|
|
|
|
|
|
|
content.role = config.config_default_role
|
|
|
|
|
|
|
|
content.locale = config.config_default_locale
|
|
|
|
|
|
|
|
content.sidebar_view = config.config_default_show
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
nickname = check_username(nickname)
|
|
|
|
ub.session.add(content)
|
|
|
|
email = check_email(to_save.get("email", ""))
|
|
|
|
ub.session.commit()
|
|
|
|
except Exception as ex:
|
|
|
|
if feature_support['oauth']:
|
|
|
|
flash(str(ex), category="error")
|
|
|
|
register_user_with_oauth(content)
|
|
|
|
|
|
|
|
send_registration_mail(to_save.get("email", "").strip(), nickname, password)
|
|
|
|
|
|
|
|
except Exception:
|
|
|
|
|
|
|
|
ub.session.rollback()
|
|
|
|
|
|
|
|
flash(_("Oops! An unknown error occurred. Please try again later."), category="error")
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
flash(_("Oops! Your Email is not allowed."), category="error")
|
|
|
|
|
|
|
|
log.warning('Registering failed for user "{}" Email: {}'.format(nickname, to_save.get("email","")))
|
|
|
|
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
|
|
|
|
flash(_("Success! Confirmation Email has been sent."), category="success")
|
|
|
|
|
|
|
|
return redirect(url_for('web.login'))
|
|
|
|
|
|
|
|
|
|
|
|
content = ub.User()
|
|
|
|
|
|
|
|
if check_valid_domain(email):
|
|
|
|
|
|
|
|
content.name = nickname
|
|
|
|
|
|
|
|
content.email = email
|
|
|
|
|
|
|
|
password = generate_random_password()
|
|
|
|
|
|
|
|
content.password = generate_password_hash(password)
|
|
|
|
|
|
|
|
content.role = config.config_default_role
|
|
|
|
|
|
|
|
content.locale = config.config_default_locale
|
|
|
|
|
|
|
|
content.sidebar_view = config.config_default_show
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
ub.session.add(content)
|
|
|
|
|
|
|
|
ub.session.commit()
|
|
|
|
|
|
|
|
if feature_support['oauth']:
|
|
|
|
|
|
|
|
register_user_with_oauth(content)
|
|
|
|
|
|
|
|
send_registration_mail(to_save.get("email", "").strip(), nickname, password)
|
|
|
|
|
|
|
|
except Exception:
|
|
|
|
|
|
|
|
ub.session.rollback()
|
|
|
|
|
|
|
|
flash(_("Oops! An unknown error occurred. Please try again later."), category="error")
|
|
|
|
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
flash(_("Oops! Your Email is not allowed."), category="error")
|
|
|
|
|
|
|
|
log.warning('Registering failed for user "{}" Email: {}'.format(nickname,
|
|
|
|
|
|
|
|
to_save.get("email","")))
|
|
|
|
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
|
|
|
|
flash(_("Success! Confirmation Email has been sent."), category="success")
|
|
|
|
|
|
|
|
return redirect(url_for('web.login'))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@web.route('/register', methods=['GET'])
|
|
|
|
|
|
|
|
def register():
|
|
|
|
|
|
|
|
if not config.config_public_reg:
|
|
|
|
|
|
|
|
abort(404)
|
|
|
|
|
|
|
|
if current_user is not None and current_user.is_authenticated:
|
|
|
|
|
|
|
|
return redirect(url_for('web.index'))
|
|
|
|
|
|
|
|
if not config.get_mail_server_configured():
|
|
|
|
|
|
|
|
flash(_("Oops! Email server is not configured, please contact your administrator."), category="error")
|
|
|
|
|
|
|
|
return render_title_template('register.html', title=_("Register"), page="register")
|
|
|
|
if feature_support['oauth']:
|
|
|
|
if feature_support['oauth']:
|
|
|
|
register_user_with_oauth()
|
|
|
|
register_user_with_oauth()
|
|
|
|
return render_title_template('register.html', config=config, title=_("Register"), page="register")
|
|
|
|
return render_title_template('register.html', config=config, title=_("Register"), page="register")
|
|
|
|