girder 3.2.9.dev8__tar.gz → 3.2.9.dev12__tar.gz

{girder-3.2.9.dev8/girder.egg-info → girder-3.2.9.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder
-Version: 3.2.9.dev8
+Version: 3.2.9.dev12
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/api/v1/assetstore.py

@@ -82,12 +82,15 @@ class Assetstore(Resource):
                'ignore accessKeyId and secret.', dataType='boolean', required=False)
         .param('serverSideEncryption', 'Whether to use S3 SSE to encrypt the objects uploaded to '
                'this bucket (for S3 type).', dataType='boolean', required=False, default=False)
+        .param('allowS3AcceleratedTransfer', 'Whether to allow clients to requests a data '
+               'transfer using S3 transfer acceleration.', dataType='boolean', required=False,
+               default=False)
         .errorResponse()
         .errorResponse('You are not an administrator.', 403)
     )
     def createAssetstore(self, name, type, root, perms, db, mongohost, replicaset, bucket,
                          prefix, accessKeyId, secret, service, readOnly, region, inferCredentials,
-                         serverSideEncryption):
+                         serverSideEncryption, allowS3AcceleratedTransfer):
         if type == AssetstoreType.FILESYSTEM:
             self.requireParams({'root': root})
             return self._model.createFilesystemAssetstore(
@@ -101,7 +104,8 @@ class Assetstore(Resource):
             return self._model.createS3Assetstore(
                 name=name, bucket=bucket, prefix=prefix, secret=secret,
                 accessKeyId=accessKeyId, service=service, readOnly=readOnly, region=region,
-                inferCredentials=inferCredentials, serverSideEncryption=serverSideEncryption)
+                inferCredentials=inferCredentials, serverSideEncryption=serverSideEncryption,
+                allowS3AcceleratedTransfer=allowS3AcceleratedTransfer)
         else:
             raise RestException('Invalid type parameter')
 
@@ -181,12 +185,16 @@ class Assetstore(Resource):
                'ignore accessKeyId and secret.', dataType='boolean', required=False)
         .param('serverSideEncryption', 'Whether to use S3 SSE to encrypt the objects uploaded to '
                'this bucket (for S3 type).', dataType='boolean', required=False, default=False)
+        .param('allowS3AcceleratedTransfer', 'Whether to allow clients to requests a data '
+               'transfer using S3 transfer acceleration.', dataType='boolean', required=False,
+               default=False)
         .errorResponse()
         .errorResponse('You are not an administrator.', 403)
     )
     def updateAssetstore(self, assetstore, name, root, perms, db, mongohost, replicaset,
                          bucket, prefix, accessKeyId, secret, service, readOnly, region, current,
-                         inferCredentials, serverSideEncryption, params):
+                         inferCredentials, serverSideEncryption, allowS3AcceleratedTransfer,
+                         params):
         assetstore['name'] = name
         assetstore['current'] = current
 
@@ -214,6 +222,7 @@ class Assetstore(Resource):
             assetstore['region'] = region
             assetstore['inferCredentials'] = inferCredentials
             assetstore['serverSideEncryption'] = serverSideEncryption
+            assetstore['allowS3AcceleratedTransfer'] = allowS3AcceleratedTransfer
             if readOnly is not None:
                 assetstore['readOnly'] = readOnly
         else:

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/api/v1/file.py

@@ -73,12 +73,14 @@ class File(Resource):
                required=False)
         .param('assetstoreId', 'Direct the upload to a specific assetstore (admin-only).',
                required=False)
+        .jsonParam('uploadExtraParameters', 'Arbitrary data to send along with the upload request.',
+                   required=False)
         .errorResponse()
         .errorResponse('Write access was denied on the parent folder.', 403)
         .errorResponse('Failed to create upload.', 500)
     )
     def initUpload(self, parentType, parentId, name, size, mimeType, linkUrl, reference,
-                   assetstoreId):
+                   assetstoreId, uploadExtraParameters):
         """
         Before any bytes of the actual file are sent, a request should be made
         to initialize the upload. This creates the temporary record of the
@@ -120,7 +122,8 @@ class File(Resource):
                 # version upgrade.
                 upload = Upload().createUpload(
                     user=user, name=name, parentType=parentType, parent=parent, size=size,
-                    mimeType=mimeType, reference=reference, assetstore=assetstore)
+                    mimeType=mimeType, reference=reference, assetstore=assetstore,
+                    uploadExtraParameters=uploadExtraParameters)
             except OSError as exc:
                 if exc.errno == errno.EACCES:
                     raise GirderException(
@@ -128,7 +131,9 @@ class File(Resource):
                 raise
             if upload['size'] > 0:
                 if chunk:
-                    return Upload().handleChunk(upload, chunk, filter=True, user=user)
+                    return Upload().handleChunk(
+                        upload, chunk, filter=True, user=user,
+                        uploadExtraParameters=uploadExtraParameters)
 
                 return upload
             else:
@@ -195,13 +200,15 @@ class File(Resource):
         .modelParam('uploadId', paramType='formData', model=Upload)
         .param('offset', 'Offset of the chunk in the file.', dataType='integer',
                paramType='query', required=False, default=0)
+        .jsonParam('uploadExtraParameters', 'Arbitrary data to send along with the upload request.',
+                   required=False)
         .errorResponse(('ID was invalid.',
                         'Received too many bytes.',
                         'Chunk is smaller than the minimum size.'))
         .errorResponse('You are not the user who initiated the upload.', 403)
         .errorResponse('Failed to store upload.', 500)
     )
-    def readChunk(self, upload, offset, params):
+    def readChunk(self, upload, offset, uploadExtraParameters, params):
         """
         After the temporary upload record has been created (see initUpload),
         the bytes themselves should be passed up in ordered chunks. The user
@@ -231,7 +238,8 @@ class File(Resource):
                 'Server has received %s bytes, but client sent offset %s.' % (
                     upload['received'], offset))
         try:
-            return Upload().handleChunk(upload, chunk, filter=True, user=user)
+            return Upload().handleChunk(
+                upload, chunk, filter=True, user=user, uploadExtraParameters=uploadExtraParameters)
         except OSError as exc:
             if exc.errno == errno.EACCES:
                 raise Exception('Failed to store upload.')
@@ -254,8 +262,8 @@ class File(Resource):
         .param('contentDisposition', 'Specify the Content-Disposition response '
                'header disposition-type value.', required=False,
                enum=['inline', 'attachment'], default='attachment')
-        .param('extraParameters', 'Arbitrary data to send along with the download request.',
-               required=False)
+        .jsonParam('extraParameters', 'Arbitrary data to send along with the download request.',
+                   required=False)
         .errorResponse('ID was invalid.')
         .errorResponse('Read access was denied on the parent folder.', 403)
     )

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/api/v1/item.py

@@ -272,9 +272,9 @@ class Item(Resource):
                'header disposition-type value, only applied for single file '
                'items.', required=False, enum=['inline', 'attachment'],
                default='attachment')
-        .param('extraParameters', 'Arbitrary data to send along with the '
-               'download request, only applied for single file '
-               'items.', required=False)
+        .jsonParam('extraParameters', 'Arbitrary data to send along with the '
+                   'download request, only applied for single file '
+                   'items.', required=False)
         # single file items could produce other types, too.
         .produces(['application/zip', 'application/octet-stream'])
         .errorResponse('ID was invalid.')

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/models/assetstore.py

@@ -132,7 +132,7 @@ class Assetstore(Model):
 
     def createS3Assetstore(self, name, bucket, accessKeyId, secret, prefix='',
                            service='', readOnly=False, region=None, inferCredentials=False,
-                           serverSideEncryption=False):
+                           serverSideEncryption=False, allowS3AcceleratedTransfer=False):
         return self.save({
             'type': AssetstoreType.S3,
             'created': datetime.datetime.utcnow(),
@@ -145,7 +145,8 @@ class Assetstore(Model):
             'service': service,
             'region': region,
             'inferCredentials': inferCredentials,
-            'serverSideEncryption': serverSideEncryption
+            'serverSideEncryption': serverSideEncryption,
+            'allowS3AcceleratedTransfer': allowS3AcceleratedTransfer
         })
 
     def getCurrent(self):

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/models/file.py

@@ -86,7 +86,7 @@ class File(acl_mixin.AccessControlMixin, Model):
         :param contentDisposition: Content-Disposition response header
             disposition-type value.
         :type contentDisposition: str or None
-        :type extraParameters: str or None
+        :type extraParameters: dict or None
         """
         events.trigger('model.file.download.request', info={
             'file': file,

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/models/upload.py

@@ -106,7 +106,7 @@ class Upload(Model):
 
         return doc
 
-    def handleChunk(self, upload, chunk, filter=False, user=None):
+    def handleChunk(self, upload, chunk, filter=False, user=None, uploadExtraParameters=None):
         """
         When a chunk is uploaded, this should be called to process the chunk.
         If this is the final chunk of the upload, this method will finalize
@@ -126,6 +126,9 @@ class Upload(Model):
         :type filter: bool
         :param user: The current user. Only affects behavior if filter=True.
         :type user: dict or None
+        :param uploadExtraParameters: A dict of parameters that will be given to the assetstore
+            adapter for customization of the upload request.
+        :type uploadExtraParameters: Optional[dict]
         """
         from .assetstore import Assetstore
         from .file import File
@@ -134,7 +137,7 @@ class Upload(Model):
         assetstore = Assetstore().load(upload['assetstoreId'])
         adapter = assetstore_utilities.getAssetstoreAdapter(assetstore)
 
-        upload = adapter.uploadChunk(upload, chunk)
+        upload = adapter.uploadChunk(upload, chunk, uploadExtraParameters)
         if '_id' in upload or upload['received'] != upload['size']:
             upload = self.save(upload)
 
@@ -319,12 +322,12 @@ class Upload(Model):
             }
         if reference is not None:
             upload['reference'] = reference
-        upload = adapter.initUpload(upload)
+        upload = adapter.initUpload(upload, uploadExtraParameters=None)
         return self.save(upload)
 
     def createUpload(self, user, name, parentType, parent, size, mimeType=None,
                      reference=None, assetstore=None, attachParent=False,
-                     save=True):
+                     save=True, uploadExtraParameters=None):
         """
         Creates a new upload record, and creates its temporary file
         that the chunks will be written into. Chunks should then be sent
@@ -392,7 +395,7 @@ class Upload(Model):
         else:
             upload['userId'] = None
 
-        upload = adapter.initUpload(upload)
+        upload = adapter.initUpload(upload, uploadExtraParameters)
         if save:
             upload = self.save(upload)
         return upload

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/utility/abstract_assetstore_adapter.py

@@ -154,7 +154,7 @@ class AbstractAssetstoreAdapter:
             'total': None
         }
 
-    def initUpload(self, upload):
+    def initUpload(self, upload, uploadExtraParameters):
         """
         This must be called before any chunks are uploaded to do any
         additional behavior and optionally augment the upload document. The
@@ -166,7 +166,7 @@ class AbstractAssetstoreAdapter:
         """
         return upload
 
-    def uploadChunk(self, upload, chunk):
+    def uploadChunk(self, upload, chunk, uploadExtraParameters):
         """
         Call this method to process each chunk of an upload.
 
@@ -174,6 +174,9 @@ class AbstractAssetstoreAdapter:
         :type upload: dict
         :param chunk: The file object representing the chunk that was uploaded.
         :type chunk: file
+        :param uploadExtraParameters: A dict of parameters that will be given to the assetstore
+            adapter for customization of the upload request.
+        :type uploadExtraParameters: Optional[dict]
         :returns: Must return the upload document with any optional changes.
         """
         raise NotImplementedError('Must override processChunk in %s.' %
@@ -272,7 +275,7 @@ class AbstractAssetstoreAdapter:
         :param contentDisposition: Value for Content-Disposition response
             header disposition-type value.
         :type contentDisposition: str or None
-        :type extraParameters: str or None
+        :type extraParameters: dict or None
         """
         raise NotImplementedError('Must override downloadFile in %s.' %
                                   self.__class__.__name__)

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/utility/filesystem_assetstore_adapter.py

@@ -121,7 +121,7 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
             'total': None
         }
 
-    def initUpload(self, upload):
+    def initUpload(self, upload, uploadExtraParameters):
         """
         Generates a temporary file and sets its location in the upload document
         as tempFile. This is the file that the chunks will be appended to.
@@ -132,7 +132,7 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         upload['sha512state'] = _hash_state.serializeHex(sha512())
         return upload
 
-    def uploadChunk(self, upload, chunk):
+    def uploadChunk(self, upload, chunk, uploadExtraParameters):
         """
         Appends the chunk into the temporary file.
         """

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/utility/gridfs_assetstore_adapter.py

@@ -111,7 +111,7 @@ class GridFsAssetstoreAdapter(AbstractAssetstoreAdapter):
             self.chunkColl = 'Failed to configure'
             self.unavailable = True
 
-    def initUpload(self, upload):
+    def initUpload(self, upload, uploadExtraParameters):
         """
         Creates a UUID that will be used to uniquely link each chunk to
         """
@@ -119,7 +119,7 @@ class GridFsAssetstoreAdapter(AbstractAssetstoreAdapter):
         upload['sha512state'] = _hash_state.serializeHex(sha512())
         return upload
 
-    def uploadChunk(self, upload, chunk):
+    def uploadChunk(self, upload, chunk, uploadExtraParameters):
         """
         Stores the uploaded chunk in fixed-sized pieces in the chunks
         collection of this assetstore's database.

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/utility/s3_assetstore_adapter.py

@@ -11,7 +11,7 @@ import requests
 
 from girder import events, logger
 from girder.api.rest import setContentDisposition
-from girder.exceptions import GirderException, ValidationException
+from girder.exceptions import GirderException, RestException, ValidationException
 from girder.models.file import File
 from girder.models.folder import Folder
 from girder.models.item import Item
@@ -113,6 +113,17 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
                 self.assetstore['service'], self.assetstore.get('region'),
                 self.assetstore.get('inferCredentials'))
             self.client = S3AssetstoreAdapter._s3Client(self.connectParams)
+            if self.assetstore.get('allowS3AcceleratedTransfer', False):
+                acceleratedConnectParams = self.connectParams.copy()
+                acceleratedConnectParams['config'].s3 = {'use_accelerate_endpoint': True}
+                self.acceleratedClient = S3AssetstoreAdapter._s3Client(acceleratedConnectParams)
+
+    def _getClient(self, useAcceleratedTransfer):
+        if useAcceleratedTransfer:
+            if not self.assetstore.get('allowS3AcceleratedTransfer'):
+                raise RestException('Accelerated transfer is not allowed on this assetstore.')
+            return self.acceleratedClient
+        return self.client
 
     def _getRequestHeaders(self, upload):
         headers = {
@@ -134,8 +145,9 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
 
         See https://gist.github.com/gleicon/2b8acb9f9c0f22753eaac227ff997b34
         """
-        url = self.client.generate_presigned_url(*args, **kwargs)
-        if getattr(self.client, '_useGoogleAccessId', False):
+        client = self._getClient(kwargs.pop('useS3TransferAcceleration', False))
+        url = client.generate_presigned_url(*args, **kwargs)
+        if getattr(client, '_useGoogleAccessId', False):
             awskey, gskey = 'AWSAccessKeyId', 'GoogleAccessId'
             parsed = urllib.parse.urlparse(url)
             if awskey in urllib.parse.parse_qs(parsed.query):
@@ -147,7 +159,12 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
                     parsed[5]))
         return url
 
-    def initUpload(self, upload):
+    @staticmethod
+    def _getS3TransferAccelerationParam(extraParameters):
+        return isinstance(extraParameters, dict) \
+            and extraParameters.get('use_S3_transfer_acceleration', False)
+
+    def initUpload(self, upload, uploadExtraParameters):
         """
         Build the request required to initiate an authorized upload to S3.
         """
@@ -195,10 +212,13 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
             method = 'put_object'
             params['ContentLength'] = upload['size']
 
-        requestInfo['url'] = self._generatePresignedUrl(ClientMethod=method, Params=params)
+        useS3TransferAcceleration = self._getS3TransferAccelerationParam(uploadExtraParameters)
+
+        requestInfo['url'] = self._generatePresignedUrl(
+            ClientMethod=method, Params=params, useS3TransferAcceleration=useS3TransferAcceleration)
         return upload
 
-    def uploadChunk(self, upload, chunk):
+    def uploadChunk(self, upload, chunk, uploadExtraParameters):
         """
         Rather than processing actual bytes of the chunk, this will generate
         the signature required to upload the chunk. Clients that do not support
@@ -209,12 +229,14 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
             and S3 upload ID. If a normal chunk file-like object is passed,
             we will send the data to S3.
         """
+        useS3TransferAcceleration = self._getS3TransferAccelerationParam(uploadExtraParameters)
+
         if isinstance(chunk, str):
-            return self._clientUploadChunk(upload, chunk)
+            return self._clientUploadChunk(upload, chunk, useS3TransferAcceleration)
         else:
-            return self._proxiedUploadChunk(upload, chunk)
+            return self._proxiedUploadChunk(upload, chunk, useS3TransferAcceleration)
 
-    def _clientUploadChunk(self, upload, chunk):
+    def _clientUploadChunk(self, upload, chunk, useS3TransferAcceleration):
         """
         Clients that support direct-to-S3 upload behavior will go through this
         method by sending a normally-encoded form string as the chunk parameter,
@@ -238,7 +260,7 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
             'ContentLength': length,
             'UploadId': info['s3UploadId'],
             'PartNumber': info['partNumber']
-        })
+        }, useS3TransferAcceleration=useS3TransferAcceleration)
 
         upload['s3']['uploadId'] = info['s3UploadId']
         upload['s3']['partNumber'] = info['partNumber']
@@ -249,7 +271,7 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
 
         return upload
 
-    def _proxiedUploadChunk(self, upload, chunk):
+    def _proxiedUploadChunk(self, upload, chunk, useS3TransferAcceleration):
         """
         Clients that do not support direct-to-S3 upload behavior will go through
         this method by sending the chunk data as they normally would for other
@@ -285,7 +307,7 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
                 'ContentLength': size,
                 'UploadId': upload['s3']['uploadId'],
                 'PartNumber': upload['s3']['partNumber']
-            })
+            }, useS3TransferAcceleration=useS3TransferAcceleration)
 
             resp = requests.request(method='PUT', url=url, data=chunk, headers=headers)
             if resp.status_code not in (200, 201):
@@ -405,7 +427,11 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
         if contentDisposition == 'inline' and not file.get('imported'):
             params['ResponseContentDisposition'] = 'inline; filename="%s"' % file['name']
 
-        url = self._generatePresignedUrl(ClientMethod='get_object', Params=params)
+        useS3TransferAcceleration = self._getS3TransferAccelerationParam(extraParameters)
+
+        url = self._generatePresignedUrl(
+            ClientMethod='get_object', Params=params,
+            useS3TransferAcceleration=useS3TransferAcceleration)
 
         if headers:
             raise cherrypy.HTTPRedirect(url)

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/web_client/src/templates/widgets/editAssetstoreWidget.pug

@@ -60,6 +60,10 @@
               label
                 input#g-edit-s3-sse(type="checkbox")
                 | Server side encryption
+            .checkbox
+              label
+                input#g-edit-s3-accelerated-endpoint(type="checkbox")
+                | Allow S3 accelerated endpoint
         if assetstore.get('hasFiles')
           div
             i.icon-attention

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/web_client/src/templates/widgets/newAssetstore.pug

@@ -113,6 +113,10 @@
             label
               input#g-new-s3-sse(type="checkbox")
               | Server side encryption
+          .checkbox
+            label
+              input#g-new-s3-accelerated-endpoint(type="checkbox")
+              | Allow S3 accelerated endpoint
 
           p#g-new-s3-error.g-validation-failed-message
           input.g-new-assetstore-submit.btn.btn-sm.btn-primary(type="submit", value="Create")

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/web_client/src/views/widgets/EditAssetstoreWidget.js

@@ -126,7 +126,8 @@ fieldsMap[AssetstoreType.S3] = {
             region: this.$('#g-edit-s3-region').val(),
             readOnly: this.$('#g-edit-s3-readonly').is(':checked'),
             inferCredentials: this.$('#g-edit-s3-infercredentials').is(':checked'),
-            serverSideEncryption: this.$('#g-edit-s3-sse').is(':checked')
+            serverSideEncryption: this.$('#g-edit-s3-sse').is(':checked'),
+            allowS3AcceleratedTransfer: this.$('#g-edit-s3-accelerated-endpoint').is(':checked')
         };
     },
     set: function () {
@@ -142,6 +143,8 @@ fieldsMap[AssetstoreType.S3] = {
             (this.model.get('inferCredentials') ? 'checked' : undefined));
         this.$('#g-edit-s3-sse').attr('checked',
             (this.model.get('serverSideEncryption') ? 'checked' : undefined));
+        this.$('#g-edit-s3-accelerated-endpoint').attr('checked',
+            (this.model.get('allowS3AcceleratedTransfer') ? 'checked' : undefined));
     }
 };
 

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/girder/web_client/src/views/widgets/NewAssetstoreWidget.js

@@ -45,7 +45,8 @@ var NewAssetstoreWidget = View.extend({
                 region: this.$('#g-new-s3-region').val(),
                 readOnly: this.$('#g-new-s3-readonly').is(':checked'),
                 inferCredentials: this.$('#g-new-s3-infercredentials').is(':checked'),
-                serverSideEncryption: this.$('#g-new-s3-sse').is(':checked')
+                serverSideEncryption: this.$('#g-new-s3-sse').is(':checked'),
+                allowS3AcceleratedTransfer: this.$('#g-new-s3-accelerated-endpoint').is(':checked')
             });
         }
     },

{girder-3.2.9.dev8 → girder-3.2.9.dev12/girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder
-Version: 3.2.9.dev8
+Version: 3.2.9.dev12
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/plugins/jobs/girder_jobs/constants.py

@@ -6,6 +6,7 @@ JOB_HANDLER_LOCAL = 'jobs._local'
 
 # Scope used allow RESTful creation of girder job models
 REST_CREATE_JOB_TOKEN_SCOPE = 'jobs.rest.create_job'
+REST_LIST_JOB_TOKEN_SCOPE = 'jobs.rest.list_job'
 
 
 # integer enum describing job states. Note, no order is implied.

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/plugins/jobs/girder_jobs/job_rest.py

@@ -24,7 +24,7 @@ class Job(Resource):
         self.route('GET', ('typeandstatus', 'all',), self.allJobsTypesAndStatuses)
         self.route('GET', ('typeandstatus',), self.jobsTypesAndStatuses)
 
-    @access.public
+    @access.public(scope=constants.REST_LIST_JOB_TOKEN_SCOPE)
     @filtermodel(model=JobModel)
     @autoDescribeRoute(
         Description('List jobs for a given user.')
@@ -87,7 +87,7 @@ class Job(Resource):
         }
         return self._model.createJob(**params)
 
-    @access.admin
+    @access.user(scope=constants.REST_LIST_JOB_TOKEN_SCOPE)
     @filtermodel(model=JobModel)
     @autoDescribeRoute(
         Description('List all jobs.')
@@ -175,7 +175,7 @@ class Job(Resource):
     def deleteJob(self, job):
         self._model.remove(job)
 
-    @access.admin
+    @access.user(scope=constants.REST_LIST_JOB_TOKEN_SCOPE)
     @autoDescribeRoute(
         Description('Get types and statuses of all jobs')
         .errorResponse('Admin access was denied for the job.', 403)
@@ -183,7 +183,7 @@ class Job(Resource):
     def allJobsTypesAndStatuses(self):
         return self._model.getAllTypesAndStatuses(user='all')
 
-    @access.user
+    @access.user(scope=constants.REST_LIST_JOB_TOKEN_SCOPE)
     @autoDescribeRoute(
         Description('Get types and statuses of jobs of current user')
     )

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/plugins/jobs/plugin_tests/jobs_test.py

@@ -202,9 +202,9 @@ class JobsTestCase(base.TestCase):
         self.assertStatusOk(resp)
         self.assertEqual(len(resp.json), 0)
 
-        # User 1, as non site admin, should encounter http 403 (Forbidden)
+        # User 1, as non site admin, should still get an answer
         resp = self.request('/job/all', user=self.users[1])
-        self.assertStatus(resp, 403)
+        self.assertStatusOk(resp)
 
         # Not authenticated user should encounter http 401 (unauthorized)
         resp = self.request('/job/all')
@@ -446,9 +446,9 @@ class JobsTestCase(base.TestCase):
         self.jobModel.createJob(title='anonymous job', type='t5')
         self.jobModel.createJob(title='anonymous public job', type='t6', public=True)
 
-        # User 1, as non site admin, should encounter http 403 (Forbidden)
+        # User 1, as non site admin, should get an answer
         resp = self.request('/job/typeandstatus/all', user=self.users[1])
-        self.assertStatus(resp, 403)
+        self.assertStatusOk(resp)
 
         # Admin user gets all types and statuses
         resp = self.request('/job/typeandstatus/all', user=self.users[0])

{girder-3.2.9.dev8 → girder-3.2.9.dev12}/scripts/publicNames.txt

@@ -1104,6 +1104,7 @@ plugins
                     validTransitions
                     valid_transitions
                 REST_CREATE_JOB_TOKEN_SCOPE
+                REST_LIST_JOB_TOKEN_SCOPE
             job_rest
                 Job
                     allJobsTypesAndStatuses