From ca76f8aa6b191da6f03c1b240ae18c6c2bdba617 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:12:31 +0600
Subject: [PATCH 01/14] Update job.py

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 api_app/serializers/job.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api_app/serializers/job.py b/api_app/serializers/job.py
index 28f8e2dc..d214bddf 100644
--- a/api_app/serializers/job.py
+++ b/api_app/serializers/job.py
@@ -478,6 +478,7 @@ class Meta:
             "playbook",
             "status",
             "received_request_time",
+            "is_sample",
         ]
 
     playbook = rfs.SlugRelatedField(

From 1e5f593425ccb608a27f35aedaf258977576c38d Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:15:42 +0600
Subject: [PATCH 02/14] Update views.py

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 api_app/views.py | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/api_app/views.py b/api_app/views.py
index f0a8afbb..3dfd892f 100644
--- a/api_app/views.py
+++ b/api_app/views.py
@@ -20,6 +20,7 @@
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
 
+from api_app.choices import ScanMode
 from api_app.websocket import JobConsumer
 from certego_saas.apps.organization.permissions import (
     IsObjectOwnerOrSameOrgPermission as IsObjectUserOrSameOrgPermission,
@@ -452,7 +453,7 @@ def get_permissions(self):
         - List of applicable permissions.
         """
         permissions = super().get_permissions()
-        if self.action in ["destroy", "kill"]:
+        if self.action in ["destroy", "kill", "rescan"]:
             permissions.append(IsObjectUserOrSameOrgPermission())
         return permissions
 
@@ -541,6 +542,36 @@ def retry(self, request, pk=None):
         job.retry()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
+    @action(detail=True, methods=["post"])
+    def rescan(self, request, pk=None):
+        logger.info(f"rescan request for job: {pk}")
+        existing_job: Job = self.get_object()
+        # create a new job
+        data = {
+            "tlp": existing_job.tlp,
+            "runtime_configuration": existing_job.runtime_configuration,
+            "scan_mode": ScanMode.FORCE_NEW_ANALYSIS,
+        }
+        if existing_job.playbook_requested:
+            data["playbook_requested"] = existing_job.playbook_requested
+        else:
+            data["analyzers_requested"] = existing_job.analyzers_requested.all()
+            data["connectors_requested"] = existing_job.connectors_requested.all()
+        if existing_job.is_sample:
+            data["file"] = existing_job.file
+            data["file_name"] = existing_job.file_name
+            job_serializer = FileJobSerializer(data=data, context={"request": request})
+        else:
+            data["observable_classification"] = existing_job.observable_classification
+            data["observable_name"] = existing_job.observable_name
+            job_serializer = ObservableAnalysisSerializer(
+                data=data, context={"request": request}
+            )
+        job_serializer.is_valid(raise_exception=True)
+        new_job = job_serializer.save(send_task=True)
+        logger.info(f"rescan request for job: {pk} generated job: {new_job.pk}")
+        return Response(data={"id": new_job.pk}, status=status.HTTP_202_ACCEPTED)
+
     @add_docs(
         description="Kill running job by closing celery tasks and marking as killed",
         request=None,

From 6fa86e965f29bdd6c162e3639ef88cfea7425cc9 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:16:30 +0600
Subject: [PATCH 03/14] Create .prettierignore

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 frontend/.prettierignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 frontend/.prettierignore

diff --git a/frontend/.prettierignore b/frontend/.prettierignore
new file mode 100644
index 00000000..84f38442
--- /dev/null
+++ b/frontend/.prettierignore
@@ -0,0 +1,2 @@
+# Ignore artifacts:
+.coverage

From adb796ae5a4ea9a1c53999a9ec3fbbae14d79435 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:17:54 +0600
Subject: [PATCH 04/14] Update CustomJobNode.jsx

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 .../src/components/investigations/flow/CustomJobNode.jsx   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/investigations/flow/CustomJobNode.jsx b/frontend/src/components/investigations/flow/CustomJobNode.jsx
index 098d72e8..eba6ab80 100644
--- a/frontend/src/components/investigations/flow/CustomJobNode.jsx
+++ b/frontend/src/components/investigations/flow/CustomJobNode.jsx
@@ -56,7 +56,9 @@ function CustomJobNode({ data }) {
             id="investigation-pivotbtn"
             className="mx-1 p-2"
             size="sm"
-            href={`/scan?parent=${data.id}&observable=${data.name}`}
+            href={`/scan?parent=${data.id}&${
+              data.is_sample ? "isSample=true" : `observable=${data.name}`
+            }`}
             target="_blank"
             rel="noreferrer"
           >
@@ -67,7 +69,8 @@ function CustomJobNode({ data }) {
             placement="top"
             fade={false}
           >
-            Analyze the same observable again
+            Analyze the same observable again. CAUTION! Samples require to
+            select again the file.
           </UncontrolledTooltip>
           {data.isFirstLevel && <RemoveJob data={data} />}
         </div>

From e0e7fc7006c60c56f1a74f4394cd274b5c2b4197 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:18:30 +0600
Subject: [PATCH 05/14] Update utils.js

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 frontend/src/components/investigations/flow/utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/investigations/flow/utils.js b/frontend/src/components/investigations/flow/utils.js
index 13c537b9..40939ff2 100644
--- a/frontend/src/components/investigations/flow/utils.js
+++ b/frontend/src/components/investigations/flow/utils.js
@@ -20,6 +20,7 @@ function addJobNode(
       investigation: investigationId,
       children: job.children || [],
       status: job.status,
+      is_sample: job.is_sample,
       refetchTree,
       refetchInvestigation,
       isFirstLevel: isFirstLevel || false,

From 181f755b94f704005bbc981118185162ac87ca19 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:20:38 +0600
Subject: [PATCH 06/14] Update JobActionBar.jsx

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 .../jobs/result/bar/JobActionBar.jsx          | 34 +++----------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/jobs/result/bar/JobActionBar.jsx b/frontend/src/components/jobs/result/bar/JobActionBar.jsx
index dd3bc3ce..767c8b11 100644
--- a/frontend/src/components/jobs/result/bar/JobActionBar.jsx
+++ b/frontend/src/components/jobs/result/bar/JobActionBar.jsx
@@ -8,9 +8,7 @@ import { ContentSection, IconButton, addToast } from "@certego/certego-ui";
 
 import { SaveAsPlaybookButton } from "./SaveAsPlaybooksForm";
 
-import { downloadJobSample, deleteJob } from "../jobApi";
-import { createJob } from "../../../scan/scanApi";
-import { ScanModesNumeric } from "../../../../constants/advancedSettingsConst";
+import { downloadJobSample, deleteJob, rescanJob } from "../jobApi";
 import { JobResultSections } from "../../../../constants/miscConst";
 import {
   DeleteIcon,
@@ -53,33 +51,11 @@ export function JobActionsBar({ job }) {
   };
 
   const handleRetry = async () => {
-    if (job.is_sample) {
-      addToast(
-        "Rescan File!",
-        "It's not possible to repeat a sample analysis",
-        "warning",
-        false,
-        2000,
-      );
-    } else {
-      addToast("Retrying the same job...", null, "spinner", false, 2000);
-      const response = await createJob(
-        [job.observable_name],
-        job.observable_classification,
-        job.playbook_requested,
-        job.analyzers_requested,
-        job.connectors_requested,
-        job.runtime_configuration,
-        job.tags.map((optTag) => optTag.label),
-        job.tlp,
-        ScanModesNumeric.FORCE_NEW_ANALYSIS,
-        0,
-      );
+    addToast("Retrying the same job...", null, "spinner", false, 2000);
+    const newJobId = await rescanJob(job.id);
+    if (newJobId) {
       setTimeout(
-        () =>
-          navigate(
-            `/jobs/${response.jobIds[0]}/${JobResultSections.VISUALIZER}/`,
-          ),
+        () => navigate(`/jobs/${newJobId}/${JobResultSections.VISUALIZER}/`),
         1000,
       );
     }

From 1d3fb9f1f7d5cea636932150303b7495b4ab4c63 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:22:11 +0600
Subject: [PATCH 07/14] Update jobApi.jsx

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 .../src/components/jobs/result/jobApi.jsx     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/frontend/src/components/jobs/result/jobApi.jsx b/frontend/src/components/jobs/result/jobApi.jsx
index f6d36666..50f5a537 100644
--- a/frontend/src/components/jobs/result/jobApi.jsx
+++ b/frontend/src/components/jobs/result/jobApi.jsx
@@ -61,6 +61,33 @@ export async function deleteJob(jobId) {
   return success;
 }
 
+export async function rescanJob(jobId) {
+  try {
+    const response = await axios.post(`${JOB_BASE_URI}/${jobId}/rescan`);
+    const newJobId = response.data.id;
+    if (response.status === 202) {
+      addToast(
+        <span>
+          Sent rescan request for job #{jobId}. Created job #{newJobId}.
+        </span>,
+        null,
+        "success",
+        2000,
+      );
+    }
+    return newJobId;
+  } catch (error) {
+    addToast(
+      <span>
+        Failed. Operation: <em>rescan job #{jobId}</em>
+      </span>,
+      error.parsedMsg,
+      "warning",
+    );
+    return null;
+  }
+}
+
 export async function killPlugin(jobId, plugin) {
   const sure = await areYouSureConfirmDialog(
     `kill ${plugin.type} '${plugin.name}'`,

From e8a0edbd4503d1470f35d51a5daf484ea6ae7b1c Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:25:43 +0600
Subject: [PATCH 08/14] Update ScanForm.jsx

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 frontend/src/components/scan/ScanForm.jsx | 49 +++++++++++------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/scan/ScanForm.jsx b/frontend/src/components/scan/ScanForm.jsx
index f27c8e40..faba1188 100644
--- a/frontend/src/components/scan/ScanForm.jsx
+++ b/frontend/src/components/scan/ScanForm.jsx
@@ -81,6 +81,7 @@ function DangerErrorMessage(fieldName) {
 export default function ScanForm() {
   const [searchParams, _] = useSearchParams();
   const observableParam = searchParams.get(JobTypes.OBSERVABLE);
+  const isSampleParam = searchParams.get("isSample") === "true";
   const investigationIdParam = searchParams.get("investigation") || null;
   const parentIdParam = searchParams.get("parent");
   const { guideState, setGuideState } = useGuideContext();
@@ -416,6 +417,23 @@ export default function ScanForm() {
       }))
       .filter((item) => !item.isDisabled && item.starting);
 
+  const selectObservableType = (value) => {
+    formik.setFieldValue("observableType", value, false);
+    formik.setFieldValue(
+      "classification",
+      value === JobTypes.OBSERVABLE
+        ? ObservableClassifications.GENERIC
+        : JobTypes.FILE,
+    );
+    formik.setFieldValue("observable_names", [""], false);
+    formik.setFieldValue("files", [""], false);
+    formik.setFieldValue("analysisOptionValues", ScanTypes.playbooks, false);
+    setScanType(ScanTypes.playbooks);
+    formik.setFieldValue("playbook", "", false); // reset
+    formik.setFieldValue("analyzers", [], false); // reset
+    formik.setFieldValue("connectors", [], false); // reset
+  };
+  
   const updateAdvancedConfig = (
     tags,
     tlp,
@@ -535,9 +553,11 @@ export default function ScanForm() {
     if (observableParam) {
       updateSelectedObservable(observableParam, 0);
       if (formik.playbook) updateSelectedPlaybook(formik.playbook);
+    } else if (isSampleParam) {
+      selectObservableType(JobTypes.FILE);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [observableParam, playbooksLoading]);
+  }, [observableParam, playbooksLoading, isSampleParam]);
 
   /* With the setFieldValue the validation and rerender don't work properly: the last update seems to not trigger the validation
   and leaves the UI with values not valid, for this reason the scan button is disabled, but if the user set focus on the UI the last
@@ -614,30 +634,9 @@ export default function ScanForm() {
                         type="radio"
                         name="observableType"
                         value={jobType}
-                        onClick={(event) => {
-                          formik.setFieldValue(
-                            "observableType",
-                            event.target.value,
-                            false,
-                          );
-                          formik.setFieldValue(
-                            "classification",
-                            event.target.value === JobTypes.OBSERVABLE
-                              ? ObservableClassifications.GENERIC
-                              : JobTypes.FILE,
-                          );
-                          formik.setFieldValue("observable_names", [""], false);
-                          formik.setFieldValue("files", [""], false);
-                          formik.setFieldValue(
-                            "analysisOptionValues",
-                            ScanTypes.playbooks,
-                            false,
-                          );
-                          setScanType(ScanTypes.playbooks);
-                          formik.setFieldValue("playbook", "", false); // reset
-                          formik.setFieldValue("analyzers", [], false); // reset
-                          formik.setFieldValue("connectors", [], false); // reset
-                        }}
+                        onClick={(event) =>
+                          selectObservableType(event.target.value)
+                        }
                       />
                       <Label check>
                         {jobType === JobTypes.OBSERVABLE

From a8017f69d3f92c1cb2b0fd561f29d3ead0b1c003 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:31:04 +0600
Subject: [PATCH 09/14] Update InvestigationFlow.test.jsx

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 .../flow/InvestigationFlow.test.jsx           | 56 +++++++++++++++++--
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/frontend/tests/components/investigations/flow/InvestigationFlow.test.jsx b/frontend/tests/components/investigations/flow/InvestigationFlow.test.jsx
index bd618825..081a08b9 100644
--- a/frontend/tests/components/investigations/flow/InvestigationFlow.test.jsx
+++ b/frontend/tests/components/investigations/flow/InvestigationFlow.test.jsx
@@ -91,6 +91,7 @@ describe("test InvestigationFlow", () => {
                 analyzed_object_name: "test1.com",
                 playbook: "Dns",
                 status: "reported_without_fails",
+                is_sample: false,
                 children: [],
               },
             ],
@@ -125,6 +126,7 @@ describe("test InvestigationFlow", () => {
                 analyzed_object_name: "test1.com",
                 playbook: "Dns",
                 status: "reported_without_fails",
+                is_sample: false,
                 children: [],
               },
               {
@@ -132,6 +134,7 @@ describe("test InvestigationFlow", () => {
                 analyzed_object_name: "test2.com",
                 playbook: "Dns",
                 status: "reported_without_fails",
+                is_sample: false,
                 children: [],
               },
             ],
@@ -171,12 +174,14 @@ describe("test InvestigationFlow", () => {
                 analyzed_object_name: "test1.com",
                 playbook: "Dns",
                 status: "reported_without_fails",
+                is_sample: false,
                 children: [
                   {
                     pk: 11,
                     analyzed_object_name: "test11.com",
                     playbook: "Dns",
                     status: "reported_without_fails",
+                    is_sample: false,
                     children: [],
                   },
                 ],
@@ -255,6 +260,7 @@ describe("test InvestigationFlow", () => {
                 playbook: "Dns",
                 status: "reported_without_fails",
                 received_request_time: "2024-04-03T13:08:45.417245Z",
+                is_sample: false,
                 children: [
                   {
                     pk: 11,
@@ -263,9 +269,18 @@ describe("test InvestigationFlow", () => {
                     status: "reported_without_fails",
                     children: [],
                     received_request_time: "2024-04-03T13:09:45.417245Z",
+                    is_sample: false,
                   },
                 ],
               },
+              {
+                pk: 12,
+                analyzed_object_name: "test.sh",
+                playbook: null,
+                status: "reported_without_fails",
+                received_request_time: "2024-08-23T10:03:27.489939Z",
+                is_sample: true,
+              },
             ],
           }}
           investigationId={1}
@@ -280,16 +295,11 @@ describe("test InvestigationFlow", () => {
     expect(rootNode).toBeInTheDocument();
     expect(rootNode.textContent).toBe("My test");
 
-    // first job node
+    // observable job node
     const firstJobNode = container.querySelector("#job-10");
     expect(firstJobNode).toBeInTheDocument();
     expect(firstJobNode.textContent).toBe("test1.com");
 
-    // pivot node
-    const secondJobNode = container.querySelector("#job-11");
-    expect(secondJobNode).toBeInTheDocument();
-    expect(secondJobNode.textContent).toBe("test11.com");
-
     fireEvent.click(firstJobNode);
     // first job tollbar
     const jobTollbar = container.querySelector("#toolbar-job-10");
@@ -318,6 +328,11 @@ describe("test InvestigationFlow", () => {
     expect(jobInfo.textContent).toContain("Playbook:Dns");
     expect(jobInfo.textContent).toContain("Created:");
 
+    // observable child node
+    const secondJobNode = container.querySelector("#job-11");
+    expect(secondJobNode).toBeInTheDocument();
+    expect(secondJobNode.textContent).toBe("test11.com");
+
     fireEvent.click(secondJobNode);
     // pivot tollbar
     const secondJobTollbar = container.querySelector("#toolbar-job-11");
@@ -345,5 +360,34 @@ describe("test InvestigationFlow", () => {
     expect(secondJobInfo.textContent).toContain("Name:test11.com");
     expect(secondJobInfo.textContent).toContain("Playbook:Dns");
     expect(jobInfo.textContent).toContain("Created:");
+
+    const fileJobNode = container.querySelector("#job-12");
+    expect(fileJobNode).toBeInTheDocument();
+    expect(fileJobNode.textContent).toBe("test.sh");
+    fireEvent.click(fileJobNode);
+    // file job tollbar
+    const fileJobTollbar = container.querySelector("#toolbar-job-12");
+    expect(fileJobTollbar).toBeInTheDocument();
+    const removeFileJobButton = screen.getByRole("button", {
+      name: "Remove Branch",
+    });
+    expect(removeFileJobButton).toBeInTheDocument();
+    const linkFileJobButton = screen.getByRole("link", { name: "Link" });
+    expect(linkFileJobButton).toBeInTheDocument();
+    const fileJobPivotButton = screen.getByRole("link", { name: "Pivot" });
+    expect(fileJobPivotButton).toBeInTheDocument();
+    const fileJobCopyButton = screen.getByRole("button", { name: "Copy" });
+    expect(fileJobCopyButton).toBeInTheDocument();
+    // link to job page
+    expect(linkFileJobButton.href).toContain("/jobs/12/visualizer");
+    // link pivot
+    expect(fileJobPivotButton.href).toContain("/scan?parent=12&isSample=true");
+    // job info
+    const fileJobInfo = container.querySelector("#job12-info");
+    expect(fileJobInfo).toBeInTheDocument();
+    expect(fileJobInfo.textContent).toContain("Job:#12");
+    expect(fileJobInfo.textContent).toContain("Name:test.sh");
+    expect(fileJobInfo.textContent).toContain("Playbook:");
+    expect(fileJobInfo.textContent).toContain("Created:");
   });
 });

From 90c641e811bd078fac062a262433d70a10c2c50c Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:32:06 +0600
Subject: [PATCH 10/14] Update JobActionBar.test.jsx

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 .../jobs/result/utils/JobActionBar.test.jsx   | 118 +++---------------
 1 file changed, 18 insertions(+), 100 deletions(-)

diff --git a/frontend/tests/components/jobs/result/utils/JobActionBar.test.jsx b/frontend/tests/components/jobs/result/utils/JobActionBar.test.jsx
index ef2db1c1..87384eaf 100644
--- a/frontend/tests/components/jobs/result/utils/JobActionBar.test.jsx
+++ b/frontend/tests/components/jobs/result/utils/JobActionBar.test.jsx
@@ -6,39 +6,15 @@ import { BrowserRouter } from "react-router-dom";
 import userEvent from "@testing-library/user-event";
 import { JobActionsBar } from "../../../../../src/components/jobs/result/bar/JobActionBar";
 
-import {
-  ANALYZE_MULTIPLE_OBSERVABLE_URI,
-  PLAYBOOKS_ANALYZE_MULTIPLE_OBSERVABLE_URI,
-} from "../../../../../src/constants/apiURLs";
+import { JOB_BASE_URI } from "../../../../../src/constants/apiURLs";
 
 jest.mock("axios");
 describe("test JobActionsBar", () => {
   beforeAll(() => {
-    axios.post.mockImplementation(() =>
-      Promise.resolve({ data: { results: [], count: 0 } }),
-    );
+    axios.post.mockImplementation(() => Promise.resolve({ data: { id: 109 } }));
   });
 
   test("rescan observable playbook", async () => {
-    axios.post.mockImplementation(() =>
-      Promise.resolve({
-        data: {
-          results: [
-            {
-              job_id: 108,
-              analyzers_running: ["Classic_DNS"],
-              connectors_running: [],
-              visualizers_running: [],
-              playbook_running: "test",
-              status: "accepted",
-              already_exists: true,
-            },
-          ],
-          count: 0,
-        },
-      }),
-    );
-
     render(
       <BrowserRouter>
         <JobActionsBar
@@ -124,30 +100,16 @@ describe("test JobActionsBar", () => {
       </BrowserRouter>,
     );
 
-    const scanBtn = screen.getByText("Rescan");
-    expect(scanBtn).toBeInTheDocument();
+    const rescanBtn = screen.getByText("Rescan");
+    expect(rescanBtn).toBeInTheDocument();
 
     const user = userEvent.setup();
-    await user.click(scanBtn);
+    await user.click(rescanBtn);
 
     await waitFor(() => {
       expect(axios.post.mock.calls[0]).toEqual(
         // axios call
-        [
-          PLAYBOOKS_ANALYZE_MULTIPLE_OBSERVABLE_URI,
-          {
-            observables: [["domain", "dns.google.com"]],
-            playbook_requested: "test",
-            tlp: "AMBER",
-            scan_mode: 1,
-            runtime_configuration: {
-              analyzers: {},
-              connectors: {},
-              visualizers: {},
-            },
-          },
-          { headers: { "Content-Type": "application/json" } },
-        ],
+        [`${JOB_BASE_URI}/${108}/rescan`],
       );
     });
   });
@@ -238,55 +200,21 @@ describe("test JobActionsBar", () => {
       </BrowserRouter>,
     );
 
-    const scanBtn = screen.getByText("Rescan");
-    expect(scanBtn).toBeInTheDocument();
+    const rescanBtn = screen.getByText("Rescan");
+    expect(rescanBtn).toBeInTheDocument();
 
     const user = userEvent.setup();
-    await user.click(scanBtn);
+    await user.click(rescanBtn);
 
     await waitFor(() => {
       expect(axios.post.mock.calls[0]).toEqual(
         // axios call
-        [
-          ANALYZE_MULTIPLE_OBSERVABLE_URI,
-          {
-            observables: [["domain", "dns.google.com"]],
-            analyzers_requested: ["Classic_DNS"],
-            connectors_requested: ["MISP", "OpenCTI", "Slack", "YETI"],
-            runtime_configuration: {
-              analyzers: {},
-              connectors: {},
-              visualizers: {},
-            },
-            tlp: "AMBER",
-            scan_mode: 1,
-          },
-          { headers: { "Content-Type": "application/json" } },
-        ],
+        [`${JOB_BASE_URI}/${108}/rescan`],
       );
     });
   });
 
   test("rescan file playbook", async () => {
-    axios.post.mockImplementation(() =>
-      Promise.resolve({
-        data: {
-          results: [
-            {
-              job_id: 108,
-              analyzers_running: [],
-              connectors_running: [],
-              visualizers_running: [],
-              playbook_running: "test",
-              status: "accepted",
-              already_exists: true,
-            },
-          ],
-          count: 0,
-        },
-      }),
-    );
-
     render(
       <BrowserRouter>
         <JobActionsBar
@@ -356,23 +284,18 @@ describe("test JobActionsBar", () => {
       </BrowserRouter>,
     );
 
-    const scanBtn = screen.getByText("Rescan");
-    expect(scanBtn).toBeInTheDocument();
+    const rescanBtn = screen.getByText("Rescan");
+    expect(rescanBtn).toBeInTheDocument();
 
     const user = userEvent.setup();
-    await user.click(scanBtn);
+    await user.click(rescanBtn);
 
     await waitFor(() => {
       expect(axios.post.mock.calls[0]).toEqual(
         // axios call
-        undefined,
+        [`${JOB_BASE_URI}/${108}/rescan`],
       );
     });
-    setTimeout(() => {
-      expect(
-        screen.getByText("It's not possible to repeat a sample analysis"),
-      ).toBeInTheDocument();
-    }, 15 * 1000);
   });
 
   test("rescan file analyzer", async () => {
@@ -445,22 +368,17 @@ describe("test JobActionsBar", () => {
       </BrowserRouter>,
     );
 
-    const scanBtn = screen.getByText("Rescan");
-    expect(scanBtn).toBeInTheDocument();
+    const rescanBtn = screen.getByText("Rescan");
+    expect(rescanBtn).toBeInTheDocument();
 
     const user = userEvent.setup();
-    await user.click(scanBtn);
+    await user.click(rescanBtn);
 
     await waitFor(() => {
       expect(axios.post.mock.calls[0]).toEqual(
         // axios call
-        undefined,
+        [`${JOB_BASE_URI}/${108}/rescan`],
       );
     });
-    setTimeout(() => {
-      expect(
-        screen.getByText("It's not possible to repeat a sample analysis"),
-      ).toBeInTheDocument();
-    }, 15 * 1000);
   });
 });

From 996abec625558380a5399c80e896c902b1110d51 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:33:41 +0600
Subject: [PATCH 11/14] Update ScanForm.advanced.test.jsx

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 .../scan/ScanForm/ScanForm.advanced.test.jsx     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/frontend/tests/components/scan/ScanForm/ScanForm.advanced.test.jsx b/frontend/tests/components/scan/ScanForm/ScanForm.advanced.test.jsx
index da5b4fb2..03985842 100644
--- a/frontend/tests/components/scan/ScanForm/ScanForm.advanced.test.jsx
+++ b/frontend/tests/components/scan/ScanForm/ScanForm.advanced.test.jsx
@@ -81,6 +81,22 @@ describe("ScanForm adavanced use", () => {
     expect(screen.getByText("TEST_PLAYBOOK_DOMAIN")).toBeInTheDocument();
   });
 
+  test("test scan page with sample in the GET parameters", async () => {
+    render(
+      <MemoryRouter initialEntries={["/scan?isSample=true"]}>
+        <Routes>
+          <Route path="/scan" element={<ScanForm />} />
+        </Routes>
+      </MemoryRouter>,
+    );
+
+    // check file radio button is selected and input file rendered
+    const fileSelectorRadioButton = screen.getAllByRole("radio")[1];
+    expect(fileSelectorRadioButton).toBeInTheDocument();
+    expect(fileSelectorRadioButton.checked).toBe(true);
+    expect(screen.getByText("File(s)")).toBeInTheDocument();
+  });
+
   test("test scan page with an investigation in the GET parameters", async () => {
     const user = userEvent.setup();
     render(

From 7a8c50f0eb6ccd1c67e06cb5bc2d83b2016d8af9 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:34:45 +0600
Subject: [PATCH 12/14] Update observables.test.js

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 frontend/tests/utils/observables.test.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/tests/utils/observables.test.js b/frontend/tests/utils/observables.test.js
index 350efc7b..c52a2d8e 100644
--- a/frontend/tests/utils/observables.test.js
+++ b/frontend/tests/utils/observables.test.js
@@ -68,12 +68,15 @@ describe("Observable validators tests", () => {
     });
   });
 
-  test.each(["test.exe", "test.pdf,", ",test.js,", "256.256.256.256"])(
-    "test invalid domains (%s)",
-    (valueToValidate) => {
-      expect(observableValidators(valueToValidate)).toBeNull();
-    },
-  );
+  test.each([
+    "test.exe",
+    "test.pdf,",
+    ",test.js,",
+    "256.256.256.256",
+    "google(.)com",
+  ])("test invalid domains (%s)", (valueToValidate) => {
+    expect(observableValidators(valueToValidate)).toBeNull();
+  });
 
   test.each([
     "40ff44d9e619b17524bf3763204f9cbb",

From dfc5dc8bc8b4266caf334e52d1af172725aff74c Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:36:59 +0600
Subject: [PATCH 13/14] Update test_api.py

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 tests/api_app/test_api.py | 213 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 213 insertions(+)

diff --git a/tests/api_app/test_api.py b/tests/api_app/test_api.py
index b1627a55..4ed59bf8 100644
--- a/tests/api_app/test_api.py
+++ b/tests/api_app/test_api.py
@@ -1,6 +1,7 @@
 # This file is a part of ThreatMatrix https://github.com/khulnasoft/ThreatMatrix
 # See the file 'LICENSE' for copying permission.
 
+import datetime
 import hashlib
 import os
 from typing import Tuple
@@ -11,6 +12,7 @@
 
 from api_app import models
 from api_app.analyzers_manager.models import AnalyzerConfig
+from api_app.playbooks_manager.models import PlaybookConfig
 
 from .. import CustomViewSetTestCase
 
@@ -425,3 +427,214 @@ def test_tlp_clear_and_white(self):
         job_id = int(contents["job_id"])
         job = models.Job.objects.get(pk=job_id)
         self.assertEqual(job.tlp, "CLEAR", msg=msg)
+
+    def test_job_rescan__observable_analyzers(self):
+        job = models.Job.objects.create(
+            tlp="CLEAR",
+            user=self.user,
+            observable_name="test.com",
+            observable_classification="domain",
+            status="reported_without_fails",
+            finished_analysis_time=datetime.datetime(
+                2024, 8, 24, 10, 10, tzinfo=datetime.timezone.utc
+            )
+            - datetime.timedelta(days=5),
+            runtime_configuration={
+                "analyzers": {"Classic_DNS": {"query_type": "TXT"}},
+                "connectors": {},
+                "visualizers": {},
+            },
+        )
+        job.analyzers_requested.set([AnalyzerConfig.objects.get(name="Classic_DNS")])
+        response = self.client.post(f"/api/jobs/{job.pk}/rescan", format="json")
+        contents = response.json()
+        self.assertEqual(response.status_code, 202, contents)
+        new_job_id = int(contents["id"])
+        new_job = models.Job.objects.get(pk=new_job_id)
+        self.assertEqual(new_job.observable_name, "test.com")
+        self.assertEqual(new_job.tlp, "CLEAR")
+        self.assertEqual(
+            list(new_job.analyzers_requested.all()),
+            [AnalyzerConfig.objects.get(name="Classic_DNS")],
+        )
+        self.assertEqual(
+            new_job.runtime_configuration,
+            {
+                "analyzers": {"Classic_DNS": {"query_type": "TXT"}},
+                "connectors": {},
+                "visualizers": {},
+            },
+        )
+
+    def test_job_rescan__observable_playbook(self):
+        job = models.Job.objects.create(
+            tlp="CLEAR",
+            user=self.user,
+            observable_name="test.com",
+            observable_classification="domain",
+            status="reported_without_fails",
+            finished_analysis_time=datetime.datetime(
+                2024, 8, 24, 10, 10, tzinfo=datetime.timezone.utc
+            )
+            - datetime.timedelta(days=5),
+            playbook_requested=PlaybookConfig.objects.get(name="Dns"),
+            runtime_configuration={
+                "analyzers": {"Classic_DNS": {"query_type": "TXT"}},
+                "connectors": {},
+                "visualizers": {},
+            },
+        )
+        response = self.client.post(f"/api/jobs/{job.pk}/rescan", format="json")
+        contents = response.json()
+        self.assertEqual(response.status_code, 202, contents)
+        new_job_id = int(contents["id"])
+        new_job = models.Job.objects.get(pk=new_job_id)
+        self.assertEqual(new_job.observable_name, "test.com")
+        self.assertEqual(new_job.tlp, "CLEAR")
+        self.assertEqual(
+            new_job.playbook_requested, PlaybookConfig.objects.get(name="Dns")
+        )
+        self.assertEqual(
+            new_job.runtime_configuration,
+            {
+                "analyzers": {"Classic_DNS": {"query_type": "TXT"}},
+                "connectors": {},
+                "visualizers": {},
+            },
+        )
+
+    def test_job_rescan__sample_analyzers(self):
+        job = models.Job.objects.create(
+            tlp="CLEAR",
+            md5=self.file_md5,
+            user=self.user,
+            is_sample=True,
+            file_name="file.exe",
+            file=self.uploaded_file,
+            status="reported_without_fails",
+            finished_analysis_time=datetime.datetime(
+                2024, 8, 24, 10, 10, tzinfo=datetime.timezone.utc
+            )
+            - datetime.timedelta(days=5),
+            runtime_configuration={
+                "analyzers": {
+                    "Strings_Info": {
+                        "max_number_of_strings": 5,
+                        "max_characters_for_string": 10,
+                    }
+                },
+                "connectors": {},
+                "visualizers": {},
+            },
+        )
+        job.analyzers_requested.set([AnalyzerConfig.objects.get(name="Strings_Info")])
+
+        response = self.client.post(f"/api/jobs/{job.pk}/rescan", format="json")
+        contents = response.json()
+        self.assertEqual(response.status_code, 202, contents)
+        new_job_id = int(contents["id"])
+        new_job = models.Job.objects.get(pk=new_job_id)
+        self.assertEqual(new_job.file_name, "file.exe")
+        self.assertEqual(new_job.file, job.file)
+        self.assertEqual(new_job.tlp, "CLEAR")
+        self.assertEqual(
+            list(new_job.analyzers_requested.all()),
+            [AnalyzerConfig.objects.get(name="Strings_Info")],
+        )
+        self.assertEqual(
+            new_job.runtime_configuration,
+            {
+                "analyzers": {
+                    "Strings_Info": {
+                        "max_number_of_strings": 5,
+                        "max_characters_for_string": 10,
+                    }
+                },
+                "connectors": {},
+                "visualizers": {},
+            },
+        )
+
+    def test_job_rescan__sample_playbook(self):
+
+        job = models.Job.objects.create(
+            tlp="CLEAR",
+            md5=self.file_md5,
+            user=self.user,
+            is_sample=True,
+            file_name="file.exe",
+            file=self.uploaded_file,
+            status="reported_without_fails",
+            playbook_requested=PlaybookConfig.objects.get(
+                name="Sample_Static_Analysis"
+            ),
+            finished_analysis_time=datetime.datetime(
+                2024, 8, 24, 10, 10, tzinfo=datetime.timezone.utc
+            )
+            - datetime.timedelta(days=5),
+            runtime_configuration={
+                "analyzers": {
+                    "Strings_Info": {
+                        "max_number_of_strings": 5,
+                        "max_characters_for_string": 10,
+                    }
+                },
+                "connectors": {},
+                "visualizers": {},
+            },
+        )
+
+        response = self.client.post(f"/api/jobs/{job.pk}/rescan", format="json")
+        contents = response.json()
+        self.assertEqual(response.status_code, 202, contents)
+        new_job_id = int(contents["id"])
+        new_job = models.Job.objects.get(pk=new_job_id)
+        self.assertEqual(new_job.file_name, "file.exe")
+        self.assertEqual(new_job.file, job.file)
+        self.assertEqual(new_job.tlp, "CLEAR")
+        self.assertEqual(
+            new_job.playbook_requested,
+            PlaybookConfig.objects.get(name="Sample_Static_Analysis"),
+        )
+        self.assertEqual(
+            new_job.runtime_configuration,
+            {
+                "analyzers": {
+                    "Strings_Info": {
+                        "max_number_of_strings": 5,
+                        "max_characters_for_string": 10,
+                    }
+                },
+                "connectors": {},
+                "visualizers": {},
+            },
+        )
+
+    def test_job_rescan__permission(self):
+        job = models.Job.objects.create(
+            tlp="CLEAR",
+            user=self.user,
+            observable_name="test.com",
+            observable_classification="domain",
+            status="reported_without_fails",
+            finished_analysis_time=datetime.datetime(
+                2024, 8, 24, 10, 10, tzinfo=datetime.timezone.utc
+            )
+            - datetime.timedelta(days=5),
+            playbook_requested=PlaybookConfig.objects.get(name="Dns"),
+            runtime_configuration={
+                "analyzers": {"Classic_DNS": {"query_type": "TXT"}},
+                "connectors": {},
+                "visualizers": {},
+            },
+        )
+        # same user
+        response = self.client.post(f"/api/jobs/{job.pk}/rescan", format="json")
+        contents = response.json()
+        self.assertEqual(response.status_code, 202, contents)
+        # another user
+        self.client.logout()
+        self.client.force_login(self.guest)
+        response = self.client.post(f"/api/jobs/{job.pk}/rescan", format="json")
+        contents = response.json()
+        self.assertEqual(response.status_code, 403, contents)

From e7a870d3322a6c699e514aac6cee13833e72a218 Mon Sep 17 00:00:00 2001
From: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:43:16 +0600
Subject: [PATCH 14/14] Update ScanForm.jsx

Signed-off-by: KhulnaSoft bot <43526132+khulnasoft-bot@users.noreply.github.com>
---
 frontend/src/components/scan/ScanForm.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/scan/ScanForm.jsx b/frontend/src/components/scan/ScanForm.jsx
index faba1188..44eae64d 100644
--- a/frontend/src/components/scan/ScanForm.jsx
+++ b/frontend/src/components/scan/ScanForm.jsx
@@ -433,7 +433,7 @@ export default function ScanForm() {
     formik.setFieldValue("analyzers", [], false); // reset
     formik.setFieldValue("connectors", [], false); // reset
   };
-  
+
   const updateAdvancedConfig = (
     tags,
     tlp,
@@ -922,7 +922,7 @@ export default function ScanForm() {
                       <br />
                       For more info check the{" "}
                       <Link
-                        to="https://khulnasoft.github.io/docs/ThreatMatrix/usage/#tlp-support"
+                        to="https://khulnasoft.github.io/ThreatMatrix/docs/usage/#tlp-support"
                         target="_blank"
                       >
                         official doc.