mirror of
https://github.com/fleetdm/fleet
synced 2026-05-05 06:18:25 +00:00
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #42184 # Checklist for submitter If some of the following don't apply, delete the relevant line. - [ ] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. - [ ] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements), JS inline code is prevented especially for url redirects, and untrusted data interpolated into shell scripts/commands is validated against shell metacharacters. - [ ] If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes ## Testing - [ ] Added/updated automated tests - [ ] Where appropriate, [automated tests simulate multiple hosts and test for host isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing) (updates to one hosts's records do not affect another) - [ ] QA'd all new/changed functionality manually For unreleased bug fixes in a release candidate, one of: - [ ] Confirmed that the fix is not expected to adversely impact load test results - [ ] Alerted the release DRI if additional load testing is needed ## Database migrations - [ ] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [ ] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [ ] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`). ## New Fleet configuration settings - [ ] Setting(s) is/are explicitly excluded from GitOps If you didn't check the box above, follow this checklist for GitOps-enabled settings: - [ ] Verified that the setting is exported via `fleetctl generate-gitops` - [ ] Verified the setting is documented in a separate PR to [the GitOps documentation](https://github.com/fleetdm/fleet/blob/main/docs/Configuration/yaml-files.md#L485) - [ ] Verified that the setting is cleared on the server if it is not supplied in a YAML file (or that it is documented as being optional) - [ ] Verified that any relevant UI is disabled when GitOps mode is enabled ## fleetd/orbit/Fleet Desktop - [ ] Verified compatibility with the latest released version of Fleet (see [Must rule](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/fleetd-development-and-release-strategy.md)) - [ ] If the change applies to only one platform, confirmed that `runtime.GOOS` is used as needed to isolate changes - [ ] Verified that fleetd runs on macOS, Linux and Windows - [ ] Verified auto-update works from the released version of component to the new version (see [tools/tuf/test](../tools/tuf/test/README.md)) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes * **New Features** * Added support for GitOps exceptions per entity type (labels, software, secrets), allowing specific areas to bypass GitOps mode restrictions when configured. * **Bug Fixes** * Improved GitOps mode behavior to properly respect per-entity-type exception settings across software, labels, and secrets management. * **Tests** * Extended test coverage for GitOps exception handling scenarios. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
221 lines
6.8 KiB
TypeScript
221 lines
6.8 KiB
TypeScript
import React, { useContext, useEffect, useState } from "react";
|
|
import { InjectedRouter } from "react-router";
|
|
import { useQuery, useQueryClient } from "react-query";
|
|
|
|
import PATHS from "router/paths";
|
|
import { DEFAULT_USE_QUERY_OPTIONS } from "utilities/constants";
|
|
import { getFileDetails, IFileDetails } from "utilities/file/fileUtils";
|
|
import { getPathWithQueryParams, QueryParams } from "utilities/url";
|
|
import softwareAPI from "services/entities/software";
|
|
import labelsAPI, { getCustomLabels } from "services/entities/labels";
|
|
|
|
import { NotificationContext } from "context/notification";
|
|
import { AppContext } from "context/app";
|
|
import useGitOpsMode from "hooks/useGitOpsMode";
|
|
import { ILabelSummary } from "interfaces/label";
|
|
|
|
import FileProgressModal from "components/FileProgressModal";
|
|
import PremiumFeatureMessage from "components/PremiumFeatureMessage";
|
|
import Spinner from "components/Spinner";
|
|
import DataError from "components/DataError";
|
|
import InfoBanner from "components/InfoBanner";
|
|
import CategoriesEndUserExperienceModal from "pages/SoftwarePage/components/modals/CategoriesEndUserExperienceModal";
|
|
|
|
import PackageForm from "pages/SoftwarePage/components/forms/PackageForm";
|
|
import { IPackageFormData } from "pages/SoftwarePage/components/forms/PackageForm/PackageForm";
|
|
|
|
import { getErrorMessage } from "./helpers";
|
|
|
|
const baseClass = "software-custom-package";
|
|
|
|
interface ISoftwarePackageProps {
|
|
currentTeamId: number;
|
|
router: InjectedRouter;
|
|
isSidePanelOpen: boolean;
|
|
setSidePanelOpen: (isOpen: boolean) => void;
|
|
}
|
|
|
|
const SoftwareCustomPackage = ({
|
|
currentTeamId,
|
|
router,
|
|
isSidePanelOpen,
|
|
setSidePanelOpen,
|
|
}: ISoftwarePackageProps) => {
|
|
const { renderFlash } = useContext(NotificationContext);
|
|
const { isPremiumTier } = useContext(AppContext);
|
|
const queryClient = useQueryClient();
|
|
const { gitOpsModeEnabled } = useGitOpsMode("software");
|
|
|
|
const [uploadProgress, setUploadProgress] = useState(0);
|
|
const [uploadDetails, setUploadDetails] = useState<IFileDetails | null>(null);
|
|
const [
|
|
showPreviewEndUserExperience,
|
|
setShowPreviewEndUserExperience,
|
|
] = useState(false);
|
|
const [
|
|
isIpadOrIphoneSoftwareSource,
|
|
setIsIpadOrIphoneSoftwareSource,
|
|
] = useState(false);
|
|
|
|
const {
|
|
data: labels,
|
|
isLoading: isLoadingLabels,
|
|
isError: isErrorLabels,
|
|
} = useQuery<ILabelSummary[], Error>(
|
|
["custom_labels"],
|
|
() =>
|
|
labelsAPI
|
|
.summary(currentTeamId)
|
|
.then((res) => getCustomLabels(res.labels)),
|
|
{
|
|
...DEFAULT_USE_QUERY_OPTIONS,
|
|
enabled: isPremiumTier,
|
|
}
|
|
);
|
|
|
|
useEffect(() => {
|
|
const beforeUnloadHandler = (e: BeforeUnloadEvent) => {
|
|
e.preventDefault();
|
|
// Next line with e.returnValue is included for legacy support
|
|
// e.g.Chrome / Edge < 119
|
|
e.returnValue = true;
|
|
};
|
|
|
|
// set up event listener to prevent user from leaving page while uploading
|
|
if (uploadDetails) {
|
|
addEventListener("beforeunload", beforeUnloadHandler);
|
|
} else {
|
|
removeEventListener("beforeunload", beforeUnloadHandler);
|
|
}
|
|
|
|
// clean up event listener and timeout on component unmount
|
|
return () => {
|
|
removeEventListener("beforeunload", beforeUnloadHandler);
|
|
};
|
|
}, [uploadDetails]);
|
|
|
|
const onClickPreviewEndUserExperience = (isIosOrIpadosApp = false) => {
|
|
setShowPreviewEndUserExperience(!showPreviewEndUserExperience);
|
|
setIsIpadOrIphoneSoftwareSource(isIosOrIpadosApp);
|
|
};
|
|
|
|
const onCancel = () => {
|
|
router.push(
|
|
getPathWithQueryParams(PATHS.SOFTWARE_TITLES, {
|
|
fleet_id: currentTeamId,
|
|
})
|
|
);
|
|
};
|
|
|
|
const onSubmit = async (formData: IPackageFormData) => {
|
|
if (!formData.software) {
|
|
renderFlash(
|
|
"error",
|
|
`Couldn't add. Please refresh the page and try again.`
|
|
);
|
|
return;
|
|
}
|
|
|
|
setUploadDetails(getFileDetails(formData.software));
|
|
|
|
// Note: This TODO is copied to onSaveSoftwareChanges in EditSoftwareModal
|
|
// TODO: confirm we are deleting the second sentence (not modifying it) for non-self-service installers
|
|
try {
|
|
const {
|
|
software_package: { title_id: softwarePackageTitleId },
|
|
} = await softwareAPI.addSoftwarePackage({
|
|
data: formData,
|
|
teamId: currentTeamId,
|
|
onUploadProgress: (progressEvent) => {
|
|
const progress = progressEvent.progress || 0;
|
|
// for large uploads it seems to take a bit for the server to finalize its response so we'll keep the
|
|
// progress bar at 97% until the server response is received
|
|
setUploadProgress(Math.max(progress - 0.03, 0.01));
|
|
},
|
|
});
|
|
|
|
if (!gitOpsModeEnabled) {
|
|
renderFlash(
|
|
"success",
|
|
<>
|
|
<b>{formData.software?.name}</b> successfully added.
|
|
{formData.selfService
|
|
? " The end user can install from Fleet Desktop."
|
|
: ""}
|
|
</>
|
|
);
|
|
}
|
|
|
|
queryClient.invalidateQueries({
|
|
queryKey: [{ scope: "software-titles" }],
|
|
});
|
|
|
|
const newQueryParams: QueryParams = {
|
|
fleet_id: currentTeamId,
|
|
gitops_yaml: gitOpsModeEnabled ? "true" : undefined,
|
|
};
|
|
router.push(
|
|
getPathWithQueryParams(
|
|
PATHS.SOFTWARE_TITLE_DETAILS(softwarePackageTitleId.toString()),
|
|
newQueryParams
|
|
)
|
|
);
|
|
} catch (e) {
|
|
renderFlash("error", getErrorMessage(e));
|
|
}
|
|
setUploadDetails(null);
|
|
};
|
|
|
|
const renderContent = () => {
|
|
if (isLoadingLabels) {
|
|
return <Spinner />;
|
|
}
|
|
|
|
if (isErrorLabels) {
|
|
return <DataError verticalPaddingSize="pad-xxxlarge" />;
|
|
}
|
|
|
|
return (
|
|
<>
|
|
{gitOpsModeEnabled && (
|
|
<InfoBanner borderRadius="medium">
|
|
Add custom packages in GitOps mode so Fleet can host your software.
|
|
After adding, copy its SHA-256 hash into your YAML so the next
|
|
GitOps workflow doesn't delete it.
|
|
</InfoBanner>
|
|
)}
|
|
<PackageForm
|
|
labels={labels || []}
|
|
showSchemaButton={!isSidePanelOpen}
|
|
onClickShowSchema={() => setSidePanelOpen(true)}
|
|
className={`${baseClass}__package-form`}
|
|
onCancel={onCancel}
|
|
onSubmit={onSubmit}
|
|
onClickPreviewEndUserExperience={onClickPreviewEndUserExperience}
|
|
/>
|
|
{uploadDetails && (
|
|
<FileProgressModal
|
|
fileDetails={uploadDetails}
|
|
fileProgress={uploadProgress}
|
|
/>
|
|
)}
|
|
{showPreviewEndUserExperience && (
|
|
<CategoriesEndUserExperienceModal
|
|
onCancel={onClickPreviewEndUserExperience}
|
|
isIosOrIpadosApp={isIpadOrIphoneSoftwareSource}
|
|
/>
|
|
)}
|
|
</>
|
|
);
|
|
};
|
|
|
|
if (!isPremiumTier) {
|
|
return (
|
|
<PremiumFeatureMessage className={`${baseClass}__premium-message`} />
|
|
);
|
|
}
|
|
|
|
return <div className={baseClass}>{renderContent()}</div>;
|
|
};
|
|
|
|
export default SoftwareCustomPackage;
|