|
|
@@ -21,6 +21,7 @@ from nose.tools import assert_raises, assert_false, eq_
|
|
|
from nose import SkipTest
|
|
|
|
|
|
from django.contrib.auth.models import User
|
|
|
+from desktop.auth.backend import rewrite_user
|
|
|
|
|
|
from desktop.lib.fs import ProxyFS
|
|
|
from desktop.lib.django_test_util import make_logged_in_client
|
|
|
@@ -36,9 +37,10 @@ def test_fs_selection():
|
|
|
make_logged_in_client(username='test', groupname='default', recreate=True, is_superuser=False)
|
|
|
user = User.objects.get(username='test')
|
|
|
add_permission('test', 'has_s3', permname='s3_access', appname='filebrowser')
|
|
|
+ add_permission('test', 'has_adls', permname='adls_access', appname='filebrowser')
|
|
|
|
|
|
- s3fs, hdfs = MagicMock(), MagicMock()
|
|
|
- proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs}, 'hdfs')
|
|
|
+ s3fs, adls, hdfs = MagicMock("s3_access"), MagicMock("adls_access"), MagicMock()
|
|
|
+ proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs, 'adl': adls}, 'hdfs')
|
|
|
proxy_fs.setuser(user)
|
|
|
|
|
|
proxy_fs.isdir('s3a://bucket/key')
|
|
|
@@ -49,34 +51,43 @@ def test_fs_selection():
|
|
|
hdfs.isfile.assert_called_once_with('hdfs://localhost:42/user/alice/file')
|
|
|
assert_false(s3fs.isfile.called)
|
|
|
|
|
|
+ proxy_fs.isdir('adl://net/key')
|
|
|
+ s3fs.isdir.assert_called_once_with('adl://net/key')
|
|
|
+ assert_false(hdfs.isdir.called)
|
|
|
+
|
|
|
+ proxy_fs.isdir('adl:/key')
|
|
|
+ s3fs.isdir.assert_called_once_with('adl:/key')
|
|
|
+ assert_false(hdfs.isdir.called)
|
|
|
+
|
|
|
proxy_fs.open('/user/alice/file')
|
|
|
hdfs.open.assert_called_once_with('/user/alice/file')
|
|
|
assert_false(s3fs.open.called)
|
|
|
|
|
|
assert_raises(IOError, proxy_fs.stats, 'ftp://host')
|
|
|
- assert_raises(IOError, proxy_fs.stats, 's3//bucket/key')
|
|
|
|
|
|
|
|
|
# TODO: remove after HUE-2947 is resolved
|
|
|
def test__get_fs():
|
|
|
make_logged_in_client(username='test', groupname='default', recreate=True, is_superuser=False)
|
|
|
user = User.objects.get(username='test')
|
|
|
-
|
|
|
add_permission('test', 'has_s3', permname='s3_access', appname='filebrowser')
|
|
|
+ add_permission('test', 'has_adls', permname='adls_access', appname='filebrowser')
|
|
|
|
|
|
- s3fs, hdfs = MockFs(), MockFs()
|
|
|
- proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs}, 'hdfs')
|
|
|
+ s3fs, adls, hdfs = MockFs("s3_access"), MockFs("adls_access"), MockFs()
|
|
|
+ proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs, 'adl': adls}, 'hdfs')
|
|
|
proxy_fs.setuser(user)
|
|
|
|
|
|
f = proxy_fs._get_fs
|
|
|
|
|
|
eq_(f('s3a://bucket'), s3fs)
|
|
|
eq_(f('S3A://bucket/key'), s3fs)
|
|
|
- eq_(f('hdfs://path'), hdfs)
|
|
|
+ eq_(f('adl:/path'), adls)
|
|
|
+ eq_(f('adl://net/path'), adls)
|
|
|
+ eq_(f('hdfs:/path'), hdfs)
|
|
|
+ eq_(f('hdfs://net/path'), hdfs)
|
|
|
eq_(f('/tmp'), hdfs)
|
|
|
|
|
|
assert_raises(IOError, f, 'ftp://host')
|
|
|
- assert_raises(IOError, f, 's3//bucket/key')
|
|
|
|
|
|
|
|
|
def test_multi_fs_selection():
|
|
|
@@ -88,9 +99,10 @@ def test_multi_fs_selection():
|
|
|
make_logged_in_client(username='test', groupname='default', recreate=True, is_superuser=False)
|
|
|
user = User.objects.get(username='test')
|
|
|
add_permission('test', 'has_s3', permname='s3_access', appname='filebrowser')
|
|
|
+ add_permission('test', 'has_adls', permname='adls_access', appname='filebrowser')
|
|
|
|
|
|
- s3fs, hdfs = MagicMock(), MagicMock()
|
|
|
- proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs}, 'hdfs')
|
|
|
+ s3fs, adls, hdfs = MagicMock("s3_access"), MagicMock("adls_access"), MagicMock()
|
|
|
+ proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs, 'adl': adls}, 'hdfs')
|
|
|
proxy_fs.setuser(user)
|
|
|
|
|
|
proxy_fs.copy('s3a://bucket1/key', 's3a://bucket2/key')
|
|
|
@@ -101,6 +113,14 @@ def test_multi_fs_selection():
|
|
|
s3fs.copyfile.assert_called_once_with('s3a://bucket/key', 'key2')
|
|
|
assert_false(hdfs.copyfile.called)
|
|
|
|
|
|
+ proxy_fs.copyfile('adl://net/key', 'key2')
|
|
|
+ s3fs.copyfile.assert_called_once_with('adl://net/key', 'key2')
|
|
|
+ assert_false(hdfs.copyfile.called)
|
|
|
+
|
|
|
+ proxy_fs.copyfile('adl:/key', 'key2')
|
|
|
+ s3fs.copyfile.assert_called_once_with('adl:/key', 'key2')
|
|
|
+ assert_false(hdfs.copyfile.called)
|
|
|
+
|
|
|
proxy_fs.rename('/tmp/file', 'shmile')
|
|
|
hdfs.rename.assert_called_once_with('/tmp/file', 'shmile')
|
|
|
assert_false(s3fs.rename.called)
|
|
|
@@ -114,19 +134,21 @@ def test__get_fs_pair():
|
|
|
make_logged_in_client(username='test', groupname='default', recreate=True, is_superuser=False)
|
|
|
user = User.objects.get(username='test')
|
|
|
add_permission('test', 'has_s3', permname='s3_access', appname='filebrowser')
|
|
|
+ add_permission('test', 'has_adls', permname='adls_access', appname='filebrowser')
|
|
|
|
|
|
- s3fs, hdfs = MockFs(), MockFs()
|
|
|
- proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs}, 'hdfs')
|
|
|
+ s3fs, adls, hdfs = MockFs("s3_access"), MockFs("adls_access"), MockFs()
|
|
|
+ proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs, 'adl': adls}, 'hdfs')
|
|
|
proxy_fs.setuser(user)
|
|
|
|
|
|
f = proxy_fs._get_fs_pair
|
|
|
|
|
|
eq_(f('s3a://bucket1/key', 's3a://bucket2/key'), (s3fs, s3fs))
|
|
|
eq_(f('s3a://bucket/key', 'key2'), (s3fs, s3fs))
|
|
|
+ eq_(f('adl://net/key', 'key2'), (adls, adls))
|
|
|
+ eq_(f('adl:/key', 'key2'), (adls, adls))
|
|
|
eq_(f('/tmp/file', 'shmile'), (hdfs, hdfs))
|
|
|
|
|
|
assert_raises(IOError, f, 'ftp://host', 'key2')
|
|
|
- assert_raises(IOError, f, 's3//bucket/key', 'hdfs://normal/path')
|
|
|
|
|
|
|
|
|
def test_constructor_given_invalid_arguments():
|
|
|
@@ -135,10 +157,15 @@ def test_constructor_given_invalid_arguments():
|
|
|
|
|
|
|
|
|
class MockFs():
|
|
|
- def __init__(self):
|
|
|
+ def __init__(self, filebrowser_action=None):
|
|
|
self.user = None
|
|
|
+ self._filebrowser_action = filebrowser_action
|
|
|
+
|
|
|
+ def setuser(self, user):
|
|
|
+ self.user = user
|
|
|
+ def filebrowser_action(self):
|
|
|
+ return self._filebrowser_action
|
|
|
|
|
|
- def setuser(self, user): self.user = user
|
|
|
|
|
|
|
|
|
class TestFsPermissions(object):
|
|
|
@@ -147,41 +174,51 @@ class TestFsPermissions(object):
|
|
|
user_client = make_logged_in_client(username='test', groupname='default', recreate=True, is_superuser=False)
|
|
|
user = User.objects.get(username='test')
|
|
|
|
|
|
- proxy_fs = ProxyFS({'s3a': MockFs(), 'hdfs': MockFs()}, 'hdfs')
|
|
|
+ s3fs, adls, hdfs = MockFs("s3_access"), MockFs("adls_access"), MockFs()
|
|
|
+ proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs, 'adl': adls}, 'hdfs')
|
|
|
proxy_fs.setuser(user)
|
|
|
|
|
|
f = proxy_fs._get_fs
|
|
|
|
|
|
remove_from_group(user.username, 'has_s3')
|
|
|
+ remove_from_group(user.username, 'has_adls')
|
|
|
|
|
|
# No perms by default
|
|
|
assert_raises(Exception, f, 's3a://bucket')
|
|
|
assert_raises(Exception, f, 'S3A://bucket/key')
|
|
|
+ assert_raises(Exception, f, 'adl://net/key')
|
|
|
+ assert_raises(Exception, f, 'adl:/key')
|
|
|
f('hdfs://path')
|
|
|
f('/tmp')
|
|
|
|
|
|
try:
|
|
|
# Add perm
|
|
|
- add_permission(user.username, 'has_s3', permname='s3_access', appname='filebrowser')
|
|
|
+ add_permission('test', 'has_s3', permname='s3_access', appname='filebrowser')
|
|
|
+ add_permission('test', 'has_adls', permname='adls_access', appname='filebrowser')
|
|
|
|
|
|
f('s3a://bucket')
|
|
|
f('S3A://bucket/key')
|
|
|
+ f('adl://net/key')
|
|
|
+ f('adl:/key')
|
|
|
f('hdfs://path')
|
|
|
f('/tmp')
|
|
|
finally:
|
|
|
remove_from_group(user.username, 'has_s3')
|
|
|
-
|
|
|
+ remove_from_group(user.username, 'has_adls')
|
|
|
|
|
|
def test_fs_permissions_admin_user(self):
|
|
|
user_client = make_logged_in_client(username='admin', groupname='default', recreate=True, is_superuser=True)
|
|
|
user = User.objects.get(username='admin')
|
|
|
|
|
|
- proxy_fs = ProxyFS({'s3a': MockFs(), 'hdfs': MockFs()}, 'hdfs')
|
|
|
+ s3fs, adls, hdfs = MockFs("s3_access"), MockFs("adls_access"), MockFs()
|
|
|
+ proxy_fs = ProxyFS({'s3a': s3fs, 'hdfs': hdfs, 'adl': adls}, 'hdfs')
|
|
|
proxy_fs.setuser(user)
|
|
|
|
|
|
f = proxy_fs._get_fs
|
|
|
|
|
|
f('s3a://bucket')
|
|
|
f('S3A://bucket/key')
|
|
|
+ f('adl://net/key')
|
|
|
+ f('adl:/key')
|
|
|
f('hdfs://path')
|
|
|
f('/tmp')
|