← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/stub_sftp.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-30 14:57:22 UTC
  • mfrom: (1711.5.4 win32-sftp)
  • mto: This revision was merged to the branch mainline in revision 1827.
  • Revision ID: john@arbash-meinel.com-20060630145722-a1a54b622e7ec699
[merge] sftp fixes for win32 (and drive letters)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/stub_sftp.py
22
22
import os
23
23
from paramiko import ServerInterface, SFTPServerInterface, SFTPServer, SFTPAttributes, \
24
24
    SFTPHandle, SFTP_OK, AUTH_SUCCESSFUL, OPEN_SUCCEEDED
 
25
import sys
25
26
 
26
27
from bzrlib.osutils import pathjoin
27
28
from bzrlib.trace import mutter
64
65
 
65
66
    def __init__(self, server, root, home=None):
66
67
        SFTPServerInterface.__init__(self, server)
 
68
        # All paths are actually relative to 'root'.
 
69
        # this is like implementing chroot().
67
70
        self.root = root
68
71
        if home is None:
69
 
            self.home = self.root
 
72
            self.home = ''
70
73
        else:
 
74
            assert home.startswith(self.root), \
 
75
                    "home must be a subdirectory of root (%s vs %s)" \
 
76
                    % (home, root)
71
77
            self.home = home[len(self.root):]
72
 
        if (len(self.home) > 0) and (self.home[0] == '/'):
 
78
        if self.home.startswith('/'):
73
79
            self.home = self.home[1:]
74
80
        server._test_case.log('sftpserver - new connection')
75
81
 
76
82
    def _realpath(self, path):
 
83
        # paths returned from self.canonicalize() always start with
 
84
        # a path separator. So if 'root' is just '/', this would cause
 
85
        # a double slash at the beginning '//home/dir'. 
 
86
        if self.root == '/':
 
87
            return self.canonicalize(path)
77
88
        return self.root + self.canonicalize(path)
78
89
 
79
 
    def canonicalize(self, path):
80
 
        if os.path.isabs(path):
81
 
            return os.path.normpath(path)
82
 
        else:
83
 
            return os.path.normpath('/' + os.path.join(self.home, path))
 
90
    if sys.platform == 'win32':
 
91
        def canonicalize(self, path):
 
92
            # Win32 sftp paths end up looking like
 
93
            #     sftp://host@foo/h:/foo/bar
 
94
            # which means absolute paths look like:
 
95
            #     /h:/foo/bar
 
96
            # and relative paths stay the same:
 
97
            #     foo/bar
 
98
            # win32 needs to use the Unicode APIs. so we require the 
 
99
            # paths to be utf8 (Linux just uses bytestreams)
 
100
            thispath = path.decode('utf8')
 
101
            if path.startswith('/'):
 
102
                # Abspath H:/foo/bar
 
103
                return os.path.normpath(thispath[1:])
 
104
            else:
 
105
                return os.path.normpath(os.path.join(self.home, thispath))
 
106
    else:
 
107
        def canonicalize(self, path):
 
108
            if os.path.isabs(path):
 
109
                return os.path.normpath(path)
 
110
            else:
 
111
                return os.path.normpath('/' + os.path.join(self.home, path))
84
112
 
85
113
    def chattr(self, path, attr):
86
114
        try:
96
124
            # TODO: win32 incorrectly lists paths with non-ascii if path is not
97
125
            # unicode. However on Linux the server should only deal with
98
126
            # bytestreams and posix.listdir does the right thing 
99
 
            flist = os.listdir(path)
 
127
            if sys.platform == 'win32':
 
128
                flist = [f.encode('utf8') for f in os.listdir(path)]
 
129
            else:
 
130
                flist = os.listdir(path)
100
131
            for fname in flist:
101
132
                attr = SFTPAttributes.from_stat(os.stat(pathjoin(path, fname)))
102
133
                attr.filename = fname