YunoHost-Apps/calibreweb_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/calibreweb_ynh.git synced 2024-09-03 18:16:20 +02:00
Code Issues Activity Actions

Reupload web.patch

Browse source
This commit is contained in:
Krakinou 2019-01-13 19:13:34 +01:00
parent f2a8067c93
commit 4e40df22a6
1 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
sources/patches/app-web.patch
View file

@ -1,71 +1,71 @@
--- a/cps/web.py 2019-01-13 16:13:23.000000000 +0100 --- a/cps/web.py 2019-01-12 09:01:08.000000000 +0100
+++ b/cps/web.py 2019-01-12 09:01:08.000000000 +0100 +++ b/cps/web.py 2019-01-13 16:13:23.000000000 +0100
@@ -58,8 +58,6 @@ @@ -58,6 +58,8 @@
import server import server
from reverseproxy import ReverseProxied from reverseproxy import ReverseProxied
-global vlogout +global vlogout
- +
try: try:
from googleapiclient.errors import HttpError from googleapiclient.errors import HttpError
except ImportError: except ImportError:
@@ -2362,28 +2360,10 @@ @@ -2360,10 +2362,28 @@
return redirect(url_for('basic_configuration')) return redirect(url_for('basic_configuration'))
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('index')) return redirect(url_for('index'))
- auth_user = request.headers.get('X-Remote-User') + auth_user = request.headers.get('X-Remote-User')
- if auth_user and config.config_use_ldap and not vlogout: + if auth_user and config.config_use_ldap and not vlogout:
- vlogout = 0 + vlogout = 0
- user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == auth_user.strip().lower()).first() + user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == auth_user.strip().lower()).first()
- login_user(user, remember=True) + login_user(user, remember=True)
- flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success") + flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
- return redirect(url_for("index")) + return redirect(url_for("index"))
if request.method == "POST": if request.method == "POST":
form = request.form.to_dict() form = request.form.to_dict()
user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == form['username'].strip().lower()).first() user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == form['username'].strip().lower()).first()
- if config.config_use_ldap and user: - if user and check_password_hash(user.password, form['password']) and user.nickname is not "Guest":
- import ldap + if config.config_use_ldap and user:
- try: + import ldap
- ub.User.try_login(form['username'], form['password']) + try:
- login_user(user, remember=True) + ub.User.try_login(form['username'], form['password'])
- flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success") + login_user(user, remember=True)
- return redirect_back(url_for("index")) + flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
- except ldap.INVALID_CREDENTIALS: + return redirect_back(url_for("index"))
- ipAdress = request.headers.get('X-Forwarded-For', request.remote_addr) + except ldap.INVALID_CREDENTIALS:
- app.logger.info('LDAP Login failed for user "' + form['username'] + '" IP-adress: ' + ipAdress) + ipAdress = request.headers.get('X-Forwarded-For', request.remote_addr)
- flash(_(u"Wrong Username or Password"), category="error") + app.logger.info('LDAP Login failed for user "' + form['username'] + '" IP-adress: ' + ipAdress)
- elif user and check_password_hash(user.password, form['password']) and user.nickname is not "Guest": + flash(_(u"Wrong Username or Password"), category="error")
+ if user and check_password_hash(user.password, form['password']) and user.nickname is not "Guest": + elif user and check_password_hash(user.password, form['password']) and user.nickname is not "Guest":
login_user(user, remember=True) login_user(user, remember=True)
flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success") flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
return redirect_back(url_for("index")) return redirect_back(url_for("index"))
@@ -2404,7 +2384,6 @@ @@ -2384,6 +2404,7 @@
@login_required @login_required
def logout(): def logout():
if current_user is not None and current_user.is_authenticated: if current_user is not None and current_user.is_authenticated:
- vlogout = 1 + vlogout = 1
logout_user() logout_user()
return redirect(url_for('login')) return redirect(url_for('login'))
@@ -3109,21 +3088,6 @@ @@ -3088,6 +3109,21 @@
if "config_ebookconverter" in to_save: if "config_ebookconverter" in to_save:
content.config_ebookconverter = int(to_save["config_ebookconverter"]) content.config_ebookconverter = int(to_save["config_ebookconverter"])
- #LDAP configuratop, + #LDAP configuratop,
- if "config_use_ldap" in to_save and to_save["config_use_ldap"] == "on": + if "config_use_ldap" in to_save and to_save["config_use_ldap"] == "on":
- if not "config_ldap_provider_url" in to_save or not "config_ldap_dn" in to_save: + if not "config_ldap_provider_url" in to_save or not "config_ldap_dn" in to_save:
- ub.session.commit() + ub.session.commit()
- flash(_(u'Please enter a LDAP provider and a DN'), category="error") + flash(_(u'Please enter a LDAP provider and a DN'), category="error")
- return render_title_template("config_edit.html", content=config, origin=origin, + return render_title_template("config_edit.html", content=config, origin=origin,
- gdrive=gdriveutils.gdrive_support, gdriveError=gdriveError, + gdrive=gdriveutils.gdrive_support, gdriveError=gdriveError,
- goodreads=goodreads_support, title=_(u"Basic Configuration"), + goodreads=goodreads_support, title=_(u"Basic Configuration"),
- page="config") + page="config")
- else: + else:
- content.config_use_ldap = 1 + content.config_use_ldap = 1
- content.config_ldap_provider_url = to_save["config_ldap_provider_url"] + content.config_ldap_provider_url = to_save["config_ldap_provider_url"]
- content.config_ldap_dn = to_save["config_ldap_dn"] + content.config_ldap_dn = to_save["config_ldap_dn"]
- db_change = True + db_change = True
- +
# Remote login configuration # Remote login configuration
content.config_remote_login = ("config_remote_login" in to_save and to_save["config_remote_login"] == "on") content.config_remote_login = ("config_remote_login" in to_save and to_save["config_remote_login"] == "on")
if not content.config_remote_login: if not content.config_remote_login: