Skip to content

Commit 5da0c7b

Browse files
committed
Apply restrictions to all challenges
1 parent f2d631a commit 5da0c7b

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

src/common/helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ async function checkCreateAccess (authUser, memberId, challengeDetails) {
550550
* @param {Object} authUser the user
551551
* @param {Array} resources the challenge resources
552552
*/
553-
const getChallengeAccessLevel = async (authUser, challengeId) => {
553+
async function getChallengeAccessLevel (authUser, challengeId) {
554554
if (authUser.isMachine) {
555555
return { hasFullAccess: true }
556556
}

src/services/ArtifactService.js

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,9 @@ async function downloadArtifact (authUser, submissionId, fileName) {
4444
// Check the validness of Submission ID
4545
const submission = await HelperService._checkRef({ submissionId })
4646

47-
let challenge
48-
try {
49-
challenge = await commonHelper.getChallenge(submission.challengeId)
50-
} catch (e) {
51-
throw new errors.NotFoundError(`Could not load challenge: ${submission.challengeId}.\n Details: ${_.get(e, 'message')}`)
52-
}
53-
5447
const { hasFullAccess, isSubmitter, hasNoAccess } = await commonHelper.getChallengeAccessLevel(authUser, submission.challengeId)
5548

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

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

97-
let challenge
98-
try {
99-
challenge = await commonHelper.getChallenge(submission.challengeId)
100-
} catch (e) {
101-
throw new errors.NotFoundError(`Could not load challenge: ${submission.challengeId}.\n Details: ${_.get(e, 'message')}`)
102-
}
103-
10490
const { hasFullAccess, isSubmitter, hasNoAccess } = await commonHelper.getChallengeAccessLevel(authUser, submission.challengeId)
10591

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

0 commit comments

Comments
 (0)