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.

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

B2-40 support 100 Continue #300

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
099294c
draft support for 100-continue through stdlib http.client
emnoor-reef Aug 9, 2023
cee2665
fix header type when checking for Expect: 100-continue
emnoor-reef Aug 12, 2023
b72b838
Handle b2 server responding with empty text phrase in status line
emnoor-reef Aug 12, 2023
f2c2bde
Update NOTICE file to include urllib3 changes
emnoor-reef Aug 12, 2023
08c4f16
Update test for 100-continue
emnoor-reef Aug 12, 2023
56a741e
Add test for 100-continue success case
emnoor-reef Aug 12, 2023
9b7f80c
Format code
emnoor-reef Aug 12, 2023
334ef68
Move urllib3 subclasses into separate package
emnoor-reef Aug 12, 2023
3c23b92
Fix NOTICE of vendored requests
emnoor-reef Aug 13, 2023
3c1c10c
Move HTTPAdapterWithContinue to b2sdk.requests
emnoor-reef Aug 13, 2023
b0e4063
Fix botocore vendor package name & NOTICE
emnoor-reef Aug 13, 2023
456b93b
Update botocore LICENCE & NOTICE
emnoor-reef Aug 13, 2023
2d905b5
Add urllib3 as explicit dependency
emnoor-reef Aug 13, 2023
73b7237
Add file contents inclusion assertion to 100-continue test
emnoor-reef Aug 13, 2023
3c2aa62
Enable 100-continue for file uploads by default
emnoor-reef Aug 13, 2023
dd1ecd5
Fix broken b2sdk/file_version.py
emnoor-reef Aug 13, 2023
42a6fc1
Propagate api_config.expect_100_* settings
emnoor-reef Aug 13, 2023
5009d6e
Rename except-100 vars & headers
emnoor-reef Aug 13, 2023
710c361
Remove misleading comment
emnoor-reef Aug 15, 2023
9c92658
Add changelog entry for 100-continue
emnoor-reef Aug 15, 2023
015eb4d
Move expect-100 tests into separate file
emnoor-reef Aug 15, 2023
1ed88bb
Fix formatting
emnoor-reef Aug 15, 2023
2e53be1
Fix file headers
emnoor-reef Aug 15, 2023
4478dd2
Fix failing test
emnoor-reef Aug 15, 2023
28b4d40
Fix typos
emnoor-reef Sep 2, 2023
c55f813
Separate fixtures from big expect_100_setup fixture
emnoor-reef Sep 2, 2023
504b3f7
Fix lint issues
emnoor-reef Sep 2, 2023
ed9a201
Merge branch '100-continue' of https://github.com/emnoor-reef/b2-sdk-…
emnoor-reef Sep 2, 2023
42bc4ab
add the unit tests from botocore's AWSHTTPConnection
emnoor-reef Sep 15, 2023
5819641
Update botocore notice about its unittest
emnoor-reef Sep 15, 2023
b54bb3a
check for waiting in 100 continue integration tests
emnoor-reef Sep 18, 2023
5866262
add test to verify data is sent AFTER waiting for 100 Continue response
emnoor-reef Sep 18, 2023
2f337cf
fix patched wait_for_read in test
emnoor-reef Sep 18, 2023
abde2c1
remove unnecessary tests for 100 continue
emnoor-reef Sep 18, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Require `typing_extensions` on Python 3.11 (already required on earlier versinons) for better compatibility with pydantic v2
* Fix `RawSimulator` handling of `cache_control` parameter during tests.

### Changed
* Uploading files now makes use of `Expect: 100-continue` header

## [1.22.1] - 2023-07-24

### Fixed
Expand Down
177 changes: 177 additions & 0 deletions b2sdk/_botocore/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS
74 changes: 74 additions & 0 deletions b2sdk/_botocore/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
b2sdk
Copyright 2023 Backblaze Inc.

b2sdk includes vendorized parts of the botocore python library for 100-continue functionality.

Copyright 2023 Backblaze Inc.
Changes made to the original source:
* Updated botocore.awsrequest.request method to work with str/byte header values (urllib 1.x vs 2.x)
* Updated botocore.awsrequest._handle_expect_response method to work with b2 responses
* Updated botocore.awsrequest._send_output method to change 100 response timeout
* Add a new test test_handles_expect_100_with_no_reason_phrase to TestAWSHTTPConnection test class

---

Botocore
Copyright 2012-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.

----

Botocore includes vendorized parts of the requests python library for backwards compatibility.

Requests License
================

Copyright 2013 Kenneth Reitz

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

Botocore includes vendorized parts of the urllib3 library for backwards compatibility.

Urllib3 License
===============

This is the MIT license: http://www.opensource.org/licenses/mit-license.php

Copyright 2008-2011 Andrey Petrov and contributors (see CONTRIBUTORS.txt),
Modifications copyright 2012 Kenneth Reitz.

Permission is hereby granted, free of charge, to any person obtaining a copy of this
software and associated documentation files (the "Software"), to deal in the Software
without restriction, including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

Bundle of CA Root Certificates
==============================

***** BEGIN LICENSE BLOCK *****
This Source Code Form is subject to the terms of the
Mozilla Public License, v. 2.0. If a copy of the MPL
was not distributed with this file, You can obtain
one at http://mozilla.org/MPL/2.0/.

***** END LICENSE BLOCK *****
3 changes: 3 additions & 0 deletions b2sdk/_botocore/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This module contains modified parts of the botocore module (https://github.com/boto/botocore).
The modules original license is included in LICENSE.
Changes made to the original source are listed in NOTICE, along with original NOTICE.
10 changes: 10 additions & 0 deletions b2sdk/_botocore/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
######################################################################
#
# File: b2sdk/_botocore/__init__.py
#
# Copyright 2023 Backblaze Inc. All Rights Reserved.
#
# License https://www.backblaze.com/using_b2_code.html
# License Apache License 2.0 (http://www.apache.org/licenses/ and LICENSE file in this directory)
#
######################################################################
Loading