x2go-commits May 2013

x2go-commits@lists.x2go.org

2 participants
1156 discussions

x2gobroker.git - build-main (branch) updated: d79176f0865a1b9a66bb90e1ad33f4c47dc6ba75
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via d79176f0865a1b9a66bb90e1ad33f4c47dc6ba75 (commit) from 8962ee55af016895cd725ecf59245c3020b3eed8 (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/… [View More]config.py | 12 ++++++------ x2gobroker/tests/runalltests.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/x2gobroker/config.py b/x2gobroker/config.py index c441a12..962b33c 100644 --- a/x2gobroker/config.py +++ b/x2gobroker/config.py @@ -43,7 +43,7 @@ class X2GoBrokerConfigFile(object): Class for processing a ini-file like configuration file. If entries are omitted in such a config file, they are filled with - default values (as hard-coded in Python X2goBroker), so the resulting objects + default values (as hard-coded in Python X2goBroker), so the resulting objects always contain the same fields. The default values are also used to define a data type for each configuration @@ -127,7 +127,7 @@ class X2GoBrokerConfigFile(object): Stores a value for a given section and key. This methods affects a ConfigParser object held in - RAM. No configuration file is affected by this + RAM. No configuration file is affected by this method. To write the configuration to disk use the L{write()} method. @@ -150,9 +150,9 @@ class X2GoBrokerConfigFile(object): def _fill_defaults(self): """\ - Fills a C{ConfigParser} object with the default config file - values as pre-defined in Python X2GoBroker or. This ConfigParser - object is held in RAM. No configuration file is affected by this + Fills a C{ConfigParser} object with the default config file + values as pre-defined in Python X2GoBroker or. This ConfigParser + object is held in RAM. No configuration file is affected by this method. """ @@ -205,7 +205,7 @@ class X2GoBrokerConfigFile(object): @param key: the ini file key in the given section @type key: C{str} - @return: a Python variable type + @return: a Python variable type @rtype: class """ diff --git a/x2gobroker/tests/runalltests.py b/x2gobroker/tests/runalltests.py index badc6cc..f0156db 100644 --- a/x2gobroker/tests/runalltests.py +++ b/x2gobroker/tests/runalltests.py @@ -18,8 +18,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -"""\ -This file is a default test runner as found in ZOPE/Plone products. It works +""" +This file is a default test runner as found in ZOPE/Plone products. It works fine for any kind of Python unit testing---as we do here for Python X2GoBroker. """ 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). [View Less]

1 0

