/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005 Canonical Ltd
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
2
# -*- coding: utf-8 -*-
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
3
#
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
8
#
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
13
#
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
19
"""Tests for bzr setting permissions.
20
21
Files which are created underneath .bzr/ should inherit its permissions.
22
So if the directory is group writable, the files and subdirs should be as well.
23
24
In the future, when we have Repository/Branch/Checkout information, the
25
permissions should be inherited individually, rather than all be the same.
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
26
"""
27
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
28
# TODO: jam 20051215 There are no tests for ftp yet, because we have no ftp server
29
# TODO: jam 20051215 Currently the default behavior for 'bzr branch' is just 
30
#                    defined by the local umask. This isn't terrible, is it
31
#                    the truly desired behavior?
32
 
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
33
import os
34
import sys
35
import stat
1955.3.13 by John Arbash Meinel
Run the full test suite, and fix up any deprecation warnings.
36
from cStringIO import StringIO
1910.2.32 by Aaron Bentley
Handle capital-letter file-ids
37
import urllib
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
38
39
from bzrlib.branch import Branch
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
40
from bzrlib.bzrdir import BzrDir
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
41
from bzrlib.lockable_files import LockableFiles, TransportLock
1534.4.28 by Robert Collins
first cut at merge from integration.
42
from bzrlib.tests import TestCaseWithTransport, TestSkipped
1185.50.20 by John Arbash Meinel
merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.
43
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
1530.1.17 by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible.
44
from bzrlib.transport import get_transport
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
45
from bzrlib.workingtree import WorkingTree
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
46
47
48
def chmod_r(base, file_mode, dir_mode):
49
    """Recursively chmod from a base directory"""
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
50
    os.chmod(base, dir_mode)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
51
    for root, dirs, files in os.walk(base):
52
        for d in dirs:
53
            p = os.path.join(root, d)
54
            os.chmod(p, dir_mode)
55
        for f in files:
56
            p = os.path.join(root, f)
57
            os.chmod(p, file_mode)
58
59
1185.58.7 by John Arbash Meinel
Added the ability to disable setting permissions
60
def check_mode_r(test, base, file_mode, dir_mode, include_base=True):
61
    """Check that all permissions match
62
63
    :param test: The TestCase being run
64
    :param base: The path to the root directory to check
65
    :param file_mode: The mode for all files
66
    :param dir_mode: The mode for all directories
67
    :param include_base: If false, only check the subdirectories
68
    """
1530.1.17 by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible.
69
    t = get_transport(".")
1185.58.7 by John Arbash Meinel
Added the ability to disable setting permissions
70
    if include_base:
1530.1.21 by Robert Collins
Review feedback fixes.
71
        test.assertTransportMode(t, base, dir_mode)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
72
    for root, dirs, files in os.walk(base):
73
        for d in dirs:
1910.2.32 by Aaron Bentley
Handle capital-letter file-ids
74
            p = '/'.join([urllib.quote(x) for x in root.split('/\\') + [d]])
1530.1.21 by Robert Collins
Review feedback fixes.
75
            test.assertTransportMode(t, p, dir_mode)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
76
        for f in files:
77
            p = os.path.join(root, f)
1910.2.32 by Aaron Bentley
Handle capital-letter file-ids
78
            p = '/'.join([urllib.quote(x) for x in root.split('/\\') + [f]])
1530.1.21 by Robert Collins
Review feedback fixes.
79
            test.assertTransportMode(t, p, file_mode)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
80
1532 by Robert Collins
Merge in John Meinels integration branch.
81
1534.4.28 by Robert Collins
first cut at merge from integration.
82
class TestPermissions(TestCaseWithTransport):
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
83
84
    def test_new_files(self):
85
        if sys.platform == 'win32':
86
            raise TestSkipped('chmod has no effect on win32')
87
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
88
        t = self.make_branch_and_tree('.')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
89
        b = t.branch
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
90
        open('a', 'wb').write('foo\n')
1910.2.32 by Aaron Bentley
Handle capital-letter file-ids
91
        # ensure check_mode_r works with capital-letter file-ids like TREE_ROOT
92
        t.add('a', 'CAPS-ID')
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
93
        t.commit('foo')
94
95
        chmod_r('.bzr', 0644, 0755)
96
        check_mode_r(self, '.bzr', 0644, 0755)
97
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
98
        # although we are modifying the filesystem
99
        # underneath the objects, they are not locked, and thus it must
100
        # be safe for most operations. But here we want to observe a 
101
        # mode change in the control bits, which current do not refresh
102
        # when a new lock is taken out.
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
103
        t = WorkingTree.open('.')
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
104
        b = t.branch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
105
        self.assertEqualMode(0755, b.control_files._dir_mode)
106
        self.assertEqualMode(0644, b.control_files._file_mode)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
