~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-04 18:51:39 UTC
  • mfrom: (2961.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
Authentication ring implementation (read-only)

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
 
23
23
from cStringIO import StringIO
24
24
 
25
 
from bzrlib.smart import protocol, medium
 
25
from bzrlib.smart import protocol
26
26
from bzrlib.transport import chroot, get_transport
27
27
from bzrlib.urlutils import local_path_to_url
28
28
    
29
29
 
30
 
def make_app(root, prefix, path_var='REQUEST_URI', readonly=True):
 
30
def make_app(root, prefix, path_var, 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, prefix)
43
 
    app = RelpathSetter(app, '', path_var)
 
42
    app = SmartWSGIApp(base_transport)
 
43
    app = RelpathSetter(app, prefix, 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, root_client_path='/'):
 
88
    def __init__(self, backing_transport):
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.
96
93
        """
97
94
        # Use a ChrootTransportDecorator so that this web application won't
98
95
        # accidentally let people access locations they shouldn't.
101
98
        self.chroot_server = chroot.ChrootServer(backing_transport)
102
99
        self.chroot_server.setUp()
103
100
        self.backing_transport = get_transport(self.chroot_server.get_url())
104
 
        self.root_client_path = root_client_path
105
101
        # While the chroot server can technically be torn down at this point,
106
102
        # as all it does is remove the scheme registration from transport's 
107
103
        # protocol dictionary, we don't *just in case* there are parts of 
116
112
            return []
117
113
 
118
114
        relpath = environ['bzrlib.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
 
        if adjusted_relpath.startswith('/'):
148
 
            raise AssertionError(adjusted_relpath)
149
 
 
150
 
        transport = self.backing_transport.clone(adjusted_relpath)
 
115
        transport = self.backing_transport.clone(relpath)
151
116
        out_buffer = StringIO()
152
117
        request_data_length = int(environ['CONTENT_LENGTH'])
153
118
        request_data_bytes = environ['wsgi.input'].read(request_data_length)
154
119
        smart_protocol_request = self.make_request(
155
 
            transport, out_buffer.write, request_data_bytes, adjusted_rcp)
 
120
            transport, out_buffer.write, request_data_bytes)
156
121
        if smart_protocol_request.next_read_size() != 0:
157
122
            # The request appears to be incomplete, or perhaps it's just a
158
123
            # newer version we don't understand.  Regardless, all we can do
166
131
        start_response('200 OK', headers)
167
132
        return [response_data]
168
133
 
169
 
    def make_request(self, transport, write_func, request_bytes, rcp):
170
 
        protocol_factory, unused_bytes = medium._get_protocol_factory_for_bytes(
171
 
            request_bytes)
172
 
        server_protocol = protocol_factory(transport, write_func, rcp)
173
 
        server_protocol.accept_bytes(unused_bytes)
 
134
    def make_request(self, transport, write_func, request_bytes):
 
135
        # XXX: This duplicates the logic in
 
136
        # SmartServerStreamMedium._build_protocol.
 
137
        if request_bytes.startswith(protocol.REQUEST_VERSION_TWO):
 
138
            protocol_class = protocol.SmartServerRequestProtocolTwo
 
139
            request_bytes = request_bytes[len(protocol.REQUEST_VERSION_TWO):]
 
140
        else:
 
141
            protocol_class = protocol.SmartServerRequestProtocolOne
 
142
        server_protocol = protocol_class(transport, write_func)
 
143
        server_protocol.accept_bytes(request_bytes)
174
144
        return server_protocol