x2gobroker.git - build-main (branch) updated: e313c67ec94b6e86cd7de7623e9a538db739cedf
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via e313c67ec94b6e86cd7de7623e9a538db739cedf (commit) from 6b4fb9fc63be39e279a311614ffce9e47609d770 (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/… [View More]brokers/base_broker.py | 16 ++++++++ x2gobroker/nameservices/base_nameservice.py | 14 +++---- x2gobroker/nameservices/libnss_nameservice.py | 14 +++---- x2gobroker/nameservices/testsuite_nameservice.py | 43 ++++++++++------------ x2gobroker/tests/test_broker_base.py | 22 ++++++++++- 5 files changed, 69 insertions(+), 40 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index caaf85c..1daf79a 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -434,6 +434,22 @@ class X2GoBroker(object): else: return False + def get_primary_group(self, username): + """\ + Get the primary group of a given user. + + @param username: get primary group for this username + @type username: C{unicode} + + @return: returns the name of the primary group + @rtype: C{unicode} + + """ + if self._import_nameservice_module(service=self.get_groupdb_service()): + return self.nameservice_module.X2GoBrokerNameService().get_primary_group(username) + else: + return False + def is_group_member(self, username, group, primary_groups=False): """\ Check if a user is member of a given group. diff --git a/x2gobroker/nameservices/base_nameservice.py b/x2gobroker/nameservices/base_nameservice.py index b6c53af..cf05c38 100644 --- a/x2gobroker/nameservices/base_nameservice.py +++ b/x2gobroker/nameservices/base_nameservice.py @@ -21,25 +21,23 @@ class X2GoBrokerNameService(object): def has_user(self, username): - return username in self.get_users() + return unicode(username) in self.get_users() def get_users(self): return [] def get_primary_group(self, username): - return [] + return u'' def has_group(self, group): - return group in self.get_groups() + return unicode(group) in self.get_groups() def get_groups(self): return [] def is_group_member(self, username, group, primary_groups=False): - _groups = self.get_group_members(group) - if primary_groups: - _groups.extend(self.get_primary_group(username)) - return username in _groups + _members = self.get_group_members(group, primary_groups=primary_groups) + return unicode(username) in _members def get_group_members(self, group, primary_groups=False): return [] @@ -48,5 +46,5 @@ class X2GoBrokerNameService(object): _groups = [] for _group in self.get_groups(): if self.is_group_member(username=username, group=_group, primary_groups=primary_groups): - _groups.append(_group) + _groups.append(unicode(_group)) return _groups diff --git a/x2gobroker/nameservices/libnss_nameservice.py b/x2gobroker/nameservices/libnss_nameservice.py index c7a6e84..5f11f4c 100644 --- a/x2gobroker/nameservices/libnss_nameservice.py +++ b/x2gobroker/nameservices/libnss_nameservice.py @@ -29,20 +29,20 @@ import base_nameservice as base class X2GoBrokerNameService(base.X2GoBrokerNameService): def get_users(self): - return [ p.pw_name for p in pwd.getpwall() ] + return [ unicode(p.pw_name) for p in pwd.getpwall() ] def get_primary_group(self, username): - prim_gid_number = [ p.pw_gid for p in pwd.getpwall() if p.pw_name == username ] - return [ g.gr_name for g in grp.getgrall() if g.gr_gid in prim_gid_number ] + prim_gid_number = [ p.pw_gid for p in pwd.getpwall() if unicode(p.pw_name) == unicode(username) ][0] + return [ unicode(g.gr_name) for g in grp.getgrall() if g.gr_gid == prim_gid_number ][0] def get_groups(self): - return [ g.gr_name for g in grp.getgrall() ] + return [ unicode(g.gr_name) for g in grp.getgrall() ] def get_group_members(self, group, primary_groups=False): _members_from_primgroups = [] if primary_groups: for username in self.get_users(): - if group in self.get_primary_group(username): - _members_from_primgroups.append(group) - return grp.getgrnam(group).gr_mem + _members_from_primgroups + if unicode(group) == self.get_primary_group(username): + _members_from_primgroups.append(unicode(username)) + return [ unicode(u) for u in grp.getgrnam(group).gr_mem ] + _members_from_primgroups diff --git a/x2gobroker/nameservices/testsuite_nameservice.py b/x2gobroker/nameservices/testsuite_nameservice.py index e1e8173..a0ea7e2 100644 --- a/x2gobroker/nameservices/testsuite_nameservice.py +++ b/x2gobroker/nameservices/testsuite_nameservice.py @@ -21,38 +21,33 @@ # Python X2GoBroker modules import base_nameservice as base +_users = [ u'maja', u'willi', u'flip', u'kassandra', u'thekla' ] +_groups = { + u'male': [u'willi', u'flip'], + u'female': [u'maja', u'kassandra', u'thekla'], + u'bees': [u'maja', u'willi', u'kassandra'], + u'grasshoppers': [u'flip'], + u'spiders': [u'thekla'], +} + class X2GoBrokerNameService(base.X2GoBrokerNameService): def get_users(self): - return [ 'maja', 'willi', 'flip', 'kassandra', 'thekla' ] + return _users def get_primary_group(self, username): - return username + return unicode(username) def get_groups(self): - return [ 'male', 'female', 'bees', 'grasshoppers', 'spiders' ] + return _groups.keys() + _users def get_group_members(self, group, primary_groups=False): - _groups = [] - _dict = { - 'male': ['willi', 'flip'], - 'female': ['maja', 'kassandra', 'thekla'], - 'bees': ['maja', 'willi', 'kassandra'], - 'grasshoppers': ['flip'], - 'spiders': ['thekla'], - } - if group in _dict.keys(): - _groups.extend(_dict[group]) - _dict_prim = { - 'maja': 'maja', - 'willi': 'willi', - 'flip': 'flip', - 'kassandra': 'kassandra', - 'thekla': 'thekla', - } - if group in _dict_prim.keys() and primary_groups: - _groups.extend(_dict_prim[group]) - - return _groups + _members = [] + if group in _groups.keys(): + _members.extend(_groups[group]) + for username in self.get_users(): + if unicode(group) == self.get_primary_group(username): + _members.append(username) + return _members diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index 9abd1cc..14a9e21 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -203,6 +203,24 @@ enable = true self.assertTrue( ( 'root' not in base_backend.get_group_members('root') ) ) self.assertTrue( ( 'root' in base_backend.get_group_members('root', primary_groups=True) ) ) + def test_nameservicelibnss_primgroup(self): + _config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS) + _config_defaults.update({'base': {'enable': True, }, }) + _config = """ +[global] +default-user-db = libnss +default-group-db = libnss + +[base] +enable = true +""" + tf = tempfile.NamedTemporaryFile() + print >> tf, _config + tf.seek(0) + base_backend = base.X2GoBroker(config_file=tf.name) + self.assertTrue(type(base_backend.get_primary_group('root') in (type(''), type(u'')))) + self.assertTrue(type(unicode(base_backend.get_primary_group('root')) == u'root')) + def test_nameservice_nodefaultsinconfig(self): _config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS) _config = """ @@ -432,7 +450,9 @@ enable = true self.assertEqual(users, ['flip', 'kassandra', 'maja', 'thekla', 'willi']) groups = base_backend.get_groups() groups.sort() - self.assertEqual(groups, ['bees', 'female', 'grasshoppers', 'male', 'spiders']) + _expected_groups = ['bees', 'female', 'grasshoppers', 'male', 'spiders'] + ['flip', 'kassandra', 'maja', 'thekla', 'willi'] + _expected_groups.sort() + self.assertEqual(groups, _expected_groups) def test_checkprofileacls_group_simpletests(self): _config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS) 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). [View Less]

