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
e6799e7a
Commit
e6799e7a
authored
Jan 27, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved detection of invalid email addresses (#1831) upon registering
parent
0f83f999
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
main.js
cps/static/js/main.js
+0
-1
web.py
cps/web.py
+11
-4
No files found.
cps/static/js/main.js
View file @
e6799e7a
...
...
@@ -82,7 +82,6 @@ $(".container-fluid").bind('drop', function (e) {
var
files
=
e
.
originalEvent
.
dataTransfer
.
files
;
var
test
=
$
(
"#btn-upload"
)[
0
].
accept
;
$
(
this
).
css
(
'background'
,
''
);
// var final = [];
const
dt
=
new
DataTransfer
()
jQuery
.
each
(
files
,
function
(
index
,
item
)
{
if
(
test
.
indexOf
(
item
.
name
.
substr
(
item
.
name
.
lastIndexOf
(
'.'
)))
!==
-
1
)
{
...
...
cps/web.py
View file @
e6799e7a
...
...
@@ -24,6 +24,7 @@ from __future__ import division, print_function, unicode_literals
import
os
from
datetime
import
datetime
import
json
import
re
import
mimetypes
import
chardet
# dependency of requests
...
...
@@ -1273,11 +1274,17 @@ def register():
if
config
.
config_register_email
:
nickname
=
to_save
[
"email"
]
else
:
nickname
=
to_save
[
"nickname"
]
if
not
nickname
or
not
to_save
[
"email"
]
:
nickname
=
to_save
.
get
(
'nickname'
,
None
)
if
not
nickname
or
not
to_save
.
get
(
"email"
,
None
)
:
flash
(
_
(
u"Please fill out all fields!"
),
category
=
"error"
)
return
render_title_template
(
'register.html'
,
title
=
_
(
u"register"
),
page
=
"register"
)
#if to_save["email"].count("@") != 1 or not \
# Regex according to https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/email#validation
if
not
re
.
search
(
r"^[\w.!#$
%
&'*+\\/=?^_`{|}~-]+@[\w](?:[\w-]{0,61}[\w])?(?:\.[\w](?:[\w-]{0,61}[\w])?)*$"
,
to_save
[
"email"
]):
flash
(
_
(
u"Invalid e-mail address format"
),
category
=
"error"
)
log
.
warning
(
'Registering failed for user "
%
s" e-mail address:
%
s'
,
nickname
,
to_save
[
"email"
])
return
render_title_template
(
'register.html'
,
title
=
_
(
u"register"
),
page
=
"register"
)
existing_user
=
ub
.
session
.
query
(
ub
.
User
)
.
filter
(
func
.
lower
(
ub
.
User
.
nickname
)
==
nickname
.
lower
())
.
first
()
...
...
@@ -1303,7 +1310,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
.
warning
(
'Registering failed for user "
%
s" e-mail address:
%
s'
,
to_save
[
'nickname'
]
,
to_save
[
"email"
])
log
.
warning
(
'Registering failed for user "
%
s" e-mail address:
%
s'
,
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'
))
...
...
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