From 07cb4225869c36c54dbd72bb1b07f5ddd4ec4e49 Mon Sep 17 00:00:00 2001 From: Jeroen Willemsen Date: Tue, 5 Sep 2023 10:24:16 +0200 Subject: [PATCH] Feature: update node to verion 20 as checkout v4 standard operates with v20 --- .github/workflows/container_test.yml | 2 +- .github/workflows/pre-commit.yml | 4 ++-- README.md | 4 ++-- config/fbctf.yml | 15 +++++++++++++++ package-lock.json | 17 +++++++++-------- pom.xml | 2 +- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.github/workflows/container_test.yml b/.github/workflows/container_test.yml index 62d2e9575..cbd72d5e9 100644 --- a/.github/workflows/container_test.yml +++ b/.github/workflows/container_test.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Maven Action uses: "s4u/setup-maven-action@v1.9.0" with: - java-version: 19 + java-version: 17 maven-version: 3.8.5 - uses: actions/checkout@v4 - name: Navigate to test script and run diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 8d1bedfea..ddb666bcf 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -25,12 +25,12 @@ jobs: python-version: "3.9" - uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 cache: "npm" - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '19' + java-version: '17' - name: Install npm dependencies run: npm install - uses: actions/cache@v3 diff --git a/README.md b/README.md index 0769136e6..275fcc67a 100644 --- a/README.md +++ b/README.md @@ -413,11 +413,11 @@ You can use the OWASP Dependency-checker by calling `mvn dependency-check:aggreg ### Get the project started in IntelliJ IDEA -Requirements: make sure you have the following tools installed: [Docker](https://www.docker.com/products/docker-desktop/), [Java19 JDK](https://jdk.java.net/19/), [NodeJS 18](https://nodejs.org/dist/v18.12.1/node-v18.12.1-x86.msi) and [IntelliJ IDEA](https://www.jetbrains.com/idea/download). +Requirements: make sure you have the following tools installed: [Docker](https://www.docker.com/products/docker-desktop/), [Java17 JDK](https://jdk.java.net/17/), [NodeJS 20](https://nodejs.org/en/download/current) and [IntelliJ IDEA](https://www.jetbrains.com/idea/download). 1. Fork and clone the project as described in the [documentation](https://github.com/OWASP/wrongsecrets/blob/master/CONTRIBUTING.md). 2. Import the project in IntelliJ (e.g. import as mvn project / local sources) -3. Go to the project settings and make sure it uses Java19 (And that the JDK can be found) +3. Go to the project settings and make sure it uses Java17 (And that the JDK can be found) 4. Go to the IDE settings>Language & Frameworks > Lombok and make sure Lombok processing is enabled 5. Open the Maven Tab in your IDEA and run "Reload All Maven Projects" to make the system sync and download everything. Next, in that same tab use the "install" option as part of the OWASP WrongSecrets Lifecycle to genereate the asciidoc and such. 6. Now run the `main` method in `org.owasp.wrongsecrets.WrongSecretsApplication.java`. This should fail with a stack trace. diff --git a/config/fbctf.yml b/config/fbctf.yml index 00d190b9e..b805a9fde 100644 --- a/config/fbctf.yml +++ b/config/fbctf.yml @@ -92,3 +92,18 @@ ctf: challenge30: name: Panama code: PA + challenge31: + name: Netherlands + code: NL + challenge32: + name: Germany + code: DE + challenge33: + name: Israel + code: IL + challenge34: + name: Brazil + code: BR + challenge35: + name: Japan + code: JP diff --git a/package-lock.json b/package-lock.json index 2e1d7d5ff..bc29269a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -235,9 +235,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.18.48", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.48.tgz", - "integrity": "sha512-iL0PIMwejpmuVHgfibHpfDwOdsbmB50wr21X71VnF5d7SsBF7WK+ZvP/SCcFm7Iwb9iiYSap9rlrdhToNAWdxg==", + "version": "16.18.48", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.48.tgz", + "integrity": "sha512-mlaecDKQ7rIZrYD7iiKNdzFb6e/qD5I9U1rAhq+Fd+DWvYVs+G2kv74UFHmSOlg5+i/vF3XxuR522V4u8BqO+Q==", "dev": true }, "node_modules/@types/semver": { @@ -1065,15 +1065,15 @@ } }, "node_modules/cypress": { - "version": "12.17.2", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz", - "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==", + "version": "12.17.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", + "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^2.88.11", + "@cypress/request": "2.88.12", "@cypress/xvfb": "^1.2.4", - "@types/node": "^14.14.31", + "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -1106,6 +1106,7 @@ "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "process": "^0.11.10", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", "semver": "^7.5.3", diff --git a/pom.xml b/pom.xml index f891b51e9..7cb154775 100644 --- a/pom.xml +++ b/pom.xml @@ -431,7 +431,7 @@ generate-resources - v18.16.0 + v20.6.0 js