-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/add-terraform-docs
- Loading branch information
Showing
20 changed files
with
1,030 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,3 +8,6 @@ node_modules/ | |
| out/ | ||
|
|
||
| junit.xml | ||
|
|
||
| # Snyk | ||
| .dccache | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
linters/ruff/test_data/ruff_nbqa_v0.9.2_basic_nb.check.shot
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
| // trunk-upgrade-validation:RELEASE | ||
|
|
||
| exports[`Testing linter ruff-nbqa test basic_nb 1`] = ` | ||
| { | ||
| "issues": [ | ||
| { | ||
| "code": "error", | ||
| "file": "test_data/basic_nb.in.ipynb", | ||
| "issueClass": "ISSUE_CLASS_EXISTING", | ||
| "level": "LEVEL_HIGH", | ||
| "linter": "ruff-nbqa", | ||
| "message": "/tmp/plugins_/test_data/basic_nb.in.ipynb:cell_1:1:8: F401 [*] \`os\` imported but unused | ||
| | | ||
| 1 | # %%NBQA-CELL-SEP | ||
| 2 | import os | ||
| | ^^ F401 | ||
| 3 | | ||
| 4 | print("Hello World!") | ||
| | | ||
| = help: Remove unused import: \`os\`", | ||
| "targetType": "jupyter", | ||
| }, | ||
| ], | ||
| "lintActions": [ | ||
| { | ||
| "command": "lint", | ||
| "fileGroupName": "jupyter", | ||
| "linter": "ruff-nbqa", | ||
| "paths": [ | ||
| "test_data/basic_nb.in.ipynb", | ||
| ], | ||
| "verb": "TRUNK_VERB_CHECK", | ||
| }, | ||
| { | ||
| "command": "lint", | ||
| "fileGroupName": "jupyter", | ||
| "linter": "ruff-nbqa", | ||
| "paths": [ | ||
| "test_data/basic_nb.in.ipynb", | ||
| ], | ||
| "upstream": true, | ||
| "verb": "TRUNK_VERB_CHECK", | ||
| }, | ||
| ], | ||
| "taskFailures": [], | ||
| "unformattedFiles": [], | ||
| } | ||
| `; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| version: 0.1 | ||
| downloads: | ||
| - name: snyk | ||
| downloads: | ||
| - url: https://downloads.snyk.io/cli/v${version}/snyk-${os}-${cpu} | ||
| cpu: arm_64 | ||
| os: | ||
| macos: macos | ||
| linux: linux | ||
| - url: https://downloads.snyk.io/cli/v${version}/snyk-${os} | ||
| cpu: x86_64 | ||
| os: | ||
| macos: macos | ||
| linux: linux | ||
| - url: https://downloads.snyk.io/cli/v${version}/snyk-win.exe | ||
| os: windows | ||
| tools: | ||
| definitions: | ||
| - name: snyk | ||
| download: snyk | ||
| known_good_version: 1.1295.0 | ||
| shims: [snyk] | ||
| health_checks: | ||
| - command: snyk --version | ||
| parse_regex: ${semver} | ||
| lint: | ||
| definitions: | ||
| - name: snyk | ||
| tools: [snyk] | ||
| suggest_if: config_present | ||
| description: Security scanning tool for code, dependencies and containers | ||
| known_good_version: 1.1295.0 | ||
| commands: | ||
| - name: test | ||
| files: [lockfile] | ||
| output: sarif | ||
| run: snyk test --sarif --skip-unresolved --file=${target} | ||
| success_codes: [0, 1] # Snyk returns 1 when vulnerabilities are found | ||
| read_output_from: stdout | ||
| batch: false | ||
| is_security: true | ||
| - name: code | ||
| files: [javascript, typescript, java, python] | ||
| output: sarif | ||
| run: snyk code test --sarif . | ||
| run_from: ${parent} | ||
| success_codes: [0, 1] | ||
| read_output_from: stdout | ||
| sandbox_type: copy_targets | ||
| batch: true | ||
| is_security: true | ||
| - name: container | ||
| files: [docker] | ||
| output: sarif | ||
| run: snyk container test --sarif ${target} | ||
| success_codes: [0, 1] | ||
| read_output_from: stdout | ||
| batch: true | ||
| is_security: true | ||
| direct_configs: [.snyk] | ||
| environment: | ||
| - name: SNYK_TOKEN | ||
| optional: true | ||
| value: ${env.SNYK_TOKEN} | ||
| - name: PATH | ||
| list: ["${linter}", "${env.PATH}"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| import { customLinterCheckTest } from "tests"; | ||
| import { TEST_DATA } from "tests/utils"; | ||
|
|
||
| customLinterCheckTest({ linterName: "snyk", args: TEST_DATA, testName: "basic" }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
|
|
||
| /* | ||
| * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/ | ||
| * | ||
| * Copyright (c) 2002 - 2019 Bruce Mayhew | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it under the terms of the | ||
| * GNU General Public License as published by the Free Software Foundation; either version 2 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without | ||
| * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along with this program; if | ||
| * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
| * 02111-1307, USA. | ||
| * | ||
| * Getting Source ============== | ||
| * | ||
| * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects. | ||
| */ | ||
|
|
||
| package org.owasp.webgoat.sql_injection.introduction; | ||
|
|
||
| import org.owasp.webgoat.assignments.AssignmentEndpoint; | ||
| import org.owasp.webgoat.assignments.AssignmentHints; | ||
| import org.owasp.webgoat.assignments.AttackResult; | ||
| import org.springframework.web.bind.annotation.PostMapping; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.ResponseBody; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| import javax.sql.DataSource; | ||
| import java.sql.*; | ||
|
|
||
| import static java.sql.ResultSet.*; | ||
|
|
||
|
|
||
| @RestController | ||
| @AssignmentHints(value = {"SqlStringInjectionHint4-1", "SqlStringInjectionHint4-2", "SqlStringInjectionHint4-3"}) | ||
| public class SqlInjectionLesson4 extends AssignmentEndpoint { | ||
|
|
||
| private final DataSource dataSource; | ||
|
|
||
| public SqlInjectionLesson4(DataSource dataSource) { | ||
| this.dataSource = dataSource; | ||
| } | ||
|
|
||
| @PostMapping("/SqlInjection/attack4") | ||
| @ResponseBody | ||
| public AttackResult completed(@RequestParam String query) { | ||
| return injectableQuery(query); | ||
| } | ||
|
|
||
| protected AttackResult injectableQuery(String query) { | ||
| try (Connection connection = dataSource.getConnection()) { | ||
| try (Statement statement = connection.createStatement(TYPE_SCROLL_INSENSITIVE, CONCUR_READ_ONLY)) { | ||
| statement.executeUpdate(query); | ||
| connection.commit(); | ||
| ResultSet results = statement.executeQuery("SELECT phone from employees;"); | ||
| StringBuffer output = new StringBuffer(); | ||
| // user completes lesson if column phone exists | ||
| if (results.first()) { | ||
| output.append("<span class='feedback-positive'>" + query + "</span>"); | ||
| return success(this).output(output.toString()).build(); | ||
| } else { | ||
| return failed(this).output(output.toString()).build(); | ||
| } | ||
| } catch (SQLException sqle) { | ||
| return failed(this).output(sqle.getMessage()).build(); | ||
| } | ||
| } catch (Exception e) { | ||
| return failed(this).output(this.getClass().getName() + " : " + e.getMessage()).build(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.