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
144
Merge Requests
144
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
e43a4fd3
Commit
e43a4fd3
authored
Mar 19, 2023
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*: fix wrong base64 usage
parent
a46c074a
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
34 additions
and
35 deletions
+34
-35
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testCookieCrumbler.py
...ateItem/portal_components/test.erp5.testCookieCrumbler.py
+2
-2
bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentManagement.py
...em/portal_components/extension.erp5.DocumentManagement.py
+3
-3
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_common/StaticWebSite_getRedirectSourceUrlForOfficeJSApplication.py
...aticWebSite_getRedirectSourceUrlForOfficeJSApplication.py
+2
-2
bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.py
...lateItem/portal_components/document.erp5.PayzenService.py
+2
-2
bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant/Query_createExpenseRecord.py
...l_skins/erp5_smart_assistant/Query_createExpenseRecord.py
+2
-2
bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.ShaCacheMixin.py
...TemplateItem/portal_components/test.erp5.ShaCacheMixin.py
+1
-1
bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheExternal.py
...eItem/portal_components/test.erp5.testShaCacheExternal.py
+2
-2
bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirExternal.py
...ateItem/portal_components/test.erp5.testShaDirExternal.py
+2
-2
erp5/util/testbrowser/examples/createERP5User.py
erp5/util/testbrowser/examples/createERP5User.py
+1
-1
product/ERP5/bin/bigfile_client_example.py
product/ERP5/bin/bigfile_client_example.py
+1
-1
product/ERP5Security/__init__.py
product/ERP5Security/__init__.py
+16
-17
No files found.
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testCookieCrumbler.py
View file @
e43a4fd3
...
...
@@ -73,7 +73,7 @@ class ERP5CookieCrumblerTests (CookieCrumblerTests):
self
.
req
=
makerequest
(
root
,
self
.
responseOut
)
self
.
credentials
=
quote
(
base64
.
encodebytes
(
'abraham:pass-w'
).
replace
(
'
\
012
'
,
''
))
base64
.
encodebytes
(
b'abraham:pass-w'
).
decode
(
).
replace
(
'
\
012
'
,
''
))
def
testCookieLongLogin
(
self
):
# verify the user and auth cookie get set
...
...
@@ -88,7 +88,7 @@ class ERP5CookieCrumblerTests (CookieCrumblerTests):
'abrahammmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm'
)
resp
=
self
.
req
.
response
self
.
assertIn
(
'__ac'
,
resp
.
cookies
)
self
.
credentials
=
base64
.
encodebytes
(
'%s:%s'
%
(
long_name
,
long_pass
)
).
replace
(
'
\
012
'
,
''
)
self
.
credentials
=
base64
.
encodebytes
(
(
'%s:%s'
%
(
long_name
,
long_pass
)).
encode
()).
decode
(
).
replace
(
'
\
012
'
,
''
)
self
.
assertEqual
(
resp
.
cookies
[
'__ac'
][
'value'
],
self
.
credentials
)
self
.
assertEqual
(
resp
.
cookies
[
'__ac'
][
normalizeCookieParameterName
(
'path'
)],
'/'
)
...
...
bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentManagement.py
View file @
e43a4fd3
...
...
@@ -58,8 +58,8 @@ def convertToOdf(self, name, data):
to work with (and we for example have to figure out portal_type)
"""
sp
=
mkProxy
(
self
)
kw
=
sp
.
run_convert
(
name
,
base64
.
encodebytes
(
data
))
odf
=
base64
.
decodebytes
(
kw
[
'data'
])
kw
=
sp
.
run_convert
(
name
,
base64
.
encodebytes
(
data
).
decode
(
))
odf
=
base64
.
decodebytes
(
kw
[
'data'
]
.
encode
()
)
return
odf
def
mkProxy
(
self
):
...
...
@@ -74,7 +74,7 @@ def mkProxy(self):
def
generateFile
(
self
,
name
,
data
,
format
):
# pylint: disable=redefined-builtin
sp
=
mkProxy
(
self
)
kw
=
sp
.
run_generate
(
name
,
data
,
None
,
format
)
res
=
base64
.
decodebytes
(
kw
[
'data'
])
res
=
base64
.
decodebytes
(
kw
[
'data'
]
.
encode
()
)
return
res
def
getAttrFromFilename
(
self
,
fname
):
...
...
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_common/StaticWebSite_getRedirectSourceUrlForOfficeJSApplication.py
View file @
e43a4fd3
...
...
@@ -19,8 +19,8 @@ except KeyError:
return
result_dict
try
:
encoded
=
name
.
replace
(
"definition_view/"
,
""
,
1
)
name
=
base64
.
decodebytes
(
encoded
)
encoded
=
name
.
replace
(
"definition_view/"
,
""
,
1
)
.
encode
()
name
=
base64
.
decodebytes
(
encoded
)
.
decode
()
base_64
=
True
except
binascii
.
Error
:
pass
...
...
bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.py
View file @
e43a4fd3
...
...
@@ -55,9 +55,9 @@ class PayzenREST:
def
callPayzenApi
(
self
,
URL
,
payzen_dict
):
base64string
=
base64
.
encodebytes
(
'%s:%s'
%
(
(
'%s:%s'
%
(
self
.
getServiceUsername
(),
self
.
getServiceApiKey
())).
replace
(
'
\
n
'
,
''
)
self
.
getServiceApiKey
())).
encode
()).
decode
().
replace
(
'
\
n
'
,
''
)
header
=
{
"Authorization"
:
"Basic %s"
%
base64string
}
LOG
(
'callPayzenApi'
,
WARNING
,
"data = %s URL = %s"
%
(
str
(
payzen_dict
),
URL
),
error
=
False
)
...
...
bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant/Query_createExpenseRecord.py
View file @
e43a4fd3
...
...
@@ -2,8 +2,8 @@ import base64
portal
=
context
.
getPortalObject
()
expense_record_module
=
portal
.
getDefaultModule
(
'Expense Record'
)
sender
=
portal
.
portal_membership
.
getAuthenticatedMember
().
getUserValue
()
data
=
context
.
getData
(
)
data64
=
u''
.
join
(
base64
.
encodebytes
(
data
).
splitlines
())
data
=
bytes
(
context
.
getData
()
)
data64
=
u''
.
join
(
base64
.
encodebytes
(
data
).
decode
().
splitlines
())
photo_data
=
u'data:%s;base64,%s'
%
(
"image/*"
,
data64
)
expense_record_module
.
newContent
(
comment
=
comment
,
...
...
bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.ShaCacheMixin.py
View file @
e43a4fd3
...
...
@@ -48,7 +48,7 @@ class ShaCacheMixin(object):
self
.
shacache
.
publish
()
self
.
header_dict
=
{
'Content-Type'
:
'application/json'
,
'Authorization'
:
'Basic %s'
%
(
base64
.
encodebytes
(
'ERP5TypeTestCase:'
).
strip
())
'Authorization'
:
'Basic %s'
%
(
base64
.
encodebytes
(
b'ERP5TypeTestCase:'
).
decode
(
).
strip
())
}
self
.
shacache_url
=
self
.
shacache
.
absolute_url
()
self
.
tic
()
...
...
bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheExternal.py
View file @
e43a4fd3
...
...
@@ -59,8 +59,8 @@ class TestShaCacheExternal(ShaCacheMixin, ShaSecurityMixin, ERP5TypeTestCase):
# Define POST headers with Authentication
self
.
content_type
=
'application/json'
authentication_string
=
'lucas:lucas'
base64string
=
base64
.
encodebytes
(
authentication_string
).
strip
()
authentication_string
=
b
'lucas:lucas'
base64string
=
base64
.
encodebytes
(
authentication_string
).
decode
().
strip
()
self
.
header_dict
=
{
'Authorization'
:
'Basic %s'
%
base64string
,
'Content-Type'
:
self
.
content_type
}
...
...
bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirExternal.py
View file @
e43a4fd3
...
...
@@ -60,8 +60,8 @@ class TestShaDirExternal(ShaDirMixin, ShaSecurityMixin, ERP5TypeTestCase):
# Define POST headers with Authentication
self
.
content_type
=
'application/json'
authentication_string
=
'lucas:lucas'
base64string
=
base64
.
encodebytes
(
authentication_string
).
strip
()
authentication_string
=
b
'lucas:lucas'
base64string
=
base64
.
encodebytes
(
authentication_string
).
decode
().
strip
()
self
.
header_dict
=
{
'Authorization'
:
'Basic %s'
%
base64string
,
'Content-Type'
:
self
.
content_type
}
...
...
erp5/util/testbrowser/examples/createERP5User.py
View file @
e43a4fd3
...
...
@@ -45,7 +45,7 @@ zope_url = url.rsplit('/', 2)[0]
import
base64
browser
.
mech_browser
.
addheaders
.
append
(
(
'Authorization'
,
'Basic %s'
%
base64
.
encodebytes
(
'%s:%s'
%
(
username
,
password
))
))
'Basic %s'
%
base64
.
encodebytes
(
(
'%s:%s'
%
(
username
,
password
)).
encode
())).
decode
(
))
for
index
in
range
(
user_nbr
):
new_username
=
"%s%d"
%
(
new_username_prefix
,
index
)
...
...
product/ERP5/bin/bigfile_client_example.py
View file @
e43a4fd3
...
...
@@ -4,7 +4,7 @@ import six.moves.http_client
connection
=
six
.
moves
.
http_client
.
HTTPConnection
(
'192.168.242.68:12001'
)
import
base64
base64string
=
base64
.
encodebytes
(
'zope:insecure'
)[:
-
1
]
base64string
=
base64
.
encodebytes
(
b'zope:insecure'
).
decode
(
)[:
-
1
]
n
=
1
<<
20
...
...
product/ERP5Security/__init__.py
View file @
e43a4fd3
...
...
@@ -77,7 +77,7 @@ if IS_ZOPE2: # BBB
except
AttributeError
:
pass
else
:
medusa_headers
[
'authorization'
]
=
'Basic %s'
%
encodebytes
(
'%s:'
%
username
).
rstrip
()
medusa_headers
[
'authorization'
]
=
'Basic %s'
%
encodebytes
((
'%s:'
%
username
).
encode
()).
decode
(
).
rstrip
()
else
:
REQUEST
.
_orig_env
[
'REMOTE_USER'
]
=
username
else
:
# zope4
...
...
@@ -87,7 +87,6 @@ else: # zope4
"""
pass
def
initialize
(
context
):
from
.
import
(
ERP5UserManager
,
...
...
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