aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-23 00:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Block new user registration if registering via MLC (#840)

Browse Source 
* Block new user registration if registering via MLC
* Allow login with MLC while registration is disabled
This commit is contained in:
Kevin Chung
2019-01-19 16:00:29 -05:00
committed by GitHub
parent f8607c3d5c
commit 3af036b4b2
4 changed files with 182 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
CTFd/auth.py
View File

@@ -21,6 +21,7 @@ from CTFd.utils.decorators.visibility import check_registration_visibility
from CTFd.utils.modes import TEAMS_MODE, USERS_MODE
from CTFd.utils.security.signing import serialize, unserialize, SignatureExpired, BadSignature, BadTimeSignature
from CTFd.utils.helpers import info_for, error_for, get_errors, get_infos
from CTFd.utils.config.visibility import registration_visible
import base64
import requests
@@ -319,14 +320,23 @@ def oauth_redirect():
user = Users.query.filter_by(email=user_email).first()
if user is None:
user = Users(
name=user_name,
email=user_email,
oauth_id=user_id,
verified=True
)
db.session.add(user)
db.session.commit()
# Check if we are allowing registration before creating users
if registration_visible():
user = Users(
name=user_name,
email=user_email,
oauth_id=user_id,
verified=True
)
db.session.add(user)
db.session.commit()
else:
log('logins', "[{date}] {ip} - Public registration via MLC blocked")
error_for(
endpoint='auth.login',
message='Public registration is disabled. Please try again later.'
)
return redirect(url_for('auth.login'))
if get_config('user_mode') == TEAMS_MODE:
team_id = api_data['team']['id']
@@ -344,6 +354,11 @@ def oauth_redirect():
team.members.append(user)
db.session.commit()
if user.oauth_id is None:
user.oauth_id = user_id
user.verified = True
db.session.commit()
login_user(user)
return redirect(url_for('challenges.listing'))