From 044725f3d5059f1cbf9cc03271d5261db02ed7e4 Mon Sep 17 00:00:00 2001 From: Karan Preet Singh Sasan Date: Thu, 9 Nov 2023 18:22:36 -0800 Subject: [PATCH 1/3] adding links to SAST and DAST --- facade-app/src/Components/Header.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/facade-app/src/Components/Header.tsx b/facade-app/src/Components/Header.tsx index a5ac312..6665232 100644 --- a/facade-app/src/Components/Header.tsx +++ b/facade-app/src/Components/Header.tsx @@ -65,12 +65,16 @@ export default class Header extends React.Component { About Us + DAST + + SAST + Date: Thu, 9 Nov 2023 18:25:05 -0800 Subject: [PATCH 2/3] Fixing indentation --- facade-app/src/Components/Header.tsx | 14 +- facade-app/src/test/App.test.tsx | 184 +++++++++++++-------------- facade-app/src/test/Utils.test.tsx | 12 +- 3 files changed, 105 insertions(+), 105 deletions(-) diff --git a/facade-app/src/Components/Header.tsx b/facade-app/src/Components/Header.tsx index 6665232..9c3ec16 100644 --- a/facade-app/src/Components/Header.tsx +++ b/facade-app/src/Components/Header.tsx @@ -65,15 +65,15 @@ export default class Header extends React.Component { About Us - - - DAST - + + + DAST + - - SAST - + + SAST + diff --git a/facade-app/src/test/App.test.tsx b/facade-app/src/test/App.test.tsx index a50cccf..5d1c5fa 100644 --- a/facade-app/src/test/App.test.tsx +++ b/facade-app/src/test/App.test.tsx @@ -1,92 +1,92 @@ -import React from "react"; -import { render, screen, fireEvent } from "@testing-library/react"; -import { getResource } from "../Utilities/Utils"; -import testFixture from "./fixtures"; - -import App from "../App"; - -jest.mock("../Utilities/Utils"); - -describe("App", () => { - const _renderAppFully = () => { - //mock getResource since it will not work during testing - (getResource as jest.Mock).mockImplementation( - (uri: string, callback: Function, isJson: boolean) => { - //testFixture structure does not match the web response. - //so, we restructure it - const response = { - VulnerableApp: - testFixture.applicationData[0].vulnerabilityDefinitions, - "VulnerableApp-jsp": - testFixture.applicationData[1].vulnerabilityDefinitions, - "VulnerableApp-php": - testFixture.applicationData[2].vulnerabilityDefinitions, - }; - - callback({ isSuccessful: true, data: response }); - } - ); - - return render(); - }; - - const _renderAppFail = () => { - (getResource as jest.Mock).mockImplementation( - (uri: string, callback: Function, isJson: boolean) => { - callback({ isSuccessful: false, error: "error" }); - } - ); - - return render(); - }; - - const _renderAppNull = () => { - (getResource as jest.Mock).mockImplementation( - (uri: string, callback: Function, isJson: boolean) => { - callback({ isSuccessful: true, data: null }); - } - ); - - return render(); - }; - - const _renderAppEmpty = () => { - (getResource as jest.Mock).mockImplementation( - (uri: string, callback: Function, isJson: boolean) => { - callback({ isSuccessful: true, data: {} }); - } - ); - - return render(); - }; - - it("renders correctly", async () => { - expect(_renderAppFully().container).toMatchSnapshot(); - }); - - it("renders content on nav item click", () => { - _renderAppFully(); - - fireEvent( - screen.getByTestId("VulnerableApp.CommandInjection.LEVEL_1"), - new MouseEvent("click", { bubbles: true, cancelable: true }) - ); - const content = screen.getByTestId("VULNERABILITY_CONTENT_DESCRIPTION"); - expect(content).toBeInTheDocument(); - }); - - it("does not render nav when data is null", async () => { - _renderAppNull(); - expect(screen.queryByTestId(/LEFT_NAV_CONTAINER/i)).toBeNull(); - }); - - it("does not render nav when getResource failed", async () => { - _renderAppFail(); - expect(screen.queryByTestId(/LEFT_NAV_CONTAINER/i)).toBeNull(); - }); - - it("does not render nav items when empty", async () => { - _renderAppEmpty(); - expect(screen.queryByTestId(/VulnerableApp.CommandInjection/i)).toBeNull(); - }); -}); +import React from "react"; +import { render, screen, fireEvent } from "@testing-library/react"; +import { getResource } from "../Utilities/Utils"; +import testFixture from "./fixtures"; + +import App from "../App"; + +jest.mock("../Utilities/Utils"); + +describe("App", () => { + const _renderAppFully = () => { + //mock getResource since it will not work during testing + (getResource as jest.Mock).mockImplementation( + (uri: string, callback: Function, isJson: boolean) => { + //testFixture structure does not match the web response. + //so, we restructure it + const response = { + VulnerableApp: + testFixture.applicationData[0].vulnerabilityDefinitions, + "VulnerableApp-jsp": + testFixture.applicationData[1].vulnerabilityDefinitions, + "VulnerableApp-php": + testFixture.applicationData[2].vulnerabilityDefinitions, + }; + + callback({ isSuccessful: true, data: response }); + } + ); + + return render(); + }; + + const _renderAppFail = () => { + (getResource as jest.Mock).mockImplementation( + (uri: string, callback: Function, isJson: boolean) => { + callback({ isSuccessful: false, error: "error" }); + } + ); + + return render(); + }; + + const _renderAppNull = () => { + (getResource as jest.Mock).mockImplementation( + (uri: string, callback: Function, isJson: boolean) => { + callback({ isSuccessful: true, data: null }); + } + ); + + return render(); + }; + + const _renderAppEmpty = () => { + (getResource as jest.Mock).mockImplementation( + (uri: string, callback: Function, isJson: boolean) => { + callback({ isSuccessful: true, data: {} }); + } + ); + + return render(); + }; + + it("renders correctly", async () => { + expect(_renderAppFully().container).toMatchSnapshot(); + }); + + it("renders content on nav item click", () => { + _renderAppFully(); + + fireEvent( + screen.getByTestId("VulnerableApp.CommandInjection.LEVEL_1"), + new MouseEvent("click", { bubbles: true, cancelable: true }) + ); + const content = screen.getByTestId("VULNERABILITY_CONTENT_DESCRIPTION"); + expect(content).toBeInTheDocument(); + }); + + it("does not render nav when data is null", async () => { + _renderAppNull(); + expect(screen.queryByTestId(/LEFT_NAV_CONTAINER/i)).toBeNull(); + }); + + it("does not render nav when getResource failed", async () => { + _renderAppFail(); + expect(screen.queryByTestId(/LEFT_NAV_CONTAINER/i)).toBeNull(); + }); + + it("does not render nav items when empty", async () => { + _renderAppEmpty(); + expect(screen.queryByTestId(/VulnerableApp.CommandInjection/i)).toBeNull(); + }); +}); diff --git a/facade-app/src/test/Utils.test.tsx b/facade-app/src/test/Utils.test.tsx index 2ff1b5e..a512f3e 100644 --- a/facade-app/src/test/Utils.test.tsx +++ b/facade-app/src/test/Utils.test.tsx @@ -26,27 +26,27 @@ describe("appendStaticResourcesToDocument()", () => { hints: [ { vulnerabilityTypes: [{ identifierType: "CWE", value: "WASC-1" }], - description: "vulnerability hint 1" + description: "vulnerability hint 1", }, ], resourceInformation: { htmlResource: { resourceType: ResourceType.HTML, isAbsolute: false, - uri: "/" + uri: "/", }, staticResources: [ { resourceType: ResourceType.JAVASCRIPT, isAbsolute: false, - uri: "/dummy_javascript_uri" + uri: "/dummy_javascript_uri", }, { resourceType: ResourceType.CSS, isAbsolute: false, - uri: "/dummy_css_uri" - } - ] + uri: "/dummy_css_uri", + }, + ], }, }; it("should modify the content of an element.", () => { From 31bcf738983fb46d96ab15a56816542be9dd6aee Mon Sep 17 00:00:00 2001 From: Karan Preet Singh Sasan Date: Thu, 9 Nov 2023 18:57:25 -0800 Subject: [PATCH 3/3] Fixing tests --- facade-app/src/test/Header.test.tsx | 10 ++-- .../src/test/__snapshots__/App.test.tsx.snap | 58 ++++++++++++++++++- .../test/__snapshots__/Footer.test.tsx.snap | 2 +- .../test/__snapshots__/Header.test.tsx.snap | 44 ++++++++------ 4 files changed, 89 insertions(+), 25 deletions(-) diff --git a/facade-app/src/test/Header.test.tsx b/facade-app/src/test/Header.test.tsx index d6ec2d5..c4b7e2c 100644 --- a/facade-app/src/test/Header.test.tsx +++ b/facade-app/src/test/Header.test.tsx @@ -92,7 +92,7 @@ describe("Header", () => { }; render(
); - const link = screen.getAllByRole("link")[0]; + const link = screen.getAllByRole("link")[2]; const githubIcon = screen.getAllByRole("img")[2]; const text = screen.getByText("Github"); @@ -130,8 +130,8 @@ describe("Header", () => { showHints: false, }; render(
); - - const owaspLink = screen.getAllByRole("link")[1]; + + const owaspLink = screen.getByRole("link", { name: "Owasp VulnerableApp" }); const owaspIcon = screen.getAllByRole("img")[3]; const text = screen.getByText("Owasp VulnerableApp"); @@ -154,7 +154,7 @@ describe("Header", () => { }; render(
); - const zapLink = screen.getAllByRole("link")[2]; + const zapLink = screen.getByRole("link", { name: "ZAP JWT Addon" }); const zapIcon = screen.getAllByRole("img")[4]; const text = screen.getByText("ZAP JWT Addon"); @@ -177,7 +177,7 @@ describe("Header", () => { }; render(
); - const zapLink = screen.getAllByRole("link")[3]; + const zapLink = screen.getAllByRole("link")[5]; const zapIcon = screen.getAllByRole("img")[5]; const text = screen.getByText("ZAP FileUpload Addon"); diff --git a/facade-app/src/test/__snapshots__/App.test.tsx.snap b/facade-app/src/test/__snapshots__/App.test.tsx.snap index d704c2d..f6eb61b 100644 --- a/facade-app/src/test/__snapshots__/App.test.tsx.snap +++ b/facade-app/src/test/__snapshots__/App.test.tsx.snap @@ -95,6 +95,62 @@ exports[`App renders correctly 1`] = ` + @@ -2282,7 +2338,7 @@ exports[`App renders correctly 1`] = ` data-testid="FOOTER_COPYRIGHT_TEXT" > © Copyright - 2022 + 2023 , SasanLabs diff --git a/facade-app/src/test/__snapshots__/Footer.test.tsx.snap b/facade-app/src/test/__snapshots__/Footer.test.tsx.snap index 3f18e83..ceb2ffc 100644 --- a/facade-app/src/test/__snapshots__/Footer.test.tsx.snap +++ b/facade-app/src/test/__snapshots__/Footer.test.tsx.snap @@ -17,7 +17,7 @@ exports[`Footer renders correctly 1`] = ` data-testid="FOOTER_COPYRIGHT_TEXT" > © Copyright - 2022 + 2023 , SasanLabs diff --git a/facade-app/src/test/__snapshots__/Header.test.tsx.snap b/facade-app/src/test/__snapshots__/Header.test.tsx.snap index f9b1747..30e0301 100644 --- a/facade-app/src/test/__snapshots__/Header.test.tsx.snap +++ b/facade-app/src/test/__snapshots__/Header.test.tsx.snap @@ -100,28 +100,36 @@ exports[`Header renders correctly 1`] = ` class="rs-dropdown-menu" role="menu" > -
  • - - DAST - -
    • -
  • + DAST + +
    • + + - - SAST - - + + SAST + + +