107
108
        # Modifying a file shouldn't break the permissions
109
        open('a', 'wb').write('foo2\n')
110
        t.commit('foo2')
111
        # The mode should be maintained after commit
112
        check_mode_r(self, '.bzr', 0644, 0755)
113
114
        # Adding a new file should maintain the permissions
115
        open('b', 'wb').write('new b\n')
116
        t.add('b')
117
        t.commit('new b')
118
        check_mode_r(self, '.bzr', 0644, 0755)
119
120
        # Recursively update the modes of all files
121
        chmod_r('.bzr', 0664, 0775)
122
        check_mode_r(self, '.bzr', 0664, 0775)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
123
        t = WorkingTree.open('.')
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
124
        b = t.branch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
125
        self.assertEqualMode(0775, b.control_files._dir_mode)
126
        self.assertEqualMode(0664, b.control_files._file_mode)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
127
128
        open('a', 'wb').write('foo3\n')
129
        t.commit('foo3')
130
        check_mode_r(self, '.bzr', 0664, 0775)
131
132
        open('c', 'wb').write('new c\n')
133
        t.add('c')
134
        t.commit('new c')
135
        check_mode_r(self, '.bzr', 0664, 0775)
136
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
137
        # Test the group sticky bit
138
        # Recursively update the modes of all files
139
        chmod_r('.bzr', 0664, 02775)
140
        check_mode_r(self, '.bzr', 0664, 02775)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
141
        t = WorkingTree.open('.')
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
142
        b = t.branch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
143
        self.assertEqualMode(02775, b.control_files._dir_mode)
144
        self.assertEqualMode(0664, b.control_files._file_mode)
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
145
146
        open('a', 'wb').write('foo4\n')
147
        t.commit('foo4')
148
        check_mode_r(self, '.bzr', 0664, 02775)
149
150
        open('d', 'wb').write('new d\n')
151
        t.add('d')
152
        t.commit('new d')
153
        check_mode_r(self, '.bzr', 0664, 02775)
154
1185.58.7 by John Arbash Meinel
Added the ability to disable setting permissions
155
    def test_disable_set_mode(self):
156
        # TODO: jam 20051215 Ultimately, this test should probably test that
157
        #                    extra chmod calls aren't being made
158
        try:
1534.4.28 by Robert Collins
first cut at merge from integration.
159
            transport = get_transport(self.get_url())
1955.3.13 by John Arbash Meinel
Run the full test suite, and fix up any deprecation warnings.
160
            transport.put_bytes('my-lock', '')
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
161
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
1185.65.23 by Robert Collins
update tests somewhat
162
            self.assertNotEqual(None, lockable._dir_mode)
163
            self.assertNotEqual(None, lockable._file_mode)
164
165
            LockableFiles._set_dir_mode = False
166
            transport = get_transport('.')
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
167
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
1185.65.23 by Robert Collins
update tests somewhat
168
            self.assertEqual(None, lockable._dir_mode)
169
            self.assertNotEqual(None, lockable._file_mode)
170
171
            LockableFiles._set_file_mode = False
172
            transport = get_transport('.')
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
173
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
1185.65.23 by Robert Collins
update tests somewhat
174
            self.assertEqual(None, lockable._dir_mode)
175
            self.assertEqual(None, lockable._file_mode)
176
177
            LockableFiles._set_dir_mode = True
178
            transport = get_transport('.')
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
179
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
1185.65.23 by Robert Collins
update tests somewhat
180
            self.assertNotEqual(None, lockable._dir_mode)
181
            self.assertEqual(None, lockable._file_mode)
182
183
            LockableFiles._set_file_mode = True
184
            transport = get_transport('.')
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
185
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
1185.65.23 by Robert Collins
update tests somewhat
186
            self.assertNotEqual(None, lockable._dir_mode)
187
            self.assertNotEqual(None, lockable._file_mode)
1185.58.7 by John Arbash Meinel
Added the ability to disable setting permissions
188
        finally:
1185.65.23 by Robert Collins
update tests somewhat
189
            LockableFiles._set_dir_mode = True
190
            LockableFiles._set_file_mode = True
1185.58.7 by John Arbash Meinel
Added the ability to disable setting permissions
191
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
192
193
class TestSftpPermissions(TestCaseWithSFTPServer):
194
195
    def test_new_files(self):
196
        if sys.platform == 'win32':
197
            raise TestSkipped('chmod has no effect on win32')
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
198
        # Though it would be nice to test that SFTP to a server
199
        # which does support chmod has the right effect
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
200
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
201
        # bodge around for stubsftpserver not letting use connect
202
        # more than once
203
        _t = get_transport(self.get_url())
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
204
205
        os.mkdir('local')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
206
        t_local = self.make_branch_and_tree('local')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
207
        b_local = t_local.branch
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
208
        open('local/a', 'wb').write('foo\n')
