Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tests to support multipart 1.x+ versions. #8

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Fix tests to support multipart 1.x+ versions. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a4ec25
WIP: Fix tests to support multipart 1.x+ versions.
icemac Nov 21, 2024
11cd2de
Fix another test + make code usable on older Python versions.
icemac Nov 22, 2024
4be235d
Fix last of the tests.
icemac Nov 27, 2024
4786336
Use function moved to zope.app.wsgi.
icemac Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Changes
5.1 (unreleased)
----------------

- Nothing changed yet.
- Fix tests to support multipart 1.x+ versions.


5.0 (2023-02-09)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def read(*rnames):
'zope.app.rotterdam >= 4.0',
'zope.app.basicskin >= 4.0',
'zope.app.form >= 5.0',
'zope.app.wsgi',
'zope.app.wsgi >= 5.3.dev0',
'zope.app.schema',

'zope.formlib',
Expand Down
166 changes: 53 additions & 113 deletions src/zope/app/authentication/browser/group_searching_with_empty_string.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ We'll add a pluggable authentication utility:
>>> print(http(r"""
... POST /++etc++site/default/@@contents.html HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... Content-Length: 98
... Content-Type: application/x-www-form-urlencoded
... Referer: http://localhost/++etc++site/default/@@contents.html?type_name=BrowserAdd__zope.pluggableauth.authentication.PluggableAuthentication
...
Expand All @@ -17,156 +16,98 @@ We'll add a pluggable authentication utility:

And register it:

>>> print(http(r"""
>>> content_type, content = encodeMultipartFormdata([
... ('field.comment', ''),
... ('field.actions.register', 'Register'),
... ])
>>> print(http(b"""
... POST /++etc++site/default/PAU/addRegistration.html HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... Content-Length: 699
... Content-Type: multipart/form-data; boundary=---------------------------191720529414243436931796477300
... Content-Type: %b
... Referer: http://localhost/++etc++site/default/PAU/addRegistration.html
...
... -----------------------------191720529414243436931796477300
... Content-Disposition: form-data; name="field.comment"
...
...
... -----------------------------191720529414243436931796477300
... Content-Disposition: form-data; name="field.actions.register"
...
... Register
... -----------------------------191720529414243436931796477300--
... """))
... %b
... """ % (content_type, content)))
HTTP/1.1 303 See Other
...


Next, we'll add the group folder:

>>> print(http(r"""
... POST /++etc++site/default/PAU/+/AddGroupFolder.html%3D HTTP/1.1
>>> content_type, content = encodeMultipartFormdata([
... ('field.prefix', 'groups'),
... ('UPDATE_SUBMIT', 'Add'),
... ('add_input_name', 'groups'),
... ])
>>> print(http(b"""
... POST /++etc++site/default/PAU/+/AddGroupFolder.html%%3D HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... Content-Length: 427
... Content-Type: multipart/form-data; boundary=---------------------------4150524541658557772058105275
... Content-Type: %b
... Referer: http://localhost/++etc++site/default/PAU/+/AddGroupFolder.html=
...
... -----------------------------4150524541658557772058105275
... Content-Disposition: form-data; name="field.prefix"
...
... groups
... -----------------------------4150524541658557772058105275
... Content-Disposition: form-data; name="UPDATE_SUBMIT"
...
... Add
... -----------------------------4150524541658557772058105275
... Content-Disposition: form-data; name="add_input_name"
...
... groups
... -----------------------------4150524541658557772058105275--
... """))
... %b
... """ % (content_type, content)))
HTTP/1.1 303 See Other
...


And add some groups:


>>> print(http(r"""
... POST /++etc++site/default/PAU/groups/+/AddGroupInformation.html%3D HTTP/1.1
>>> content_type, content = encodeMultipartFormdata([
... ('field.title', 'Test1'),
... ('field.description', ''),
... ('UPDATE_SUBMIT', 'Add'),
... ('add_input_name', 'Test1'),
... ])
>>> print(http(b"""
... POST /++etc++site/default/PAU/groups/+/AddGroupInformation.html%%3D HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... Content-Length: 550
... Content-Type: multipart/form-data; boundary=---------------------------12719796373012316301953477158
... Content-Type: %b
... Referer: http://localhost/++etc++site/default/PAU/groups/+/AddGroupInformation.html=
...
... -----------------------------12719796373012316301953477158
... Content-Disposition: form-data; name="field.title"
...
... Test1
... -----------------------------12719796373012316301953477158
... Content-Disposition: form-data; name="field.description"
...
...
... -----------------------------12719796373012316301953477158
... Content-Disposition: form-data; name="UPDATE_SUBMIT"
...
... Add
... -----------------------------12719796373012316301953477158
... Content-Disposition: form-data; name="add_input_name"
...
... Test1
... -----------------------------12719796373012316301953477158--
... """))
... %b
... """ % (content_type, content)))
HTTP/1.1 303 See Other
...


>>> print(http(r"""
... POST /++etc++site/default/PAU/groups/+/AddGroupInformation.html%3D HTTP/1.1
>>> content_type, content = encodeMultipartFormdata([
... ('field.title', 'Test2'),
... ('field.description', ''),
... ('UPDATE_SUBMIT', 'Add'),
... ('add_input_name', 'Test2'),
... ])
>>> print(http(b"""
... POST /++etc++site/default/PAU/groups/+/AddGroupInformation.html%%3D HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... Content-Length: 550
... Content-Type: multipart/form-data; boundary=---------------------------10816732208483809451400699513
... Content-Type: %b
... Referer: http://localhost/++etc++site/default/PAU/groups/+/AddGroupInformation.html=
...
... -----------------------------10816732208483809451400699513
... Content-Disposition: form-data; name="field.title"
...
... Test2
... -----------------------------10816732208483809451400699513
... Content-Disposition: form-data; name="field.description"
...
...
... -----------------------------10816732208483809451400699513
... Content-Disposition: form-data; name="UPDATE_SUBMIT"
...
... Add
... -----------------------------10816732208483809451400699513
... Content-Disposition: form-data; name="add_input_name"
...
... Test2
... -----------------------------10816732208483809451400699513--
... """))
... %b
... """ % (content_type, content)))
HTTP/1.1 303 See Other
...


Now we'll configure our pluggable-authentication utility to use the
group folder:


>>> print(http(r"""
>>> content_type, content = encodeMultipartFormdata([
... ('field.credentialsPlugins.to', 'U2Vzc2lvbiBDcmVkZW50aWFscw=='),
... ('field.credentialsPlugins-empty-marker', ''),
... ('field.authenticatorPlugins.to', 'Z3JvdXBz'),
... ('field.authenticatorPlugins-empty-marker', ''),
... ('UPDATE_SUBMIT', 'Change'),
... ('field.credentialsPlugins', 'U2Vzc2lvbiBDcmVkZW50aWFscw=='),
... ('field.authenticatorPlugins', 'Z3JvdXBz'),
... ])
>>> print(http(b"""
... POST /++etc++site/default/PAU/@@configure.html HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... Content-Length: 1040
... Content-Type: multipart/form-data; boundary=---------------------------1786480431902757372789659730
... Content-Type: %b
... Referer: http://localhost/++etc++site/default/PAU/@@configure.html
...
... -----------------------------1786480431902757372789659730
... Content-Disposition: form-data; name="field.credentialsPlugins.to"
...
... U2Vzc2lvbiBDcmVkZW50aWFscw==
... -----------------------------1786480431902757372789659730
... Content-Disposition: form-data; name="field.credentialsPlugins-empty-marker"
...
...
... -----------------------------1786480431902757372789659730
... Content-Disposition: form-data; name="field.authenticatorPlugins.to"
...
... Z3JvdXBz
... -----------------------------1786480431902757372789659730
... Content-Disposition: form-data; name="field.authenticatorPlugins-empty-marker"
...
...
... -----------------------------1786480431902757372789659730
... Content-Disposition: form-data; name="UPDATE_SUBMIT"
...
... Change
... -----------------------------1786480431902757372789659730
... Content-Disposition: form-data; name="field.credentialsPlugins"
...
... U2Vzc2lvbiBDcmVkZW50aWFscw==
... -----------------------------1786480431902757372789659730
... Content-Disposition: form-data; name="field.authenticatorPlugins"
...
... Z3JvdXBz
... -----------------------------1786480431902757372789659730--
... """))
... %b
... """ % (content_type, content)))
HTTP/1.1 200 Ok
...

Expand All @@ -176,7 +117,6 @@ Now, if we search for a group, but don't supply a string:
>>> print(http(r"""
... POST /@@grant.html HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... Content-Length: 166
... Content-Type: application/x-www-form-urlencoded
... Referer: http://localhost/@@grant.html
...
Expand Down
Loading
Loading