Skip to content
Snippets Groups Projects
Commit 6c45bb40 authored by sveseli's avatar sveseli
Browse files

fixing download permission issue

parent 6c2413fa
No related branches found
No related tags found
No related merge requests found
...@@ -196,9 +196,6 @@ class LdapLinuxPlatformUtility: ...@@ -196,9 +196,6 @@ class LdapLinuxPlatformUtility:
raise InternalError(exception=ex) raise InternalError(exception=ex)
@classmethod @classmethod
def createLocalGroup(cls, name):
""" Create local group if it does not exist. """
@classmethod
def createLocalGroup(cls, name): def createLocalGroup(cls, name):
""" Create local group if it does not exist. """ """ Create local group if it does not exist. """
logger = cls.getLogger() logger = cls.getLogger()
......
...@@ -64,8 +64,10 @@ class FileRestApi(DsRestApi): ...@@ -64,8 +64,10 @@ class FileRestApi(DsRestApi):
if experimentFilePath: if experimentFilePath:
src = '%s/%s' % (src, experimentFilePath) src = '%s/%s' % (src, experimentFilePath)
dest = destDirectory dest = destDirectory
fileTransfer = RsyncFileTransfer(src=src, dest=dest) rsyncPath = '/tmp/rsync.%s.%s' % (username, experimentName)
flags = '-arvlP --rsync-path="%s"' % rsyncPath
fileTransfer = RsyncFileTransfer(src=src, dest=dest, flags=flags)
self.logger.info('Executing file download on behalf of %s (experiment: %s)' % (username, experimentName)) self.logger.info('Executing file download on behalf of %s (experiment: %s)' % (username, experimentName))
fileTransfer.execute() fileTransfer.execute()
finally: finally:
......
...@@ -24,6 +24,7 @@ class ExperimentManager(Singleton): ...@@ -24,6 +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
FILE_PERMISSIONS_MODE = 0640 FILE_PERMISSIONS_MODE = 0640
DIR_PERMISSIONS_MODE = 0750 DIR_PERMISSIONS_MODE = 0750
...@@ -91,6 +92,17 @@ class ExperimentManager(Singleton): ...@@ -91,6 +92,17 @@ class ExperimentManager(Singleton):
experimentUsers = experiment.get('experimentUsernameList', []) experimentUsers = experiment.get('experimentUsernameList', [])
self.platformUtility.setGroupUsers(experimentName, experimentUsers) self.platformUtility.setGroupUsers(experimentName, experimentUsers)
def createRsyncScript(self, username, experimentName):
fileName = '/tmp/rsync.%s.%s.' % (username, experimentName)
f = open(fileName, 'w')
f.write('#!/bin/sh\n')
f.write('exec sg %s "rsync $*"\n' % experimentName)
f.close()
OsUtility.chmodPath(fileName, fileMode=self.RSYNC_SCRIPT_PERMISSIONS_MODE)
def deleteRsyncScript(self, username, experimentName):
fileName = '/tmp/rsync.%s.%s.' % (username, experimentName)
OsUtility.removeFile(fileName)
def authorizeDownload(self, username, experimentName): def authorizeDownload(self, username, experimentName):
experiment = self.experimentDbApi.getExperimentByName(experimentName) experiment = self.experimentDbApi.getExperimentByName(experimentName)
storageDirectory = self.updateExperimentWithStorageDataDirectory(experiment) storageDirectory = self.updateExperimentWithStorageDataDirectory(experiment)
...@@ -98,6 +110,7 @@ class ExperimentManager(Singleton): ...@@ -98,6 +110,7 @@ class ExperimentManager(Singleton):
self.platformUtility.addLocalUserToGroup(username, experimentName) self.platformUtility.addLocalUserToGroup(username, experimentName)
else: else:
raise InvalidRequest('Experiment %s has not been started.' % experimentName) raise InvalidRequest('Experiment %s has not been started.' % experimentName)
self.createRsyncScript(username, experimentName)
return experiment return experiment
def deauthorizeDownload(self, username, experimentName): def deauthorizeDownload(self, username, experimentName):
...@@ -107,6 +120,7 @@ class ExperimentManager(Singleton): ...@@ -107,6 +120,7 @@ class ExperimentManager(Singleton):
self.platformUtility.deleteLocalUserFromGroup(username, experimentName) self.platformUtility.deleteLocalUserFromGroup(username, experimentName)
else: else:
raise InvalidRequest('Experiment %s has not been started.' % experimentName) raise InvalidRequest('Experiment %s has not been started.' % experimentName)
self.deleteRsyncScript(username, experimentName)
return experiment return experiment
def createExperimentGroup(self, experiment): def createExperimentGroup(self, experiment):
......
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