522 Commits
Author SHA1 Message Date
Jannik Hollenbach 638e20d381 Fix themes not getting applied properly
Signed-off-by: Jannik Hollenbach <[email protected]>
2025-04-06 20:48:47 +02:00
Jannik Hollenbach 50d3eef627 Use simpler, recommended angular polyfil mechanism
Signed-off-by: Jannik Hollenbach <[email protected]>
2025-04-02 22:13:33 +02:00
Jannik Hollenbach 8204a3998c Update all easily recognisable node.js native imports to be properly prefixed as recommended by node.js
Signed-off-by: Jannik Hollenbach <[email protected]>
2025-03-31 21:41:59 +02:00
Jannik Hollenbach 49b88673b4 Update login insecurity to import 2025-03-23 15:36:44 +01:00
Jannik Hollenbach 0c214e01fb Update data export insecurity to import
Signed-off-by: Jannik Hollenbach <[email protected]>
2025-03-23 15:21:49 +01:00
Jannik Hollenbach ba6d4d20c2 Update coupon insecurity to import
Signed-off-by: Jannik Hollenbach <[email protected]>
2025-03-23 15:05:46 +01:00
Jannik Hollenbach c25e131fd2 Migrate 2fa to import insecurity using esm
Properly sets the optional attributes as optional

Signed-off-by: Jannik Hollenbach <[email protected]>
2025-03-23 14:46:43 +01:00
Jannik Hollenbach e10a6a9e54 Update more requires in tests
Signed-off-by: Jannik Hollenbach <[email protected]>
2025-03-23 12:24:21 +01:00
Jannik Hollenbach 23d4deca75 Drop undicy import
Acutally already included in by default in node 18.0.0 which is the oldest version we support

Signed-off-by: Jannik Hollenbach <[email protected]>
2025-03-22 20:51:11 +01:00
Jannik Hollenbach 2115dc7c3f Migrate webhook to use fetch too
Signed-off-by: Jannik Hollenbach <[email protected]>
2025-03-22 20:16:52 +01:00
Jannik Hollenbach 7c071b8ce5 Make challengeKey typesafe to migrate datacache imports in tests to import
Signed-off-by: Jannik Hollenbach <[email protected]>
2025-03-22 19:00:17 +01:00
Jannik Hollenbach 2a0082d996 Update remaining challenge util imports 2025-03-17 21:16:45 +01:00
Björn Kimminich c9a3aed0e1 Add "Memory Bomb" to coupled file upload challenges 2025-03-06 21:47:09 +01:00
Aleksandar Zivkovic aa917bbb57 fix tutorial.js being bundled into main.js
- add precondition whether tutorial.js exists in frontend/dist/frontend
- define default implementation for
 - hasInstuctions & startHackingInstructorFor
- use async ngOnInit to lazy load hasInstructions and startHackingInstructorFor from '**/hacking-instructor' then overwrite the above-mentioned default implementation

fixes issue #2317

