Merge branch 'master' into develop

bkimminich · bkimminich · commit e201a495bab5 · 2025-02-16T21:43:22.000Z
# Conflicts:
#	frontend/src/assets/i18n/zh_TW.json
diff --git a/.mailmap b/.mailmap
@@ -4,18 +4,19 @@ Björn Kimminich <bjoern.kimminich@owasp.org> Bjoern Kimminich <bjoern.kimminich
 Björn Kimminich <bjoern.kimminich@owasp.org> Bjoern Kimminich <bjoern.kimminich@kuehne-nagel.com>
 Björn Kimminich <bjoern.kimminich@owasp.org> Björn Kimminich <bjoern.kimminich@gmx.de>
 Björn Kimminich <bjoern.kimminich@owasp.org> Björn Kimminich <bjoern.kimminich@kuehne-nagel.com>
-Björn Kimminich <bjoern.kimminich@owasp.org> bjoern.kimminich <bjoern.kimminich@kuehne-nagel.com>
 Björn Kimminich <bjoern.kimminich@owasp.org> Björn Kimminich <github.com@kimminich.de>
+Björn Kimminich <bjoern.kimminich@owasp.org> bjoern.kimminich <bjoern.kimminich@kuehne-nagel.com>
 CaptainFreak <patelshoeb4@gmail.com> CaptainFreak <captainfreak@localhost.localdomain>
+JamesCullum <5477111+JamesCullum@users.noreply.github.com> JamesCullum <JamesCullum@users.noreply.github.com>
 Jannik Hollenbach <Jannik.Hollenbach@iteratec.de> J12934 <13718901+J12934@users.noreply.github.com>
 Jannik Hollenbach <Jannik.Hollenbach@iteratec.de> Jannik Hollenbach <13718901+J12934@users.noreply.github.com>
+Jannik Hollenbach <Jannik.Hollenbach@iteratec.de> Jannik Hollenbach <jannik.hollenbach@iteratec.com>
 Jannik Hollenbach <Jannik.Hollenbach@iteratec.de> Jannik Hollenbach <jannik.hollenbach@iteratec.de>
 Jannik Hollenbach <Jannik.Hollenbach@iteratec.de> Jannik Hollenbach <jannik@hollenbach.de>
-Jannik Hollenbach <Jannik.Hollenbach@iteratec.de> Jannik Hollenbach <jannik.hollenbach@iteratec.com>
-JamesCullum <5477111+JamesCullum@users.noreply.github.com> JamesCullum <JamesCullum@users.noreply.github.com>
 MarcRler <marc.ruettler@live.de> Marc Rüttler <Marc.ruettler@live.de>
 MarcRler <marc.ruettler@live.de> MarcRler <mr144@hdm-stuttgart.de>
 Nat McHugh <nmchugh@inviqa.com> Nathaniel McHugh <nat@fishtrap.co.uk>
+Scar26 <mmatty26@gmail.com> Mohit Sharma <41830515+Scar26@users.noreply.github.com>
 Simon Basset <simon.basset.pro@gmail.com> Simon Basset <simon.basset@gmail.com>
 Supratik Das <rick.das08@gmail.com> Supratik Das <30755453+supra08@users.noreply.github.com>
 Timo Pagel <github@timo-pagel.de> Timo Pagel <gitlab@timo-pagel.de>
@@ -27,4 +28,3 @@ aaryan10 <aaryanbudhiraja2@gmail.com> Aaryan Budhiraja <31697449+aaryan01@users.
 agrawalarpit14 <agrawal.arpit14@gmail.com> Arpit Agrawal <35000671+agrawalarpit14@users.noreply.github.com>
 greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com> greenkeeper[bot] <23040076+greenkeeper[bot]@users.noreply.github.com>
 omerlh <omerl@soluto.com> Omer Levi Hevroni <omerl@soluto.com>
-Scar26 <mmatty26@gmail.com> Mohit Sharma <41830515+Scar26@users.noreply.github.com>
diff --git a/HALL_OF_FAME.md b/HALL_OF_FAME.md
@@ -1,18 +1,9 @@
 # Hall of Fame
 
