-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Local] Test after ENG-694 migration #142
Changes from all commits
f3248e7
b0ada84
4a425aa
1d3a90a
f827337
6a67766
c457624
6f8b7a8
85f1b51
f05622b
7fd60f2
772251a
8d5643d
a814a3f
253044a
9037f1a
218b184
b47abed
f1b856f
0cff134
41c57bb
8b20ccb
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
routes/*.js |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -2,14 +2,72 @@ | |||||||||||||||||||||||||||||||
* Copyright (c) 2014-2023 Bjoern Kimminich & the OWASP Juice Shop contributors. | ||||||||||||||||||||||||||||||||
* SPDX-License-Identifier: MIT | ||||||||||||||||||||||||||||||||
*/ | ||||||||||||||||||||||||||||||||
import models = require('../models/index') | ||||||||||||||||||||||||||||||||
import { Request, Response, NextFunction } from 'express' | ||||||||||||||||||||||||||||||||
import { UserModel } from '../models/user' | ||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||
import * as utils from '../lib/utils' | ||||||||||||||||||||||||||||||||
const challengeUtils = require('../lib/challengeUtils') | ||||||||||||||||||||||||||||||||
const challenges = require('../data/datacache').challenges | ||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||
class ErrorWithParent extends Error { | ||||||||||||||||||||||||||||||||
parent: Error | undefined | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||
// vuln-code-snippet start unionSqlInjectionChallenge dbSchemaChallenge | ||||||||||||||||||||||||||||||||
module.exports = function searchProducts() { | ||||||||||||||||||||||||||||||||
return (req: Request, res: Response, next: NextFunction) => { | ||||||||||||||||||||||||||||||||
let criteria: any = req.query.q === 'undefined' ? '' : req.query.q ?? '' | ||||||||||||||||||||||||||||||||
criteria = (criteria.length <= 200) ? criteria : criteria.substring(0, 200) | ||||||||||||||||||||||||||||||||
console.log(criteria) | ||||||||||||||||||||||||||||||||
models.sequelize.query(`SELECT * FROM Products WHERE ((name LIKE '%${criteria}%' OR description LIKE '%${criteria}%') AND deletedAt IS NULL) ORDER BY name`) | ||||||||||||||||||||||||||||||||
.then(([products]: any) => { | ||||||||||||||||||||||||||||||||
Comment on lines
+22
to
+23
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Warning Amplify has been notified that this line contains a vulnerability 🕷️. Vulnerability: CWE-79 Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting') Impact: MEDIUM Code Fix: ✅ Amplify Security has prepared an automated remediation for review. Click here to review and commit the code fix.
Suggested change
The code change fixes the 'Cross-site Scripting' vulnerability by properly neutralizing the input during web page generation. In the original code, the The code change replaces the direct interpolation with parameterized queries using the By using parameterized queries, the code change mitigates the risk of XSS attacks by ensuring that user input is treated as data rather than executable code. For more information on preventing XSS vulnerabilities, you can refer to the OWASP XSS Prevention Cheat Sheet: OWASP XSS Prevention Cheat Sheet Note Have a question or concern about this vulnerability fix? Get an answer within seconds by asking our Concierge 🤖 with
Comment on lines
+22
to
+23
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Warning Amplify has been notified that this line contains a vulnerability 🕷️. Vulnerability: CWE-89 Improper Neutralization of Special Elements used in an SQL Command ('SQL Injection') Impact: HIGH Code Fix: ✅ Amplify Security has prepared an automated remediation for review. Click here to review and commit the code fix.
Suggested change
The code change fixes the SQL Injection vulnerability by using parameterized queries instead of directly concatenating user input into the SQL query string. In the original code, the user input In the updated code, the Here is the documentation for Sequelize's parameterized queries: Sequelize - Querying - Parameterized queries Note Have a question or concern about this vulnerability fix? Get an answer within seconds by asking our Concierge 🤖 with
Comment on lines
+22
to
+23
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Warning Amplify has been notified that this line contains a vulnerability 🕷️. Vulnerability: CWE-79 Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting') Impact: MEDIUM Code Fix: ✅ Amplify Security has prepared an automated remediation for review. Click here to review and commit the code fix.
Suggested change
The code change fixes the 'Cross-site Scripting' vulnerability by properly neutralizing the input during web page generation. In the original code, the The code change replaces the string interpolation with parameterized queries. Instead of directly concatenating the By using parameterized queries, the code change mitigates the risk of cross-site scripting vulnerabilities and improves the security of the application. For more information on preventing cross-site scripting vulnerabilities, you can refer to the OWASP Cross-Site Scripting (XSS) Prevention Cheat Sheet: OWASP XSS Prevention Cheat Sheet Note Have a question or concern about this vulnerability fix? Get an answer within seconds by asking our Concierge 🤖 with |
||||||||||||||||||||||||||||||||
const dataString = JSON.stringify(products) | ||||||||||||||||||||||||||||||||
if (challengeUtils.notSolved(challenges.unionSqlInjectionChallenge)) { // vuln-code-snippet hide-start | ||||||||||||||||||||||||||||||||
let solved = true | ||||||||||||||||||||||||||||||||
UserModel.findAll().then(data => { | ||||||||||||||||||||||||||||||||
const users = utils.queryResultToJson(data) | ||||||||||||||||||||||||||||||||
if (users.data?.length) { | ||||||||||||||||||||||||||||||||
for (let i = 0; i < users.data.length; i++) { | ||||||||||||||||||||||||||||||||
solved = solved && utils.containsOrEscaped(dataString, users.data[i].email) && utils.contains(dataString, users.data[i].password) | ||||||||||||||||||||||||||||||||
if (!solved) { | ||||||||||||||||||||||||||||||||
break | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
if (solved) { | ||||||||||||||||||||||||||||||||
challengeUtils.solve(challenges.unionSqlInjectionChallenge) | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
}).catch((error: Error) => { | ||||||||||||||||||||||||||||||||
next(error) | ||||||||||||||||||||||||||||||||
}) | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
if (challengeUtils.notSolved(challenges.dbSchemaChallenge)) { | ||||||||||||||||||||||||||||||||
let solved = true | ||||||||||||||||||||||||||||||||
models.sequelize.query('SELECT sql FROM sqlite_master').then(([data]: any) => { | ||||||||||||||||||||||||||||||||
const tableDefinitions = utils.queryResultToJson(data) | ||||||||||||||||||||||||||||||||
if (tableDefinitions.data?.length) { | ||||||||||||||||||||||||||||||||
for (let i = 0; i < tableDefinitions.data.length; i++) { | ||||||||||||||||||||||||||||||||
if (tableDefinitions.data[i].sql) { | ||||||||||||||||||||||||||||||||
solved = solved && utils.containsOrEscaped(dataString, tableDefinitions.data[i].sql) | ||||||||||||||||||||||||||||||||
if (!solved) { | ||||||||||||||||||||||||||||||||
break | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
if (solved) { | ||||||||||||||||||||||||||||||||
challengeUtils.solve(challenges.dbSchemaChallenge) | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
}) | ||||||||||||||||||||||||||||||||
} // vuln-code-snippet hide-end | ||||||||||||||||||||||||||||||||
for (let i = 0; i < products.length; i++) { | ||||||||||||||||||||||||||||||||
products[i].name = req.__(products[i].name) | ||||||||||||||||||||||||||||||||
products[i].description = req.__(products[i].description) | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
res.json(utils.queryResultToJson(products)) | ||||||||||||||||||||||||||||||||
}).catch((error: ErrorWithParent) => { | ||||||||||||||||||||||||||||||||
next(error.parent) | ||||||||||||||||||||||||||||||||
}) | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||
// vuln-code-snippet end unionSqlInjectionChallenge dbSchemaChallenge |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Warning
Amplify has been notified that this line contains a vulnerability 🕷️.
Vulnerability: CWE-89 Improper Neutralization of Special Elements used in an SQL Command ('SQL Injection')
Impact: HIGH
Code Fix: ✅
Amplify Security has prepared an automated remediation for review. Click here to review and commit the code fix.
The code change fixes the SQL Injection vulnerability by using parameterized queries instead of directly concatenating user input into the SQL query string.
In the original code, the user input
criteria
is directly concatenated into the SQL query using string interpolation (%${criteria}%
). This allows an attacker to manipulate thecriteria
value and inject malicious SQL code, potentially leading to unauthorized access or data manipulation.In the updated code, the
criteria
value is passed as a parameter using thereplacements
option in thesequelize.query
method. This ensures that the user input is properly sanitized and escaped before being included in the SQL query. By using parameterized queries, the code prevents SQL Injection attacks by treating the user input as data rather than executable code.For more information on preventing SQL Injection vulnerabilities, you can refer to the OWASP SQL Injection Prevention Cheat Sheet: OWASP SQL Injection Prevention Cheat Sheet
Note
Have a question or concern about this vulnerability fix? Get an answer within seconds by asking our Concierge 🤖 with
@amplify-security
.i.e. @amplify-security are there known performance issues resulting from this fix?