Fix: invalid user can login from OSS (#10348)
### What problem does this PR solve? An invalid user can log in from OSS https://github.com/infiniflow/ragflow/issues/10293 ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
parent
2d5d10ecbf
commit
0b759f559c
1 changed files with 8 additions and 3 deletions
|
|
@ -105,9 +105,7 @@ def login():
|
||||||
code=settings.RetCode.FORBIDDEN,
|
code=settings.RetCode.FORBIDDEN,
|
||||||
message="This account has been disabled, please contact the administrator!",
|
message="This account has been disabled, please contact the administrator!",
|
||||||
)
|
)
|
||||||
|
elif user:
|
||||||
|
|
||||||
if user:
|
|
||||||
response_data = user.to_json()
|
response_data = user.to_json()
|
||||||
user.access_token = get_uuid()
|
user.access_token = get_uuid()
|
||||||
login_user(user)
|
login_user(user)
|
||||||
|
|
@ -236,6 +234,9 @@ def oauth_callback(channel):
|
||||||
# User exists, try to log in
|
# User exists, try to log in
|
||||||
user = users[0]
|
user = users[0]
|
||||||
user.access_token = get_uuid()
|
user.access_token = get_uuid()
|
||||||
|
if user and hasattr(user, 'is_active') and user.is_active == "0":
|
||||||
|
return redirect("/?error=user_inactive")
|
||||||
|
|
||||||
login_user(user)
|
login_user(user)
|
||||||
user.save()
|
user.save()
|
||||||
return redirect(f"/?auth={user.get_id()}")
|
return redirect(f"/?auth={user.get_id()}")
|
||||||
|
|
@ -326,6 +327,8 @@ def github_callback():
|
||||||
# User has already registered, try to log in
|
# User has already registered, try to log in
|
||||||
user = users[0]
|
user = users[0]
|
||||||
user.access_token = get_uuid()
|
user.access_token = get_uuid()
|
||||||
|
if user and hasattr(user, 'is_active') and user.is_active == "0":
|
||||||
|
return redirect("/?error=user_inactive")
|
||||||
login_user(user)
|
login_user(user)
|
||||||
user.save()
|
user.save()
|
||||||
return redirect("/?auth=%s" % user.get_id())
|
return redirect("/?auth=%s" % user.get_id())
|
||||||
|
|
@ -427,6 +430,8 @@ def feishu_callback():
|
||||||
|
|
||||||
# User has already registered, try to log in
|
# User has already registered, try to log in
|
||||||
user = users[0]
|
user = users[0]
|
||||||
|
if user and hasattr(user, 'is_active') and user.is_active == "0":
|
||||||
|
return redirect("/?error=user_inactive")
|
||||||
user.access_token = get_uuid()
|
user.access_token = get_uuid()
|
||||||
login_user(user)
|
login_user(user)
|
||||||
user.save()
|
user.save()
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue