Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
1bc203dd
Commit
1bc203dd
authored
Oct 19, 2022
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: import from six.moves.
parent
a1965e58
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
74 additions
and
77 deletions
+74
-77
bt5/erp5_oauth2_authorisation/DocumentTemplateItem/portal_components/document.erp5.OAuth2AuthorisationServerConnector.py
...nents/document.erp5.OAuth2AuthorisationServerConnector.py
+16
-17
bt5/erp5_oauth2_authorisation/SkinTemplateItem/portal_skins/erp5_oauth2_authorisation/ERP5Site_getClientIdFromLoginOnceCameFrom.py
...uthorisation/ERP5Site_getClientIdFromLoginOnceCameFrom.py
+2
-2
bt5/erp5_oauth2_authorisation/SkinTemplateItem/portal_skins/erp5_oauth2_authorisation/ERP5Site_isOAuth2CameFrom.py
...ns/erp5_oauth2_authorisation/ERP5Site_isOAuth2CameFrom.py
+2
-2
bt5/erp5_oauth2_authorisation/SkinTemplateItem/portal_skins/erp5_oauth2_authorisation/ERP5Site_retryOAuth2Authorisation.py
...oauth2_authorisation/ERP5Site_retryOAuth2Authorisation.py
+3
-3
bt5/erp5_oauth2_authorisation/SkinTemplateItem/portal_skins/erp5_oauth2_authorisation/logged_in_once.py
.../portal_skins/erp5_oauth2_authorisation/logged_in_once.py
+3
-3
bt5/erp5_oauth2_authorisation/TestTemplateItem/portal_components/test.erp5.testOAuth2Server.py
...plateItem/portal_components/test.erp5.testOAuth2Server.py
+28
-28
bt5/erp5_oauth2_resource/DocumentTemplateItem/portal_components/document.erp5.OAuth2AuthorisationClientConnector.py
...nents/document.erp5.OAuth2AuthorisationClientConnector.py
+13
-14
bt5/erp5_oauth2_resource/SkinTemplateItem/portal_skins/erp5_oauth2_resource/ERP5Site_preventLoginAttemptRetry.py
...erp5_oauth2_resource/ERP5Site_preventLoginAttemptRetry.py
+5
-6
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_form.py
...plateItem/portal_skins/erp5_web_renderjs_ui/login_form.py
+2
-2
No files found.
bt5/erp5_oauth2_authorisation/DocumentTemplateItem/portal_components/document.erp5.OAuth2AuthorisationServerConnector.py
View file @
1bc203dd
...
@@ -32,8 +32,7 @@ from io import BytesIO
...
@@ -32,8 +32,7 @@ from io import BytesIO
import
json
import
json
from
os
import
urandom
from
os
import
urandom
from
time
import
time
from
time
import
time
import
urllib
from
six.moves.urllib.parse
import
parse_qsl
,
urlencode
,
urlsplit
,
urlunsplit
import
urlparse
import
uuid
import
uuid
from
cryptography.hazmat.backends
import
default_backend
from
cryptography.hazmat.backends
import
default_backend
from
cryptography
import
fernet
from
cryptography
import
fernet
...
@@ -146,7 +145,7 @@ def substituteRequest(
...
@@ -146,7 +145,7 @@ def substituteRequest(
environ
=
request
.
environ
environ
=
request
.
environ
inner_environ_dict
=
environ
.
copy
()
inner_environ_dict
=
environ
.
copy
()
inner_environ_dict
[
'REQUEST_METHOD'
]
=
method
inner_environ_dict
[
'REQUEST_METHOD'
]
=
method
inner_environ_dict
[
'QUERY_STRING'
]
=
url
lib
.
url
encode
(
query_list
)
inner_environ_dict
[
'QUERY_STRING'
]
=
urlencode
(
query_list
)
if
request
.
_auth
:
if
request
.
_auth
:
inner_environ_dict
[
'HTTP_AUTHORIZATION'
]
=
request
.
_auth
inner_environ_dict
[
'HTTP_AUTHORIZATION'
]
=
request
.
_auth
...
@@ -257,18 +256,18 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
...
@@ -257,18 +256,18 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
if
is_local_client
and
self
.
__login_retry_url
:
if
is_local_client
and
self
.
__login_retry_url
:
# ...with a local resource server, redirect user agent to
# ...with a local resource server, redirect user agent to
# the provided login URL.
# the provided login URL.
split_login_retry_url
=
url
parse
.
url
split
(
self
.
__login_retry_url
)
split_login_retry_url
=
urlsplit
(
self
.
__login_retry_url
)
return
(
return
(
(
(
(
(
'Location'
,
'Location'
,
url
parse
.
url
unsplit
((
urlunsplit
((
split_login_retry_url
.
scheme
,
split_login_retry_url
.
scheme
,
split_login_retry_url
.
netloc
,
split_login_retry_url
.
netloc
,
split_login_retry_url
.
path
,
split_login_retry_url
.
path
,
url
lib
.
url
encode
([
urlencode
([
(
x
,
y
)
(
x
,
y
)
for
x
,
y
in
urlparse
.
parse_qsl
(
split_login_retry_url
.
query
)
for
x
,
y
in
parse_qsl
(
split_login_retry_url
.
query
)
if
x
!=
'portal_status_message'
if
x
!=
'portal_status_message'
]
+
[(
]
+
[(
'portal_status_message'
,
'portal_status_message'
,
...
@@ -300,7 +299,7 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
...
@@ -300,7 +299,7 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
credentials
=
credentials
,
credentials
=
credentials
,
)
)
if
authorization_status
==
302
and
is_local_client
:
if
authorization_status
==
302
and
is_local_client
:
split_location
=
url
parse
.
url
split
(
authorization_header_dict
[
'Location'
])
split_location
=
urlsplit
(
authorization_header_dict
[
'Location'
])
# XXX: to cut down on code complexity, this code has strong expectations on what location is.
# XXX: to cut down on code complexity, this code has strong expectations on what location is.
_
,
client_connector_id
,
method_id
=
split_location
.
path
.
rsplit
(
'/'
,
2
)
_
,
client_connector_id
,
method_id
=
split_location
.
path
.
rsplit
(
'/'
,
2
)
if
method_id
!=
'loggedIn'
:
if
method_id
!=
'loggedIn'
:
...
@@ -308,7 +307,7 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
...
@@ -308,7 +307,7 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
client_connector_value
=
client_value
.
getParentValue
().
getParentValue
()[
client_connector_id
]
client_connector_value
=
client_value
.
getParentValue
().
getParentValue
()[
client_connector_id
]
if
client_connector_value
.
getPortalType
()
!=
'OAuth2 Authorisation Client Connector'
:
if
client_connector_value
.
getPortalType
()
!=
'OAuth2 Authorisation Client Connector'
:
raise
ValueError
(
split_location
.
path
)
raise
ValueError
(
split_location
.
path
)
query_list
=
urlparse
.
parse_qsl
(
split_location
.
query
)
query_list
=
parse_qsl
(
split_location
.
query
)
# Note: query string generation should not have produce any duplicate
# Note: query string generation should not have produce any duplicate
# entries, so convert into a dict for code simplicity.
# entries, so convert into a dict for code simplicity.
query_dict
=
{
query_dict
=
{
...
@@ -362,7 +361,7 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
...
@@ -362,7 +361,7 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
for
key
,
value
in
six
.
iteritems
(
request_info_dict
):
for
key
,
value
in
six
.
iteritems
(
request_info_dict
):
if
value
is
None
:
if
value
is
None
:
continue
continue
if
not
isinstance
(
value
,
basestring
):
if
not
isinstance
(
value
,
six
.
text_type
):
raise
TypeError
((
key
,
repr
(
value
)))
raise
TypeError
((
key
,
repr
(
value
)))
new_request_info_dict
[
key
]
=
value
new_request_info_dict
[
key
]
=
value
inner_response
=
HTTPResponse
(
stdout
=
None
,
stderr
=
None
)
inner_response
=
HTTPResponse
(
stdout
=
None
,
stderr
=
None
)
...
@@ -386,7 +385,7 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
...
@@ -386,7 +385,7 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
# Use the internal path back to us so it can be traversed to while
# Use the internal path back to us so it can be traversed to while
# still in the just-authenticated request.
# still in the just-authenticated request.
(
(
self
.
__server_connector_path
+
'?'
+
url
parse
.
url
split
(
uri
).
query
self
.
__server_connector_path
+
'?'
+
urlsplit
(
uri
).
query
)
if
is_local_client
else
)
if
is_local_client
else
# Use the external URL back to us so user can be redirected to it,
# Use the external URL back to us so user can be redirected to it,
# as they are then authenticated over multiple requests.
# as they are then authenticated over multiple requests.
...
@@ -408,8 +407,8 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
...
@@ -408,8 +407,8 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
login_form
=
neutral_context_value
.
login_form
login_form
=
neutral_context_value
.
login_form
portal_status_message_list
=
[
portal_status_message_list
=
[
value
value
for
name
,
value
in
urlparse
.
parse_qsl
(
for
name
,
value
in
parse_qsl
(
url
parse
.
url
split
(
came_from
).
query
,
urlsplit
(
came_from
).
query
,
)
)
if
name
==
'portal_status_message'
if
name
==
'portal_status_message'
]
]
...
@@ -764,8 +763,8 @@ class _ERP5RequestValidator(RequestValidator):
...
@@ -764,8 +763,8 @@ class _ERP5RequestValidator(RequestValidator):
# redirect_uri path, but it may be under an extra layer of VirtualHost Monster
# redirect_uri path, but it may be under an extra layer of VirtualHost Monster
# magic.
# magic.
# Client is declared local, accept any redirect URI on our scheme and netloc.
# Client is declared local, accept any redirect URI on our scheme and netloc.
split_my_url
=
url
parse
.
url
split
(
client_value
.
absolute_url
())
split_my_url
=
urlsplit
(
client_value
.
absolute_url
())
split_redirect_uri
=
url
parse
.
url
split
(
redirect_uri
)
split_redirect_uri
=
urlsplit
(
redirect_uri
)
return
(
return
(
split_my_url
.
scheme
==
split_redirect_uri
.
scheme
and
split_my_url
.
scheme
==
split_redirect_uri
.
scheme
and
split_my_url
.
netloc
==
split_redirect_uri
.
netloc
split_my_url
.
netloc
==
split_redirect_uri
.
netloc
...
@@ -855,10 +854,10 @@ def _callEndpoint(endpoint, self, REQUEST):
...
@@ -855,10 +854,10 @@ def _callEndpoint(endpoint, self, REQUEST):
if
request_body
is
None
and
content_type
==
'application/x-www-form-urlencoded'
:
if
request_body
is
None
and
content_type
==
'application/x-www-form-urlencoded'
:
# XXX: very imperfect, but should be good enough for OAuth2 usage:
# XXX: very imperfect, but should be good enough for OAuth2 usage:
# no standard OAuth2 POST field should be marshalled by Zope.
# no standard OAuth2 POST field should be marshalled by Zope.
request_body
=
url
lib
.
url
encode
([
request_body
=
urlencode
([
(
x
,
y
)
(
x
,
y
)
for
x
,
y
in
six
.
iteritems
(
REQUEST
.
form
)
for
x
,
y
in
six
.
iteritems
(
REQUEST
.
form
)
if
isinstance
(
y
,
basestring
)
if
isinstance
(
y
,
six
.
text_type
)
])
])
uri
=
other
.
get
(
'URL'
,
''
)
uri
=
other
.
get
(
'URL'
,
''
)
query_string
=
environ
.
get
(
'QUERY_STRING'
)
query_string
=
environ
.
get
(
'QUERY_STRING'
)
...
...
bt5/erp5_oauth2_authorisation/SkinTemplateItem/portal_skins/erp5_oauth2_authorisation/ERP5Site_getClientIdFromLoginOnceCameFrom.py
View file @
1bc203dd
...
@@ -6,14 +6,14 @@ Once the user is authenticated, the same value can be accessed with:
...
@@ -6,14 +6,14 @@ Once the user is authenticated, the same value can be accessed with:
from AccessControl import getSecurityManager
from AccessControl import getSecurityManager
getSecurityManager().getUser().getClientId()
getSecurityManager().getUser().getClientId()
"""
"""
import
urlparse
from
six.moves.urllib.parse
import
parse_qsl
,
urlsplit
# The came_from for login_once_form is special: it has no scheme, no netloc, a path and a query.
# The came_from for login_once_form is special: it has no scheme, no netloc, a path and a query.
# Verify this so caller knows if they are providing the wrong value.
# Verify this so caller knows if they are providing the wrong value.
if
not
context
.
ERP5Site_isOAuth2CameFrom
(
came_from
=
came_from
):
if
not
context
.
ERP5Site_isOAuth2CameFrom
(
came_from
=
came_from
):
raise
ValueError
raise
ValueError
result
,
=
[
result
,
=
[
value
value
for
name
,
value
in
urlparse
.
parse_qsl
(
urlparse
.
urlsplit
(
came_from
).
query
)
for
name
,
value
in
parse_qsl
(
urlsplit
(
came_from
).
query
)
if
name
==
'client_id'
if
name
==
'client_id'
]
]
return
result
return
result
bt5/erp5_oauth2_authorisation/SkinTemplateItem/portal_skins/erp5_oauth2_authorisation/ERP5Site_isOAuth2CameFrom.py
View file @
1bc203dd
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
OAuth2's /authorize endpoint produces a very specific format of came_from, with very specific meaning (not a real URL).
OAuth2's /authorize endpoint produces a very specific format of came_from, with very specific meaning (not a real URL).
This script returns True value if given such came_from, and False otherwise.
This script returns True value if given such came_from, and False otherwise.
"""
"""
import
urlparse
from
six.moves.urllib.parse
import
urlsplit
parsed_came_from
=
url
parse
.
url
split
(
came_from
)
parsed_came_from
=
urlsplit
(
came_from
)
return
bool
(
return
bool
(
not
parsed_came_from
.
scheme
and
not
parsed_came_from
.
scheme
and
not
parsed_came_from
.
netloc
and
not
parsed_came_from
.
netloc
and
...
...
bt5/erp5_oauth2_authorisation/SkinTemplateItem/portal_skins/erp5_oauth2_authorisation/ERP5Site_retryOAuth2Authorisation.py
View file @
1bc203dd
...
@@ -3,16 +3,16 @@
...
@@ -3,16 +3,16 @@
Retry calling /authorize using the values in came_from
Retry calling /authorize using the values in came_from
(which a previous call to /authorize generated, and is not a traditional came_from).
(which a previous call to /authorize generated, and is not a traditional came_from).
"""
"""
import
urlparse
from
six.moves.urllib.parse
import
parse_qsl
,
urlsplit
from
erp5.component.document.OAuth2AuthorisationServerConnector
import
substituteRequest
from
erp5.component.document.OAuth2AuthorisationServerConnector
import
substituteRequest
if
not
context
.
ERP5Site_isOAuth2CameFrom
(
came_from
):
if
not
context
.
ERP5Site_isOAuth2CameFrom
(
came_from
):
# came_from is broken, there is no way to call /authorize , so escape to wherever.
# came_from is broken, there is no way to call /authorize , so escape to wherever.
context
.
Base_redirect
()
context
.
Base_redirect
()
return
return
parsed_came_from
=
url
parse
.
url
split
(
came_from
)
parsed_came_from
=
urlsplit
(
came_from
)
query_list
=
[
query_list
=
[
(
key
,
value
)
(
key
,
value
)
for
key
,
value
in
urlparse
.
parse_qsl
(
parsed_came_from
.
query
)
for
key
,
value
in
parse_qsl
(
parsed_came_from
.
query
)
if
key
!=
'portal_status_message'
if
key
!=
'portal_status_message'
]
]
if
portal_status_message
is
not
None
:
if
portal_status_message
is
not
None
:
...
...
bt5/erp5_oauth2_authorisation/SkinTemplateItem/portal_skins/erp5_oauth2_authorisation/logged_in_once.py
View file @
1bc203dd
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
Similar to logged_in, but user authentication will only last for current request if nothing else is done.
Similar to logged_in, but user authentication will only last for current request if nothing else is done.
So came_from must be honoured within the current request, and not redirected to.
So came_from must be honoured within the current request, and not redirected to.
"""
"""
import
urlparse
from
six.moves.urllib.parse
import
parse_qsl
,
urlsplit
from
erp5.component.document.OAuth2AuthorisationServerConnector
import
substituteRequest
from
erp5.component.document.OAuth2AuthorisationServerConnector
import
substituteRequest
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
if
portal
.
portal_skins
.
updateSkinCookie
():
if
portal
.
portal_skins
.
updateSkinCookie
():
...
@@ -23,7 +23,7 @@ if not came_from or not context.ERP5Site_isOAuth2CameFrom(came_from):
...
@@ -23,7 +23,7 @@ if not came_from or not context.ERP5Site_isOAuth2CameFrom(came_from):
# came_from is broken, there is no way to call authorize, so escape to wherever.
# came_from is broken, there is no way to call authorize, so escape to wherever.
context
.
Base_redirect
()
context
.
Base_redirect
()
return
return
parsed_came_from
=
url
parse
.
url
split
(
came_from
)
parsed_came_from
=
urlsplit
(
came_from
)
# Turn the ZODB path from came_from into a relative URL and base it on context (and not portal) to
# Turn the ZODB path from came_from into a relative URL and base it on context (and not portal) to
# work as expected from within Web Sites without Virtual Host Monster relocating them above portal.
# work as expected from within Web Sites without Virtual Host Monster relocating them above portal.
connector_value
=
context
.
restrictedTraverse
(
parsed_came_from
.
path
.
lstrip
(
'/'
))
connector_value
=
context
.
restrictedTraverse
(
parsed_came_from
.
path
.
lstrip
(
'/'
))
...
@@ -35,7 +35,7 @@ if (
...
@@ -35,7 +35,7 @@ if (
return
return
# Note: query string generation should not have produce any duplicate
# Note: query string generation should not have produce any duplicate
# entries, so directly use to update form dict for code simplicity.
# entries, so directly use to update form dict for code simplicity.
form
=
dict
(
urlparse
.
parse_qsl
(
parsed_came_from
.
query
))
form
=
dict
(
parse_qsl
(
parsed_came_from
.
query
))
login_retry_url
=
REQUEST
.
form
.
get
(
'login_retry_url'
)
login_retry_url
=
REQUEST
.
form
.
get
(
'login_retry_url'
)
if
login_retry_url
is
not
None
:
if
login_retry_url
is
not
None
:
form
[
'login_retry_url'
]
=
login_retry_url
form
[
'login_retry_url'
]
=
login_retry_url
...
...
bt5/erp5_oauth2_authorisation/TestTemplateItem/portal_components/test.erp5.testOAuth2Server.py
View file @
1bc203dd
...
@@ -29,15 +29,14 @@ import base64
...
@@ -29,15 +29,14 @@ import base64
from
collections
import
defaultdict
from
collections
import
defaultdict
from
functools
import
partial
,
wraps
from
functools
import
partial
,
wraps
import
hashlib
import
hashlib
import
HTMLParser
from
six.moves.html_parser
import
HTMLParser
from
io
import
BytesIO
from
io
import
BytesIO
import
json
import
json
import
random
import
random
import
pprint
import
pprint
from
time
import
time
from
time
import
time
import
unittest
import
unittest
import
urllib
from
six.moves.urllib.parse
import
parse_qsl
,
quote
,
unquote
,
urlencode
,
urlsplit
,
urlunsplit
import
urlparse
import
six
import
six
from
AccessControl.SecurityManagement
import
getSecurityManager
,
setSecurityManager
from
AccessControl.SecurityManagement
import
getSecurityManager
,
setSecurityManager
from
DateTime
import
DateTime
from
DateTime
import
DateTime
...
@@ -50,6 +49,7 @@ import Zope2
...
@@ -50,6 +49,7 @@ import Zope2
from
ZPublisher.mapply
import
mapply
from
ZPublisher.mapply
import
mapply
from
ZPublisher.HTTPRequest
import
HTTPRequest
from
ZPublisher.HTTPRequest
import
HTTPRequest
from
ZPublisher.HTTPResponse
import
HTTPResponse
from
ZPublisher.HTTPResponse
import
HTTPResponse
from
six.moves
import
xrange
_TEST_ACCESS_COOKIE_NAME
=
'__Site-test_at'
_TEST_ACCESS_COOKIE_NAME
=
'__Site-test_at'
_TEST_REFRESH_COOKIE_NAME
=
'__Site-test_rt'
_TEST_REFRESH_COOKIE_NAME
=
'__Site-test_rt'
...
@@ -61,11 +61,11 @@ _HTML_FIELD_TAG_SET = {
...
@@ -61,11 +61,11 @@ _HTML_FIELD_TAG_SET = {
'submit'
,
'submit'
,
# Very incomplete, but enough for this tests' purpose: ignores "select"s...
# Very incomplete, but enough for this tests' purpose: ignores "select"s...
}
}
class
FormExtractor
(
HTMLParser
.
HTMLParser
):
class
FormExtractor
(
HTMLParser
):
def
reset
(
self
):
def
reset
(
self
):
self
.
__in_form
=
False
self
.
__in_form
=
False
self
.
form_list
=
[]
self
.
form_list
=
[]
HTMLParser
.
HTMLParser
.
reset
(
self
)
HTMLParser
.
reset
(
self
)
def
handle_starttag
(
self
,
tag
,
attribute_item_list
):
def
handle_starttag
(
self
,
tag
,
attribute_item_list
):
attr_dict
=
dict
(
attribute_item_list
)
attr_dict
=
dict
(
attribute_item_list
)
...
@@ -181,7 +181,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -181,7 +181,7 @@ class TestOAuth2(ERP5TypeTestCase):
def
afterSetUp
(
self
):
def
afterSetUp
(
self
):
super
(
TestOAuth2
,
self
).
afterSetUp
()
super
(
TestOAuth2
,
self
).
afterSetUp
()
parsed_site_url
=
url
parse
.
url
split
(
self
.
portal
.
absolute_url
())
parsed_site_url
=
urlsplit
(
self
.
portal
.
absolute_url
())
self
.
__scheme
=
parsed_site_url
.
scheme
self
.
__scheme
=
parsed_site_url
.
scheme
context_netloc_list
=
parsed_site_url
.
netloc
.
rsplit
(
':'
,
1
)
context_netloc_list
=
parsed_site_url
.
netloc
.
rsplit
(
':'
,
1
)
try
:
try
:
...
@@ -292,7 +292,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -292,7 +292,7 @@ class TestOAuth2(ERP5TypeTestCase):
cleanup_list
=
self
.
__cleanup_list
cleanup_list
=
self
.
__cleanup_list
# XXX: imperfect cleanup if indexation did not complete
# XXX: imperfect cleanup if indexation did not complete
cleanup_list
.
extend
(
cleanup_list
.
extend
(
x
.
getObject
()
for
x
in
self
.
__searchOAuth2Session
()
,
x
.
getObject
()
for
x
in
self
.
__searchOAuth2Session
()
)
)
parent_dict
=
defaultdict
(
list
)
parent_dict
=
defaultdict
(
list
)
for
document_value
in
cleanup_list
:
for
document_value
in
cleanup_list
:
...
@@ -353,7 +353,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -353,7 +353,7 @@ class TestOAuth2(ERP5TypeTestCase):
cookie_header
=
';'
.
join
(
cookie_header
=
';'
.
join
(
'%s="%s"'
%
(
'%s="%s"'
%
(
name
,
name
,
urllib
.
quote
(
cookie_dict
[
'value'
]),
quote
(
cookie_dict
[
'value'
]),
)
for
name
,
cookie_dict
in
six
.
iteritems
(
dict
(
cookie_dict
))
)
for
name
,
cookie_dict
in
six
.
iteritems
(
dict
(
cookie_dict
))
if
cookie_dict
if
cookie_dict
)
)
...
@@ -482,7 +482,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -482,7 +482,7 @@ class TestOAuth2(ERP5TypeTestCase):
Assert that given call redirects to given location with given status.
Assert that given call redirects to given location with given status.
Only scheme, netloc and path are matched (ex: query is ignored).
Only scheme, netloc and path are matched (ex: query is ignored).
"""
"""
parsed_reference_location
=
url
parse
.
url
split
(
reference_location
)
parsed_reference_location
=
urlsplit
(
reference_location
)
status
,
header_dict
,
cookie_dict
,
body
=
query_result
status
,
header_dict
,
cookie_dict
,
body
=
query_result
self
.
assertIn
(
self
.
assertIn
(
body
.
strip
(),
body
.
strip
(),
...
@@ -493,7 +493,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -493,7 +493,7 @@ class TestOAuth2(ERP5TypeTestCase):
header_dict
.
get
(
'location'
,
b''
),
header_dict
.
get
(
'location'
,
b''
),
),
),
)
)
parsed_location
=
url
parse
.
url
split
(
header_dict
.
get
(
'location'
,
''
))
parsed_location
=
urlsplit
(
header_dict
.
get
(
'location'
,
''
))
self
.
assertEqual
(
self
.
assertEqual
(
(
(
status
,
status
,
...
@@ -560,13 +560,13 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -560,13 +560,13 @@ class TestOAuth2(ERP5TypeTestCase):
raise
ValueError
(
'No field name ending with ":method"'
)
raise
ValueError
(
'No field name ending with ":method"'
)
# Call Base_callDialogMethod
# Call Base_callDialogMethod
status
,
inner_header_dict
,
inner_cookie_dict
,
body
=
self
.
_query
(
status
,
inner_header_dict
,
inner_cookie_dict
,
body
=
self
.
_query
(
path
=
url
parse
.
url
split
(
action_url
).
path
+
'/'
+
script_id
,
path
=
urlsplit
(
action_url
).
path
+
'/'
+
script_id
,
method
=
'POST'
,
method
=
'POST'
,
client_ip
=
client_ip
,
client_ip
=
client_ip
,
content_type
=
'application/x-www-form-urlencoded'
,
content_type
=
'application/x-www-form-urlencoded'
,
header_dict
=
header_dict
,
header_dict
=
header_dict
,
cookie_dict
=
cookie_dict
,
cookie_dict
=
cookie_dict
,
body
=
url
lib
.
url
encode
(
list
(
value_callback
(
body
=
urlencode
(
list
(
value_callback
(
field_item_list
=
tuple
(
field_item_list
=
tuple
(
(
key
,
value
)
(
key
,
value
)
for
key
,
value
in
field_list
for
key
,
value
in
field_list
...
@@ -589,7 +589,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -589,7 +589,7 @@ class TestOAuth2(ERP5TypeTestCase):
# portal, so if it is outside we know the redirection comes from the
# portal, so if it is outside we know the redirection comes from the
# action script and we are done.
# action script and we are done.
if
location
.
startswith
(
portal
.
absolute_url
()):
if
location
.
startswith
(
portal
.
absolute_url
()):
parsed_location
=
url
parse
.
url
split
(
location
)
parsed_location
=
urlsplit
(
location
)
dialog_method
,
=
[
dialog_method
,
=
[
value
value
for
key
,
value
in
field_list
for
key
,
value
in
field_list
...
@@ -642,7 +642,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -642,7 +642,7 @@ class TestOAuth2(ERP5TypeTestCase):
If the login form is displayed but this is None, test fails.
If the login form is displayed but this is None, test fails.
If the login for is not displayed and this is not None, test fails.
If the login for is not displayed and this is not None, test fails.
Called with:
Called with:
parsed_location (url
parse.url
split)
parsed_location (urlsplit)
Parsed locator. Use this if you want, for example, to access the portal_status_message.
Parsed locator. Use this if you want, for example, to access the portal_status_message.
See _submitDialog for further signature definitions.
See _submitDialog for further signature definitions.
authentication_is_local (bool)
authentication_is_local (bool)
...
@@ -658,7 +658,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -658,7 +658,7 @@ class TestOAuth2(ERP5TypeTestCase):
throughout the course of this method.
throughout the course of this method.
Returns:
Returns:
parsed_location (url
parse.url
split)
parsed_location (urlsplit)
Parsed version of the actual redirection location aimed at redirect_uri.
Parsed version of the actual redirection location aimed at redirect_uri.
cookie_dict (dict)
cookie_dict (dict)
Flattened view of all response set-cookie headers.
Flattened view of all response set-cookie headers.
...
@@ -676,7 +676,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -676,7 +676,7 @@ class TestOAuth2(ERP5TypeTestCase):
else
:
else
:
cookie_jar
[
key
]
=
value
cookie_jar
[
key
]
=
value
cookie_dict
[
key
]
=
value
cookie_dict
[
key
]
=
value
parsed_redirect_uri
=
url
parse
.
url
split
(
redirect_uri
)
parsed_redirect_uri
=
urlsplit
(
redirect_uri
)
def
isRedirectURI
(
parsed_location
):
def
isRedirectURI
(
parsed_location
):
return
(
return
(
parsed_location
.
scheme
==
parsed_redirect_uri
.
scheme
and
parsed_location
.
scheme
==
parsed_redirect_uri
.
scheme
and
...
@@ -686,7 +686,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -686,7 +686,7 @@ class TestOAuth2(ERP5TypeTestCase):
assert
not
parsed_redirect_uri
.
query
assert
not
parsed_redirect_uri
.
query
assert
not
parsed_redirect_uri
.
fragment
assert
not
parsed_redirect_uri
.
fragment
# XXX: just to satisfy authentication_callback
# XXX: just to satisfy authentication_callback
parsed_location
=
url
parse
.
urlsplit
(
urlparse
.
urlunsplit
((
parsed_location
=
url
split
(
urlunsplit
((
''
,
''
,
''
,
''
,
path
,
path
,
...
@@ -713,7 +713,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -713,7 +713,7 @@ class TestOAuth2(ERP5TypeTestCase):
updateCookieDictAndJar
(
inner_cookie_dict
)
updateCookieDictAndJar
(
inner_cookie_dict
)
if
status
==
302
:
if
status
==
302
:
# Being redirected...
# Being redirected...
parsed_location
=
url
parse
.
url
split
(
inner_header_dict
.
get
(
'location'
,
''
))
parsed_location
=
urlsplit
(
inner_header_dict
.
get
(
'location'
,
''
))
if
isRedirectURI
(
parsed_location
):
if
isRedirectURI
(
parsed_location
):
# ...to client: check if this is expected and leave
# ...to client: check if this is expected and leave
self
.
assertTrue
(
self
.
assertTrue
(
...
@@ -808,7 +808,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -808,7 +808,7 @@ class TestOAuth2(ERP5TypeTestCase):
client_id
=
oauth2_client_declaration_value
.
getId
()
client_id
=
oauth2_client_declaration_value
.
getId
()
parsed_location
,
cookie_dict
,
time_before
,
time_after
=
response
=
self
.
_authorise
(
parsed_location
,
cookie_dict
,
time_before
,
time_after
=
response
=
self
.
_authorise
(
path
=
oauth2_server_connector
+
'/authorize'
,
path
=
oauth2_server_connector
+
'/authorize'
,
query
=
url
lib
.
url
encode
({
query
=
urlencode
({
'response_type'
:
'code'
,
'response_type'
:
'code'
,
'client_id'
:
client_id
,
'client_id'
:
client_id
,
'state'
:
reference_state
,
'state'
:
reference_state
,
...
@@ -827,7 +827,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -827,7 +827,7 @@ class TestOAuth2(ERP5TypeTestCase):
},
},
)
)
self
.
assertEqual
(
cookie_dict
,
{})
self
.
assertEqual
(
cookie_dict
,
{})
query_list
=
urlparse
.
parse_qsl
(
parsed_location
.
query
)
query_list
=
parse_qsl
(
parsed_location
.
query
)
query_dict
=
dict
(
query_list
)
query_dict
=
dict
(
query_list
)
self
.
assertEqual
(
len
(
query_list
),
len
(
query_dict
),
(
query_list
,
query_dict
))
self
.
assertEqual
(
len
(
query_list
),
len
(
query_dict
),
(
query_list
,
query_dict
))
authorisation_code
=
query_dict
[
'code'
]
authorisation_code
=
query_dict
[
'code'
]
...
@@ -848,7 +848,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -848,7 +848,7 @@ class TestOAuth2(ERP5TypeTestCase):
path
=
oauth2_server_connector
+
'/token'
,
path
=
oauth2_server_connector
+
'/token'
,
method
=
'POST'
,
method
=
'POST'
,
content_type
=
'application/x-www-form-urlencoded'
,
content_type
=
'application/x-www-form-urlencoded'
,
body
=
url
lib
.
url
encode
({
body
=
urlencode
({
'grant_type'
:
'authorization_code'
,
'grant_type'
:
'authorization_code'
,
'code'
:
authorisation_code
,
'code'
:
authorisation_code
,
'client_id'
:
client_id
,
'client_id'
:
client_id
,
...
@@ -876,7 +876,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -876,7 +876,7 @@ class TestOAuth2(ERP5TypeTestCase):
path
=
oauth2_server_connector
+
'/token'
,
path
=
oauth2_server_connector
+
'/token'
,
method
=
'POST'
,
method
=
'POST'
,
content_type
=
'application/x-www-form-urlencoded'
,
content_type
=
'application/x-www-form-urlencoded'
,
body
=
url
lib
.
url
encode
({
body
=
urlencode
({
'grant_type'
:
'refresh_token'
,
'grant_type'
:
'refresh_token'
,
'refresh_token'
:
refresh_token
,
'refresh_token'
:
refresh_token
,
}),
}),
...
@@ -893,7 +893,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -893,7 +893,7 @@ class TestOAuth2(ERP5TypeTestCase):
path
=
oauth2_server_connector
+
'/revoke'
,
path
=
oauth2_server_connector
+
'/revoke'
,
method
=
'POST'
,
method
=
'POST'
,
content_type
=
'application/x-www-form-urlencoded'
,
content_type
=
'application/x-www-form-urlencoded'
,
body
=
url
lib
.
url
encode
({
body
=
urlencode
({
'token_type_hint'
:
'refresh_token'
,
'token_type_hint'
:
'refresh_token'
,
'token'
:
refresh_token
,
'token'
:
refresh_token
,
}),
}),
...
@@ -909,7 +909,7 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -909,7 +909,7 @@ class TestOAuth2(ERP5TypeTestCase):
path
=
oauth2_server_connector
+
'/token'
,
path
=
oauth2_server_connector
+
'/token'
,
method
=
'POST'
,
method
=
'POST'
,
content_type
=
'application/x-www-form-urlencoded'
,
content_type
=
'application/x-www-form-urlencoded'
,
body
=
url
lib
.
url
encode
({
body
=
urlencode
({
'grant_type'
:
'refresh_token'
,
'grant_type'
:
'refresh_token'
,
'refresh_token'
:
refresh_token
,
'refresh_token'
:
refresh_token
,
}),
}),
...
@@ -1018,8 +1018,8 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -1018,8 +1018,8 @@ class TestOAuth2(ERP5TypeTestCase):
_
,
_
,
cookie_dict
,
_
=
query_result
=
self
.
_query
(
_
,
_
,
cookie_dict
,
_
=
query_result
=
self
.
_query
(
path
=
parsed_location
.
path
,
path
=
parsed_location
.
path
,
method
=
'GET'
,
method
=
'GET'
,
query
=
url
lib
.
url
encode
(
query
=
urlencode
(
urlparse
.
parse_qsl
(
parsed_location
.
query
)
+
[
parse_qsl
(
parsed_location
.
query
)
+
[
(
'client_id'
,
oauth2_client_connector_value
.
getReference
()),
(
'client_id'
,
oauth2_client_connector_value
.
getReference
()),
],
],
),
),
...
@@ -1203,8 +1203,8 @@ class TestOAuth2(ERP5TypeTestCase):
...
@@ -1203,8 +1203,8 @@ class TestOAuth2(ERP5TypeTestCase):
),
),
reference_location
=
portal_url
+
'login_form'
,
reference_location
=
portal_url
+
'login_form'
,
)
)
login_form_query
=
url
lib
.
url
encode
(
login_form_query
=
urlencode
(
urlparse
.
parse_qsl
(
parsed_login_form_location
.
query
)
+
[
parse_qsl
(
parsed_login_form_location
.
query
)
+
[
# Pick the local client_id, for simplicity
# Pick the local client_id, for simplicity
(
'client_id'
,
self
.
__oauth2_local_client_connector_value
.
getReference
()),
(
'client_id'
,
self
.
__oauth2_local_client_connector_value
.
getReference
()),
],
],
...
...
bt5/erp5_oauth2_resource/DocumentTemplateItem/portal_components/document.erp5.OAuth2AuthorisationClientConnector.py
View file @
1bc203dd
...
@@ -31,13 +31,12 @@ import email.utils
...
@@ -31,13 +31,12 @@ import email.utils
import
functools
import
functools
import
hashlib
import
hashlib
import
hmac
import
hmac
import
httplib
from
six.moves.http_client
import
HTTPConnection
,
HTTPSConnection
import
json
import
json
from
os
import
urandom
from
os
import
urandom
import
random
import
random
from
time
import
time
from
time
import
time
import
urllib
from
six.moves.urllib.parse
import
urlencode
,
urljoin
,
urlparse
import
urlparse
import
ssl
import
ssl
from
AccessControl
import
(
from
AccessControl
import
(
ClassSecurityInfo
,
ClassSecurityInfo
,
...
@@ -191,7 +190,7 @@ class _OAuth2AuthorisationServerProxy(object):
...
@@ -191,7 +190,7 @@ class _OAuth2AuthorisationServerProxy(object):
ca_certificate_pem
,
ca_certificate_pem
,
insecure
,
insecure
,
):
):
scheme
=
url
parse
.
url
split
(
authorisation_server_url
).
scheme
scheme
=
urlsplit
(
authorisation_server_url
).
scheme
if
scheme
!=
'https'
and
not
insecure
:
if
scheme
!=
'https'
and
not
insecure
:
raise
ValueError
(
'Only https access to Authorisation Server is allowed'
)
raise
ValueError
(
'Only https access to Authorisation Server is allowed'
)
self
.
_scheme
=
scheme
self
.
_scheme
=
scheme
...
@@ -210,7 +209,7 @@ class _OAuth2AuthorisationServerProxy(object):
...
@@ -210,7 +209,7 @@ class _OAuth2AuthorisationServerProxy(object):
def
_query
(
self
,
method_id
,
body
,
header_dict
=
()):
def
_query
(
self
,
method_id
,
body
,
header_dict
=
()):
plain_url
=
self
.
_authorisation_server_url
+
'/'
+
method_id
plain_url
=
self
.
_authorisation_server_url
+
'/'
+
method_id
parsed_url
=
urlparse
.
urlparse
(
plain_url
)
parsed_url
=
urlparse
(
plain_url
)
if
self
.
_scheme
==
'https'
:
if
self
.
_scheme
==
'https'
:
ssl_context
=
ssl
.
create_default_context
(
ssl_context
=
ssl
.
create_default_context
(
cadata
=
self
.
_ca_certificate_pem
,
cadata
=
self
.
_ca_certificate_pem
,
...
@@ -222,11 +221,11 @@ class _OAuth2AuthorisationServerProxy(object):
...
@@ -222,11 +221,11 @@ class _OAuth2AuthorisationServerProxy(object):
ssl_context
.
verify_mode
=
ssl
.
CERT_REQUIRED
ssl_context
.
verify_mode
=
ssl
.
CERT_REQUIRED
ssl_context
.
check_hostname
=
True
ssl_context
.
check_hostname
=
True
Connection
=
functools
.
partial
(
Connection
=
functools
.
partial
(
httplib
.
HTTPSConnection
,
HTTPSConnection
,
context
=
ssl_context
,
context
=
ssl_context
,
)
)
else
:
else
:
Connection
=
httplib
.
HTTPConnection
Connection
=
HTTPConnection
timeout
=
getTimeLeft
()
timeout
=
getTimeLeft
()
if
timeout
is
None
or
timeout
>
self
.
_timeout
:
if
timeout
is
None
or
timeout
>
self
.
_timeout
:
timeout
=
self
.
_timeout
timeout
=
self
.
_timeout
...
@@ -256,7 +255,7 @@ class _OAuth2AuthorisationServerProxy(object):
...
@@ -256,7 +255,7 @@ class _OAuth2AuthorisationServerProxy(object):
def
_queryERP5
(
self
,
method_id
,
kw
=
()):
def
_queryERP5
(
self
,
method_id
,
kw
=
()):
header_dict
,
body
,
status
=
self
.
_query
(
header_dict
,
body
,
status
=
self
.
_query
(
method_id
=
method_id
,
method_id
=
method_id
,
body
=
url
lib
.
url
encode
(
kw
),
body
=
urlencode
(
kw
),
header_dict
=
{
header_dict
=
{
'Accept'
:
'application/json;charset=UTF-8'
,
'Accept'
:
'application/json;charset=UTF-8'
,
'Content-Type'
:
'application/x-www-form-urlencoded'
,
'Content-Type'
:
'application/x-www-form-urlencoded'
,
...
@@ -274,7 +273,7 @@ class _OAuth2AuthorisationServerProxy(object):
...
@@ -274,7 +273,7 @@ class _OAuth2AuthorisationServerProxy(object):
def
_queryOAuth2
(
self
,
method
,
REQUEST
,
RESPONSE
):
def
_queryOAuth2
(
self
,
method
,
REQUEST
,
RESPONSE
):
header_dict
,
body
,
status
=
self
.
_query
(
header_dict
,
body
,
status
=
self
.
_query
(
method
,
method
,
body
=
url
lib
.
url
encode
(
REQUEST
.
form
.
items
()),
body
=
urlencode
(
REQUEST
.
form
.
items
()),
header_dict
=
{
header_dict
=
{
'CONTENT_TYPE'
:
REQUEST
.
environ
[
'CONTENT_TYPE'
],
'CONTENT_TYPE'
:
REQUEST
.
environ
[
'CONTENT_TYPE'
],
},
},
...
@@ -377,7 +376,7 @@ class OAuth2AuthorisationClientConnector(
...
@@ -377,7 +376,7 @@ class OAuth2AuthorisationClientConnector(
if
'/'
in
authorisation_server_url
:
if
'/'
in
authorisation_server_url
:
# Remote Authorisation Server
# Remote Authorisation Server
return
_OAuth2AuthorisationServerProxy
(
return
_OAuth2AuthorisationServerProxy
(
authorisation_server_url
=
url
parse
.
url
join
(
authorisation_server_url
=
urljoin
(
# In case authorisation_server_url contains slashes but is still
# In case authorisation_server_url contains slashes but is still
# relative (to the scheme or to the netloc - path-relative is not
# relative (to the scheme or to the netloc - path-relative is not
# supported by urljoin)
# supported by urljoin)
...
@@ -474,7 +473,7 @@ class OAuth2AuthorisationClientConnector(
...
@@ -474,7 +473,7 @@ class OAuth2AuthorisationClientConnector(
assert
inner_response
.
status
==
200
assert
inner_response
.
status
==
200
access_token
=
oauth2_response
[
'access_token'
]
access_token
=
oauth2_response
[
'access_token'
]
refresh_token
=
oauth2_response
.
get
(
'refresh_token'
)
refresh_token
=
oauth2_response
.
get
(
'refresh_token'
)
parsed_actual_url
=
urlparse
.
urlparse
(
request
.
other
.
get
(
'ACTUAL_URL'
))
parsed_actual_url
=
urlparse
(
request
.
other
.
get
(
'ACTUAL_URL'
))
same_site
=
self
.
ERP5Site_getAuthCookieSameSite
(
same_site
=
self
.
ERP5Site_getAuthCookieSameSite
(
scheme
=
parsed_actual_url
.
scheme
,
scheme
=
parsed_actual_url
.
scheme
,
hostname
=
parsed_actual_url
.
hostname
,
hostname
=
parsed_actual_url
.
hostname
,
...
@@ -712,8 +711,8 @@ class OAuth2AuthorisationClientConnector(
...
@@ -712,8 +711,8 @@ class OAuth2AuthorisationClientConnector(
# came_from is what the user was trying to do just before they ended up
# came_from is what the user was trying to do just before they ended up
# here, so we can redirect them there once they are authenticated.
# here, so we can redirect them there once they are authenticated.
if
came_from
:
if
came_from
:
parsed_came_from
=
urlparse
.
urlparse
(
came_from
)
parsed_came_from
=
urlparse
(
came_from
)
parsed_redirect_uri
=
urlparse
.
urlparse
(
redirect_uri
)
parsed_redirect_uri
=
urlparse
(
redirect_uri
)
if
(
if
(
parsed_came_from
.
scheme
!=
parsed_redirect_uri
.
scheme
or
parsed_came_from
.
scheme
!=
parsed_redirect_uri
.
scheme
or
parsed_came_from
.
netloc
!=
parsed_redirect_uri
.
netloc
parsed_came_from
.
netloc
!=
parsed_redirect_uri
.
netloc
...
@@ -829,7 +828,7 @@ class OAuth2AuthorisationClientConnector(
...
@@ -829,7 +828,7 @@ class OAuth2AuthorisationClientConnector(
'Location'
,
'Location'
,
self
.
_getAuthorisationServerValue
(
self
.
_getAuthorisationServerValue
(
REQUEST
=
REQUEST
,
REQUEST
=
REQUEST
,
).
absolute_url
()
+
'/authorize?'
+
url
lib
.
url
encode
(
query_list
),
).
absolute_url
()
+
'/authorize?'
+
urlencode
(
query_list
),
)
)
else
:
else
:
# Provide the current URL to authorize, so that it can redirect the
# Provide the current URL to authorize, so that it can redirect the
...
...
bt5/erp5_oauth2_resource/SkinTemplateItem/portal_skins/erp5_oauth2_resource/ERP5Site_preventLoginAttemptRetry.py
View file @
1bc203dd
...
@@ -3,17 +3,16 @@ Modify given URL so that the resulting one prevents further login attempts when
...
@@ -3,17 +3,16 @@ Modify given URL so that the resulting one prevents further login attempts when
Useful to break redirection loops.
Useful to break redirection loops.
"""
"""
import
urllib
from
six.moves.urllib.parse
import
urlencode
,
urlsplit
,
urlunsplit
import
urlparse
PARAMETER_NAME
=
'disable_cookie_login__'
PARAMETER_NAME
=
'disable_cookie_login__'
parsed_url
=
url
parse
.
url
split
(
url
)
parsed_url
=
urlsplit
(
url
)
return
url
parse
.
url
unsplit
((
return
urlunsplit
((
parsed_url
.
scheme
,
parsed_url
.
scheme
,
parsed_url
.
netloc
,
parsed_url
.
netloc
,
parsed_url
.
path
,
parsed_url
.
path
,
url
lib
.
url
encode
([
urlencode
([
(
x
,
y
)
(
x
,
y
)
for
x
,
y
in
urlparse
.
parse_qsl
(
parsed_url
.
query
)
for
x
,
y
in
parse_qsl
(
parsed_url
.
query
)
if
x
!=
PARAMETER_NAME
if
x
!=
PARAMETER_NAME
]
+
[
]
+
[
(
PARAMETER_NAME
,
'1'
),
(
PARAMETER_NAME
,
'1'
),
...
...
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_form.py
View file @
1bc203dd
# Short-circuit old (pre-oauth2) web-mode "login_form"s
# Short-circuit old (pre-oauth2) web-mode "login_form"s
import
urllib
from
six.moves.urllib.parse
import
urlencode
web_section_value
=
context
.
getWebSectionValue
()
web_section_value
=
context
.
getWebSectionValue
()
client_id
=
context
.
getPortalObject
().
ERP5Site_getOAuth2ClientConnectorClientId
(
client_id
=
context
.
getPortalObject
().
ERP5Site_getOAuth2ClientConnectorClientId
(
connector_id
=
(
connector_id
=
(
...
@@ -13,7 +13,7 @@ if client_id is None:
...
@@ -13,7 +13,7 @@ if client_id is None:
return
context
.
login_once_form
(
has_oauth2
=
False
)
return
context
.
login_once_form
(
has_oauth2
=
False
)
if
came_from
:
if
came_from
:
# Make the user go through WebSite_login after authentication, so it does its url de-templatification magic
# Make the user go through WebSite_login after authentication, so it does its url de-templatification magic
came_from
=
context
.
absolute_url
()
+
'/WebSite_login?'
+
url
lib
.
url
encode
(((
'came_from'
,
came_from
),
))
came_from
=
context
.
absolute_url
()
+
'/WebSite_login?'
+
urlencode
(((
'came_from'
,
came_from
),
))
return
context
.
skinSuper
(
'erp5_web_renderjs_ui'
,
script
.
id
)(
return
context
.
skinSuper
(
'erp5_web_renderjs_ui'
,
script
.
id
)(
REQUEST
=
REQUEST
,
REQUEST
=
REQUEST
,
RESPONSE
=
RESPONSE
,
RESPONSE
=
RESPONSE
,
...
...
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