From bf60724634dcf8a8bd49320b6a5ed157cd8cb1c2 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 13 Nov 2015 17:04:52 +0000
Subject: [PATCH] fix for subdirectory permission issue
---
src/python/dm/common/utility/ldapLinuxPlatformUtility.py | 2 +-
.../dm/ds_web_service/service/impl/experimentManager.py | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/python/dm/common/utility/ldapLinuxPlatformUtility.py b/src/python/dm/common/utility/ldapLinuxPlatformUtility.py
index ab16c71e..7e498d90 100755
--- a/src/python/dm/common/utility/ldapLinuxPlatformUtility.py
+++ b/src/python/dm/common/utility/ldapLinuxPlatformUtility.py
@@ -223,5 +223,5 @@ class LdapLinuxPlatformUtility:
if __name__ == '__main__':
utility = LdapLinuxPlatformUtility('ldaps://dmid-vm.xray.aps.anl.gov:636', 'uid=dmadmin,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov', '/tmp/ldapPassword', groupDnFormat='cn=%s,ou=DM,ou=Group,o=aps.anl.gov,dc=aps,dc=anl,dc=gov', minGidNumber=66000)
- print utility.getGroupInfo(u'test24')
+ print utility.getGroupInfo(u'satija201510')
diff --git a/src/python/dm/ds_web_service/service/impl/experimentManager.py b/src/python/dm/ds_web_service/service/impl/experimentManager.py
index 3dbeda7e..2fc3d0af 100755
--- a/src/python/dm/ds_web_service/service/impl/experimentManager.py
+++ b/src/python/dm/ds_web_service/service/impl/experimentManager.py
@@ -140,6 +140,11 @@ class ExperimentManager(Singleton):
OsUtility.chmodPath(filePath, fileMode=self.FILE_PERMISSIONS_MODE)
self.logger.debug('Changing group owner for %s to %s' % (filePath, experimentName))
self.platformUtility.changePathGroupOwner(filePath, experimentName)
+ dirPath = os.path.dirname(filePath)
+ if dirPath != storageDirectory:
+ self.logger.debug('Changing group owner for experiment subdirectory %s to %s' % (dirPath, experimentName))
+ self.platformUtility.changePathGroupOwner(dirPath, experimentName)
+
self.logger.debug('Processing file %s' % filePath)
self.fileProcessingManager.processFile(fileInfo)
else:
--
GitLab