Skip to content
Snippets Groups Projects
Commit 0d07db0e authored by sveseli's avatar sveseli
Browse files

got download working

parent 6c45bb40
No related branches found
No related tags found
No related merge requests found
...@@ -183,7 +183,7 @@ class LdapLinuxPlatformUtility: ...@@ -183,7 +183,7 @@ class LdapLinuxPlatformUtility:
return return
except Exception, ex: except Exception, ex:
raise InternalError(exception=ex) raise InternalError(exception=ex)
logger.debug('Adding user %s to group %s' % (username, groupName)) logger.debug('Removing user %s from group %s' % (username, groupName))
memberUidList2 = copy.copy(memberUidList) memberUidList2 = copy.copy(memberUidList)
memberUidList2.remove(username) memberUidList2.remove(username)
groupAttrs2 = copy.copy(groupAttrs) groupAttrs2 = copy.copy(groupAttrs)
...@@ -278,4 +278,8 @@ class LdapLinuxPlatformUtility: ...@@ -278,4 +278,8 @@ class LdapLinuxPlatformUtility:
if __name__ == '__main__': 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) 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'id8i-test02') print utility.getGroupInfo(u'id8i-test02')
utility.addLocalUserToGroup(u'sveseli', u'id8i-test02')
print utility.getGroupInfo(u'id8i-test02')
#utility.deleteLocalUserFromGroup(u'sveseli', u'id8i-test02')
#print utility.getGroupInfo(u'id8i-test02')
...@@ -24,7 +24,7 @@ class ExperimentManager(Singleton): ...@@ -24,7 +24,7 @@ class ExperimentManager(Singleton):
MANAGE_STORAGE_PERMISSIONS_KEY = 'managestoragepermissions' MANAGE_STORAGE_PERMISSIONS_KEY = 'managestoragepermissions'
PLATFORM_UTILITY_KEY = 'platformutility' PLATFORM_UTILITY_KEY = 'platformutility'
RSYNC_SCRIPT_PERMISSIONS_MODE = 0711 RSYNC_SCRIPT_PERMISSIONS_MODE = 0755
FILE_PERMISSIONS_MODE = 0640 FILE_PERMISSIONS_MODE = 0640
DIR_PERMISSIONS_MODE = 0750 DIR_PERMISSIONS_MODE = 0750
...@@ -93,17 +93,20 @@ class ExperimentManager(Singleton): ...@@ -93,17 +93,20 @@ class ExperimentManager(Singleton):
self.platformUtility.setGroupUsers(experimentName, experimentUsers) self.platformUtility.setGroupUsers(experimentName, experimentUsers)
def createRsyncScript(self, username, experimentName): def createRsyncScript(self, username, experimentName):
fileName = '/tmp/rsync.%s.%s.' % (username, experimentName) fileName = '/tmp/rsync.%s.%s' % (username, experimentName)
self.logger.debug('Creating rsync script %s' % (fileName))
f = open(fileName, 'w') f = open(fileName, 'w')
f.write('#!/bin/sh\n') f.write('#!/bin/sh\n')
f.write('exec sg %s "rsync $*"\n' % experimentName) f.write('exec sg %s "rsync $*"\n' % experimentName)
f.close() f.close()
OsUtility.chmodPath(fileName, fileMode=self.RSYNC_SCRIPT_PERMISSIONS_MODE) OsUtility.chmodPath(fileName, fileMode=self.RSYNC_SCRIPT_PERMISSIONS_MODE)
def deleteRsyncScript(self, username, experimentName): def deleteRsyncScript(self, username, experimentName):
fileName = '/tmp/rsync.%s.%s.' % (username, experimentName) fileName = '/tmp/rsync.%s.%s' % (username, experimentName)
self.logger.debug('Removing rsync script %s' % (fileName))
OsUtility.removeFile(fileName) OsUtility.removeFile(fileName)
def authorizeDownload(self, username, experimentName): def authorizeDownload(self, username, experimentName):
self.logger.debug('Authorizing download for %s from experiment %s' % (username, experimentName))
experiment = self.experimentDbApi.getExperimentByName(experimentName) experiment = self.experimentDbApi.getExperimentByName(experimentName)
storageDirectory = self.updateExperimentWithStorageDataDirectory(experiment) storageDirectory = self.updateExperimentWithStorageDataDirectory(experiment)
if os.path.exists(storageDirectory): if os.path.exists(storageDirectory):
...@@ -115,6 +118,7 @@ class ExperimentManager(Singleton): ...@@ -115,6 +118,7 @@ class ExperimentManager(Singleton):
def deauthorizeDownload(self, username, experimentName): def deauthorizeDownload(self, username, experimentName):
experiment = self.experimentDbApi.getExperimentByName(experimentName) experiment = self.experimentDbApi.getExperimentByName(experimentName)
self.logger.debug('De-authorizing download for %s from experiment %s' % (username, experimentName))
storageDirectory = self.updateExperimentWithStorageDataDirectory(experiment) storageDirectory = self.updateExperimentWithStorageDataDirectory(experiment)
if os.path.exists(storageDirectory): if os.path.exists(storageDirectory):
self.platformUtility.deleteLocalUserFromGroup(username, experimentName) self.platformUtility.deleteLocalUserFromGroup(username, experimentName)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment