Skip to content
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

[Snyk] Upgrade pdfkit from 0.11.0 to 0.12.3 #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions data/datacreator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ async function createRandomFakeUsers () {
return text
}

return Promise.all(new Array(config.get('application.numberOfRandomFakeUsers')).fill(0).map(
return await Promise.all(new Array(config.get('application.numberOfRandomFakeUsers')).fill(0).map(
() => models.User.create({
email: getGeneratedRandomFakeUserEmail(),
password: makeRandomString(5)
Expand Down Expand Up @@ -258,7 +258,7 @@ async function createMemories () {
})
]

return Promise.all(memories)
return await Promise.all(memories)
}

async function createProducts () {
Expand Down Expand Up @@ -305,7 +305,7 @@ async function createProducts () {
}
datacache.retrieveBlueprintChallengeFile = blueprint

return Promise.all(
return await Promise.all(
products.map(
({ reviews = [], useForChristmasSpecialChallenge = false, urlForProductTamperingChallenge = false, fileForRetrieveBlueprintChallenge = false, ...product }) =>
models.Product.create(product).catch(
Expand Down
2 changes: 1 addition & 1 deletion lib/antiCheat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: MIT
*/

import config = require('config')
const colors = require('colors/safe')
const logger = require('./logger')
import config = require('config')

const coupledChallenges = { // TODO prevent also near-identical challenges (e.g. all null byte file access or dom xss + bonus payload etc.) from counting as cheating
loginAdminChallenge: ['weakPasswordChallenge'],
Expand Down
2 changes: 1 addition & 1 deletion lib/startup/registerWebsocketEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: MIT
*/

import config = require('config')
const notifications = require('../../data/datacache').notifications
const utils = require('../utils')
const security = require('../insecurity')
const challenges = require('../../data/datacache').challenges
import config = require('config')
let firstConnectedSocket = null

const registerWebsocketEvents = (server) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/startup/validateDependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* SPDX-License-Identifier: MIT
*/

import colors = require('colors/safe')
try {
require('check-dependencies')
} catch (err) {
console.error('Please run "npm install" before starting the application!')
process.exit(1)
}
const logger = require('../logger')
import colors = require('colors/safe')
const dependencyChecker = require('check-dependencies')

const validateDependencies = async ({ packageDir = '.', exitOnFailure = true } = {}) => {
Expand Down
2 changes: 1 addition & 1 deletion models/feedback.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/

/* jslint node: true */
const security = require('../lib/insecurity')
import utils = require('../lib/utils')
const security = require('../lib/insecurity')
const challenges = require('../data/datacache').challenges

module.exports = (sequelize, { STRING, INTEGER }) => {
Expand Down
2 changes: 1 addition & 1 deletion models/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
*/

/* jslint node: true */
import config = require('config')
const security = require('../lib/insecurity')
const utils = require('../lib/utils')
const challenges = require('../data/datacache').challenges
import config = require('config')

module.exports = (sequelize, { STRING, BOOLEAN }) => {
const User = sequelize.define('User', {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"notevil": "^1.3.3",
"on-finished": "^2.3.0",
"otplib": "^12.0.1",
"pdfkit": "^0.11.0",
"pdfkit": "^0.12.3",
"portscanner": "^2.2.0",
"prom-client": "^12.0.0",
"pug": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion routes/2fa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-License-Identifier: MIT
*/

import config = require('config')
const security = require('../lib/insecurity')
const models = require('../models/index')
const otplib = require('otplib')
const utils = require('../lib/utils')
const challenges = require('../data/datacache').challenges
import config = require('config')

otplib.authenticator.options = {
// Accepts tokens as valid even when they are 30sec to old or to new
Expand Down
2 changes: 1 addition & 1 deletion routes/appVersion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const utils = require('../lib/utils')
import config = require('config')
const utils = require('../lib/utils')

module.exports = function retrieveAppVersion () {
return (req, res) => {
Expand Down
2 changes: 1 addition & 1 deletion routes/authenticatedUsers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: MIT
*/

import models = require('../models/index')
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
import models = require('../models/index')

module.exports = function retrieveUserList () {
return (req, res, next) => {
Expand Down
2 changes: 1 addition & 1 deletion routes/b2bOrder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: MIT
*/

import vm = require('vm')
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
const safeEval = require('notevil')
import vm = require('vm')
const challenges = require('../data/datacache').challenges

module.exports = function b2bOrder () {
Expand Down
2 changes: 1 addition & 1 deletion routes/basket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: MIT
*/

import models = require('../models/index')
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
import models = require('../models/index')
const challenges = require('../data/datacache').challenges

module.exports = function retrieveBasket () {
Expand Down
2 changes: 1 addition & 1 deletion routes/basketItems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: MIT
*/

import models = require('../models/index')
const utils = require('../lib/utils')
const challenges = require('../data/datacache').challenges
const security = require('../lib/insecurity')
import models = require('../models/index')

module.exports.addBasketItem = function addBasketItem () {
return (req, res, next) => {
Expand Down
2 changes: 1 addition & 1 deletion routes/changePassword.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: MIT
*/

import models = require('../models/index')
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
import models = require('../models/index')
const cache = require('../data/datacache')
const challenges = cache.challenges

Expand Down
2 changes: 1 addition & 1 deletion routes/chatbot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* SPDX-License-Identifier: MIT
*/

import fs = require('fs')
const { Bot } = require('juicy-chat-bot')
const security = require('../lib/insecurity')
const jwt = require('jsonwebtoken')
const utils = require('../lib/utils')
const botUtils = require('../lib/botUtils')
const config = require('config')
import fs = require('fs')
const download = require('download')
const models = require('../models/index')
const challenges = require('../data/datacache').challenges
Expand Down
2 changes: 1 addition & 1 deletion routes/coupon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const security = require('../lib/insecurity')
import models = require('../models/index')
const security = require('../lib/insecurity')

module.exports = function applyCoupon () {
return ({ params }, res, next) => {
Expand Down
2 changes: 1 addition & 1 deletion routes/currentUser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const security = require('../lib/insecurity')
import utils = require('../lib/utils')
const security = require('../lib/insecurity')
const cache = require('../data/datacache')
const challenges = cache.challenges

Expand Down
2 changes: 1 addition & 1 deletion routes/dataExport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: MIT
*/

import models = require('../models/index')
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
const db = require('../data/mongodb')
const challenges = require('../data/datacache').challenges
import models = require('../models/index')

module.exports = function dataExport () {
return async (req, res, next) => {
Expand Down
2 changes: 1 addition & 1 deletion routes/fileUpload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-License-Identifier: MIT
*/

import fs = require('fs')
const utils = require('../lib/utils')
const challenges = require('../data/datacache').challenges
const libxml = require('libxmljs2')
const os = require('os')
const vm = require('vm')
import fs = require('fs')
const unzipper = require('unzipper')
const path = require('path')

Expand Down
2 changes: 1 addition & 1 deletion routes/imageCaptcha.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const svgCaptcha = require('svg-captcha')
import models = require('../models/index')
const svgCaptcha = require('svg-captcha')
const Op = models.Sequelize.Op
const security = require('../lib/insecurity')

Expand Down
2 changes: 1 addition & 1 deletion routes/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: MIT
*/

import models = require('../models/index')
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
import models = require('../models/index')
const challenges = require('../data/datacache').challenges
const users = require('../data/datacache').users
const config = require('config')
Expand Down
2 changes: 1 addition & 1 deletion routes/metrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* SPDX-License-Identifier: MIT
*/

import models = require('../models/index')
const Prometheus = require('prom-client')
const onFinished = require('on-finished')
const orders = require('../data/mongodb').orders
Expand All @@ -11,7 +12,6 @@ const challenges = require('../data/datacache').challenges
const utils = require('../lib/utils')
const antiCheat = require('../lib/antiCheat')
const config = require('config')
import models = require('../models/index')
const Op = models.Sequelize.Op

const register = Prometheus.register
Expand Down
2 changes: 1 addition & 1 deletion routes/orderHistory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const security = require('../lib/insecurity')
import db = require('../data/mongodb')
const security = require('../lib/insecurity')

module.exports.orderHistory = function orderHistory () {
return async (req, res, next) => {
Expand Down
2 changes: 1 addition & 1 deletion routes/profileImageFileUpload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const utils = require('../lib/utils')
import fs = require('fs')
const utils = require('../lib/utils')
const models = require('../models/index')
const security = require('../lib/insecurity')
const logger = require('../lib/logger')
Expand Down
2 changes: 1 addition & 1 deletion routes/resetPassword.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-License-Identifier: MIT
*/

import config = require('config')
const utils = require('../lib/utils')
const challenges = require('../data/datacache').challenges
const users = require('../data/datacache').users
const security = require('../lib/insecurity')
const models = require('../models/index')
import config = require('config')

module.exports = function resetPassword () {
return ({ body, connection }, res, next) => {
Expand Down
2 changes: 1 addition & 1 deletion routes/saveLoginIp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: MIT
*/

import models = require('../models/index')
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
import models = require('../models/index')
const cache = require('../data/datacache')
const challenges = cache.challenges

Expand Down
2 changes: 1 addition & 1 deletion routes/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const utils = require('../lib/utils')
import models = require('../models/index')
const utils = require('../lib/utils')
const challenges = require('../data/datacache').challenges

// vuln-code-snippet start unionSqlInjectionChallenge dbSchemaChallenge
Expand Down
2 changes: 1 addition & 1 deletion routes/verify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: MIT
*/

import models = require('../models/index')
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
const jwt = require('jsonwebtoken')
const jws = require('jws')
import models = require('../models/index')
const cache = require('../data/datacache')
const Op = models.Sequelize.Op
const challenges = cache.challenges
Expand Down
2 changes: 1 addition & 1 deletion server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: MIT
*/
import dataErasure from './routes/dataErasure'
import fs = require('fs')
const startTime = Date.now()
const path = require('path')
import fs = require('fs')
const morgan = require('morgan')
const colors = require('colors/safe')
const finale = require('finale-rest')
Expand Down
2 changes: 1 addition & 1 deletion test/api/chatBotSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ describe('/chatbot', () => {
})
const testCommand = functionTest[0].utterances[0]
const testResponse = '3be2e438b7f3d04c89d7749f727bb3bd'
return frisby.setup({
return await frisby.setup({
request: {
headers: {
Authorization: `Bearer ${token}`,
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/basketSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const security = require('../../lib/insecurity')
import config = require('config')
const security = require('../../lib/insecurity')
const models = require('../../models/index')

describe('/#/basket', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/complainSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const config = require('config')
import path = require('path')
const config = require('config')
const utils = require('../../lib/utils')

describe('/#/complain', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/deluxeSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* SPDX-License-Identifier: MIT
*/

const config = require('config')
import request = require('request')
const config = require('config')

describe('/#/deluxe-membership', () => {
describe('challenge "svgInjection"', () => {
Expand Down
Loading