Merge pull request #400 from Infisical/snyk-fix-0ab98e0c00b32ecebcd11cb2298f542f

[Snyk] Security upgrade styled-components from 5.3.5 to 5.3.7

backend/src/config/index.ts

@@ -50,6 +50,7 @@ const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY!;
 const STRIPE_WEBHOOK_SECRET = process.env.STRIPE_WEBHOOK_SECRET!;
 const TELEMETRY_ENABLED = process.env.TELEMETRY_ENABLED! !== 'false' && true;
 const LICENSE_KEY = process.env.LICENSE_KEY!;
+const SMTP_CONFIGURED = SMTP_HOST == '' || SMTP_HOST == undefined ? false : true
 
 export {
   PORT,
@@ -101,5 +102,6 @@ export {
   STRIPE_SECRET_KEY,
   STRIPE_WEBHOOK_SECRET,
   TELEMETRY_ENABLED,
-  LICENSE_KEY
+  LICENSE_KEY,
+  SMTP_CONFIGURED
 };

backend/src/controllers/v1/signupController.ts

@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import * as Sentry from '@sentry/node';
 import { User } from '../../models';
-import { JWT_SIGNUP_LIFETIME, JWT_SIGNUP_SECRET, INVITE_ONLY_SIGNUP } from '../../config';
+import { JWT_SIGNUP_LIFETIME, JWT_SIGNUP_SECRET, INVITE_ONLY_SIGNUP, SMTP_CONFIGURED } from '../../config';
 import {
 	sendEmailVerification,
 	checkEmailVerification,
@@ -20,7 +20,6 @@ export const beginEmailSignup = async (req: Request, res: Response) => {
 	let email: string;
 	try {
 		email = req.body.email;
-
 		if (INVITE_ONLY_SIGNUP) {
 			// Only one user can create an account without being invited. The rest need to be invited in order to make an account
 			const userCount = await User.countDocuments({})
@@ -75,10 +74,12 @@ export const verifyEmailSignup = async (req: Request, res: Response) => {
 		}
 
 		// verify email
+		if (SMTP_CONFIGURED) {
 			await checkEmailVerification({
 				email,
 				code
 			});
+		}
 
 		if (!user) {
 			user = await new User({

backend/src/controllers/v2/authController.ts

@@ -13,7 +13,7 @@ import { EELogService } from '../../ee/services';
 import {
   NODE_ENV,
   JWT_MFA_LIFETIME,
-  JWT_MFA_SECRET
+  JWT_MFA_SECRET,
 } from '../../config';
 import { BadRequestError, InternalServerError } from '../../utils/errors';
 import {

backend/src/helpers/nodemailer.ts

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import handlebars from 'handlebars';
 import nodemailer from 'nodemailer';
-import { SMTP_FROM_NAME, SMTP_FROM_ADDRESS } from '../config';
+import { SMTP_FROM_NAME, SMTP_FROM_ADDRESS, SMTP_CONFIGURED } from '../config';
 import * as Sentry from '@sentry/node';
 
 let smtpTransporter: nodemailer.Transporter;
@@ -25,6 +25,7 @@ const sendMail = async ({
   recipients: string[];
   substitutions: any;
 }) => {
+  if (SMTP_CONFIGURED) {
     try {
       const html = fs.readFileSync(
         path.resolve(__dirname, '../templates/' + template),
@@ -43,6 +44,7 @@ const sendMail = async ({
       Sentry.setUser(null);
       Sentry.captureException(err);
     }
+  }
 };
 
 const setTransporter = (transporter: nodemailer.Transporter) => {

frontend/package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "frontend",
+  "name": "npm-proj-1677883018530-0.7603125731052582NtcmfK",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -66,7 +66,7 @@
         "react-table": "^7.8.0",
         "set-cookie-parser": "^2.5.1",
         "sharp": "^0.31.2",
-        "styled-components": "^5.3.5",
+        "styled-components": "^5.3.7",
         "tailwind-merge": "^1.8.1",
         "tweetnacl": "^1.0.3",
         "tweetnacl-util": "^0.15.1",
@@ -20245,10 +20245,9 @@
       }
     },
     "node_modules/styled-components": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.5.tgz",
-      "integrity": "sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg==",
-      "hasInstallScript": true,
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.7.tgz",
+      "integrity": "sha512-JL1b4A79OGqav4TxkrNsuuQfy6ZnrpyQx6hBDQ3Hd3JyuR2IQuVNBpF+FCEWFNZpN5hj+fhkaEVWteVJ18f0tw==",
       "dependencies": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/traverse": "^7.4.5",
@@ -37001,9 +37000,9 @@
       }
     },
     "styled-components": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.5.tgz",
-      "integrity": "sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.7.tgz",
+      "integrity": "sha512-JL1b4A79OGqav4TxkrNsuuQfy6ZnrpyQx6hBDQ3Hd3JyuR2IQuVNBpF+FCEWFNZpN5hj+fhkaEVWteVJ18f0tw==",
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/traverse": "^7.4.5",

frontend/package.json

@@ -73,7 +73,7 @@
     "react-table": "^7.8.0",
     "set-cookie-parser": "^2.5.1",
     "sharp": "^0.31.2",
-    "styled-components": "^5.3.5",
+    "styled-components": "^5.3.7",
     "tailwind-merge": "^1.8.1",
     "tweetnacl": "^1.0.3",
     "tweetnacl-util": "^0.15.1",