From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 12 Dec 2007 15:43:35 +0000 (+0000)
Subject: protect against, and log unknown user or group
X-Git-Tag: NodeManager-1.6-1~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ca573a9fe347091f0d7b1d4e493cbc955afb9c37;hp=73402670197b77b74f870323acddca6267a0930c;p=nodemanager.git

protect against, and log unknown user or group
---

diff --git a/conf_files.py b/conf_files.py
index 4903b3f..c5d5924 100644
--- a/conf_files.py
+++ b/conf_files.py
@@ -39,8 +39,16 @@ class conf_files:
         if dest == '/etc/proper/propd.conf': return
         err_cmd = cf_rec['error_cmd']
         mode = string.atoi(cf_rec['file_permissions'], base=8)
-        uid = pwd.getpwnam(cf_rec['file_owner'])[2]
-        gid = grp.getgrnam(cf_rec['file_group'])[2]
+        try:
+            uid = pwd.getpwnam(cf_rec['file_owner'])[2]
+        except:
+            logger.log('conf_files: cannot find user %s -- %s not updated'%(cf_rec['file_owner'],dest))
+            return
+        try:
+            gid = grp.getgrnam(cf_rec['file_group'])[2]
+        except:
+            logger.log('conf_files: cannot find group %s -- %s not updated'%(cf_rec['file_group'],dest))
+            return
         url = 'https://%s/%s' % (self.config.PLC_BOOT_HOST, cf_rec['source'])
         try:
             contents = curlwrapper.retrieve(url, self.config.cacert)