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
282859bc
Commit
282859bc
authored
Aug 22, 2020
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'github/master' into master
parents
a3ae97a5
4ee5dcaf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
web.py
cps/web.py
+6
-6
No files found.
cps/web.py
View file @
282859bc
...
...
@@ -1362,7 +1362,7 @@ def register():
return
render_title_template
(
'register.html'
,
title
=
_
(
u"register"
),
page
=
"register"
)
else
:
flash
(
_
(
u"Your e-mail is not allowed to register"
),
category
=
"error"
)
log
.
info
(
'Registering failed for user "
%
s" e-mail a
dress:
%
s'
,
to_save
[
'nickname'
],
to_save
[
"email"
])
log
.
warning
(
'Registering failed for user "
%
s" e-mail ad
dress:
%
s'
,
to_save
[
'nickname'
],
to_save
[
"email"
])
return
render_title_template
(
'register.html'
,
title
=
_
(
u"register"
),
page
=
"register"
)
flash
(
_
(
u"Confirmation e-mail was send to your e-mail account."
),
category
=
"success"
)
return
redirect
(
url_for
(
'web.login'
))
...
...
@@ -1410,7 +1410,7 @@ def login():
flash
(
_
(
u"Could not login:
%(message)
s"
,
message
=
error
),
category
=
"error"
)
else
:
ipAdress
=
request
.
headers
.
get
(
'X-Forwarded-For'
,
request
.
remote_addr
)
log
.
info
(
'LDAP Login failed for user "
%
s" IP-a
dress:
%
s'
,
form
[
'username'
],
ipAdress
)
log
.
warning
(
'LDAP Login failed for user "
%
s" IP-ad
dress:
%
s'
,
form
[
'username'
],
ipAdress
)
flash
(
_
(
u"Wrong Username or Password"
),
category
=
"error"
)
else
:
ipAdress
=
request
.
headers
.
get
(
'X-Forwarded-For'
,
request
.
remote_addr
)
...
...
@@ -1419,13 +1419,13 @@ def login():
ret
,
__
=
reset_password
(
user
.
id
)
if
ret
==
1
:
flash
(
_
(
u"New Password was send to your email address"
),
category
=
"info"
)
log
.
info
(
'Password reset for user "
%
s" IP-adress:
%
s'
,
form
[
'username'
],
ipAdress
)
log
.
info
(
'Password reset for user "
%
s" IP-ad
d
ress:
%
s'
,
form
[
'username'
],
ipAdress
)
else
:
log
.
info
(
u"An unknown error occurred. Please try again later"
)
log
.
error
(
u"An unknown error occurred. Please try again later"
)
flash
(
_
(
u"An unknown error occurred. Please try again later."
),
category
=
"error"
)
else
:
flash
(
_
(
u"Please enter valid username to reset password"
),
category
=
"error"
)
log
.
info
(
'Username missing for password reset IP-a
dress:
%
s'
,
ipAdress
)
log
.
warning
(
'Username missing for password reset IP-ad
dress:
%
s'
,
ipAdress
)
else
:
if
user
and
check_password_hash
(
str
(
user
.
password
),
form
[
'password'
])
and
user
.
nickname
!=
"Guest"
:
login_user
(
user
,
remember
=
bool
(
form
.
get
(
'remember_me'
)))
...
...
@@ -1434,7 +1434,7 @@ def login():
config
.
config_is_initial
=
False
return
redirect_back
(
url_for
(
"web.index"
))
else
:
log
.
info
(
'Login failed for user "
%
s" IP-a
dress:
%
s'
,
form
[
'username'
],
ipAdress
)
log
.
warning
(
'Login failed for user "
%
s" IP-ad
dress:
%
s'
,
form
[
'username'
],
ipAdress
)
flash
(
_
(
u"Wrong Username or Password"
),
category
=
"error"
)
next_url
=
request
.
args
.
get
(
'next'
,
default
=
url_for
(
"web.index"
),
type
=
str
)
...
...
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