209
        t_local.add('a')
210
        t_local.commit('foo')
211
212
        # Delete them because we are modifying the filesystem underneath them
213
        chmod_r('local/.bzr', 0644, 0755)
214
        check_mode_r(self, 'local/.bzr', 0644, 0755)
215
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
216
        t = WorkingTree.open('local')
1185.50.76 by John Arbash Meinel
[merge] robertc's integration branch: add BzrDir, and checkouts
217
        b_local = t.branch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
218
        self.assertEqualMode(0755, b_local.control_files._dir_mode)
219
        self.assertEqualMode(0644, b_local.control_files._file_mode)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
220
221
        os.mkdir('sftp')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
222
        sftp_url = self.get_url('sftp')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
223
        b_sftp = BzrDir.create_branch_and_repo(sftp_url)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
224
225
        b_sftp.pull(b_local)
226
        del b_sftp
227
        chmod_r('sftp/.bzr', 0644, 0755)
228
        check_mode_r(self, 'sftp/.bzr', 0644, 0755)
229
230
        b_sftp = Branch.open(sftp_url)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
231
        self.assertEqualMode(0755, b_sftp.control_files._dir_mode)
232
        self.assertEqualMode(0644, b_sftp.control_files._file_mode)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
233
234
        open('local/a', 'wb').write('foo2\n')
235
        t_local.commit('foo2')
236
        b_sftp.pull(b_local)
237
        # The mode should be maintained after commit
238
        check_mode_r(self, 'sftp/.bzr', 0644, 0755)
239
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
240
        open('local/b', 'wb').write('new b\n')
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
241
        t_local.add('b')
242
        t_local.commit('new b')
243
        b_sftp.pull(b_local)
244
        check_mode_r(self, 'sftp/.bzr', 0644, 0755)
245
246
        del b_sftp
247
        # Recursively update the modes of all files
248
        chmod_r('sftp/.bzr', 0664, 0775)
249
        check_mode_r(self, 'sftp/.bzr', 0664, 0775)
250
251
        b_sftp = Branch.open(sftp_url)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
252
        self.assertEqualMode(0775, b_sftp.control_files._dir_mode)
253
        self.assertEqualMode(0664, b_sftp.control_files._file_mode)
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
254
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
255
        open('local/a', 'wb').write('foo3\n')
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
256
        t_local.commit('foo3')
257
        b_sftp.pull(b_local)
258
        check_mode_r(self, 'sftp/.bzr', 0664, 0775)
259
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
260
        open('local/c', 'wb').write('new c\n')
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
261
        t_local.add('c')
262
        t_local.commit('new c')
263
        b_sftp.pull(b_local)
264
        check_mode_r(self, 'sftp/.bzr', 0664, 0775)
265
1185.58.10 by John Arbash Meinel
[patch] Robey Pointer to fix sftp server using umask for files (failing tests for directories)
266
    def test_sftp_server_modes(self):
267
        if sys.platform == 'win32':
268
            raise TestSkipped('chmod has no effect on win32')
269
270
        umask = 0022
271
        original_umask = os.umask(umask)
272
273
        try:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
274
            t = get_transport(self.get_url())
1185.58.10 by John Arbash Meinel
[patch] Robey Pointer to fix sftp server using umask for files (failing tests for directories)
275
            # Direct access should be masked by umask
276
            t._sftp_open_exclusive('a', mode=0666).write('foo\n')
1530.1.21 by Robert Collins
Review feedback fixes.
277
            self.assertTransportMode(t, 'a', 0666 &~umask)
1185.58.10 by John Arbash Meinel
[patch] Robey Pointer to fix sftp server using umask for files (failing tests for directories)
278
279
            # but Transport overrides umask
1955.3.13 by John Arbash Meinel
Run the full test suite, and fix up any deprecation warnings.
280
            t.put_bytes('b', 'txt', mode=0666)
1530.1.21 by Robert Collins
Review feedback fixes.
281
            self.assertTransportMode(t, 'b', 0666)
1185.58.10 by John Arbash Meinel
[patch] Robey Pointer to fix sftp server using umask for files (failing tests for directories)
282
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
283
            t._get_sftp().mkdir('c', mode=0777)
1530.1.21 by Robert Collins
Review feedback fixes.
284
            self.assertTransportMode(t, 'c', 0777 &~umask)
1185.58.10 by John Arbash Meinel
[patch] Robey Pointer to fix sftp server using umask for files (failing tests for directories)
285
286
            t.mkdir('d', mode=0777)
1530.1.21 by Robert Collins
Review feedback fixes.
287
            self.assertTransportMode(t, 'd', 0777)
1185.58.10 by John Arbash Meinel
[patch] Robey Pointer to fix sftp server using umask for files (failing tests for directories)
288
        finally:
289
            os.umask(original_umask)