4763.2.4
by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry. |
1 |
# Copyright (C) 2006-2010 Canonical Ltd
|
1540.3.18
by Martin Pool
Style review fixes (thanks robertc) |
2 |
#
|
1540.3.3
by Martin Pool
Review updates of pycurl transport |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1540.3.18
by Martin Pool
Style review fixes (thanks robertc) |
7 |
#
|
1540.3.3
by Martin Pool
Review updates of pycurl transport |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
1540.3.18
by Martin Pool
Style review fixes (thanks robertc) |
12 |
#
|
1540.3.3
by Martin Pool
Review updates of pycurl transport |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1540.3.3
by Martin Pool
Review updates of pycurl transport |
16 |
|
2485.8.41
by Vincent Ladeuil
Finish http refactoring. Test suite passing. |
17 |
from bzrlib import ( |
18 |
errors, |
|
3052.3.3
by Vincent Ladeuil
Add -Dhttp support. |
19 |
trace, |
2485.8.41
by Vincent Ladeuil
Finish http refactoring. Test suite passing. |
20 |
)
|
3052.3.3
by Vincent Ladeuil
Add -Dhttp support. |
21 |
from bzrlib.transport import http |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
22 |
# TODO: handle_response should be integrated into the http/__init__.py
|
2004.2.1
by John Arbash Meinel
Cleanup of urllib functions |
23 |
from bzrlib.transport.http.response import handle_response |
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
24 |
from bzrlib.transport.http._urllib2_wrappers import ( |
2004.2.1
by John Arbash Meinel
Cleanup of urllib functions |
25 |
Opener, |
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
26 |
Request, |
2004.2.1
by John Arbash Meinel
Cleanup of urllib functions |
27 |
)
|
28 |
||
1540.3.3
by Martin Pool
Review updates of pycurl transport |
29 |
|
3052.3.3
by Vincent Ladeuil
Add -Dhttp support. |
30 |
class HttpTransport_urllib(http.HttpTransportBase): |
1786.1.33
by John Arbash Meinel
Cleanup pass #2 |
31 |
"""Python urllib transport for http and https."""
|
1540.3.3
by Martin Pool
Review updates of pycurl transport |
32 |
|
2004.1.9
by vila
Takes jam's remarks into account when possible, add TODOs for the rest. |
33 |
# In order to debug we have to issue our traces in sync with
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
34 |
# httplib, which use print :(
|
35 |
_debuglevel = 0 |
|
2004.3.1
by vila
Test ConnectionError exceptions. |
36 |
|
2004.2.1
by John Arbash Meinel
Cleanup of urllib functions |
37 |
_opener_class = Opener |
38 |
||
2485.8.59
by Vincent Ladeuil
Update from review comments. |
39 |
def __init__(self, base, _from_transport=None): |
40 |
super(HttpTransport_urllib, self).__init__( |
|
3878.4.6
by Vincent Ladeuil
Fix bug #270863 by preserving 'bzr+http[s]' decorator. |
41 |
base, 'urllib', _from_transport=_from_transport) |
2485.8.59
by Vincent Ladeuil
Update from review comments. |
42 |
if _from_transport is not None: |
43 |
self._opener = _from_transport._opener |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
44 |
else: |
3945.1.5
by Vincent Ladeuil
Start implementing http activity reporting at socket level. |
45 |
self._opener = self._opener_class( |
46 |
report_activity=self._report_activity) |
|
2420.1.5
by Vincent Ladeuil
Refactor http and proxy authentication. Tests passing. proxy password can be prompted too. |
47 |
|
2485.8.41
by Vincent Ladeuil
Finish http refactoring. Test suite passing. |
48 |
def _perform(self, request): |
49 |
"""Send the request to the server and handles common errors.
|
|
50 |
||
51 |
:returns: urllib2 Response object
|
|
52 |
"""
|
|
53 |
connection = self._get_connection() |
|
54 |
if connection is not None: |
|
55 |
# Give back shared info
|
|
56 |
request.connection = connection |
|
57 |
(auth, proxy_auth) = self._get_credentials() |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
58 |
# Clean the httplib.HTTPConnection pipeline in case the previous
|
59 |
# request couldn't do it
|
|
60 |
connection.cleanup_pipe() |
|
2485.8.41
by Vincent Ladeuil
Finish http refactoring. Test suite passing. |
61 |
else: |
3133.1.2
by Vincent Ladeuil
Fix #177643 by making pycurl handle url-embedded credentials again. |
62 |
# First request, initialize credentials.
|
2900.2.16
by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password). |
63 |
# scheme and realm will be set by the _urllib2_wrappers.AuthHandler
|
3133.1.2
by Vincent Ladeuil
Fix #177643 by making pycurl handle url-embedded credentials again. |
64 |
auth = self._create_auth() |
65 |
# Proxy initialization will be done by the first proxied request
|
|
2900.2.24
by Vincent Ladeuil
Review feedback. |
66 |
proxy_auth = dict() |
2363.4.12
by Vincent Ladeuil
Take jam's review comments into account. Fix typos, give better |
67 |
# Ensure authentication info is provided
|
2485.8.41
by Vincent Ladeuil
Finish http refactoring. Test suite passing. |
68 |
request.auth = auth |
69 |
request.proxy_auth = proxy_auth |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
70 |
|
71 |
if self._debuglevel > 0: |
|
72 |
print 'perform: %s base: %s, url: %s' % (request.method, self.base, |
|
73 |
request.get_full_url()) |
|
74 |
response = self._opener.open(request) |
|
2485.8.41
by Vincent Ladeuil
Finish http refactoring. Test suite passing. |
75 |
if self._get_connection() is not request.connection: |
76 |
# First connection or reconnection
|
|
77 |
self._set_connection(request.connection, |
|
78 |
(request.auth, request.proxy_auth)) |
|
79 |
else: |
|
80 |
# http may change the credentials while keeping the
|
|
81 |
# connection opened
|
|
82 |
self._update_credentials((request.auth, request.proxy_auth)) |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
83 |
|
2164.2.1
by v.ladeuil+lp at free
First rough http branch redirection implementation. |
84 |
code = response.code |
4795.4.5
by Vincent Ladeuil
Make sure all redirection code paths can handle authentication. |
85 |
if (request.follow_redirections is False |
86 |
and code in (301, 302, 303, 307)): |
|
2164.2.1
by v.ladeuil+lp at free
First rough http branch redirection implementation. |
87 |
raise errors.RedirectRequested(request.get_full_url(), |
88 |
request.redirected_to, |
|
3878.4.4
by Vincent Ladeuil
Cleanup. |
89 |
is_permanent=(code == 301)) |
2164.2.1
by v.ladeuil+lp at free
First rough http branch redirection implementation. |
90 |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
91 |
if request.redirected_to is not None: |
3052.3.3
by Vincent Ladeuil
Add -Dhttp support. |
92 |
trace.mutter('redirected from: %s to: %s' % (request.get_full_url(), |
93 |
request.redirected_to)) |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
94 |
|
95 |
return response |
|
1540.3.26
by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet |
96 |
|
5247.2.12
by Vincent Ladeuil
Ensure that all transports close their underlying connection. |
97 |
def disconnect(self): |
98 |
connection = self._get_connection() |
|
99 |
if connection is not None: |
|
100 |
connection.close() |
|
101 |
||
2520.2.1
by Vincent Ladeuil
First step to fix #115209 use _coalesce_offsets like other transports. |
102 |
def _get(self, relpath, offsets, tail_amount=0): |
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
103 |
"""See HttpTransport._get"""
|
2485.8.25
by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different. |
104 |
abspath = self._remote_path(relpath) |
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
105 |
headers = {} |
2520.2.2
by Vincent Ladeuil
Fix #115209 by issuing a single range request on 400: Bad Request |
106 |
accepted_errors = [200, 404] |
2520.2.1
by Vincent Ladeuil
First step to fix #115209 use _coalesce_offsets like other transports. |
107 |
if offsets or tail_amount: |
108 |
range_header = self._attempted_range_header(offsets, tail_amount) |
|
2004.1.30
by v.ladeuil+lp at free
Fix #62276 and #62029 by providing a more robust http range handling. |
109 |
if range_header is not None: |
2520.2.2
by Vincent Ladeuil
Fix #115209 by issuing a single range request on 400: Bad Request |
110 |
accepted_errors.append(206) |
111 |
accepted_errors.append(400) |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
112 |
accepted_errors.append(416) |
2004.1.30
by v.ladeuil+lp at free
Fix #62276 and #62029 by providing a more robust http range handling. |
113 |
bytes = 'bytes=' + range_header |
114 |
headers = {'Range': bytes} |
|
2004.3.1
by vila
Test ConnectionError exceptions. |
115 |
|
2520.2.2
by Vincent Ladeuil
Fix #115209 by issuing a single range request on 400: Bad Request |
116 |
request = Request('GET', abspath, None, headers, |
117 |
accepted_errors=accepted_errors) |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
118 |
response = self._perform(request) |
119 |
||
120 |
code = response.code |
|
121 |
if code == 404: # not found |
|
2164.2.1
by v.ladeuil+lp at free
First rough http branch redirection implementation. |
122 |
raise errors.NoSuchFile(abspath) |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
123 |
elif code in (400, 416): |
124 |
# We don't know which, but one of the ranges we specified was
|
|
125 |
# wrong.
|
|
126 |
raise errors.InvalidHttpRange(abspath, range_header, |
|
127 |
'Server return code %d' % code) |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
128 |
|
3945.1.5
by Vincent Ladeuil
Start implementing http activity reporting at socket level. |
129 |
data = handle_response(abspath, code, response.info(), response) |
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
130 |
return code, data |
1540.3.3
by Martin Pool
Review updates of pycurl transport |
131 |
|
2018.2.7
by Andrew Bennetts
Implement _post on HttpTransport_urllib. |
132 |
def _post(self, body_bytes): |
2485.8.25
by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different. |
133 |
abspath = self._remote_path('.bzr/smart') |
3430.3.5
by Vincent Ladeuil
Fixed as per Andrew's review. |
134 |
# We include 403 in accepted_errors so that send_http_smart_request can
|
135 |
# handle a 403. Otherwise a 403 causes an unhandled TransportError.
|
|
5514.1.1
by Vincent Ladeuil
Correctly set the Content-Type header when POSTing. |
136 |
response = self._perform( |
137 |
Request('POST', abspath, body_bytes, |
|
138 |
{'Content-Type': 'application/octet-stream'}, |
|
139 |
accepted_errors=[200, 403])) |
|
2004.1.28
by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code |
140 |
code = response.code |
3945.1.5
by Vincent Ladeuil
Start implementing http activity reporting at socket level. |
141 |
data = handle_response(abspath, code, response.info(), response) |
2004.1.28
by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code |
142 |
return code, data |
2018.2.7
by Andrew Bennetts
Implement _post on HttpTransport_urllib. |
143 |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
144 |
def _head(self, relpath): |
145 |
"""Request the HEAD of a file.
|
|
146 |
||
147 |
Performs the request and leaves callers handle the results.
|
|
148 |
"""
|
|
2485.8.25
by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different. |
149 |
abspath = self._remote_path(relpath) |
2520.2.2
by Vincent Ladeuil
Fix #115209 by issuing a single range request on 400: Bad Request |
150 |
request = Request('HEAD', abspath, |
151 |
accepted_errors=[200, 404]) |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
152 |
response = self._perform(request) |
153 |
||
154 |
return response |
|
155 |
||
1540.3.3
by Martin Pool
Review updates of pycurl transport |
156 |
def has(self, relpath): |
157 |
"""Does the target location exist?
|
|
158 |
"""
|
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
159 |
response = self._head(relpath) |
160 |
||
161 |
code = response.code |
|
2164.2.16
by Vincent Ladeuil
Add tests. |
162 |
if code == 200: # "ok", |
1540.3.3
by Martin Pool
Review updates of pycurl transport |
163 |
return True |
164 |
else: |
|
2004.1.1
by vila
Connection sharing, with redirection. without authentification. |
165 |
return False |
1540.3.25
by Martin Pool
New 'http+urllib' scheme |
166 |
|
167 |
||
1540.3.6
by Martin Pool
[merge] update from bzr.dev |
168 |
def get_test_permutations(): |
169 |
"""Return the permutations to be used in testing."""
|
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
170 |
from bzrlib.tests import ( |
171 |
features, |
|
172 |
http_server, |
|
173 |
)
|
|
2929.3.10
by Vincent Ladeuil
Add a fake https server and test facilities. |
174 |
permutations = [(HttpTransport_urllib, http_server.HttpServer_urllib),] |
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
175 |
if features.HTTPSServerFeature.available(): |
2929.3.10
by Vincent Ladeuil
Add a fake https server and test facilities. |
176 |
from bzrlib.tests import https_server |
177 |
permutations.append((HttpTransport_urllib, |
|
178 |
https_server.HTTPSServer_urllib)) |
|
179 |
return permutations |