Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
a1a8a0cf
Commit
a1a8a0cf
authored
Jul 25, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Logout if logged out and don't allow to get logged in afterwards
parent
259ac94b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
3 deletions
+28
-3
admin.py
cps/admin.py
+5
-2
ub.py
cps/ub.py
+19
-1
web.py
cps/web.py
+4
-0
No files found.
cps/admin.py
View file @
a1a8a0cf
...
@@ -34,6 +34,7 @@ from babel.dates import format_datetime
...
@@ -34,6 +34,7 @@ from babel.dates import format_datetime
from
flask
import
Blueprint
,
flash
,
redirect
,
url_for
,
abort
,
request
,
make_response
,
send_from_directory
,
g
,
Response
from
flask
import
Blueprint
,
flash
,
redirect
,
url_for
,
abort
,
request
,
make_response
,
send_from_directory
,
g
,
Response
from
flask_login
import
login_required
,
current_user
,
logout_user
,
confirm_login
from
flask_login
import
login_required
,
current_user
,
logout_user
,
confirm_login
from
flask_babel
import
gettext
as
_
from
flask_babel
import
gettext
as
_
from
flask
import
session
as
flask_session
from
sqlalchemy
import
and_
from
sqlalchemy
import
and_
from
sqlalchemy.orm.attributes
import
flag_modified
from
sqlalchemy.orm.attributes
import
flag_modified
from
sqlalchemy.exc
import
IntegrityError
,
OperationalError
,
InvalidRequestError
from
sqlalchemy.exc
import
IntegrityError
,
OperationalError
,
InvalidRequestError
...
@@ -98,8 +99,10 @@ def admin_required(f):
...
@@ -98,8 +99,10 @@ def admin_required(f):
@
admi
.
before_app_request
@
admi
.
before_app_request
def
before_request
():
def
before_request
():
if
current_user
.
is_authenticated
:
if
not
ub
.
check_user_session
(
current_user
.
id
,
flask_session
.
get
(
'_id'
)):
confirm_login
()
logout_user
()
# if current_user.is_authenticated:
# confirm_login()
g
.
constants
=
constants
g
.
constants
=
constants
g
.
user
=
current_user
g
.
user
=
current_user
g
.
allow_registration
=
config
.
config_public_reg
g
.
allow_registration
=
config
.
config_public_reg
...
...
cps/ub.py
View file @
a1a8a0cf
...
@@ -60,6 +60,24 @@ app_DB_path = None
...
@@ -60,6 +60,24 @@ app_DB_path = None
Base
=
declarative_base
()
Base
=
declarative_base
()
searched_ids
=
{}
searched_ids
=
{}
logged_in
=
dict
()
def
store_user_session
():
if
flask_session
.
get
(
'_user_id'
,
""
):
if
logged_in
.
get
(
flask_session
.
get
(
'_user_id'
,
""
)):
logged_in
[
flask_session
.
get
(
'_user_id'
,
""
)]
.
append
(
flask_session
.
get
(
'_id'
,
""
))
else
:
logged_in
[
flask_session
.
get
(
'_user_id'
,
""
)]
=
[
flask_session
.
get
(
'_id'
,
""
)]
log
.
info
(
flask_session
.
get
(
'_id'
,
""
))
def
delete_user_session
(
user_id
,
session_key
):
try
:
logged_in
.
get
(
str
(
user_id
),
[])
.
remove
(
session_key
)
except
ValueError
:
pass
def
check_user_session
(
user_id
,
session_key
):
return
session_key
in
logged_in
.
get
(
str
(
user_id
),
[])
def
store_ids
(
result
):
def
store_ids
(
result
):
ids
=
list
()
ids
=
list
()
...
@@ -72,7 +90,7 @@ class UserBase:
...
@@ -72,7 +90,7 @@ class UserBase:
@
property
@
property
def
is_authenticated
(
self
):
def
is_authenticated
(
self
):
return
Tru
e
return
self
.
is_activ
e
def
_has_role
(
self
,
role_flag
):
def
_has_role
(
self
,
role_flag
):
return
constants
.
has_flag
(
self
.
role
,
role_flag
)
return
constants
.
has_flag
(
self
.
role
,
role_flag
)
...
...
cps/web.py
View file @
a1a8a0cf
...
@@ -1513,6 +1513,7 @@ def login():
...
@@ -1513,6 +1513,7 @@ def login():
login_result
,
error
=
services
.
ldap
.
bind_user
(
form
[
'username'
],
form
[
'password'
])
login_result
,
error
=
services
.
ldap
.
bind_user
(
form
[
'username'
],
form
[
'password'
])
if
login_result
:
if
login_result
:
login_user
(
user
,
remember
=
bool
(
form
.
get
(
'remember_me'
)))
login_user
(
user
,
remember
=
bool
(
form
.
get
(
'remember_me'
)))
ub
.
store_user_session
()
log
.
debug
(
u"You are now logged in as: '
%
s'"
,
user
.
name
)
log
.
debug
(
u"You are now logged in as: '
%
s'"
,
user
.
name
)
flash
(
_
(
u"you are now logged in as: '
%(nickname)
s'"
,
nickname
=
user
.
name
),
flash
(
_
(
u"you are now logged in as: '
%(nickname)
s'"
,
nickname
=
user
.
name
),
category
=
"success"
)
category
=
"success"
)
...
@@ -1520,6 +1521,7 @@ def login():
...
@@ -1520,6 +1521,7 @@ def login():
elif
login_result
is
None
and
user
and
check_password_hash
(
str
(
user
.
password
),
form
[
'password'
])
\
elif
login_result
is
None
and
user
and
check_password_hash
(
str
(
user
.
password
),
form
[
'password'
])
\
and
user
.
name
!=
"Guest"
:
and
user
.
name
!=
"Guest"
:
login_user
(
user
,
remember
=
bool
(
form
.
get
(
'remember_me'
)))
login_user
(
user
,
remember
=
bool
(
form
.
get
(
'remember_me'
)))
ub
.
store_user_session
()
log
.
info
(
"Local Fallback Login as: '
%
s'"
,
user
.
name
)
log
.
info
(
"Local Fallback Login as: '
%
s'"
,
user
.
name
)
flash
(
_
(
u"Fallback Login as: '
%(nickname)
s', LDAP Server not reachable, or user not known"
,
flash
(
_
(
u"Fallback Login as: '
%(nickname)
s', LDAP Server not reachable, or user not known"
,
nickname
=
user
.
name
),
nickname
=
user
.
name
),
...
@@ -1549,6 +1551,7 @@ def login():
...
@@ -1549,6 +1551,7 @@ def login():
else
:
else
:
if
user
and
check_password_hash
(
str
(
user
.
password
),
form
[
'password'
])
and
user
.
name
!=
"Guest"
:
if
user
and
check_password_hash
(
str
(
user
.
password
),
form
[
'password'
])
and
user
.
name
!=
"Guest"
:
login_user
(
user
,
remember
=
bool
(
form
.
get
(
'remember_me'
)))
login_user
(
user
,
remember
=
bool
(
form
.
get
(
'remember_me'
)))
ub
.
store_user_session
()
log
.
debug
(
u"You are now logged in as: '
%
s'"
,
user
.
name
)
log
.
debug
(
u"You are now logged in as: '
%
s'"
,
user
.
name
)
flash
(
_
(
u"You are now logged in as: '
%(nickname)
s'"
,
nickname
=
user
.
name
),
category
=
"success"
)
flash
(
_
(
u"You are now logged in as: '
%(nickname)
s'"
,
nickname
=
user
.
name
),
category
=
"success"
)
config
.
config_is_initial
=
False
config
.
config_is_initial
=
False
...
@@ -1572,6 +1575,7 @@ def login():
...
@@ -1572,6 +1575,7 @@ def login():
@
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
:
ub
.
delete_user_session
(
current_user
.
id
,
flask_session
.
get
(
'_id'
,
""
))
logout_user
()
logout_user
()
if
feature_support
[
'oauth'
]
and
(
config
.
config_login_type
==
2
or
config
.
config_login_type
==
3
):
if
feature_support
[
'oauth'
]
and
(
config
.
config_login_type
==
2
or
config
.
config_login_type
==
3
):
logout_oauth_user
()
logout_oauth_user
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment