Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/common/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ async function checkCreateAccess (authUser, memberId, challengeDetails) {
* @param {Object} authUser the user
* @param {Array} resources the challenge resources
*/
const getChallengeAccessLevel = async (authUser, challengeId) => {
async function getChallengeAccessLevel (authUser, challengeId) {
if (authUser.isMachine) {
return { hasFullAccess: true }
}
Expand Down
18 changes: 2 additions & 16 deletions src/services/ArtifactService.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,9 @@ async function downloadArtifact (authUser, submissionId, fileName) {
// Check the validness of Submission ID
const submission = await HelperService._checkRef({ submissionId })

let challenge
try {
challenge = await commonHelper.getChallenge(submission.challengeId)
} catch (e) {
throw new errors.NotFoundError(`Could not load challenge: ${submission.challengeId}.\n Details: ${_.get(e, 'message')}`)
}

const { hasFullAccess, isSubmitter, hasNoAccess } = await commonHelper.getChallengeAccessLevel(authUser, submission.challengeId)

if (hasNoAccess || (isSubmitter && challenge.isMM && submission.memberId.toString() !== authUser.userId.toString())) {
if (hasNoAccess || (isSubmitter && submission.memberId.toString() !== authUser.userId.toString())) {
throw new errors.HttpStatusError(403, 'You are not allowed to download this submission artifact.')
}

Expand Down Expand Up @@ -94,16 +87,9 @@ async function listArtifacts (authUser, submissionId) {
// Check the validness of Submission ID
const submission = await HelperService._checkRef({ submissionId })

let challenge
try {
challenge = await commonHelper.getChallenge(submission.challengeId)
} catch (e) {
throw new errors.NotFoundError(`Could not load challenge: ${submission.challengeId}.\n Details: ${_.get(e, 'message')}`)
}

const { hasFullAccess, isSubmitter, hasNoAccess } = await commonHelper.getChallengeAccessLevel(authUser, submission.challengeId)

if (hasNoAccess || (isSubmitter && challenge.isMM && submission.memberId.toString() !== authUser.userId.toString())) {
if (hasNoAccess || (isSubmitter && submission.memberId.toString() !== authUser.userId.toString())) {
throw new errors.HttpStatusError(403, 'You are not allowed to access this submission artifact.')
}

Expand Down