← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2009-01-28 18:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 3968.
  • Revision ID: jelmer@samba.org-20090128184255-bdmklkvm83ltk191
https://launchpad.net/bugs/321183
Update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/wsgi.py
22
22
 
23
23
from cStringIO import StringIO
24
24
 
25
 
from bzrlib.transport import chroot, get_transport, smart
 
25
from bzrlib.smart import protocol, medium
 
26
from bzrlib.transport import chroot, get_transport
26
27
from bzrlib.urlutils import local_path_to_url
27
28
    
28
29
 
29
 
def make_app(root, prefix, path_var, readonly=True):
 
30
def make_app(root, prefix, path_var='REQUEST_URI', readonly=True,
 
31
    load_plugins=True, enable_logging=True):
30
32
    """Convenience function to construct a WSGI bzr smart server.
31
33
    
32
34
    :param root: a local path that requests will be relative to.
38
40
        base_transport = get_transport('readonly+' + local_url)
39
41
    else:
40
42
        base_transport = get_transport(local_url)
41
 
    app = SmartWSGIApp(base_transport)
42
 
    app = RelpathSetter(app, prefix, path_var)
 
43
    if load_plugins:
 
44
        from bzrlib.plugin import load_plugins
 
45
        load_plugins()
 
46
    if enable_logging:
 
47
        import bzrlib.trace
 
48
        bzrlib.trace.enable_default_logging()
 
49
    app = SmartWSGIApp(base_transport, prefix)
 
50
    app = RelpathSetter(app, '', path_var)
43
51
    return app
44
52
 
45
53
 
75
83
        path = environ[self.path_var]
76
84
        suffix = '/.bzr/smart'
77
85
        if not (path.startswith(self.prefix) and path.endswith(suffix)):
78
 
            start_response('404 Not Found', {})
 
86
            start_response('404 Not Found', [])
79
87
            return []
80
88
        environ['bzrlib.relpath'] = path[len(self.prefix):-len(suffix)]
81
89
        return self.app(environ, start_response)
84
92
class SmartWSGIApp(object):
85
93
    """A WSGI application for the bzr smart server."""
86
94
 
87
 
    def __init__(self, backing_transport):
 
95
    def __init__(self, backing_transport, root_client_path='/'):
88
96
        """Constructor.
89
97
 
90
98
        :param backing_transport: a transport.  Requests will be processed
91
99
            relative to this transport.
 
100
        :param root_client_path: the client path that maps to the root of
 
101
            backing_transport.  This is used to interpret relpaths received from
 
102
            the client.
92
103
        """
93
104
        # Use a ChrootTransportDecorator so that this web application won't
94
105
        # accidentally let people access locations they shouldn't.
95
106
        # e.g. consider a smart server request for "get /etc/passwd" or
96
107
        # something.
97
 
        self.backing_transport = chroot.ChrootTransportDecorator(
98
 
            'chroot+' + backing_transport.base, _decorated=backing_transport)
 
108
        self.chroot_server = chroot.ChrootServer(backing_transport)
 
109
        self.chroot_server.setUp()
 
110
        self.backing_transport = get_transport(self.chroot_server.get_url())
 
111
        self.root_client_path = root_client_path
 
112
        # While the chroot server can technically be torn down at this point,
 
113
        # as all it does is remove the scheme registration from transport's 
 
114
        # protocol dictionary, we don't *just in case* there are parts of 
 
115
        # bzrlib that will invoke 'get_transport' on urls rather than cloning
 
116
        # around the existing transport.
 
117
        #self.chroot_server.tearDown()
99
118
 
100
119
    def __call__(self, environ, start_response):
101
120
        """WSGI application callable."""
104
123
            return []
105
124
 
106
125
        relpath = environ['bzrlib.relpath']
107
 
        transport = self.backing_transport.clone(relpath)
 
126
 
 
127
        if not relpath.startswith('/'):
 
128
            relpath = '/' + relpath
 
129
        if not relpath.endswith('/'):
 
130
            relpath += '/'
 
131
 
 
132
        # Compare the HTTP path (relpath) and root_client_path, and calculate
 
133
        # new relpath and root_client_path accordingly, to be used to build the
 
134
        # request.
 
135
        if relpath.startswith(self.root_client_path):
 
136
            # The relpath traverses all of the mandatory root client path.
 
137
            # Remove the root_client_path from the relpath, and set
 
138
            # adjusted_tcp to None to tell the request handler that no further
 
139
            # path translation is required.
 
140
            adjusted_rcp = None
 
141
            adjusted_relpath = relpath[len(self.root_client_path):]
 
142
        elif self.root_client_path.startswith(relpath):
 
143
            # The relpath traverses some of the mandatory root client path.
 
144
            # Subtract the relpath from the root_client_path, and set the
 
145
            # relpath to '.'.
 
146
            adjusted_rcp = '/' + self.root_client_path[len(relpath):]
 
147
            adjusted_relpath = '.'
 
148
        else:
 
149
            adjusted_rcp = self.root_client_path
 
150
            adjusted_relpath = relpath
 
151
 
 
152
        if adjusted_relpath.startswith('/'):
 
153
            adjusted_relpath = adjusted_relpath[1:]
 
154
        if adjusted_relpath.startswith('/'):
 
155
            raise AssertionError(adjusted_relpath)
 
156
 
 
157
        transport = self.backing_transport.clone(adjusted_relpath)
108
158
        out_buffer = StringIO()
109
 
        smart_protocol_request = self.make_request(transport, out_buffer.write)
110
159
        request_data_length = int(environ['CONTENT_LENGTH'])
111
160
        request_data_bytes = environ['wsgi.input'].read(request_data_length)
112
 
        smart_protocol_request.accept_bytes(request_data_bytes)
 
161
        smart_protocol_request = self.make_request(
 
162
            transport, out_buffer.write, request_data_bytes, adjusted_rcp)
113
163
        if smart_protocol_request.next_read_size() != 0:
114
164
            # The request appears to be incomplete, or perhaps it's just a
115
165
            # newer version we don't understand.  Regardless, all we can do
123
173
        start_response('200 OK', headers)
124
174
        return [response_data]
125
175
 
126
 
    def make_request(self, transport, write_func):
127
 
        return smart.SmartServerRequestProtocolOne(transport, write_func)
 
176
    def make_request(self, transport, write_func, request_bytes, rcp):
 
177
        protocol_factory, unused_bytes = medium._get_protocol_factory_for_bytes(
 
178
            request_bytes)
 
179
        server_protocol = protocol_factory(transport, write_func, rcp)
 
180
        server_protocol.accept_bytes(unused_bytes)
 
181
        return server_protocol