2777.4.1
by Andrew Bennetts
Move HPSS protocol description from bzrlib.smart docstring into doc/developers. |
1 |
================ |
2 |
Network Protocol |
|
3 |
================ |
|
4 |
||
5 |
:Date: 2007-09-03 |
|
6 |
||
7 |
||
8 |
.. contents:: |
|
9 |
||
10 |
||
11 |
Overview |
|
12 |
======== |
|
13 |
||
14 |
The smart protocol provides a way to send a requests and corresponding |
|
15 |
responses to communicate with a remote bzr process. |
|
16 |
||
17 |
Layering |
|
18 |
======== |
|
19 |
||
20 |
Medium |
|
21 |
------ |
|
22 |
||
23 |
At the bottom level there is either a socket, pipes, or an HTTP |
|
24 |
request/response. We call this layer the *medium*. It is responsible for |
|
25 |
carrying bytes between a client and server. For sockets, we have the idea |
|
26 |
that you have multiple requests and get a read error because the other |
|
27 |
side did shutdown. For pipes we have read pipe which will have a zero |
|
28 |
read which marks end-of-file. For HTTP server environment there is no |
|
29 |
end-of-stream because each request coming into the server is independent. |
|
30 |
||
31 |
So we need a wrapper around pipes and sockets to seperate out requests |
|
32 |
from substrate and this will give us a single model which is consistent |
|
33 |
for HTTP, sockets and pipes. |
|
34 |
||
35 |
Protocol |
|
36 |
-------- |
|
37 |
||
38 |
On top of the medium is the *protocol*. This is the layer that |
|
39 |
deserialises bytes into the structured data that requests and responses |
|
40 |
consist of. |
|
41 |
||
42 |
Request/Response processing |
|
43 |
--------------------------- |
|
44 |
||
45 |
On top of the protocol is the logic for processing requests (on the |
|
46 |
server) or responses (on the client). |
|
47 |
||
48 |
Server-side |
|
49 |
----------- |
|
50 |
||
51 |
Sketch:: |
|
52 |
||
53 |
MEDIUM (factory for protocol, reads bytes & pushes to protocol, |
|
54 |
uses protocol to detect end-of-request, sends written |
|
55 |
bytes to client) e.g. socket, pipe, HTTP request handler. |
|
56 |
^ |
|
57 |
| bytes. |
|
58 |
v |
|
59 |
||
60 |
PROTOCOL(serialization, deserialization) accepts bytes for one |
|
61 |
request, decodes according to internal state, pushes |
|
62 |
structured data to handler. accepts structured data from |
|
63 |
handler and encodes and writes to the medium. factory for |
|
64 |
handler. |
|
65 |
^ |
|
66 |
| structured data |
|
67 |
v |
|
68 |
||
69 |
HANDLER (domain logic) accepts structured data, operates state |
|
70 |
machine until the request can be satisfied, |
|
71 |
sends structured data to the protocol. |
|
72 |
||
73 |
Request handlers are registered in the `bzrlib.smart.request` module. |
|
74 |
||
75 |
||
76 |
Client-side |
|
77 |
----------- |
|
78 |
||
79 |
Sketch:: |
|
80 |
||
81 |
CLIENT domain logic, accepts domain requests, generated structured |
|
82 |
data, reads structured data from responses and turns into |
|
83 |
domain data. Sends structured data to the protocol. |
|
84 |
Operates state machines until the request can be delivered |
|
85 |
(e.g. reading from a bundle generated in bzrlib to deliver a |
|
86 |
complete request). |
|
87 |
||
2777.4.3
by Andrew Bennetts
Various small improvements. |
88 |
This is RemoteBzrDir, RemoteRepository, etc. |
2777.4.1
by Andrew Bennetts
Move HPSS protocol description from bzrlib.smart docstring into doc/developers. |
89 |
^ |
90 |
| structured data |
|
91 |
v |
|
92 |
||
93 |
PROTOCOL (serialization, deserialization) accepts structured data for one |
|
94 |
request, encodes and writes to the medium. Reads bytes from the |
|
95 |
medium, decodes and allows the client to read structured data. |
|
96 |
^ |
|
97 |
| bytes. |
|
98 |
v |
|
99 |
||
2777.4.3
by Andrew Bennetts
Various small improvements. |
100 |
MEDIUM accepts bytes from the protocol & delivers to the remote server. |
101 |
Allows the protocol to read bytes e.g. socket, pipe, HTTP request. |
|
2777.4.1
by Andrew Bennetts
Move HPSS protocol description from bzrlib.smart docstring into doc/developers. |
102 |
|
103 |
The domain logic is in `bzrlib.remote`: `RemoteBzrDir`, `RemoteBranch`, |
|
104 |
and so on. |
|
105 |
||
106 |
There is also an plain file-level transport that calls remote methods to |
|
107 |
manipulate files on the server in `bzrlib.transport.remote`. |
|
108 |
||
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
109 |
Protocol description |
110 |
==================== |
|
111 |
||
112 |
Version one |
|
113 |
----------- |
|
114 |
||
2777.4.3
by Andrew Bennetts
Various small improvements. |
115 |
Version one of the protocol was introduced in Bazaar 0.11. |
116 |
||
117 |
The protocol (for both requests and responses) is described by:: |
|
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
118 |
|
119 |
REQUEST := MESSAGE_V1 |
|
120 |
RESPONSE := MESSAGE_V1 |
|
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
121 |
MESSAGE_V1 := ARGS [BODY] |
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
122 |
|
123 |
ARGS := ARG [MORE_ARGS] NEWLINE |
|
124 |
MORE_ARGS := SEP ARG [MORE_ARGS] |
|
125 |
SEP := 0x01 |
|
126 |
||
127 |
BODY := LENGTH NEWLINE BODY_BYTES TRAILER |
|
128 |
LENGTH := decimal integer |
|
129 |
TRAILER := "done" NEWLINE |
|
130 |
||
131 |
That is, a tuple of arguments separated by Ctrl-A and terminated with a |
|
132 |
newline, followed by length prefixed body with a constant trailer. Note |
|
133 |
that although arguments are not 8-bit safe (they cannot include 0x01 or |
|
134 |
0x0a bytes without breaking the protocol encoding), the body is. |
|
135 |
||
136 |
Version two |
|
137 |
----------- |
|
138 |
||
2777.4.3
by Andrew Bennetts
Various small improvements. |
139 |
Version two was introduced in Bazaar 0.16. |
140 |
||
141 |
The request protocol is:: |
|
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
142 |
|
143 |
REQUEST_V2 := "bzr request 2" NEWLINE MESSAGE_V2 |
|
144 |
||
2777.4.3
by Andrew Bennetts
Various small improvements. |
145 |
The response protocol is:: |
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
146 |
|
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
147 |
RESPONSE_V2 := "bzr response 2" NEWLINE RESPONSE_STATUS NEWLINE MESSAGE_V2 |
148 |
RESPONSE_STATUS := "success" | "failed" |
|
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
149 |
|
150 |
Future versions should follow this structure, like version two does:: |
|
151 |
||
152 |
FUTURE_MESSAGE := VERSION_STRING NEWLINE REST_OF_MESSAGE |
|
153 |
||
154 |
This is so that clients and servers can read bytes up to the first newline |
|
155 |
byte to determine what version a message is. |
|
156 |
||
157 |
For compatibility will all versions (past and future) of bzr clients, |
|
158 |
servers that receive a request in an unknown protocol version should |
|
159 |
respond with a single-line error terminated with 0x0a (NEWLINE), rather |
|
160 |
than structured response prefixed with a version string. |
|
161 |
||
162 |
Version two of the message protocol is:: |
|
163 |
||
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
164 |
MESSAGE_V2 := ARGS [BODY_V2] |
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
165 |
BODY_V2 := BODY | STREAMED_BODY |
166 |
||
167 |
That is, a version one length-prefixed body, or a version two streamed |
|
168 |
body. |
|
169 |
||
2777.4.3
by Andrew Bennetts
Various small improvements. |
170 |
Version two with streamed bodies |
171 |
-------------------------------- |
|
172 |
||
173 |
An extension to version two allows streamed bodies. A streamed body looks |
|
174 |
a lot like HTTP's chunked encoding:: |
|
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
175 |
|
176 |
STREAMED_BODY := "chunked" NEWLINE CHUNKS TERMINATOR |
|
177 |
CHUNKS := CHUNK [CHUNKS] |
|
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
178 |
CHUNK := HEX_LENGTH CHUNK_CONTENT |
179 |
HEX_LENGTH := HEX_DIGITS NEWLINE |
|
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
180 |
CHUNK_CONTENT := bytes |
181 |
||
182 |
TERMINATOR := SUCCESS_TERMINATOR | ERROR_TERMINATOR |
|
183 |
SUCCESS_TERMINATOR := 'END' NEWLINE |
|
184 |
ERROR_TERMINATOR := 'ERR' NEWLINE CHUNKS SUCCESS_TERMINATOR |
|
185 |
||
186 |
That is, the body consists of a series of chunks. Each chunk starts with |
|
187 |
a length prefix in hexadecimal digits, followed by an ASCII newline byte. |
|
2748.4.16
by Andrew Bennetts
Tweaks suggested by review. |
188 |
The end of the body is signaled by '``END\\n``', or by '``ERR\\n``' |
189 |
followed by error args, one per chunk. Note that these args are 8-bit |
|
190 |
safe, unlike request args. |
|
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
191 |
|
192 |
A streamed body starts with the string "chunked" so that legacy clients |
|
193 |
and servers will not mistake the first chunk as the start of a version one |
|
194 |
body. |
|
195 |
||
2777.4.3
by Andrew Bennetts
Various small improvements. |
196 |
The type of body (length-prefixed or chunked) in a response is always the |
197 |
same for a given request method. Only new request methods introduced in |
|
198 |
Bazaar 0.91 and later use streamed bodies. |
|
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
199 |
|
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
200 |
Version three |
201 |
------------- |
|
202 |
||
203 |
.. note:: |
|
204 |
||
205 |
For some discussion of the requirements that led to this new protocol |
|
3211.7.6
by Andrew Bennetts
Take Martin's latest comments into account: Keep symmetry of requests and responses, allow streamed bodies to be explicitly interrupted with an error. |
206 |
version, see `bug #83935`_. |
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
207 |
|
3211.7.6
by Andrew Bennetts
Take Martin's latest comments into account: Keep symmetry of requests and responses, allow streamed bodies to be explicitly interrupted with an error. |
208 |
.. _bug #83935: https://bugs.launchpad.net/bzr/+bug/83935 |
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
209 |
|
210 |
Version three has bencoding of most protocol structures, to make parsing |
|
3211.7.2
by Andrew Bennetts
Tweak the proposed protocol according to review comments. |
211 |
simpler. For extra parsing convenience, these structures are length |
212 |
prefixed:: |
|
213 |
||
214 |
LENGTH_PREFIX := 32-bit unsigned integer in network byte order |
|
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
215 |
|
3211.7.7
by Andrew Bennetts
Update the protocol spec for Robert and Martin's latest comments. |
216 |
Unlike earlier versions, clients and servers are no longer required to |
217 |
know which request verbs and responses will have bodies attached. Because |
|
218 |
of length-prefixing and other changes, it is always possible to know when |
|
219 |
a complete request or response has been read, even if the server |
|
220 |
implements no verbs. |
|
221 |
||
222 |
The underlying message format is:: |
|
223 |
||
3245.4.60
by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'. |
224 |
MESSAGE := "bzr message 3 (bzr 1.6)" NEWLINE HEADERS MESSAGE_PARTS |
3211.7.8
by Andrew Bennetts
Cosmetic tweaks. |
225 |
HEADERS := LENGTH_PREFIX bencoded_dict |
3211.7.7
by Andrew Bennetts
Update the protocol spec for Robert and Martin's latest comments. |
226 |
MESSAGE_PARTS := MESSAGE_PART [MORE_MESSAGE_PARTS] |
227 |
MORE_MESSAGE_PARTS := END_MESSAGE_PARTS | MESSAGE_PARTS |
|
228 |
END_MESSAGE_PARTS := "e" |
|
3211.7.8
by Andrew Bennetts
Cosmetic tweaks. |
229 |
|
3211.7.9
by Andrew Bennetts
Remove CHUNKED_BYTES message part; it's unnecessary. Also polished the text a little. |
230 |
MESSAGE_PART := ONE_BYTE | STRUCTURE | BYTES |
3211.7.7
by Andrew Bennetts
Update the protocol spec for Robert and Martin's latest comments. |
231 |
ONE_BYTE := "o" byte |
232 |
STRUCTURE := "s" LENGTH_PREFIX bencoded_structure |
|
233 |
BYTES := "b" LENGTH_PREFIX bytes |
|
234 |
||
235 |
This format allows an arbitrary sequence of message parts to be encoded |
|
236 |
in a single message. |
|
237 |
||
238 |
Headers |
|
239 |
~~~~~~~ |
|
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
240 |
|
241 |
Each request and response will have “headers”, a dictionary of key-value pairs. |
|
242 |
The keys must be strings, not any other type of value. |
|
243 |
||
244 |
Currently, the only defined header is “Software version”. Both the client and |
|
245 |
the server should include a “Software version” header, with a value of a |
|
3211.7.10
by Andrew Bennetts
Trivial tweaks to keep network-protocol.txt current with implementation. |
246 |
free-form string such as “bzrlib 1.5”, to aid debugging and logging. Clients |
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
247 |
and servers **should not** vary behaviour based on this string. |
248 |
||
3211.7.9
by Andrew Bennetts
Remove CHUNKED_BYTES message part; it's unnecessary. Also polished the text a little. |
249 |
Conventional requests and responses |
250 |
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
251 |
||
252 |
By convention, most requests and responses have a simple “arguments plus |
|
253 |
optional body” structure, as in earlier protocol versions. This section |
|
254 |
describes how such messages are encoded. All requests and responses |
|
255 |
defined by earlier protocol versions must be encoded in this way. |
|
256 |
||
257 |
Conventional requests will send a sequence of: |
|
258 |
||
259 |
* Arguments (a STRUCTURE of a tuple) |
|
260 |
||
261 |
* (Optional) body |
|
262 |
||
263 |
* Single body (BYTES), or |
|
264 |
||
265 |
* Streamed body (multiple BYTES parts), followed by a status (ONE_BYTE) |
|
266 |
||
267 |
* if status is "E", followed by an Error (STRUCTURE) |
|
268 |
||
269 |
Conventional responses will send a sequence of: |
|
270 |
||
271 |
* Status (ONE_BYTE) |
|
272 |
||
273 |
* Arguments (a STRUCTURE of a tuple) |
|
274 |
||
275 |
* (Optional) body |
|
276 |
||
277 |
* Single body (BYTES), or |
|
278 |
||
279 |
* Streamed body (multiple BYTES parts), followed by a status (ONE_BYTE) |
|
280 |
||
281 |
* if status is "E", followed by an Error (STRUCTURE) |
|
3211.7.7
by Andrew Bennetts
Update the protocol spec for Robert and Martin's latest comments. |
282 |
|
283 |
In all cases, the ONE_BYTE status is either "S" for Success or "E" for |
|
3211.7.9
by Andrew Bennetts
Remove CHUNKED_BYTES message part; it's unnecessary. Also polished the text a little. |
284 |
Error. Note that the streamed body from version two is now just multiple |
285 |
BYTES parts. |
|
3211.7.7
by Andrew Bennetts
Update the protocol spec for Robert and Martin's latest comments. |
286 |
|
287 |
For new methods, these sequences are just a convention and may be varied |
|
288 |
if appropriate for a particular request or response. However, each |
|
3211.7.9
by Andrew Bennetts
Remove CHUNKED_BYTES message part; it's unnecessary. Also polished the text a little. |
289 |
request should at least start with a STRUCTURE encoding the arguments |
3211.7.7
by Andrew Bennetts
Update the protocol spec for Robert and Martin's latest comments. |
290 |
tuple. The first element of that tuple must be a string that names the |
291 |
request method. (Note that arguments in this protocol version are |
|
292 |
bencoded. As a result, unlike previous protocol versions, arguments in |
|
293 |
this version are 8-bit clean.) |
|
294 |
||
3211.7.9
by Andrew Bennetts
Remove CHUNKED_BYTES message part; it's unnecessary. Also polished the text a little. |
295 |
For errors (where the Status byte of a response or a streamed body is |
296 |
"E"), the situation is analagous to requests. The first item in the |
|
297 |
encoded sequence must be a string of the error name. The other arguments |
|
298 |
supply details about the error, and their number and types will depend on |
|
299 |
the type of error (as identified by the error name). |
|
3211.7.1
by Andrew Bennetts
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions). |
300 |
|
2777.4.1
by Andrew Bennetts
Move HPSS protocol description from bzrlib.smart docstring into doc/developers. |
301 |
Paths |
302 |
===== |
|
303 |
||
304 |
Paths are passed across the network. The client needs to see a namespace |
|
305 |
that includes any repository that might need to be referenced, and the |
|
306 |
client needs to know about a root directory beyond which it cannot ascend. |
|
307 |
||
308 |
Servers run over ssh will typically want to be able to access any path the |
|
309 |
user can access. Public servers on the other hand (which might be over |
|
310 |
http, ssh or tcp) will typically want to restrict access to only a |
|
311 |
particular directory and its children, so will want to do a software |
|
312 |
virtual root at that level. In other words they'll want to rewrite |
|
313 |
incoming paths to be under that level (and prevent escaping using ../ |
|
2777.4.3
by Andrew Bennetts
Various small improvements. |
314 |
tricks). The default implementation in bzrlib does this using the |
315 |
`bzrlib.transport.chroot` module. |
|
2777.4.1
by Andrew Bennetts
Move HPSS protocol description from bzrlib.smart docstring into doc/developers. |
316 |
|
317 |
URLs that include ~ should probably be passed across to the server |
|
318 |
verbatim and the server can expand them. This will proably not be |
|
2777.4.3
by Andrew Bennetts
Various small improvements. |
319 |
meaningful when limited to a directory? See `bug 109143`_. |
320 |
||
321 |
.. _bug 109143: https://bugs.launchpad.net/bzr/+bug/109143 |
|
2777.4.1
by Andrew Bennetts
Move HPSS protocol description from bzrlib.smart docstring into doc/developers. |
322 |
|
323 |
||
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
324 |
Requests |
325 |
======== |
|
326 |
||
2777.4.3
by Andrew Bennetts
Various small improvements. |
327 |
The first argument of a request specifies the request method. |
328 |
||
2777.4.2
by Andrew Bennetts
Add description of proposed streamed body extension to network-protocol.txt. |
329 |
The available request methods are registered in `bzrlib.smart.request`. |
330 |
||
2777.4.3
by Andrew Bennetts
Various small improvements. |
331 |
**XXX**: ideally the request methods should be documented here. |
332 |
Contributions welcome! |
|
333 |
||
334 |
||
3211.7.6
by Andrew Bennetts
Take Martin's latest comments into account: Keep symmetry of requests and responses, allow streamed bodies to be explicitly interrupted with an error. |
335 |
Recognised errors |
336 |
================= |
|
337 |
||
338 |
The first argument of an error response specifies the error type. |
|
339 |
||
3211.7.10
by Andrew Bennetts
Trivial tweaks to keep network-protocol.txt current with implementation. |
340 |
One possible error name is ``UnknownMethod``, which means the server does |
3211.7.9
by Andrew Bennetts
Remove CHUNKED_BYTES message part; it's unnecessary. Also polished the text a little. |
341 |
not recognise the verb used by the client's request. This error was |
342 |
introduced in version three. |
|
343 |
||
3211.7.6
by Andrew Bennetts
Take Martin's latest comments into account: Keep symmetry of requests and responses, allow streamed bodies to be explicitly interrupted with an error. |
344 |
**XXX**: ideally the error types should be documented here. Contributions |
345 |
welcome! |
|
346 |
||
2777.4.1
by Andrew Bennetts
Move HPSS protocol description from bzrlib.smart docstring into doc/developers. |
347 |
.. |
348 |
vim: ft=rst tw=74 ai |
|
349 |