The branch, master-inai has been updated via 8206b502bce2392b6ca4551d964860c4a0848cef (commit) from d9a975b5e648d5ee0a207814da8f85abc81e9f64 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/backends/inifile.py | 20 ++++++++++++++++++-- x2gobroker/defaults.py | 12 +++++++++++- x2gobroker/tests/test_backend_inifile.py | 24 ++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gobroker/backends/inifile.py b/x2gobroker/backends/inifile.py index 5d2f451..424634a 100644 --- a/x2gobroker/backends/inifile.py +++ b/x2gobroker/backends/inifile.py @@ -60,11 +60,27 @@ class X2GoBroker(base.X2GoBroker): def get_profile_defaults(self): - return self.session_profiles.get_defaults() + profile_defaults = self.session_profiles.get_defaults() + for key in profile_defaults.keys(): + if key.startswith('acl-'): + del profile_defaults[key] + return profile_defaults def get_profile(self, profile_id): - return self.session_profiles.get_section(profile_id) + profile = self.session_profiles.get_section(profile_id) + for key in profile.keys(): + if key.startswith('acl-'): + del profile[key] + return profile + + def get_profile_acls(self, profile_id): + + profile = self.session_profiles.get_section(profile_id) + for key in profile.keys(): + if not key.startswith('acl-'): + del profile[key] + return profile def list_profiles(self, username): diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index c11b36f..b9f477b 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -113,5 +113,15 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = { 'sshport': 22, 'setdpi': 0, 'pack': '16m-jpeg', + 'acl-users-allowed': ['ALL'], + 'acl-users-denied': [], + 'acl-users-order': '', + 'acl-groups-allowed': ['ALL'], + 'acl-groups-denied': [], + 'acl-groups-order': '', + 'acl-clients-allowed': ['ALL'], + 'acl-clients-denied': [], + 'acl-clients-order': '', + 'acl-any-order': 'deny-allow', }, -} \ No newline at end of file +} diff --git a/x2gobroker/tests/test_backend_inifile.py b/x2gobroker/tests/test_backend_inifile.py index 12f55c7..f9e7f2e 100644 --- a/x2gobroker/tests/test_backend_inifile.py +++ b/x2gobroker/tests/test_backend_inifile.py @@ -45,6 +45,9 @@ class TestX2GoBrokerBackendInifile(unittest.TestCase): inifile_backend = x2gobroker.backends.inifile.X2GoBroker(profile_config_file='../../etc/x2gobroker-sessionprofiles.conf') _profile_defaults = inifile_backend.get_profile_defaults() _expected_profile_defaults = x2gobroker.defaults.X2GOBROKER_SESSIONPROFILE_DEFAULTS['DEFAULT'] + for key in copy.deepcopy(_expected_profile_defaults): + if key.startswith('acl-'): + del _expected_profile_defaults[key] for _param in _profile_defaults: self.assertTrue( ( _param in _expected_profile_defaults.keys() and _profile_defaults[_param] == _expected_profile_defaults[_param] ) ) for _param in _expected_profile_defaults: @@ -69,6 +72,14 @@ cmd = GNOME user = bar cmd = KDE fullscreen = true + +[testprofile3] +user = bar +cmd = KDE +fullscreen = true +acl-users-denied = ALL +acl-users-allowed = foo,bar +acl-users-order = deny-allow """ tf = tempfile.NamedTemporaryFile() print >> tf, _session_profiles @@ -92,6 +103,12 @@ fullscreen = true 'cmd': 'KDE', 'fullscreen': True, }) + _expected_profile3 = copy.deepcopy(_expected_defaults) + _expected_profile3.update({ + 'user': 'bar', + 'cmd': 'KDE', + 'fullscreen': True, + }) _profile1 = inifile_backend.get_profile('testprofile1') del _profile1['default'] for key in _expected_profile1.keys(): @@ -106,6 +123,13 @@ fullscreen = true for key in _profile2.keys(): self.assertTrue( ( key in _expected_profile2.keys() ) and ( _profile2[key] == _expected_profile2[key] ) ) + _profile3 = inifile_backend.get_profile('testprofile3') + del _profile3['default'] + for key in _expected_profile3.keys(): + self.assertTrue( ( key in _profile3.keys() ) ) + for key in _profile3.keys(): + self.assertTrue( ( key in _expected_profile3.keys() ) and ( _profile3[key] == _expected_profile3[key] ) ) + ### TEST: select_profile() method # def test_profileselection(self): hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).