Signed-off-by: Aleksandar Zivkovic <[email protected]>
2025-01-04 01:41:15 +01:00
Björn Kimminich 623fc01582 Update copyright to include 2025 2025-01-01 19:37:26 +01:00
Bjoern Kimminich a0b64f98bd Swap out abandoned placekitten.com usage
(with similar placecats.com)
2024-12-10 18:27:01 +01:00
Jannik Hollenbach 074b8aa02e Fix incorrect / outdates documentation links
Signed-off-by: Jannik Hollenbach <[email protected]>
2024-11-19 19:56:31 +01:00
Bjoern Kimminich f189af0628 Merge branch 'master' into develop
# Conflicts:
#	Dockerfile
#	frontend/package.json
#	package.json
2024-04-22 15:33:58 +02:00
Bjoern Kimminich 992780c17c Make property access null-safe 2024-04-22 14:21:07 +02:00
Jannik Hollenbach 4d55b43c9d Merge pull request #2205 from juice-shop/feat/csaf-chal 2024-04-02 00:03:12 +02:00
Jannik Hollenbach 9a7fdd66fc Switch e2e tests to use a more clear wordings
Hard to understand what not disabledEnv is supposed to mean
2024-03-10 10:47:48 +01:00
Jannik Hollenbach d7a4dac0c6 Refactor safetyMode setting 2024-03-10 10:31:50 +01:00
Timo Pagel 3292776cec feat: add csaf 2024-03-09 10:37:21 +01:00
Pratham Agarwal 771971bf22 fix: refactored code 2024-02-26 18:49:10 +05:30
Pratham Agarwal 92f37dce46 fix: issue with auto & off keyword for docker 2024-01-31 01:35:23 +05:30
Pratham Agarwal ed5e4929bb fix: lint issues 2024-01-30 00:19:22 +05:30
Pratham Agarwal 10729f7abd fix: auto keyword 2024-01-29 23:59:21 +05:30
Pratham Agarwal f5717f18ec Merge branch 'develop' into alpha/patch 2024-01-28 02:03:06 +05:30
Pratham Agarwal 52785b1b24 feat:added enum functionality 2024-01-28 01:44:08 +05:30
Pratham Agarwal 38b3e23f52 resolves issue #2174 2024-01-27 00:53:16 +05:30
Bjoern Kimminich b7812ac2e1 Fix all @typescript-eslint/restrict-template-expressions warnings 2024-01-24 13:56:01 +01:00
Björn Kimminich 99c67ca4d4 Change dependency to glob 10.x 2024-01-21 20:35:02 +01:00
Björn Kimminich 7173d85315 Switch to promisable glob library 2024-01-18 22:26:08 +01:00
Jannik Hollenbach 3b9019b68c Use already defined type instead of redefining it 2024-01-16 21:28:47 +01:00
Jannik Hollenbach 91414d7e54 Simplify queryResultsToJson to be typeable
It seems this entire data values is not required?
All tests are still passing and it looks good?
2024-01-16 21:28:47 +01:00
Björn Kimminich e2f8e06662 Merge remote-tracking branch 'origin/develop' into develop 2024-01-14 23:41:16 +01:00
Björn Kimminich 41883d0660 Count expected interactions only once
(i.e. avoiding interaction spamming from reducing cheat score)
2024-01-14 23:39:01 +01:00
Jannik Hollenbach 90b5e05549 Properly use esm export for botUtils 2024-01-13 17:50:09 +01:00
Jannik Hollenbach ad622a561a Migrate remaining commonjs require in models to esm 2024-01-13 17:48:09 +01:00
Jannik Hollenbach 3e079fd3d4 Update last remaining requires in lib to esm 2024-01-13 16:33:05 +01:00
Jannik Hollenbach a3f344032d Migrate lib & startup func's to esm 2024-01-13 16:08:18 +01:00
Jannik Hollenbach 07574166bc Also migrate datacache import in botutils 2024-01-13 13:30:52 +01:00
Jannik Hollenbach 80b9de9c7d Migrate datacache to esm 2024-01-13 13:19:18 +01:00
Jannik Hollenbach 6ef153a88d Migrate html-entities imports to esm 2024-01-13 12:54:06 +01:00
Jannik Hollenbach 8ed0e9983d Use automatically generated model types
Requires us to have proper types around for the config as the manual types (incorrectly) had the additional properties of the config file set
2024-01-13 12:16:13 +01:00
Jannik Hollenbach 25580c585e StructuredClone is now natively supported and does cloning / unfreezing without hacks
https://developer.mozilla.org/en-US/docs/Web/API/structuredClone#browser_compatibility
2024-01-13 12:13:57 +01:00
Björn Kimminich 87beace18d Fix all restrict-plus-operands linting issues 2024-01-06 14:59:58 +01:00
Björn Kimminich 67a973780a Fix capping of final score 2024-01-05 17:59:36 +01:00
Björn Kimminich f3df9ea8f1 Add cap of 100% to challenge cheat score 2024-01-05 17:52:35 +01:00
Björn Kimminich d975426947 Multiply cheat score depending on lack of preceding interactions 2024-01-04 00:15:38 +01:00