← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/wsgi.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/wsgi.py
27
27
from bzrlib.urlutils import local_path_to_url
28
28
    
29
29
 
30
 
def make_app(root, prefix, path_var, readonly=True):
 
30
def make_app(root, prefix, path_var='REQUEST_URI', readonly=True):
31
31
    """Convenience function to construct a WSGI bzr smart server.
32
32
    
33
33
    :param root: a local path that requests will be relative to.
39
39
        base_transport = get_transport('readonly+' + local_url)
40
40
    else:
41
41
        base_transport = get_transport(local_url)
42
 
    app = SmartWSGIApp(base_transport)
43
 
    app = RelpathSetter(app, prefix, path_var)
 
42
    app = SmartWSGIApp(base_transport, prefix)
 
43
    app = RelpathSetter(app, '', path_var)
44
44
    return app
45
45
 
46
46
 
85
85
class SmartWSGIApp(object):
86
86
    """A WSGI application for the bzr smart server."""
87
87
 
88
 
    def __init__(self, backing_transport):
 
88
    def __init__(self, backing_transport, root_client_path='/'):
89
89
        """Constructor.
90
90
 
91
91
        :param backing_transport: a transport.  Requests will be processed
92
92
            relative to this transport.
 
93
        :param root_client_path: the client path that maps to the root of
 
94
            backing_transport.  This is used to interpret relpaths received from
 
95
            the client.
93
96
        """
94
97
        # Use a ChrootTransportDecorator so that this web application won't
95
98
        # accidentally let people access locations they shouldn't.
98
101
        self.chroot_server = chroot.ChrootServer(backing_transport)
99
102
        self.chroot_server.setUp()
100
103
        self.backing_transport = get_transport(self.chroot_server.get_url())
 
104
        self.root_client_path = root_client_path
101
105
        # While the chroot server can technically be torn down at this point,
102
106
        # as all it does is remove the scheme registration from transport's 
103
107
        # protocol dictionary, we don't *just in case* there are parts of 
112
116
            return []
113
117
 
114
118
        relpath = environ['bzrlib.relpath']
115
 
        transport = self.backing_transport.clone(relpath)
 
119
 
 
120
        if not relpath.startswith('/'):
 
121
            relpath = '/' + relpath
 
122
        if not relpath.endswith('/'):
 
123
            relpath += '/'
 
124
 
 
125
        # Compare the HTTP path (relpath) and root_client_path, and calculate
 
126
        # new relpath and root_client_path accordingly, to be used to build the
 
127
        # request.
 
128
        if relpath.startswith(self.root_client_path):
 
129
            # The relpath traverses all of the mandatory root client path.
 
130
            # Remove the root_client_path from the relpath, and set
 
131
            # adjusted_tcp to None to tell the request handler that no further
 
132
            # path translation is required.
 
133
            adjusted_rcp = None
 
134
            adjusted_relpath = relpath[len(self.root_client_path):]
 
135
        elif self.root_client_path.startswith(relpath):
 
136
            # The relpath traverses some of the mandatory root client path.
 
137
            # Subtract the relpath from the root_client_path, and set the
 
138
            # relpath to '.'.
 
139
            adjusted_rcp = '/' + self.root_client_path[len(relpath):]
 
140
            adjusted_relpath = '.'
 
141
        else:
 
142
            adjusted_rcp = self.root_client_path
 
143
            adjusted_relpath = relpath
 
144
 
 
145
        if adjusted_relpath.startswith('/'):
 
146
            adjusted_relpath = adjusted_relpath[1:]
 
147
        assert not adjusted_relpath.startswith('/')
 
148
 
 
149
        transport = self.backing_transport.clone(adjusted_relpath)
116
150
        out_buffer = StringIO()
117
151
        request_data_length = int(environ['CONTENT_LENGTH'])
118
152
        request_data_bytes = environ['wsgi.input'].read(request_data_length)
119
153
        smart_protocol_request = self.make_request(
120
 
            transport, out_buffer.write, request_data_bytes)
 
154
            transport, out_buffer.write, request_data_bytes, adjusted_rcp)
121
155
        if smart_protocol_request.next_read_size() != 0:
122
156
            # The request appears to be incomplete, or perhaps it's just a
123
157
            # newer version we don't understand.  Regardless, all we can do
131
165
        start_response('200 OK', headers)
132
166
        return [response_data]
133
167
 
134
 
    def make_request(self, transport, write_func, request_bytes):
 
168
    def make_request(self, transport, write_func, request_bytes, rcp):
135
169
        # XXX: This duplicates the logic in
136
170
        # SmartServerStreamMedium._build_protocol.
137
171
        if request_bytes.startswith(protocol.REQUEST_VERSION_TWO):
139
173
            request_bytes = request_bytes[len(protocol.REQUEST_VERSION_TWO):]
140
174
        else:
141
175
            protocol_class = protocol.SmartServerRequestProtocolOne
142
 
        server_protocol = protocol_class(transport, write_func)
 
176
        server_protocol = protocol_class(
 
177
            transport, write_func, rcp)
143
178
        server_protocol.accept_bytes(request_bytes)
144
179
        return server_protocol