Filter out broken matches which are no challenges

(fixes juice-shop/juice-shop-ctf#112)
oguzhalit · Sep 15, 2021 · 8e1395d · 8e1395d
1 parent 69059a3
commit 8e1395d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/routes/vulnCodeSnippet.ts b/routes/vulnCodeSnippet.ts
@@ -141,7 +141,7 @@ exports.serveCodeSnippet = () => async (req: Request<SnippetRequestBody, {}, {}>
 exports.challengesWithCodeSnippet = () => async (req: Request, res: Response, next: NextFunction) => { // TODO Split off function for actual detection and reuse in codingChallengeFixesSpec
  const match = /vuln-code-snippet start .*/
  const matches = await fileSniff(SNIPPET_PATHS, match)
- const challenges = matches.map(m => m.match.trim().substr(26).trim()).join(' ').split(' ')
+ const challenges = matches.map(m => m.match.trim().substr(26).trim()).join(' ').split(' ').filter(c => c.endsWith('Challenge'))
  res.json({ challenges })
 }
 

diff --git a/test/server/codingChallengeFixesSpec.ts b/test/server/codingChallengeFixesSpec.ts
@@ -15,24 +15,20 @@ describe('codingChallengeFixes', () => {
  before(async () => {
  const match = /vuln-code-snippet start .*/
  const matches = await fileSniff(SNIPPET_PATHS, match)
- codingChallenges = matches.map(m => m.match.trim().substr(26).trim()).join(' ').split(' ')
+ codingChallenges = matches.map(m => m.match.trim().substr(26).trim()).join(' ').split(' ').filter(c => c.endsWith('Challenge'))
  })
 
  it('should have a correct fix for each coding challenge', async () => {
  for (const challenge of codingChallenges) {
- if (challenge.endsWith('Challenge')) {
- const fixes = readFixes(challenge)
- expect(fixes.correct, `Coding challenge ${challenge} does not have a correct fix file`).to.be.greaterThan(-1)
- }
+ const fixes = readFixes(challenge)
+ expect(fixes.correct, `Coding challenge ${challenge} does not have a correct fix file`).to.be.greaterThan(-1)
  }
  })
 
  it('should have a total of three or more fix options for each coding challenge', async () => {
  for (const challenge of codingChallenges) {
- if (challenge.endsWith('Challenge')) {
- const fixes = readFixes(challenge)
- expect(fixes.fixes.length, `Coding challenge ${challenge} does not have enough fix option files`).to.be.greaterThanOrEqual(3)
- }
+ const fixes = readFixes(challenge)
+ expect(fixes.fixes.length, `Coding challenge ${challenge} does not have enough fix option files`).to.be.greaterThanOrEqual(3)
  }
  })
 })