tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into archiving

Browse source
This commit is contained in:
Darko Poljak 2017-08-10 19:11:35 +02:00
commit 8bb70055f4
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cdist/conf/type/__user_groups/gencode-remote
View file

@ -59,8 +59,8 @@ for group in $changed_groups; do
esac esac
else else
case "$state_should" in case "$state_should" in
present) echo "gpasswd -a \"$group\" \"$user\"" ;; present) echo "gpasswd -a \"$user\" \"$group\"" ;;
absent) echo "gpasswd -d \"$group\" \"$user\"" ;; absent) echo "gpasswd -d \"$user\" \"$group\"" ;;
esac esac
fi fi
done done

10
cdist/core/cdist_object.py
View file

@ -21,9 +21,7 @@
# #
# #
import fnmatch
import os import os
import collections
import cdist import cdist
import cdist.core import cdist.core
@ -142,9 +140,13 @@ class CdistObject(object):
if '//' in self.object_id: if '//' in self.object_id:
raise IllegalObjectIdError( raise IllegalObjectIdError(
self.object_id, 'object_id may not contain //') self.object_id, 'object_id may not contain //')
if self.object_id == '.':
_invalid_object_ids = ('.', '/', )
for ioid in _invalid_object_ids:
if self.object_id == ioid:
raise IllegalObjectIdError( raise IllegalObjectIdError(
self.object_id, 'object_id may not be a .') self.object_id,
'object_id may not be a {}'.format(ioid))
# If no object_id and type is not singleton => error out # If no object_id and type is not singleton => error out
if not self.object_id and not self.cdist_type.is_singleton: if not self.object_id and not self.cdist_type.is_singleton:

7
cdist/test/cdist_object/__init__.py
View file

@ -147,6 +147,13 @@ class ObjectIdTestCase(test.CdistTestCase):
core.CdistObject(cdist_type, self.object_base_path, core.CdistObject(cdist_type, self.object_base_path,
OBJECT_MARKER_NAME, illegal_object_id) OBJECT_MARKER_NAME, illegal_object_id)
def test_object_id_equals_slash(self):
cdist_type = core.CdistType(type_base_path, '__third')
illegal_object_id = '/'
with self.assertRaises(core.IllegalObjectIdError):
core.CdistObject(cdist_type, self.object_base_path,
OBJECT_MARKER_NAME, illegal_object_id)
def test_object_id_on_singleton_type(self): def test_object_id_on_singleton_type(self):
cdist_type = core.CdistType(type_base_path, '__test_singleton') cdist_type = core.CdistType(type_base_path, '__test_singleton')
illegal_object_id = 'object_id' illegal_object_id = 'object_id'