-## Core Team
-
-- [Björn Kimminich](https://github.com/bkimminich) aka `bkimminich`
-  ([Project Leader](https://www.owasp.org/index.php/Projects/Project_Leader_Responsibilities))
-  [![Keybase PGP](https://img.shields.io/keybase/pgp/bkimminich)](https://keybase.io/bkimminich)
-- [Jannik Hollenbach](https://github.com/J12934) aka `J12934`
-- [Timo Pagel](https://github.com/wurstbrot) aka `wurstbrot`
-- [Shubham Palriwala](https://github.com/ShubhamPalriwala) aka `ShubhamPalriwala`
-
 ## GitHub Contributors
 
-As reported by [`git-stats -a -s '2014'`](https://www.npmjs.com/package/git-stats) analysis of `master` as of Wed, 07 Aug
-2024 after deduplication with `.mailmap`.
+As reported by [`git-stats -a -s '2014'`](https://www.npmjs.com/package/git-stats) analysis of `master` as of Thu, 30 Jan
+2025 after deduplication with `.mailmap`.
 
 ![Top git contributors](screenshots/git-stats.png)
 
diff --git a/README.md b/README.md
@@ -137,20 +137,22 @@ OWASP Juice Shop officially supports the following versions of
 [node.js LTS schedule](https://github.com/nodejs/LTS) as close as possible. Docker images and packaged distributions are
 offered accordingly.
 
-| node.js | Supported               | Tested                                                    | [Packaged Distributions](#packaged-distributions) | [Docker images](#docker-container) from `master` | [Docker images](#docker-container) from `develop` |
-|:--------|:------------------------|:----------------------------------------------------------|:--------------------------------------------------|:-------------------------------------------------|:--------------------------------------------------|
-| 23.x    | :x:                     | :x:                                                       |                                                   |                                                  |                                                   |
-| 22.x    | :heavy_check_mark:      | :heavy_check_mark:                                        | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     |                                                  |                                                   |
-| 21.x    | ( :heavy_check_mark:  ) | :heavy_check_mark:                                        | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     |                                                  |                                                   |
-| 20.x    | :heavy_check_mark:      | :heavy_check_mark:                                        | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     | `latest` (`linux/amd64`, `linux/arm64`)          | `snapshot` (`linux/amd64`, `linux/arm64`)         |
-| 19.x    | ( :heavy_check_mark: )  | :x:                                                       |                                                   |                                                  |                                                   |
-| 18.x    | :heavy_check_mark:      | :heavy_check_mark:                                        | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     |                                                  |                                                   |
-| <18.x   | :x:                     | :x:                                                       |                                                   |                                                  |                                                   |
+| node.js | Supported                | Tested             | [Packaged Distributions](#packaged-distributions) | [Docker images](#docker-container) from `master` | [Docker images](#docker-container) from `develop` |
+|:--------|:-------------------------|:-------------------|:--------------------------------------------------|:-------------------------------------------------|:--------------------------------------------------|
+| 23.x    | :x:                      | :x:                |                                                   |                                                  |                                                   |
+| 22.x    | :heavy_check_mark:*      | :heavy_check_mark: | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     |                                                  |                                                   |
+| 21.x    | ( :heavy_check_mark:*  ) | :heavy_check_mark: | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     |                                                  |                                                   |
+| 20.x    | :heavy_check_mark:       | :heavy_check_mark: | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     | `latest` (`linux/amd64`, `linux/arm64`)          | `snapshot` (`linux/amd64`, `linux/arm64`)         |
+| 19.x    | ( :heavy_check_mark: )   | :x:                |                                                   |                                                  |                                                   |
+| 18.x    | :heavy_check_mark:       | :heavy_check_mark: | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     |                                                  |                                                   |
+| <18.x   | :x:                      | :x:                |                                                   |                                                  |                                                   |
 
 Juice Shop is automatically tested _only on the latest `.x` minor version_ of each node.js version mentioned above!
 There is no guarantee that older minor node.js releases will always work with Juice Shop!
 Please make sure you stay up to date with your chosen version.
 
+\*=:warning: _There are no pre-built binaries for `libxmljs` available for Node.js versions greater than 20.x. In order to build Juice Shop from source locally, you need to have all C++ build tools installed that are needed to compile those binaries locally. In the packaged distributions theses binaries are already included. We are working on a pure JavaScript replacement of `libxmljs` in [#2421](https://github.com/juice-shop/juice-shop/issues/2421). Contributions are highly welcome!_
+
 ### Troubleshooting
 
 [![Gitter](http://img.shields.io/badge/gitter-join%20chat-1dce73.svg)](https://gitter.im/bkimminich/juice-shop)
@@ -225,14 +227,10 @@ about donations and how they are used here:
 
 ## Contributors
 
-The OWASP Juice Shop core project team are:
+The OWASP Juice Shop Project Leaders are:
 
-- [Björn Kimminich](https://github.com/bkimminich) aka `bkimminich`
-  ([Project Leader](https://www.owasp.org/index.php/Projects/Project_Leader_Responsibilities))
-  [![Keybase PGP](https://img.shields.io/keybase/pgp/bkimminich)](https://keybase.io/bkimminich)
+- [Björn Kimminich](https://github.com/bkimminich) aka `bkimminich` [![Keybase PGP](https://img.shields.io/keybase/pgp/bkimminich)](https://keybase.io/bkimminich)
 - [Jannik Hollenbach](https://github.com/J12934) aka `J12934`
-- [Timo Pagel](https://github.com/wurstbrot) aka `wurstbrot`
-- [Shubham Palriwala](https://github.com/ShubhamPalriwala) aka `ShubhamPalriwala`
 
 For a list of all contributors to the OWASP Juice Shop please visit our
 [HALL_OF_FAME.md](HALL_OF_FAME.md).
diff --git a/REFERENCES.md b/REFERENCES.md
@@ -320,22 +320,22 @@ mentioned or used!
 * :date: [OWASP Juice Shop 10th anniversary: Is it still fresh?](https://god.owasp.de/2024/program-detail.html?talk=talkOne) by Björn Kimminich, [German OWASP Day 2024](https://god.owasp.de/2024), 13.11.2024
 * [OWASP Juice Shop 10th anniversary: Is it still fresh?](https://opensecurityconference.org/conference/keynotes) keynote by Björn Kimminich, [Open Security Conference](https://opensecurityconference.org/), 04.10.2024
 * [DSOMM & Juice Shop User Day](https://owasp2024globalappsecsanfra.sched.com/event/1gk01/juice-shop-dsomm-user-day-2024) before [OWASP 2024 Global AppSec San Francisco](https://sf.globalappsec.org/) with Timo Pagel, Jannik Hollenbach & Björn Kimminich, 25.09.2024
-* [OWASP Juice Shop](https://owasp2024globalappsecsanfra.sched.com/event/1ivEu/owasp-juiceshop) talk in Project Track of [OWASP 2024 Global AppSec San Francisco](https://sf.globalappsec.org/) by Björn Kimminich, 27.09.2024
+* [OWASP Juice Shop](https://owasp2024globalappsecsanfra.sched.com/event/1ivEu/owasp-juiceshop) talk in Project Track of [OWASP 2024 Global AppSec San Francisco](https://sf.globalappsec.org/) by Björn Kimminich, 27.09.2024 ([YouTube](https://www.youtube.com/watch?v=1-2e-OpvV-Y))
 * [Brick your Juice Shop in 319 easy steps](https://www.meetup.com/owasp-hamburg-stammtisch/events/302138351/)
   by Jannik Hollenbach & Björn Kimminich, [69. OWASP Stammtisch Hamburg](https://owasp.org/www-chapter-germany/stammtische/hamburg/), 23.07.2024
 * [OWASP Juice Shop - An Open Source Software and security Fairytale](https://ndc-security.com/agenda/owasp-juice-shop-an-open-source-software-and-security-fairytale-09mg/09ko186cud8) by Björn Kimminich, [NDC Security 2024](https://ndc-security.com/), 11.01.2024
 
 #### 2023
 
 * [Juice Shop Training: Train the Trainer Edition](http://www.owaspbenelux.eu/program/training#Bj%C3%B6rn-Kimminich) with Björn Kimminich, [OWASP BeNeLux Days 2023](http://www.owaspbenelux.eu/). 24.11.2023
-* [OWASP Juice Shop - An Open Source Software (and security) Fairytale](http://www.owaspbenelux.eu/program/talks#Bj%C3%B6rn-Kimminich) by Björn Kimminich, [OWASP BeNeLux Days 2023](http://www.owaspbenelux.eu/). 23.11.2023 [YouTube](https://youtu.be/54caQ4g72oI)
+* [OWASP Juice Shop - An Open Source Software (and security) Fairytale](http://www.owaspbenelux.eu/program/talks#Bj%C3%B6rn-Kimminich) by Björn Kimminich, [OWASP BeNeLux Days 2023](http://www.owaspbenelux.eu/). 23.11.2023 ([YouTube](https://youtu.be/54caQ4g72oI))
 * [How Vulnerable is Juice Shop? A Secure Code Review of Insecure Code](https://www.nationalcybersummit.com/Program/2023-Agenda) by Joshua Beck, [National Cyber Summit 2023](https://www.nationalcybersummit.com/Home). 20.09.2023 
 * [Track keynote: OWASP Juice Shop](https://sikkerhetsfestivalen.no/program-2023) by Björn Kimminich, [Sikkerhetsfestivalen 2023](https://sikkerhetsfestivalen.no/). 29.08.2023
-* [Juice Shop Update³](https://god.owasp.de/2023/schedule/index.html) by Björn Kimminich, [German OWASP Day 2023](https://god.owasp.de/2023). 31.05.2023 [YouTube](https://youtu.be/87DuRYwXtxk)
+* [Juice Shop Update³](https://god.owasp.de/2023/schedule/index.html) by Björn Kimminich, [German OWASP Day 2023](https://god.owasp.de/2023). 31.05.2023 ([YouTube](https://youtu.be/87DuRYwXtxk))
 * [Juice Shop Training: Train the Trainer Edition](https://god.owasp.de/2023/schedule/index.html) with Björn Kimminich, [German OWASP Day 2023](https://god.owasp.de/2023). 30.05.2023
 * [OWASP Juice Shop](https://www.meetup.com/owasp-chapter-netherlands-meetup/events/292323208)
-  by Björn Kimminich, [April 2023 OWASP Chapter Netherlands Meetup](https://www.meetup.com/owasp-chapter-netherlands-meetup/), 20.04.2023 [YouTube](https://www.youtube.com/live/Bhp3LpgtNZ4?feature=share&t=3856)
-* [Squeezing the last drop out of OWASP Juice Shop](https://owasp2023globalappsecdublin.sched.com/event/1FWfq/squeezing-the-last-drop-out-of-owasp-juice-shop) by Björn Kimminich, [OWASP 2023 Global AppSec Dublin](https://dublin.globalappsec.org/), 15.02.2023  [YouTube](https://youtu.be/m1f2fPC8hLU)
+  by Björn Kimminich, [April 2023 OWASP Chapter Netherlands Meetup](https://www.meetup.com/owasp-chapter-netherlands-meetup/), 20.04.2023 ([YouTube](https://www.youtube.com/live/Bhp3LpgtNZ4?feature=share&t=3856))
+* [Squeezing the last drop out of OWASP Juice Shop](https://owasp2023globalappsecdublin.sched.com/event/1FWfq/squeezing-the-last-drop-out-of-owasp-juice-shop) by Björn Kimminich, [OWASP 2023 Global AppSec Dublin](https://dublin.globalappsec.org/), 15.02.2023  ([YouTube](https://youtu.be/m1f2fPC8hLU))
 
 #### 2022
 
diff --git a/frontend/src/assets/i18n/zh_TW.json b/frontend/src/assets/i18n/zh_TW.json
@@ -194,9 +194,9 @@
   "ADD_BASKET": "加入購物車",
   "BTN_SHOW_ALL": "顯示全部",
   "BTN_SHOW_UNAVAILABLE": "顯示為不可用",
-  "INFO_DISABLED_CHALLENGES": "{{num}} challenges are unavailable on {{env}} due to <a href='https://pwning.owasp-juice.shop/companion-guide/latest/part1/challenges.html#_potentially_dangerous_challenges'>security concerns</a> or technical incompatibility!",
+  "INFO_DISABLED_CHALLENGES": "挑戰無法在{{env}}使用因為<a href='https://pwning.owasp-juice.shop/companion-guide/latest/part1/challenges.html#_potentially_dangerous_challenges'>或者",
   "SHOW_DISABLED_CHALLENGES": "無論如何都要顯示",
-  "HIDE_DISABLED_CHALLENGES": "Hide disabled challenges",
+  "HIDE_DISABLED_CHALLENGES": "隱瞞（disabled = 取消/有缺陷）的挑戰",
   "BTN_HIDE_ALL": "隱藏全部",
   "TYPE_THESE_LETTERS": "輸入這{{length}}個字",
   "BTN_REQUEST": "請求",
@@ -458,10 +458,10 @@
   "LABEL_OUTPUT_FOR": "輸出給",
   "LABEL_OUTPUT": "輸出",
   "TITLE_SBT": "Juicy Chatbot SBT",
-  "BTN_SBT_NOTE": "Note: Never reveal your personal private keys and seed phrase to anyone",
-  "LABEL_PRIVATE_KEY": "Enter Private Key",
-  "BTN_AUTHENTICATE": "Authenticate",
-  "LABEL_ACCOUNT_ADDRESS": "Account Address",
+  "BTN_SBT_NOTE": "注意：切勿將您的私人密鑰和種子短語透露給任何人",
+  "LABEL_PRIVATE_KEY": "輸入私鑰",
+  "BTN_AUTHENTICATE": "身份驗證",
+  "LABEL_ACCOUNT_ADDRESS": "帳戶地址",
   "OWNED_BY": "被（who）擁有",
   "NFT_SBT_BOX_TEXT": "好哇！ 在｛｛link｝｝上找到果汁店SBT。 這是一個不可轉讓且永遠存在的代幣。",
   "FAUCET_BALANCE": "Faucet Balance",
diff --git a/screenshots/git-stats.png b/screenshots/git-stats.png