1 0

x2gobroker.git - build-main (branch) updated: 1652fda04d5ead18a5f891366b0d8aa47f90aebe
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 1652fda04d5ead18a5f891366b0d8aa47f90aebe (commit) from 2636bc9f7f5a7497712338de870bc3458a7437c5 (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: debian/… [View More]

1 0

x2gobroker.git - build-main (branch) updated: 8962ee55af016895cd725ecf59245c3020b3eed8
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 8962ee55af016895cd725ecf59245c3020b3eed8 (commit) from 8e3bdb8e8b0014ce0d0d4d81e763c31bc0656011 (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/… [View More]tests/runalltests.py | 2 +- x2gobroker/tests/test_broker_base.py | 2 +- x2gobroker/tests/test_broker_inifile.py | 2 +- x2gobroker/tests/test_broker_zeroconf.py | 2 +- x2gobroker/tests/test_web_plain_base.py | 2 +- x2gobroker/tests/test_web_plain_zeroconf.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gobroker/tests/runalltests.py b/x2gobroker/tests/runalltests.py index d2ead75..badc6cc 100644 --- a/x2gobroker/tests/runalltests.py +++ b/x2gobroker/tests/runalltests.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# +# # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index 5356e1f..9abd1cc 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# +# # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index dda93b1..acfb65f 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# +# # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py index 5f0832a..b417acf 100644 --- a/x2gobroker/tests/test_broker_zeroconf.py +++ b/x2gobroker/tests/test_broker_zeroconf.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# +# # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/x2gobroker/tests/test_web_plain_base.py b/x2gobroker/tests/test_web_plain_base.py index 613ab8c..fd5019c 100644 --- a/x2gobroker/tests/test_web_plain_base.py +++ b/x2gobroker/tests/test_web_plain_base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# +# # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py index 3bc09c9..53fe01e 100644 --- a/x2gobroker/tests/test_web_plain_zeroconf.py +++ b/x2gobroker/tests/test_web_plain_zeroconf.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# +# # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or 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). [View Less]

1 0

x2gobroker.git - build-main (branch) updated: 96019c8aaf5c5cf2d6587314232411b523dc73fd
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 96019c8aaf5c5cf2d6587314232411b523dc73fd (commit) from 83c2ca4146e9596397bd8da95d3acf369c18b4a2 (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/… [View More]config.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/x2gobroker/config.py b/x2gobroker/config.py index 90adbf8..c441a12 100644 --- a/x2gobroker/config.py +++ b/x2gobroker/config.py @@ -52,10 +52,10 @@ class X2GoBrokerConfigFile(object): """ defaultValues = { - 'none': { - 'none': 'empty', - }, - } + 'DEFAULT': { + 'none': 'empty', + }, + } write_user_config = False user_config_file = None @@ -77,10 +77,10 @@ class X2GoBrokerConfigFile(object): if x2gobroker.utils._checkConfigFileDefaults(defaults): self.defaultValues = defaults - # we purposefully do not inherit the ConfigParser class + # we purposefully do not inherit the C{ConfigParser} class # here as we do not want to run into name conflicts between # X2GoBroker config file options and method / property names in - # SafeConfigParser... This is a pre-cautious approach... + # C{ConfigParser}... This is a pre-cautious approach... self.iniConfig = ConfigParser.ConfigParser(self.defaultValues) self.iniConfig.optionxform = str @@ -126,7 +126,7 @@ class X2GoBrokerConfigFile(object): """\ Stores a value for a given section and key. - This methods affects a SafeConfigParser object held in + This methods affects a ConfigParser object held in RAM. No configuration file is affected by this method. To write the configuration to disk use the L{write()} method. @@ -150,17 +150,17 @@ class X2GoBrokerConfigFile(object): def _fill_defaults(self): """\ - Fills a C{SafeConfigParser} object with the default config file - values as pre-defined in Python X2GoBroker or. This SafeConfigParser + Fills a C{ConfigParser} object with the default config file + values as pre-defined in Python X2GoBroker or. This ConfigParser object is held in RAM. No configuration file is affected by this method. """ - for section, sectionvalue in [ (key, value) for (key, value) in self.defaultValues.items() if key.upper() != 'DEFAULT' ]: - for key, value in sectionvalue.items(): + for section, sectiondict in self.defaultValues.items(): + if section != 'DEFAULT' and not self.iniConfig.has_section(section): + self.iniConfig.add_section(section) + for key, value in sectiondict.items(): if self.iniConfig.has_option(section, key): continue - if not self.iniConfig.has_section(section): - self.iniConfig.add_section(section) self._storeValue(section, key, value) def update_value(self, section, key, value): @@ -183,7 +183,7 @@ class X2GoBrokerConfigFile(object): def write(self): """\ - Write the ini file modifications (SafeConfigParser object) from RAM to disk. + Write the ini file modifications (ConfigParser object) from RAM to disk. For writing the first of the C{config_files} specified on instance construction that is writable will be used. 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). [View Less]

1 0

x2gobroker.git - build-main (branch) updated: 6dfb975d5022d3124329fb01e6cf2bb00be7228b
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 6dfb975d5022d3124329fb01e6cf2bb00be7228b (commit) from 23151c4e7770fed744369f21d9f3a3979ba0f18b (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/… [View More]

1 0

x2gobroker.git - build-main (branch) updated: efadd7bc9a73ae99a0a537ec308a074666a085a0
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via efadd7bc9a73ae99a0a537ec308a074666a085a0 (commit) from 96019c8aaf5c5cf2d6587314232411b523dc73fd (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/… [View More]brokers/base_broker.py | 60 ++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 27 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 4ab60c8..caaf85c 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -196,15 +196,14 @@ class X2GoBroker(object): _acls = self.get_acl_defaults() _acls.update(acls) - _order = {} - _order['users'] = _order['groups'] = _order['clients'] = _acls['acl-any-order'] + _order[u'users'] = _order[u'groups'] = _order[u'clients'] = _acls[u'acl-any-order'] - try: _order['users'] = _acls['acl-users-order'] + try: _order[u'users'] = _acls[u'acl-users-order'] except KeyError: pass - try: _order['groups'] = _acls['acl-groups-order'] + try: _order[u'groups'] = _acls[u'acl-groups-order'] except KeyError: pass - try: _order['clients'] = _acls['acl-clients-order'] + try: _order[u'clients'] = _acls[u'acl-clients-order'] except KeyError: pass # to pass an ACL test, all three keys in the dict below have to be set to True @@ -225,62 +224,62 @@ class X2GoBroker(object): ### clients access is granted first, if that fails then we return False here... # FIXME: provide code for client based access control - if not _grant_availability['by_client']: + if not _grant_availability[u'by_client']: return False ### no user/group ACLs are in use, allow access then... - if len(_acls['acl-users-allow'] + _acls['acl-users-deny'] + _acls['acl-groups-allow'] + _acls['acl-groups-deny']) == 0: + if len(_acls[u'acl-users-allow'] + _acls[u'acl-users-deny'] + _acls[u'acl-groups-allow'] + _acls[u'acl-groups-deny']) == 0: return True ### CHECKING on a per-user basis... _allow_user_override = False _explicitly_deny_user = False - if len( _acls['acl-users-allow'] + _acls['acl-users-deny'] ) > 0: + if len( _acls[u'acl-users-allow'] + _acls[u'acl-users-deny'] ) > 0: _allow_user = False _deny_user = False - if username in _acls['acl-users-allow'] or 'ALL' in _acls['acl-users-allow']: + if username in _acls[u'acl-users-allow'] or u'ALL' in _acls[u'acl-users-allow']: _allow_user_override = True _allow_user = True - if username in _acls['acl-users-deny']: + if username in _acls[u'acl-users-deny']: _explicitly_deny_user = True - if _explicitly_deny_user or ('ALL' in _acls['acl-users-deny']): + if _explicitly_deny_user or (u'ALL' in _acls[u'acl-users-deny']): _deny_user = True - if _order['users'] == 'allow-deny': - _grant_availability['by_user'] = (_allow_user or _deny_user) and (_allow_user and (not _deny_user)) + if _order[u'users'] == 'allow-deny': + _grant_availability[u'by_user'] = (_allow_user or _deny_user) and (_allow_user and (not _deny_user)) else: - _grant_availability['by_user'] = (_allow_user or _deny_user) and ((not _deny_user) or _allow_user) + _grant_availability[u'by_user'] = (_allow_user or _deny_user) and ((not _deny_user) or _allow_user) # if a user has been granted access directly, then the corresponding session profile(s) # will be provided to him/her, it does not matter what the group acl will have to say to this... - if _grant_availability['by_user']: + if _grant_availability[u'by_user']: return True ### CHECKING on a per-group basis... - if len(_acls['acl-groups-allow'] + _acls['acl-groups-deny']) > 0: + if len(_acls[u'acl-groups-allow'] + _acls[u'acl-groups-deny']) > 0: _allow_group = False _deny_group = False - _user_groups = ['ALL'] + self.get_user_groups(username, primary_groups=True) + _user_groups = [u'ALL'] + self.get_user_groups(username, primary_groups=True) - _allow_group = bool(len(set(_user_groups).intersection( set(_acls['acl-groups-allow']) ))) - _deny_group = bool(len(set(_user_groups).intersection( set(_acls['acl-groups-deny']) ))) + _allow_group = bool(len(set(_user_groups).intersection( set(_acls[u'acl-groups-allow']) ))) + _deny_group = bool(len(set(_user_groups).intersection( set(_acls[u'acl-groups-deny']) ))) - if _order['groups'] == 'allow-deny': - _grant_availability['by_group'] = (_allow_group or _deny_group) and (_allow_group and (not _deny_group)) + if _order[u'groups'] == 'allow-deny': + _grant_availability[u'by_group'] = (_allow_group or _deny_group) and (_allow_group and (not _deny_group)) else: - _grant_availability['by_group'] = (_allow_group or _deny_group) and (not _deny_group) or _allow_group + _grant_availability[u'by_group'] = (_allow_group or _deny_group) and (not _deny_group) or _allow_group # if a group has been granted access, with one exception: if the thread model for users is # allow-deny, then we presume that the acl-users-deny entry has precendence over # acl-groups-allow/acl-groups-deny. - if (_grant_availability['by_group'] and not _explicitly_deny_user) or _allow_user_override: + if (_grant_availability[u'by_group'] and not _explicitly_deny_user) or _allow_user_override: return True return False @@ -583,18 +582,25 @@ class X2GoBroker(object): return list_of_profiles - def select_profile(self, profile_name='DEFAULT'): + def select_session(self, profile_id): """\ Start/resume a session by selecting a profile name offered by the X2Go client. The X2Go server that the session is launched on is selected automatically by the X2Go session broker. - @param profile_name: a dictionary object containing information on a selected session profile - @type profile_name: C{dict} + @param profile_id: the selected profile ID. This matches one of the dictionary keys offered by the C{list_profiles} method + @type profile_id: C{dict} """ - return {} + profile = self.get_profile(profile_id) + + selected_session = { + 'server': profile[u'host'], + 'port': profile[u'sshport'], + } + + return selected_session def change_password(self, new='', old=''): """\ 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). [View Less]

1 0

x2gobroker.git - build-main (branch) updated: 23151c4e7770fed744369f21d9f3a3979ba0f18b
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 23151c4e7770fed744369f21d9f3a3979ba0f18b (commit) from efadd7bc9a73ae99a0a537ec308a074666a085a0 (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/… [View More]

1 0

x2gobroker.git - build-main (branch) updated: 5b273ab1ecaf19c40ce1ea3de05290d5a7fc46cf
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 5b273ab1ecaf19c40ce1ea3de05290d5a7fc46cf (commit) from 6dfb975d5022d3124329fb01e6cf2bb00be7228b (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/… [View More]

1 0

x2gobroker.git - build-main (branch) updated: 8e3bdb8e8b0014ce0d0d4d81e763c31bc0656011
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 8e3bdb8e8b0014ce0d0d4d81e763c31bc0656011 (commit) from 5b273ab1ecaf19c40ce1ea3de05290d5a7fc46cf (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/… [View More]brokers/inifile_broker.py | 12 ++-- x2gobroker/tests/test_broker_inifile.py | 96 +++++++++++++++++++++++-------- 2 files changed, 78 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index 1ef5418..af33bf2 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -69,6 +69,10 @@ class X2GoBroker(base.X2GoBroker): def get_profile(self, profile_id): profile = self.session_profiles.get_section(profile_id) + profile_defaults = self.get_profile_defaults() + for key in profile_defaults.keys(): + if key not in profile.keys(): + profile.update({ key: profile_defaults[key] }) for key in profile.keys(): if key.startswith('acl-'): del profile[key] @@ -82,11 +86,7 @@ class X2GoBroker(base.X2GoBroker): for key in profile.keys(): if not key.startswith('acl-'): del profile[key] + if key.startswith('acl-') and (profile[key] == '' or profile[key] == ['']): + del profile[key] return profile - def select_profile(self, profile_name): - - selectprofile_output = { - 'server': 'localhost:22', - } - return selectprofile_output diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 0129d4d..dda93b1 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -85,37 +85,41 @@ fullscreen = true user = bar cmd = KDE fullscreen = true -acl-users-denied = ALL -acl-users-allowed = foo,bar +acl-users-deny = ALL +acl-users-allow = foo,bar acl-users-order = deny-allow """ tf = tempfile.NamedTemporaryFile() print >> tf, _session_profiles tf.seek(0) inifile_backend = inifile.X2GoBroker(profile_config_file=tf.name) - _expected_defaults = { - 'exports': '', - 'fullscreen': False, - 'width': 800, - 'height': 600, - 'applications': ['TERMINAL','WWWBROWSER',] - } + _expected_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_SESSIONPROFILE_DEFAULTS['DEFAULT']) + for key in copy.deepcopy(_expected_defaults).keys(): + if key.startswith('acl-'): + del _expected_defaults[key] + _expected_defaults.update( { + u'exports': '', + u'fullscreen': False, + u'width': 800, + u'height': 600, + u'applications': ['TERMINAL','WWWBROWSER',] + } ) _expected_profile1 = copy.deepcopy(_expected_defaults) _expected_profile1.update({ - 'user': 'foo', - 'cmd': 'GNOME', + u'user': 'foo', + u'cmd': 'GNOME', }) _expected_profile2 = copy.deepcopy(_expected_defaults) _expected_profile2.update({ - 'user': 'bar', - 'cmd': 'KDE', - 'fullscreen': True, + u'user': 'bar', + u'cmd': 'KDE', + u'fullscreen': True, }) _expected_profile3 = copy.deepcopy(_expected_defaults) _expected_profile3.update({ - 'user': 'bar', - 'cmd': 'KDE', - 'fullscreen': True, + u'user': 'bar', + u'cmd': 'KDE', + u'fullscreen': True, }) _profile1 = inifile_backend.get_profile('testprofile1') for key in _expected_profile1.keys(): @@ -172,17 +176,20 @@ acl-users-order = deny-allow _expected_acl_defaults = { 'acl-clients-deny': ['ALL'], 'acl-clients-allow': ['10.0.0.0/16','10.1.0.0/16','admin-1.intern','admin-2.intern'], + 'acl-any-order': 'deny-allow', } _expected_acls_profile1 = copy.deepcopy(_expected_acl_defaults) _expected_acls_profile2 = copy.deepcopy(_expected_acl_defaults) _expected_acls_profile2.update({ 'acl-clients-deny': ['10.0.2.0/24','ALL'], + 'acl-any-order': 'deny-allow', }) _expected_acls_profile3 = copy.deepcopy(_expected_acl_defaults) _expected_acls_profile3.update({ 'acl-users-deny': ['ALL'], 'acl-users-allow': ['foo','bar'], 'acl-users-order': 'deny-allow', + 'acl-any-order': 'deny-allow', }) _acls_profile1 = inifile_backend.get_profile_acls('testprofile1') for key in _expected_acls_profile1.keys(): @@ -329,14 +336,55 @@ fullscreen = true self.assertEqual(list_of_profiles['testprofile2']['cmd'], 'XFCE') self.assertEqual(list_of_profiles['testprofile3']['cmd'], 'KDE') - ### TEST: select_profile() method + ### TEST: select_session() method + + def test_sessionselection(self): + _config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS) + _config = """ +[global] +default-user-db = testsuite +default-group-db = testsuite -# def test_profileselection(self): -# _output = { -# 'server': 'localhost:22', -# } -# zeroconf_backend = x2gobroker.brokers.zeroconf.X2GoBroker() -# self.assertEqual(zeroconf_backend.select_profile('profile_bar'), _output) +[inifile] +enable = true +""" + tfc = tempfile.NamedTemporaryFile() + print >> tfc, _config + tfc.seek(0) + + _session_profiles = """ +[testprofile1] +name = TEST-1 +host = test-1.local + +[testprofile2] +name = TEST-2 +host = test-2.local + +[testprofile3] +name = TEST-3 +host = test-3.local +sshport = 44566 +""" + tfs = tempfile.NamedTemporaryFile() + print >> tfs, _session_profiles + tfs.seek(0) + inifile_backend = inifile.X2GoBroker(config_file=tfc.name, config_defaults=_config_defaults, profile_config_file=tfs.name) + _expected_result_1 = { + 'server': 'test-1.local', + 'port': 22, + } + _expected_result_2 = { + 'server': 'test-2.local', + 'port': 22, + } + _expected_result_3 = { + 'server': 'test-3.local', + 'port': 44566, + } + self.assertEqual(inifile_backend.select_session('TEST-1'), _expected_result_1) + self.assertEqual(inifile_backend.select_session('TEST-2'), _expected_result_2) + self.assertEqual(inifile_backend.select_session('TEST-3'), _expected_result_3) def test_suite(): 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). [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits May 2013