@@ -204,7 +203,7 @@ function AppHeader() {
// auth store
const isAuthenticated = useAuthStore(
- React.useCallback((s) => s.isAuthenticated(), []),
+ React.useCallback((state) => state.isAuthenticated(), []),
);
return (
diff --git a/frontend/src/layouts/AppMain.jsx b/frontend/src/layouts/AppMain.jsx
index d4f94633e3..8cf6dc0a19 100644
--- a/frontend/src/layouts/AppMain.jsx
+++ b/frontend/src/layouts/AppMain.jsx
@@ -3,12 +3,7 @@ import { useRoutes, Outlet, useLocation } from "react-router-dom";
import PropTypes from "prop-types";
import { ErrorBoundary } from "react-error-boundary";
import { Row, Col } from "reactstrap";
-import {
- FallBackLoading,
- ErrorAlert,
- useToastr,
- Toaster,
-} from "@certego/certego-ui";
+import { FallBackLoading, ErrorAlert } from "@certego/certego-ui";
// wrapper
import withAuth from "../wrappers/withAuth";
@@ -20,6 +15,7 @@ import {
authRoutesLazy,
} from "../components/Routes";
import AppHeader from "./AppHeader";
+import Toast from "./Toast";
const NoMatch = React.lazy(() => import("./NoMatch"));
@@ -45,12 +41,7 @@ ErrorHandler.propTypes = {
error: PropTypes.object.isRequired,
};
-// constants
-const selector = (state) => state.toasts;
-
function Layout() {
- // consume store
- const toasts = useToastr(selector);
return (
<>
@@ -60,11 +51,7 @@ function Layout() {
{/* Toasts */}
-
- {toasts.map((tProps) => (
-
- ))}
-
+
);
}
diff --git a/frontend/src/layouts/Toast.jsx b/frontend/src/layouts/Toast.jsx
new file mode 100644
index 0000000000..7c3a3b1fc6
--- /dev/null
+++ b/frontend/src/layouts/Toast.jsx
@@ -0,0 +1,18 @@
+import React from "react";
+import { useToastr, Toaster } from "@certego/certego-ui";
+
+function Toast() {
+ // consume store
+ const toasts = useToastr((state) => state.toasts);
+ console.debug("Toasts:", toasts);
+
+ return (
+
+ {toasts.map((tProps) => (
+
+ ))}
+
+ );
+}
+
+export default Toast;
diff --git a/frontend/src/layouts/widgets/UserMenu.jsx b/frontend/src/layouts/widgets/UserMenu.jsx
index 77c4a2cdca..1cef27f638 100644
--- a/frontend/src/layouts/widgets/UserMenu.jsx
+++ b/frontend/src/layouts/widgets/UserMenu.jsx
@@ -22,7 +22,7 @@ import { useOrganizationStore } from "../../stores/useOrganizationStore";
*/
export default function UserMenu(props) {
// auth store
- const user = useAuthStore(React.useCallback((s) => s.user, []));
+ const user = useAuthStore(React.useCallback((state) => state.user, []));
const {
organization: { owner },
isUserAdmin,
diff --git a/frontend/src/stores/useOrganizationStore.jsx b/frontend/src/stores/useOrganizationStore.jsx
index 201053135e..a7ed742600 100644
--- a/frontend/src/stores/useOrganizationStore.jsx
+++ b/frontend/src/stores/useOrganizationStore.jsx
@@ -53,9 +53,9 @@ export const useOrganizationStore = create((set, _get) => ({
pluginsState: pluginsStateResp.data.data,
});
}
- } catch (e) {
+ } catch (error) {
// 404 means user is not part of organization
- if (e.response.status === 404)
+ if (error.response.status === 404)
set({
isUserOwner: false,
organization: {},
@@ -66,7 +66,7 @@ export const useOrganizationStore = create((set, _get) => ({
});
// update error
- set({ loading: false, error: e });
+ set({ loading: false, error });
}
},
fetchOnlyBasicInfo: async () => {
@@ -91,9 +91,9 @@ export const useOrganizationStore = create((set, _get) => ({
},
membersCount,
});
- } catch (e) {
+ } catch (error) {
// update error
- set({ error: e });
+ set({ error });
}
},
refetchMembers: async () => {
@@ -105,9 +105,9 @@ export const useOrganizationStore = create((set, _get) => ({
const { members } = resp.data;
// update members key
set({ members });
- } catch (e) {
+ } catch (error) {
// update error
- set({ error: e });
+ set({ error });
}
},
refetchInvs: async () => {
@@ -119,9 +119,9 @@ export const useOrganizationStore = create((set, _get) => ({
const { pending_invitations: pendingInvitations } = resp.data;
// update pendingInvitations key
set({ pendingInvitations });
- } catch (e) {
+ } catch (error) {
// update error
- set({ error: e });
+ set({ error });
}
},
isUserAdmin: (username) => {
diff --git a/frontend/src/stores/usePluginConfigurationStore.jsx b/frontend/src/stores/usePluginConfigurationStore.jsx
index 2fa177b4fe..a997afabb0 100644
--- a/frontend/src/stores/usePluginConfigurationStore.jsx
+++ b/frontend/src/stores/usePluginConfigurationStore.jsx
@@ -13,6 +13,7 @@ import {
PLAYBOOKS_CONFIG_URI,
INGESTORS_CONFIG_URI,
} from "../constants/apiURLs";
+import { prettifyErrors } from "../utils/api";
async function downloadAllPlugin(pluginUrl) {
const pageSize = 70;
@@ -99,8 +100,8 @@ export const usePluginConfigurationStore = create((set, get) => ({
analyzers,
analyzersLoading: false,
});
- } catch (e) {
- set({ analyzersError: e, analyzersLoading: false });
+ } catch (error) {
+ set({ analyzersError: error, analyzersLoading: false });
}
},
retrieveConnectorsConfiguration: async () => {
@@ -116,8 +117,8 @@ export const usePluginConfigurationStore = create((set, get) => ({
connectors,
connectorsLoading: false,
});
- } catch (e) {
- set({ connectorsError: e, connectorsLoading: false });
+ } catch (error) {
+ set({ connectorsError: error, connectorsLoading: false });
}
},
retrieveVisualizersConfiguration: async () => {
@@ -133,8 +134,8 @@ export const usePluginConfigurationStore = create((set, get) => ({
visualizers,
visualizersLoading: false,
});
- } catch (e) {
- set({ visualizersError: e, visualizersLoading: false });
+ } catch (error) {
+ set({ visualizersError: error, visualizersLoading: false });
}
},
retrieveIngestorsConfiguration: async () => {
@@ -150,8 +151,8 @@ export const usePluginConfigurationStore = create((set, get) => ({
ingestors,
ingestorsLoading: false,
});
- } catch (e) {
- set({ ingestorsError: e, ingestorsLoading: false });
+ } catch (error) {
+ set({ ingestorsError: error, ingestorsLoading: false });
}
},
retrievePivotsConfiguration: async () => {
@@ -167,8 +168,8 @@ export const usePluginConfigurationStore = create((set, get) => ({
pivots,
pivotsLoading: false,
});
- } catch (e) {
- set({ pivotsError: e, pivotsLoading: false });
+ } catch (error) {
+ set({ pivotsError: error, pivotsLoading: false });
}
},
retrievePlaybooksConfiguration: async () => {
@@ -184,8 +185,8 @@ export const usePluginConfigurationStore = create((set, get) => ({
playbooks,
playbooksLoading: false,
});
- } catch (e) {
- set({ playbooksError: e, playbooksLoading: false });
+ } catch (error) {
+ set({ playbooksError: error, playbooksLoading: false });
}
},
checkPluginHealth: async (type, PluginName) => {
@@ -195,10 +196,57 @@ export const usePluginConfigurationStore = create((set, get) => ({
);
console.debug("usePluginConfigurationStore - checkPluginHealth: ");
console.debug(resp);
- return Promise.resolve(resp.data?.status); // status is of type boolean
- } catch (e) {
- addToast("Failed!", e.parsedMsg.toString(), "danger");
- return null;
+ if (resp.data?.status)
+ addToast(
+ `${PluginName} - health check: success`,
+ "It is up and running",
+ "success",
+ true,
+ );
+ else
+ addToast(
+ `${PluginName} - health check: warning`,
+ "It is NOT up",
+ "warning",
+ true,
+ );
+ return Promise.resolve(resp.status);
+ } catch (error) {
+ console.error(error);
+ addToast(
+ `${PluginName} - health check: failed`,
+ prettifyErrors(error),
+ "danger",
+ true,
+ );
+ return error.response.status;
+ }
+ },
+ pluginPull: async (type, PluginName) => {
+ try {
+ const resp = await axios.post(
+ `${API_BASE_URI}/${type}/${PluginName}/pull`,
+ );
+ console.debug("usePluginConfigurationStore - pluginPull: ");
+ console.debug(resp);
+ if (resp.data?.status)
+ addToast(
+ "Plugin pull: success",
+ `${PluginName} updated`,
+ "success",
+ true,
+ );
+ else
+ addToast(
+ "Plugin pull: warning",
+ `${PluginName} pull failed`,
+ "warning",
+ true,
+ );
+ return Promise.resolve(resp.status);
+ } catch (error) {
+ addToast("Plugin pull: failed", prettifyErrors(error), "danger", true);
+ return error.response.status;
}
},
deletePlaybook: async (playbook) => {
@@ -208,8 +256,8 @@ export const usePluginConfigurationStore = create((set, get) => ({
);
addToast(`${playbook} deleted`, null, "info");
return Promise.resolve(response);
- } catch (e) {
- addToast("Failed!", e.parsedMsg, "danger");
+ } catch (error) {
+ addToast("Failed!", prettifyErrors(error), "danger");
return null;
}
},
@@ -226,7 +274,7 @@ export const usePluginConfigurationStore = create((set, get) => ({
} catch (error) {
addToast(
`Failed to enabled ${pluginName} for the organization`,
- error.parsedMsg,
+ prettifyErrors(error),
"danger",
true,
);
@@ -242,7 +290,7 @@ export const usePluginConfigurationStore = create((set, get) => ({
} catch (error) {
addToast(
`Failed to enabled ${pluginName} for the organization`,
- error.parsedMsg,
+ prettifyErrors(error),
"danger",
true,
);
@@ -262,7 +310,7 @@ export const usePluginConfigurationStore = create((set, get) => ({
} catch (error) {
addToast(
`Failed to disabled ${pluginName} for the organization`,
- error.parsedMsg,
+ prettifyErrors(error),
"danger",
true,
);
@@ -278,7 +326,7 @@ export const usePluginConfigurationStore = create((set, get) => ({
} catch (error) {
addToast(
`Failed to disabled ${pluginName} for the organization`,
- error.parsedMsg,
+ prettifyErrors(error),
"danger",
true,
);
diff --git a/frontend/src/stores/useRecentScansStore.jsx b/frontend/src/stores/useRecentScansStore.jsx
index 5342844ab1..0b1e365255 100644
--- a/frontend/src/stores/useRecentScansStore.jsx
+++ b/frontend/src/stores/useRecentScansStore.jsx
@@ -18,8 +18,8 @@ export const useRecentScansStore = create((set, _get) => ({
recentScansUser: resp.data,
loadingScansUser: false,
});
- } catch (e) {
- set({ recentScansUserError: e, loadingScansUser: false });
+ } catch (error) {
+ set({ recentScansUserError: error, loadingScansUser: false });
}
},
fetchRecentscans: async (md5) => {
@@ -30,8 +30,8 @@ export const useRecentScansStore = create((set, _get) => ({
recentScans: resp.data,
loadingScansInsertedAnalyzable: false,
});
- } catch (e) {
- set({ recentScansError: e, loadingScansInsertedAnalyzable: false });
+ } catch (error) {
+ set({ recentScansError: error, loadingScansInsertedAnalyzable: false });
}
},
}));
diff --git a/frontend/src/stores/useTagsStore.jsx b/frontend/src/stores/useTagsStore.jsx
index c217dd2ae6..5d32bb06e5 100644
--- a/frontend/src/stores/useTagsStore.jsx
+++ b/frontend/src/stores/useTagsStore.jsx
@@ -15,8 +15,8 @@ export const useTagsStore = create((set, _get) => ({
tags: resp.data,
loading: false,
});
- } catch (e) {
- set({ error: e, loading: false });
+ } catch (error) {
+ set({ error, loading: false });
}
},
create: async (label, color) => {
@@ -27,8 +27,8 @@ export const useTagsStore = create((set, _get) => ({
tags: [...state.tags, resp.data],
}));
return Promise.resolve(resp.data);
- } catch (e) {
- return Promise.reject(e);
+ } catch (error) {
+ return Promise.reject(error);
}
},
update: async (tagId, body) => {
@@ -36,11 +36,11 @@ export const useTagsStore = create((set, _get) => ({
const resp = await axios.patch(`${TAG_BASE_URI}/${tagId}`, body);
set((state) => ({
...state,
- tags: [...state.tags.filter((t) => t.id !== tagId), resp.data],
+ tags: [...state.tags.filter((tag) => tag.id !== tagId), resp.data],
}));
return Promise.resolve(resp.data);
- } catch (e) {
- return Promise.reject(e);
+ } catch (error) {
+ return Promise.reject(error);
}
},
}));
diff --git a/frontend/src/utils/api.jsx b/frontend/src/utils/api.jsx
index 77666ae086..53858c975c 100644
--- a/frontend/src/utils/api.jsx
+++ b/frontend/src/utils/api.jsx
@@ -1,6 +1,7 @@
import React from "react";
export function prettifyErrors(errorResponse) {
+ // multiple validation errors
// only validation errors returns an array of errors
/**
"errors":{
@@ -21,9 +22,27 @@ export function prettifyErrors(errorResponse) {
}
});
});
- prettyHTMLList = prettyHTMLList.map((e) =>
{e});
+ prettyHTMLList = prettyHTMLList.map((error) =>
{error});
return
;
}
+ // single validation error
+ /**
+ "errors":{
+ "detail": "Not implemented",
+ }
+ */
+ if (errorResponse.response.data?.errors?.detail) {
+ return errorResponse.response.data.errors.detail;
+ }
+ // error directly in response data
+ /**
+ "data":{
+ "detail": "Method "POST" not allowed.",
+ }
+ */
+ if (errorResponse.response.data?.detail) {
+ return errorResponse.response.data.detail;
+ }
return JSON.stringify(errorResponse.response.data);
}
diff --git a/frontend/src/utils/initAxios.js b/frontend/src/utils/initAxios.js
index 60cbf72776..1874f88248 100644
--- a/frontend/src/utils/initAxios.js
+++ b/frontend/src/utils/initAxios.js
@@ -29,7 +29,7 @@ export default function initAxios() {
});
// response interceptor
axios.interceptors.response.use(
- (r) => r,
+ (response) => response,
(error) => {
if (!error?.response) {
return Promise.reject(error);
@@ -46,7 +46,7 @@ export default function initAxios() {
response.data;
try {
err.parsedMsg = isObject(errField) ? objToString(errField) : errField;
- } catch (e) {
+ } catch (errorResponse) {
err.parsedMsg = errField;
}
// force logout
diff --git a/frontend/src/wrappers/AuthGuard.jsx b/frontend/src/wrappers/AuthGuard.jsx
index 1b7872cd2b..1eb3eb564d 100644
--- a/frontend/src/wrappers/AuthGuard.jsx
+++ b/frontend/src/wrappers/AuthGuard.jsx
@@ -12,7 +12,7 @@ Wrapper for Routes which should be accessible only to a authenticated user
export default function AuthGuard({ children }) {
// store
const [loading, isAuthenticated] = useAuthStore(
- React.useCallback((s) => [s.loading, s.isAuthenticated()], []),
+ React.useCallback((state) => [state.loading, state.isAuthenticated()], []),
);
const location = useLocation();
diff --git a/frontend/src/wrappers/IfAuthRedirectGuard.jsx b/frontend/src/wrappers/IfAuthRedirectGuard.jsx
index 7ccfcd1458..9a7e44ab08 100644
--- a/frontend/src/wrappers/IfAuthRedirectGuard.jsx
+++ b/frontend/src/wrappers/IfAuthRedirectGuard.jsx
@@ -11,7 +11,7 @@ Wrapper for Routes which should be accessible only to a non-authenticated user
export default function IfAuthRedirectGuard({ children }) {
// store
const [loading, isAuthenticated] = useAuthStore(
- React.useCallback((s) => [s.loading, s.isAuthenticated()], []),
+ React.useCallback((state) => [state.loading, state.isAuthenticated()], []),
);
const next = useSearchParam("next") || "/";
diff --git a/frontend/src/wrappers/withAuth.jsx b/frontend/src/wrappers/withAuth.jsx
index 6b22d0e609..3f27f0ced2 100644
--- a/frontend/src/wrappers/withAuth.jsx
+++ b/frontend/src/wrappers/withAuth.jsx
@@ -17,14 +17,14 @@ function withAuth(WrappedComponent) {
// stores
const [isAuthenticated, fetchUserAccess] = useAuthStore(
React.useCallback(
- (s) => [s.isAuthenticated(), s.service.fetchUserAccess],
+ (state) => [state.isAuthenticated(), state.service.fetchUserAccess],
[],
),
);
// check if the data about plugins have been downloaded or not.
const [fetchPluginsConf] = usePluginConfigurationStore(
- React.useCallback((s) => [s.hydrate], []),
+ React.useCallback((state) => [state.hydrate], []),
);
React.useLayoutEffect(() => {
diff --git a/frontend/tests/components/plugins/types/pluginActionsButtons.test.jsx b/frontend/tests/components/plugins/types/pluginActionsButtons.test.jsx
index 2ad57e13e3..faabbfd390 100644
--- a/frontend/tests/components/plugins/types/pluginActionsButtons.test.jsx
+++ b/frontend/tests/components/plugins/types/pluginActionsButtons.test.jsx
@@ -8,11 +8,12 @@ import {
API_BASE_URI,
PLAYBOOKS_CONFIG_URI,
} from "../../../../src/constants/apiURLs";
-
+import Toast from "../../../../src/layouts/Toast";
import {
PluginHealthCheckButton,
PlaybooksDeletionButton,
OrganizationPluginStateToggle,
+ PluginPullButton,
} from "../../../../src/components/plugins/types/pluginActionsButtons";
import { mockedUseOrganizationStoreOwner } from "../../../mock";
@@ -39,47 +40,39 @@ jest.mock("../../../../src/stores/useAuthStore", () => ({
}));
describe("PluginHealthCheckButton test", () => {
- test("Health check - status true", async () => {
- const userAction = userEvent.setup();
- axios.get.mockImplementation(() =>
- Promise.resolve({ data: { status: true } }),
- );
-
- const { container } = render(
-
-
- ,
- );
-
- const healthCheckIcon = container.querySelector(
- "#table-pluginhealthcheckbtn__plugin",
- );
- expect(healthCheckIcon).toBeInTheDocument();
-
- await userAction.click(healthCheckIcon);
-
- await waitFor(() => {
- expect(axios.get).toHaveBeenCalledWith(
- `${API_BASE_URI}/analyzer/plugin/health_check`,
- );
- expect(screen.getByText("Up and running!")).toBeInTheDocument();
- });
- });
-
- test("Health check - status false", async () => {
+ test.each([
+ // healthcheck true
+ {
+ pluginName: "Plugin1",
+ responseData: {
+ status: 200,
+ data: { status: true },
+ },
+ },
+ // healthcheck false
+ {
+ pluginName: "Plugin2",
+ responseData: {
+ status: 200,
+ data: { status: false },
+ },
+ },
+ ])("Health check - status 200 (%s)", async ({ pluginName, responseData }) => {
const userAction = userEvent.setup();
- axios.get.mockImplementation(() =>
- Promise.resolve({ data: { status: false } }),
- );
+ axios.get.mockImplementation(() => Promise.resolve(responseData));
const { container } = render(
-
+
+
,
);
const healthCheckIcon = container.querySelector(
- "#table-pluginhealthcheckbtn__plugin",
+ `#table-pluginhealthcheckbtn__${pluginName}`,
);
expect(healthCheckIcon).toBeInTheDocument();
@@ -87,9 +80,20 @@ describe("PluginHealthCheckButton test", () => {
await waitFor(() => {
expect(axios.get).toHaveBeenCalledWith(
- `${API_BASE_URI}/analyzer/plugin/health_check`,
+ `${API_BASE_URI}/analyzer/${pluginName}/health_check`,
);
- expect(screen.getByText("Failing!")).toBeInTheDocument();
+ // toast
+ if (responseData.data.status) {
+ // status: true
+ expect(
+ screen.getByText(`${pluginName} - health check: success`),
+ ).toBeInTheDocument();
+ } else {
+ // status: false
+ expect(
+ screen.getByText(`${pluginName} - health check: warning`),
+ ).toBeInTheDocument();
+ }
});
});
});
@@ -102,6 +106,7 @@ describe("PlaybooksDeletionButton test", () => {
const { container } = render(
+
,
);
@@ -126,72 +131,81 @@ describe("PlaybooksDeletionButton test", () => {
expect(axios.delete).toHaveBeenCalledWith(`${PLAYBOOKS_CONFIG_URI}/test`);
});
// toast
- setTimeout(() => {
- expect(screen.getByText("test deleted")).toBeInTheDocument();
- }, 15 * 1000);
+ expect(screen.getByText("test deleted")).toBeInTheDocument();
});
});
describe("OrganizationPluginStateToggle test", () => {
- test("Enable custom playbook for org", async () => {
+ test.each([
+ // enable playbook
+ {
+ pluginName: "Plugin3",
+ toEnable: true,
+ },
+ // disable playbook
+ {
+ pluginName: "Plugin4",
+ toEnable: false,
+ },
+ ])("Custom playbook for org (%s)", async ({ pluginName, toEnable }) => {
const userAction = userEvent.setup();
axios.patch.mockImplementation(() => Promise.resolve({ data: {} }));
const { container } = render(
+
,
);
- const iconButton = container.querySelector("#table-pluginstatebtn__plugin");
- expect(iconButton).toBeInTheDocument();
-
- await userAction.click(iconButton);
-
- await waitFor(() => {
- expect(axios.patch).toHaveBeenCalledWith(
- `${API_BASE_URI}/playbook/plugin`,
- { for_organization: true },
- );
- });
- });
-
- test("Disable custom playbook for org", async () => {
- const userAction = userEvent.setup();
- axios.patch.mockImplementation(() => Promise.resolve({ data: {} }));
-
- const { container } = render(
-
-
- ,
+ const iconButton = container.querySelector(
+ `#table-pluginstatebtn__${pluginName}`,
);
-
- const iconButton = container.querySelector("#table-pluginstatebtn__plugin");
expect(iconButton).toBeInTheDocument();
await userAction.click(iconButton);
await waitFor(() => {
- expect(axios.patch).toHaveBeenCalledWith(
- `${API_BASE_URI}/playbook/plugin`,
- { for_organization: false },
- );
+ if (toEnable) {
+ expect(axios.patch).toHaveBeenCalledWith(
+ `${API_BASE_URI}/playbook/${pluginName}`,
+ { for_organization: true },
+ );
+ // toast
+ expect(
+ screen.getByText(`${pluginName} enabled for the organization`),
+ ).toBeInTheDocument();
+ } else {
+ expect(axios.patch).toHaveBeenCalledWith(
+ `${API_BASE_URI}/playbook/${pluginName}`,
+ { for_organization: false },
+ );
+ // toast
+ expect(
+ screen.getByText(`${pluginName} disabled for the organization`),
+ ).toBeInTheDocument();
+ }
});
});
- test("Enable default playbook for org", async () => {
+ test.each([
+ // enable playbook
+ {
+ pluginName: "Plugin5",
+ toEnable: true,
+ },
+ // disable playbook
+ {
+ pluginName: "Plugin6",
+ toEnable: false,
+ },
+ ])("Default playbook for org (%s)", async ({ pluginName, toEnable }) => {
const userAction = userEvent.setup();
axios.patch.mockImplementation(() => Promise.resolve({ data: {} }));
axios.delete.mockImplementation(() => Promise.resolve({ data: {} }));
@@ -200,52 +214,92 @@ describe("OrganizationPluginStateToggle test", () => {
const { container } = render(
+
,
);
- const iconButton = container.querySelector("#table-pluginstatebtn__plugin");
+ const iconButton = container.querySelector(
+ `#table-pluginstatebtn__${pluginName}`,
+ );
expect(iconButton).toBeInTheDocument();
await userAction.click(iconButton);
await waitFor(() => {
- expect(axios.delete).toHaveBeenCalledWith(
- `${API_BASE_URI}/playbook/plugin/organization`,
- );
+ if (toEnable) {
+ expect(axios.delete).toHaveBeenCalledWith(
+ `${API_BASE_URI}/playbook/${pluginName}/organization`,
+ );
+ // toast
+ expect(
+ screen.getByText(`${pluginName} enabled for the organization`),
+ ).toBeInTheDocument();
+ } else {
+ expect(axios.post).toHaveBeenCalledWith(
+ `${API_BASE_URI}/playbook/${pluginName}/organization`,
+ );
+ // toast
+ expect(
+ screen.getByText(`${pluginName} disabled for the organization`),
+ ).toBeInTheDocument();
+ }
});
});
+});
- test("Disable default playbook for org", async () => {
+describe("PluginPullButton test", () => {
+ test.each([
+ // pull true
+ {
+ pluginName: "Plugin7",
+ responseData: {
+ status: 200,
+ data: { status: true },
+ },
+ },
+ // pull false
+ {
+ pluginName: "Plugin8",
+ responseData: {
+ status: 200,
+ data: { status: false },
+ },
+ },
+ ])("Pull - status 200 (%s)", async ({ pluginName, responseData }) => {
const userAction = userEvent.setup();
- axios.patch.mockImplementation(() => Promise.resolve({ data: {} }));
- axios.delete.mockImplementation(() => Promise.resolve({ data: {} }));
- axios.post.mockImplementation(() => Promise.resolve({ data: {} }));
+ axios.post.mockImplementation(() => Promise.resolve(responseData));
const { container } = render(
-
+
+
,
);
- const iconButton = container.querySelector("#table-pluginstatebtn__plugin");
- expect(iconButton).toBeInTheDocument();
+ const healthCheckIcon = container.querySelector(
+ `#table-pluginpullbtn__${pluginName}`,
+ );
+ expect(healthCheckIcon).toBeInTheDocument();
- await userAction.click(iconButton);
+ await userAction.click(healthCheckIcon);
await waitFor(() => {
expect(axios.post).toHaveBeenCalledWith(
- `${API_BASE_URI}/playbook/plugin/organization`,
+ `${API_BASE_URI}/analyzer/${pluginName}/pull`,
);
+ // toast
+ if (responseData.data.status) {
+ expect(screen.getByText(`${pluginName} updated`)).toBeInTheDocument();
+ } else {
+ expect(
+ screen.getByText(`${pluginName} pull failed`),
+ ).toBeInTheDocument();
+ }
});
});
});
diff --git a/frontend/tests/components/scan/ScanForm/ScanForm.toastRedirect.test.jsx b/frontend/tests/components/scan/ScanForm/ScanForm.toastRedirect.test.jsx
index b0deb3adfb..7d8b5ed463 100644
--- a/frontend/tests/components/scan/ScanForm/ScanForm.toastRedirect.test.jsx
+++ b/frontend/tests/components/scan/ScanForm/ScanForm.toastRedirect.test.jsx
@@ -5,6 +5,7 @@ import { BrowserRouter } from "react-router-dom";
import userEvent from "@testing-library/user-event";
import axios from "axios";
import ScanForm from "../../../../src/components/scan/ScanForm";
+import Toast from "../../../../src/layouts/Toast";
import {
mockedUseAuthStore,
@@ -36,52 +37,81 @@ jest.mock("../../../../src/components/scan/utils/RecentScans", () =>
describe("ScanForm adavanced use", () => {
/* EXTREMELY IMPORTART! These tests need to be execute sequentially or they will fail!
- Maintain them in the same describe
- */
-
- beforeAll(() => {
- axios.post.mockImplementation(() =>
- Promise.resolve({
- data: {
- results: [
- {
- job_id: 1,
- analyzers_running: [],
- connectors_running: [],
- visualizers_running: [],
- playbook_running: "TEST_PLAYBOOK_GENERIC",
- status: "accepted",
- },
- ],
- count: 1,
+ Maintain them in the same describe.
+
+ Note: each test has a different job_id because the toasts are saved and shown for 10 seconds,
+ so during the second test the first toast will still be shown.
+ */
+ test.each([
+ // toast new job with playbook
+ {
+ responseData: [
+ {
+ job_id: 1,
+ analyzers_running: [],
+ connectors_running: [],
+ visualizers_running: [],
+ playbook_running: "TEST_PLAYBOOK_GENERIC",
+ status: "accepted",
+ already_exists: false,
},
- }),
- );
- });
-
- test("toast new job with playbook", async () => {
+ ],
+ jobCount: 1,
+ },
+ // toast existing job with playbook
+ {
+ responseData: [
+ {
+ job_id: 2,
+ analyzers_running: [],
+ connectors_running: [],
+ visualizers_running: [],
+ playbook_running: "TEST_PLAYBOOK_GENERIC",
+ status: "accepted",
+ already_exists: true,
+ },
+ ],
+ jobCount: 1,
+ },
+ // toasts both new and existing jobs with playbook
+ {
+ responseData: [
+ {
+ job_id: 3,
+ analyzers_running: [],
+ connectors_running: [],
+ visualizers_running: [],
+ playbook_running: "TEST_PLAYBOOK_GENERIC",
+ status: "accepted",
+ already_exists: false,
+ },
+ {
+ job_id: 4,
+ analyzers_running: [],
+ connectors_running: [],
+ visualizers_running: [],
+ playbook_running: "TEST_PLAYBOOK_GENERIC",
+ status: "accepted",
+ already_exists: true,
+ },
+ ],
+ jobCount: 2,
+ },
+ ])("toast with playbook (%s)", async ({ responseData, jobCount }) => {
axios.post.mockImplementation(() =>
Promise.resolve({
data: {
- results: [
- {
- job_id: 1,
- analyzers_running: [],
- connectors_running: [],
- visualizers_running: [],
- playbook_running: "TEST_PLAYBOOK_GENERIC",
- status: "accepted",
- already_exists: false,
- },
- ],
- count: 1,
+ results: responseData,
+ count: jobCount,
},
}),
);
+
const user = userEvent.setup();
render(
+
,
);
@@ -90,7 +120,7 @@ describe("ScanForm adavanced use", () => {
});
await user.type(firstObservableInputElement, "newObservable");
// check playbooks has been loaded
- expect(screen.getByText("TEST_PLAYBOOK_GENERIC")).toBeInTheDocument();
+ expect(screen.getAllByText("TEST_PLAYBOOK_GENERIC")[0]).toBeInTheDocument();
// check scan is enabled
const startScanButton = screen.getByRole("button", {
name: "Start Scan",
@@ -118,390 +148,96 @@ describe("ScanForm adavanced use", () => {
],
]);
});
-
- /* without the setTimeout the expect doesn't work, but this timeout isn't real:
- it doesn't wait 15 or the test will go on timeout.
- This setTimeout makes other test fails (related to parallel execution)
- */
- // setTimeout(() => {
- // expect(screen.getByText("Created new Job with ID(s) #1")).toBeInTheDocument();
- // }, 15 * 1000);
+ if (jobCount === 1) {
+ if (responseData.already_exists) {
+ expect(
+ screen.getByText("Reported existing Job with ID(s) #2!"),
+ ).toBeInTheDocument();
+ } else {
+ expect(
+ screen.getByText("Created new Job with ID(s) #1!"),
+ ).toBeInTheDocument();
+ }
+ } else {
+ expect(
+ screen.getByText("Created new Job with ID(s) #3!"),
+ ).toBeInTheDocument();
+ expect(
+ screen.getByText("Reported existing Job with ID(s) #4!"),
+ ).toBeInTheDocument();
+ }
});
- test("toast existing job with playbook", async () => {
- axios.post.mockImplementation(() =>
- Promise.resolve({
- data: {
- results: [
- {
- job_id: 2,
- analyzers_running: [],
- connectors_running: [],
- visualizers_running: [],
- playbook_running: "TEST_PLAYBOOK_GENERIC",
- status: "accepted",
- already_exists: true,
- },
- ],
- count: 1,
+ test.each([
+ // toast new job without playbook
+ {
+ responseData: [
+ {
+ job_id: 5,
+ analyzers_running: ["TEST_ANALYZER"],
+ connectors_running: [],
+ visualizers_running: [],
+ playbook_running: null,
+ status: "accepted",
+ already_exists: false,
},
- }),
- );
- const user = userEvent.setup();
- render(
-
-
- ,
- );
-
- const firstObservableInputElement = screen.getByRole("textbox", {
- name: "",
- });
- await user.type(
- firstObservableInputElement,
- "previouslyAnalyzerObservable",
- );
- // check playbooks has been loaded
- expect(screen.getByText("TEST_PLAYBOOK_GENERIC")).toBeInTheDocument();
- // check scan is enabled
- const startScanButton = screen.getByRole("button", {
- name: "Start Scan",
- });
- expect(startScanButton).toBeInTheDocument();
- expect(startScanButton.className).not.toContain("disabled");
-
- await user.click(startScanButton);
- await waitFor(() => {
- expect(axios.post.mock.calls).toEqual([
- [
- PLAYBOOKS_ANALYZE_MULTIPLE_OBSERVABLE_URI,
- {
- observables: [["generic", "previouslyAnalyzerObservable"]],
- playbook_requested: "TEST_PLAYBOOK_GENERIC",
- tlp: "AMBER",
- scan_mode: 1,
- runtime_configuration: {
- analyzers: {},
- connectors: {},
- visualizers: {},
- },
- },
- { headers: { "Content-Type": "application/json" } },
- ],
- ]);
- });
-
- /* without the setTimeout the expect doesn't work, but this timeout isn't real:
- it doesn't wait 15 or the test will go on timeout.
- This setTimeout makes other test fails (related to parallel execution)
- */
- // setTimeout(() => {
- // expect(
- // screen.getByText("Reported existing Job with ID(s) #2"),
- // ).toBeInTheDocument();
- // }, 15 * 1000);
- });
-
- test("toasts both new and existing jobs with playbook", async () => {
- axios.post.mockImplementation(() =>
- Promise.resolve({
- data: {
- results: [
- {
- job_id: 1,
- analyzers_running: [],
- connectors_running: [],
- visualizers_running: [],
- playbook_running: "TEST_PLAYBOOK_GENERIC",
- status: "accepted",
- already_exists: false,
- },
- {
- job_id: 2,
- analyzers_running: [],
- connectors_running: [],
- visualizers_running: [],
- playbook_running: "TEST_PLAYBOOK_GENERIC",
- status: "accepted",
- already_exists: true,
- },
- ],
- count: 2,
+ ],
+ jobCount: 1,
+ },
+ // toast existing job without playbook
+ {
+ responseData: [
+ {
+ job_id: 6,
+ analyzers_running: ["TEST_ANALYZER"],
+ connectors_running: [],
+ visualizers_running: [],
+ playbook_running: null,
+ status: "accepted",
+ already_exists: true,
},
- }),
- );
- const user = userEvent.setup();
- render(
-
-
- ,
- );
-
- const firstObservableInputElement = screen.getByRole("textbox", {
- name: "",
- });
- await user.type(firstObservableInputElement, "newObservable");
- // add value
- const addObservableButton = screen.getByText("Add new value");
- expect(addObservableButton).toBeInTheDocument();
- await user.click(addObservableButton);
- // add second observable
- const secondObservableInputElement = screen.getAllByRole("textbox", {
- name: "",
- })[1];
- await user.type(
- secondObservableInputElement,
- "previouslyAnalyzerObservable",
- );
- // check playbooks has been loaded
- expect(screen.getByText("TEST_PLAYBOOK_GENERIC")).toBeInTheDocument();
- // check scan is enabled
- const startScanButton = screen.getByRole("button", {
- name: "Start Scan",
- });
- expect(startScanButton).toBeInTheDocument();
- expect(startScanButton.className).not.toContain("disabled");
-
- await user.click(startScanButton);
- await waitFor(() => {
- expect(axios.post.mock.calls).toEqual([
- [
- PLAYBOOKS_ANALYZE_MULTIPLE_OBSERVABLE_URI,
- {
- observables: [
- ["generic", "newObservable"],
- ["generic", "previouslyAnalyzerObservable"],
- ],
- playbook_requested: "TEST_PLAYBOOK_GENERIC",
- tlp: "AMBER",
- scan_mode: 1,
- runtime_configuration: {
- analyzers: {},
- connectors: {},
- visualizers: {},
- },
- },
- { headers: { "Content-Type": "application/json" } },
- ],
- ]);
- });
-
- /* without the setTimeout the expect doesn't work, but this timeout isn't real:
- it doesn't wait 15 or the test will go on timeout.
- This setTimeout makes other test fails (related to parallel execution)
- */
- // setTimeout(() => {
- // expect(
- // screen.getByText("Created new Job with ID(s) #1"),
- // ).toBeInTheDocument();
- // expect(
- // screen.getByText("Reported existing Job with ID(s) #2"),
- // ).toBeInTheDocument();
- // }, 15 * 1000);
- });
-
- test("toast new job without playbook", async () => {
- axios.post.mockImplementation(() =>
- Promise.resolve({
- data: {
- results: [
- {
- job_id: 1,
- analyzers_running: ["TEST_ANALYZER"],
- connectors_running: [],
- visualizers_running: [],
- playbook_running: null,
- status: "accepted",
- already_exists: false,
- },
- ],
- count: 1,
+ ],
+ jobCount: 1,
+ },
+ // toasts both new and existing jobs without playbook
+ {
+ responseData: [
+ {
+ job_id: 7,
+ analyzers_running: ["TEST_ANALYZER"],
+ connectors_running: [],
+ visualizers_running: [],
+ playbook_running: null,
+ status: "accepted",
+ already_exists: false,
},
- }),
- );
- const user = userEvent.setup();
- const { container } = render(
-
-
- ,
- );
-
- const firstObservableInputElement = screen.getByRole("textbox", {
- name: "",
- });
- await user.type(firstObservableInputElement, "newObservable");
- const analyzerSelectionRadioButton = screen.getAllByRole("radio")[3];
- expect(analyzerSelectionRadioButton).toBeInTheDocument();
- await user.click(analyzerSelectionRadioButton);
- expect(screen.getByText("Select Analyzers")).toBeInTheDocument();
- expect(screen.getByText("Select Connectors")).toBeInTheDocument();
-
- /* the id change in case you run a single test or all of them.
- we need this strange way to access instead of the id */
- const analyzerDropdownButton = screen.getAllByRole("combobox")[0];
- expect(analyzerDropdownButton).toBeInTheDocument();
- await user.click(analyzerDropdownButton);
- const testAnalyzerButton = container.querySelector(
- `#${analyzerDropdownButton.id.replace("-input", "")}-option-0`,
- );
- expect(testAnalyzerButton).toBeInTheDocument();
- await user.click(testAnalyzerButton);
- expect(screen.getByText("TEST_ANALYZER")).toBeInTheDocument();
- // check scan is enabled
- const startScanButton = screen.getByRole("button", {
- name: "Start Scan",
- });
- expect(startScanButton).toBeInTheDocument();
- expect(startScanButton.className).not.toContain("disabled");
-
- await user.click(startScanButton);
- await waitFor(() => {
- expect(axios.post.mock.calls).toEqual([
- [
- ANALYZE_MULTIPLE_OBSERVABLE_URI,
- {
- observables: [["generic", "newObservable"]],
- tlp: "AMBER",
- scan_mode: 2,
- analyzers_requested: ["TEST_ANALYZER"],
- scan_check_time: "24:00:00",
- },
- { headers: { "Content-Type": "application/json" } },
- ],
- ]);
- });
-
- /* without the setTimeout the expect doesn't work, but this timeout isn't real:
- it doesn't wait 15 or the test will go on timeout.
- This setTimeout makes other test fails (related to parallel execution)
- */
- // setTimeout(() => {
- // expect(
- // screen.getByText("Created new Job with ID(s) #1"),
- // ).toBeInTheDocument();
- // }, 15 * 1000);
- });
-
- test("toast existing job without playbook", async () => {
- axios.post.mockImplementation(() =>
- Promise.resolve({
- data: {
- results: [
- {
- job_id: 2,
- analyzers_running: ["TEST_ANALYZER"],
- connectors_running: [],
- visualizers_running: [],
- playbook_running: null,
- status: "accepted",
- already_exists: true,
- },
- ],
- count: 1,
+ {
+ job_id: 8,
+ analyzers_running: ["TEST_ANALYZER"],
+ connectors_running: [],
+ visualizers_running: [],
+ playbook_running: null,
+ status: "accepted",
+ already_exists: true,
},
- }),
- );
+ ],
+ jobCount: 2,
+ },
+ ])("toast without playbook (%s)", async ({ responseData, jobCount }) => {
const user = userEvent.setup();
- const { container } = render(
-
-
- ,
- );
-
- const firstObservableInputElement = screen.getByRole("textbox", {
- name: "",
- });
- await user.type(
- firstObservableInputElement,
- "previouslyAnalyzerObservable",
- );
- const analyzerSelectionRadioButton = screen.getAllByRole("radio")[3];
- expect(analyzerSelectionRadioButton).toBeInTheDocument();
- await user.click(analyzerSelectionRadioButton);
-
- expect(screen.getByText("Select Analyzers")).toBeInTheDocument();
- expect(screen.getByText("Select Connectors")).toBeInTheDocument();
- const analyzerDropdownButton = screen.getAllByRole("combobox")[0];
- expect(analyzerDropdownButton).toBeInTheDocument();
- await user.click(analyzerDropdownButton);
-
- /* the id change in case you run a single test or all of them.
- we need this strange way to access instead of the id */
- const testAnalyzerButton = container.querySelector(
- `#${analyzerDropdownButton.id.replace("-input", "")}-option-0`,
- );
- expect(testAnalyzerButton).toBeInTheDocument();
- await user.click(testAnalyzerButton);
-
- expect(screen.getByText("TEST_ANALYZER")).toBeInTheDocument();
- // check scan is enabled
- const startScanButton = screen.getByRole("button", {
- name: "Start Scan",
- });
- expect(startScanButton).toBeInTheDocument();
- expect(startScanButton.className).not.toContain("disabled");
-
- await user.click(startScanButton);
-
- await waitFor(() => {
- expect(axios.post.mock.calls).toEqual([
- [
- ANALYZE_MULTIPLE_OBSERVABLE_URI,
- {
- observables: [["generic", "previouslyAnalyzerObservable"]],
- tlp: "AMBER",
- scan_mode: 2,
- analyzers_requested: ["TEST_ANALYZER"],
- scan_check_time: "24:00:00",
- },
- { headers: { "Content-Type": "application/json" } },
- ],
- ]);
- });
-
- /* without the setTimeout the expect doesn't work, but this timeout isn't real:
- it doesn't wait 15 or the test will go on timeout.
- This setTimeout makes other test fails (related to parallel execution)
- */
- // setTimeout(() => {
- // expect(
- // screen.getByText("Reported existing Job with ID(s) #2"),
- // ).toBeInTheDocument();
- // }, 15 * 1000);
- });
-
- test("toasts both new and existing jobs without playbook", async () => {
axios.post.mockImplementation(() =>
Promise.resolve({
data: {
- results: [
- {
- job_id: 1,
- analyzers_running: ["TEST_ANALYZER"],
- connectors_running: [],
- visualizers_running: [],
- playbook_running: null,
- status: "accepted",
- already_exists: false,
- },
- {
- job_id: 2,
- analyzers_running: ["TEST_ANALYZER"],
- connectors_running: [],
- visualizers_running: [],
- playbook_running: null,
- status: "accepted",
- already_exists: true,
- },
- ],
- count: 2,
+ results: responseData,
+ count: jobCount,
},
}),
);
- const user = userEvent.setup();
- const { container } = render(
+
+ render(
+
,
);
@@ -509,39 +245,23 @@ describe("ScanForm adavanced use", () => {
name: "",
});
await user.type(firstObservableInputElement, "newObservable");
- // add value
- const addObservableButton = screen.getByText("Add new value");
- expect(addObservableButton).toBeInTheDocument();
- await user.click(addObservableButton);
-
- const secondObservableInputElement = screen.getAllByRole("textbox", {
- name: "",
- })[1];
- await user.type(
- secondObservableInputElement,
- "previouslyAnalyzerObservable",
- );
-
- // add second observable
const analyzerSelectionRadioButton = screen.getAllByRole("radio")[3];
expect(analyzerSelectionRadioButton).toBeInTheDocument();
await user.click(analyzerSelectionRadioButton);
-
expect(screen.getByText("Select Analyzers")).toBeInTheDocument();
expect(screen.getByText("Select Connectors")).toBeInTheDocument();
+
/* the id change in case you run a single test or all of them.
we need this strange way to access instead of the id */
const analyzerDropdownButton = screen.getAllByRole("combobox")[0];
expect(analyzerDropdownButton).toBeInTheDocument();
await user.click(analyzerDropdownButton);
-
- const testAnalyzerButton = container.querySelector(
+ const testAnalyzerButton = document.querySelector(
`#${analyzerDropdownButton.id.replace("-input", "")}-option-0`,
);
expect(testAnalyzerButton).toBeInTheDocument();
await user.click(testAnalyzerButton);
-
- expect(screen.getByText("TEST_ANALYZER")).toBeInTheDocument();
+ expect(screen.getAllByText("TEST_ANALYZER")[0]).toBeInTheDocument();
// check scan is enabled
const startScanButton = screen.getByRole("button", {
name: "Start Scan",
@@ -555,10 +275,7 @@ describe("ScanForm adavanced use", () => {
[
ANALYZE_MULTIPLE_OBSERVABLE_URI,
{
- observables: [
- ["generic", "newObservable"],
- ["generic", "previouslyAnalyzerObservable"],
- ],
+ observables: [["generic", "newObservable"]],
tlp: "AMBER",
scan_mode: 2,
analyzers_requested: ["TEST_ANALYZER"],
@@ -568,18 +285,23 @@ describe("ScanForm adavanced use", () => {
],
]);
});
-
- /* without the setTimeout the expect doesn't work, but this timeout isn't real:
- it doesn't wait 15 or the test will go on timeout.
- This setTimeout makes other test fails (related to parallel execution)
- */
- // setTimeout(() => {
- // expect(
- // screen.getByText("Created new Job with ID(s) #1"),
- // ).toBeInTheDocument();
- // expect(
- // screen.getByText("Reported existing Job with ID(s) #2"),
- // ).toBeInTheDocument();
- // }, 15 * 1000);
+ if (jobCount === 1) {
+ if (responseData.already_exists) {
+ expect(
+ screen.getByText("Reported existing Job with ID(s) #6!"),
+ ).toBeInTheDocument();
+ } else {
+ expect(
+ screen.getByText("Created new Job with ID(s) #5!"),
+ ).toBeInTheDocument();
+ }
+ } else {
+ expect(
+ screen.getByText("Created new Job with ID(s) #5!"),
+ ).toBeInTheDocument();
+ expect(
+ screen.getByText("Reported existing Job with ID(s) #6!"),
+ ).toBeInTheDocument();
+ }
});
});
diff --git a/frontend/tests/utils/api.test.jsx b/frontend/tests/utils/api.test.jsx
new file mode 100644
index 0000000000..c3348d4309
--- /dev/null
+++ b/frontend/tests/utils/api.test.jsx
@@ -0,0 +1,69 @@
+import React from "react";
+
+const { prettifyErrors } = require("../../src/utils/api");
+
+describe("prettify errors", () => {
+ test("error in response data", () => {
+ const error = {
+ message: "Request failed with status code 405",
+ name: "AxiosError",
+ code: "ERR_BAD_REQUEST",
+ config: {},
+ request: {},
+ response: {
+ data: {
+ detail: 'Method "POST" not allowed.',
+ },
+ },
+ };
+ expect(prettifyErrors(error)).toEqual('Method "POST" not allowed.');
+ });
+ test("single validation error", () => {
+ const error = {
+ message: "Request failed with status code 400",
+ name: "AxiosError",
+ code: "ERR_BAD_REQUEST",
+ config: {},
+ request: {},
+ response: {
+ data: {
+ errors: {
+ detail: "No healthcheck implemented",
+ },
+ },
+ },
+ };
+ expect(prettifyErrors(error)).toEqual("No healthcheck implemented");
+ });
+ test("multiple validation error", () => {
+ const error = {
+ message: "Request failed with status code 400",
+ name: "AxiosError",
+ code: "ERR_BAD_REQUEST",
+ config: {},
+ request: {},
+ response: {
+ data: {
+ errors: {
+ detail: [
+ {
+ observable_name: [
+ "This field may not be blank.",
+ "another error",
+ ],
+ },
+ { another_key: "another error" },
+ ],
+ },
+ },
+ },
+ };
+ expect(prettifyErrors(error)).toEqual(
+
+ - This field may not be blank.
+ - another error
+ - another error
+
,
+ );
+ });
+});
diff --git a/integrations/malware_tools_analyzers/Dockerfile b/integrations/malware_tools_analyzers/Dockerfile
index 0e31efe8d3..89a0a64d6e 100644
--- a/integrations/malware_tools_analyzers/Dockerfile
+++ b/integrations/malware_tools_analyzers/Dockerfile
@@ -37,8 +37,8 @@ RUN wget -q https://github.com/mandiant/capa/releases/download/v6.1.0/capa-v6.1.
# Install Floss
WORKDIR ${PROJECT_PATH}/floss
-RUN wget -q https://github.com/mandiant/flare-floss/releases/download/v2.3.0/floss-v2.3.0-linux.zip \
- && unzip floss-v2.3.0-linux.zip \
+RUN wget -q https://github.com/mandiant/flare-floss/releases/download/v3.0.1/floss-v3.0.1-linux.zip \
+ && unzip floss-v3.0.1-linux.zip \
&& ln -s ${PROJECT_PATH}/floss/floss /usr/local/bin/floss
# Build Stringsifter
@@ -126,9 +126,10 @@ RUN chown -R ${USER}:${USER} ${PROJECT_PATH} \
COPY clamav/etc/* /etc/clamav
COPY clamav/sigs/* /var/lib/clamav
# Permission juggling for ClamAV Analyzer
-RUN mkdir /var/run/clamav && \
- chown ${USER}:${USER} /var/run/clamav && \
- chmod 755 /var/run/clamav
+RUN mkdir -p /var/run/clamav ${LOG_PATH} ${LOG_PATH}/clamav&& \
+ touch ${LOG_PATH}/gunicorn_access.log ${LOG_PATH}/gunicorn_errors.log && \
+ chmod 755 /var/run/clamav && \
+ chown -R ${USER}:${USER} /var/run/clamav ${LOG_PATH}
# Serve Flask application using gunicorn
EXPOSE 4002
diff --git a/integrations/malware_tools_analyzers/clamav/etc/clamd.conf b/integrations/malware_tools_analyzers/clamav/etc/clamd.conf
index b631c12b74..15c22e12d4 100644
--- a/integrations/malware_tools_analyzers/clamav/etc/clamd.conf
+++ b/integrations/malware_tools_analyzers/clamav/etc/clamd.conf
@@ -15,7 +15,7 @@ LogRotate true
LogFacility LOG_LOCAL6
LogClean false
LogVerbose false
-LogFile /var/log/intel_owl/clamav/clamav.log
+LogFile /var/log/intel_owl/malware_tools_analyzers/clamav/clamav.log
LogTime true
LogFileUnlock false
LogFileMaxSize 0
diff --git a/integrations/malware_tools_analyzers/clamav/etc/freshclam.conf b/integrations/malware_tools_analyzers/clamav/etc/freshclam.conf
index 7a63ef2d96..a7990f6619 100644
--- a/integrations/malware_tools_analyzers/clamav/etc/freshclam.conf
+++ b/integrations/malware_tools_analyzers/clamav/etc/freshclam.conf
@@ -8,7 +8,7 @@ LogSyslog false
LogTime yes
PidFile /run/clamav/freshclam.pid
Foreground true
-UpdateLogFile /var/log/intel_owl/clamav/freshclam.log
+UpdateLogFile /var/log/intel_owl/malware_tools_analyzers/clamav/freshclam.log
LogVerbose false
LogSyslog false
LogFacility LOG_LOCAL6
diff --git a/integrations/malware_tools_analyzers/entrypoint.sh b/integrations/malware_tools_analyzers/entrypoint.sh
index 526c0026f5..0c2a67f834 100644
--- a/integrations/malware_tools_analyzers/entrypoint.sh
+++ b/integrations/malware_tools_analyzers/entrypoint.sh
@@ -1,7 +1,5 @@
#!/bin/bash
-mkdir -p ${LOG_PATH}
-touch ${LOG_PATH}/gunicorn_access.log ${LOG_PATH}/gunicorn_errors.log
-chown -R malware_tools_analyzers-user:malware_tools_analyzers-user ${LOG_PATH}
+chown clamav:${USER} /var/lib/clamav ${LOG_PATH}/clamav
# clamav processes
echo "running freshclam"
freshclam # download db for first time
diff --git a/intel_owl/settings/commons.py b/intel_owl/settings/commons.py
index f3e432d22e..f5bc3868bd 100644
--- a/intel_owl/settings/commons.py
+++ b/intel_owl/settings/commons.py
@@ -13,6 +13,7 @@
PROJECT_LOCATION = BASE_DIR / "intel_owl"
BASE_STATIC_PATH = PROJECT_LOCATION / "static"
MEDIA_ROOT = BASE_DIR / "files_required"
+CONFIG_ROOT = PROJECT_LOCATION / "configuration"
YARA_RULES_PATH = MEDIA_ROOT / "yara"
# test / ci
diff --git a/intel_owl/settings/elasticsearch.py b/intel_owl/settings/elasticsearch.py
index 1ac636a7b7..e595381513 100644
--- a/intel_owl/settings/elasticsearch.py
+++ b/intel_owl/settings/elasticsearch.py
@@ -2,15 +2,65 @@
# See the file 'LICENSE' for copying permission.
# Elastic Search Configuration
+from ssl import create_default_context
+
+from elasticsearch import Elasticsearch
+
from intel_owl import secrets
+from intel_owl.settings import CONFIG_ROOT
+
+ELASTICSEARCH_BI_ENABLED = (
+ secrets.get_secret("ELASTICSEARCH_BI_ENABLED", False) == "True"
+)
+if ELASTICSEARCH_BI_ENABLED:
+ ELASTICSEARCH_BI_HOST = secrets.get_secret("ELASTICSEARCH_BI_HOST").split(",")
+ ELASTICSEARCH_SSL_CERTIFICATE_PATH = CONFIG_ROOT / secrets.get_secret(
+ "ELASTICSEARCH_SSL_CERTIFICATE_FILE_NAME", "elasticsearch.crt"
+ )
+ ELASTICSEARCH_BI_INDEX = secrets.get_secret("ELASTICSEARCH_BI_INDEX")
+ if (
+ not ELASTICSEARCH_BI_HOST
+ or not ELASTICSEARCH_SSL_CERTIFICATE_PATH
+ or not ELASTICSEARCH_BI_INDEX
+ ):
+ print("Elasticsearch not correctly configured")
+ else:
+ elastic_ssl_context = create_default_context(
+ cafile=str(ELASTICSEARCH_SSL_CERTIFICATE_PATH)
+ )
+ from importlib.metadata import version
+
+ v = version("elasticsearch")
+ major_version = int(v.split(".")[0])
+ if major_version < 8:
+ ELASTICSEARCH_CLIENT = Elasticsearch(
+ ELASTICSEARCH_BI_HOST,
+ ssl_context=elastic_ssl_context,
+ scheme="https",
+ maxsize=20,
+ max_retries=10,
+ retry_on_timeout=True,
+ timeout=30,
+ sniff_on_connection_fail=True,
+ sniff_timeout=30,
+ )
+ else:
+ raise RuntimeError(f"Elastic version {v} is not supported at the moment.")
+
+ELASTICSEARCH_DSL_ENABLED = (
+ secrets.get_secret("ELASTICSEARCH_DSL_ENABLED", False) == "True"
+)
+if ELASTICSEARCH_DSL_ENABLED:
+ ELASTICSEARCH_DSL_HOST = secrets.get_secret("ELASTICSEARCH_DSL_HOST")
-if secrets.get_secret("ELASTICSEARCH_ENABLED", False) == "True":
ELASTICSEARCH_DSL = {
- "default": {"hosts": secrets.get_secret("ELASTICSEARCH_HOST")},
+ "default": {"hosts": ELASTICSEARCH_DSL_HOST},
}
ELASTICSEARCH_DSL_INDEX_SETTINGS = {
- "number_of_shards": int(secrets.get_secret("ELASTICSEARCH_NO_OF_SHARDS")),
- "number_of_replicas": int(secrets.get_secret("ELASTICSEARCH_NO_OF_REPLICAS")),
+ "number_of_shards": int(secrets.get_secret("ELASTICSEARCH_DSL_NO_OF_SHARDS")),
+ "number_of_replicas": int(
+ secrets.get_secret("ELASTICSEARCH_DSL_NO_OF_REPLICAS")
+ ),
}
else:
ELASTICSEARCH_DSL_AUTOSYNC = False
diff --git a/intel_owl/tasks.py b/intel_owl/tasks.py
index b036644892..8996f6508b 100644
--- a/intel_owl/tasks.py
+++ b/intel_owl/tasks.py
@@ -33,7 +33,10 @@ def on_timeout(self, soft, timeout):
return result
def on_failure(self, exc_info, send_failed_event=True, return_ok=False):
- logger.critical(f"Failure detected for task {self.task.name}")
+ logger.critical(
+ f"Failure detected for task {self.task.name}"
+ f" with exception {exc_info} and request {self._request_dict}"
+ )
return super().on_failure(
exc_info, send_failed_event=send_failed_event, return_ok=return_ok
)
@@ -302,29 +305,17 @@ def create_caches(user_pk: int):
from api_app.visualizers_manager.models import VisualizerConfig
from api_app.visualizers_manager.serializers import VisualizerConfigSerializer
- for plugin in AnalyzerConfig.objects.all():
- PythonListConfigSerializer(
- child=AnalyzerConfigSerializer()
- ).to_representation_single_plugin(plugin, user)
-
- for plugin in ConnectorConfig.objects.all():
- PythonListConfigSerializer(
- child=ConnectorConfigSerializer()
- ).to_representation_single_plugin(plugin, user)
-
- for plugin in PivotConfig.objects.all():
- PythonListConfigSerializer(
- child=PivotConfigSerializer()
- ).to_representation_single_plugin(plugin, user)
-
- for plugin in VisualizerConfig.objects.all():
- PythonListConfigSerializer(
- child=VisualizerConfigSerializer()
- ).to_representation_single_plugin(plugin, user)
- for plugin in IngestorConfig.objects.all():
- PythonListConfigSerializer(
- child=IngestorConfigSerializer()
- ).to_representation_single_plugin(plugin, user)
+ for python_config_class, serializer_class in [
+ (AnalyzerConfig, AnalyzerConfigSerializer),
+ (ConnectorConfig, ConnectorConfigSerializer),
+ (PivotConfig, PivotConfigSerializer),
+ (VisualizerConfig, VisualizerConfigSerializer),
+ (IngestorConfig, IngestorConfigSerializer),
+ ]:
+ for plugin in python_config_class.objects.all():
+ PythonListConfigSerializer(
+ child=serializer_class()
+ ).to_representation_single_plugin(plugin, user)
@signals.beat_init.connect
@@ -354,6 +345,29 @@ def beat_init_connect(*args, sender: Consumer = None, **kwargs):
)
+@shared_task(base=FailureLoggedTask, name="send_bi_to_elastic", soft_time_limit=300)
+def send_bi_to_elastic(max_timeout: int = 60):
+ from api_app.analyzers_manager.models import AnalyzerReport
+ from api_app.connectors_manager.models import ConnectorReport
+ from api_app.ingestors_manager.models import IngestorReport
+ from api_app.models import AbstractReport
+ from api_app.pivots_manager.models import PivotReport
+ from api_app.visualizers_manager.models import VisualizerReport
+
+ if settings.ELASTICSEARCH_BI_ENABLED:
+ for report_class in [
+ AnalyzerReport,
+ ConnectorReport,
+ PivotReport,
+ IngestorReport,
+ VisualizerReport,
+ ]:
+ report_class: typing.Type[AbstractReport]
+ report_class.objects.filter(sent_to_bi=False).send_to_elastic_as_bi(
+ max_timeout=max_timeout
+ )
+
+
# set logger
@signals.setup_logging.connect
def config_loggers(*args, **kwags):
diff --git a/jsconfig.json b/jsconfig.json
index 66a6ed3b22..afae929604 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,7 +1,11 @@
// this is a config file for VSCode. It allows to suggest the imports in the frontend.
+
+/* Note: Add "javascript.validate.enable": true in you vs Code config to allow Quick fix to suggest import in frontend.
+ This trigger other linting errors not checked by the CI, and it's quite annoying.
+*/
{
- "compilerOptions": {
- "checkJs": true,
- "jsx": "react"
- }
- }
\ No newline at end of file
+ "compilerOptions": {
+ "checkJs": true,
+ "jsx": "react"
+ }
+}
\ No newline at end of file
diff --git a/requirements/project-requirements.txt b/requirements/project-requirements.txt
index af0d02027e..dfb2c56e1c 100644
--- a/requirements/project-requirements.txt
+++ b/requirements/project-requirements.txt
@@ -11,9 +11,11 @@ django-ses == 3.5.0
django-iam-dbauth==0.1.4
django-prettyjson==0.4.1
django-silk==5.0.3
+django-elasticsearch-dsl==8.0
+
jsonschema==4.19.0
# django rest framework libs
-Authlib==1.2.0
+Authlib==1.3.0
djangorestframework==3.14.0
djangorestframework-filters==1.0.0.dev2
drf-spectacular==0.26.1
@@ -37,7 +39,7 @@ checkdmarc==4.8.4
dnspython==2.4.2
dnstwist[full]==20230918
google>=3.0.0
-google-cloud-webrisk==1.12.0
+google-cloud-webrisk==1.13.0
intezer-sdk==1.19.4
lief==0.13.1
maxminddb==2.5.1
@@ -71,3 +73,4 @@ XLMMacroDeobfuscator[secure]==0.2.3
pyxlsb2==0.0.8
xlrd2==1.3.4
defusedxml==0.7.1
+dateparser==1.2.0
diff --git a/start.py b/start.py
index 2b62bc6767..28cc48b07b 100644
--- a/start.py
+++ b/start.py
@@ -20,7 +20,7 @@
load_dotenv("docker/.env")
CURRENT_VERSION = os.getenv("REACT_APP_INTELOWL_VERSION", "").replace("v", "")
-PYELASTIC_DEFAULT_VERSION = "7.2.2"
+PYELASTIC_DEFAULT_VERSION = "7.4.1"
PYCTI_DEFAULT_VERSION = "5.10.0"
DOCKER_ANALYZERS = [
diff --git a/tests/api_app/analyzers_manager/test_views.py b/tests/api_app/analyzers_manager/test_views.py
index d013c23d87..22b83ee88e 100644
--- a/tests/api_app/analyzers_manager/test_views.py
+++ b/tests/api_app/analyzers_manager/test_views.py
@@ -66,7 +66,7 @@ def test_health_check(self):
result = response.json()
self.assertIn("errors", result)
self.assertIn("detail", result["errors"])
- self.assertEqual(result["errors"]["detail"], "Not implemented")
+ self.assertEqual(result["errors"]["detail"], "No healthcheck implemented")
class AnalyzerActionViewSetTests(CustomViewSetTestCase, PluginActionViewsetTestCase):