mirror of
https://github.com/fleetdm/fleet
synced 2026-05-01 10:27:35 +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 -->
144 lines
4.4 KiB
TypeScript
144 lines
4.4 KiB
TypeScript
import React from "react";
|
|
|
|
import { ITeam } from "interfaces/team";
|
|
import { IEnrollSecret } from "interfaces/enroll_secret";
|
|
|
|
import Card from "components/Card";
|
|
import EmptyTable from "components/EmptyTable";
|
|
import GitOpsModeTooltipWrapper from "components/GitOpsModeTooltipWrapper";
|
|
import Modal from "components/Modal";
|
|
import Button from "components/buttons/Button";
|
|
import Icon from "components/Icon/Icon";
|
|
import EnrollSecretTable from "../EnrollSecretTable";
|
|
|
|
interface IEnrollSecretModal {
|
|
selectedTeamId: number;
|
|
primoMode: boolean;
|
|
onReturnToApp: () => void;
|
|
teams: ITeam[];
|
|
toggleSecretEditorModal: () => void;
|
|
toggleDeleteSecretModal: () => void;
|
|
setSelectedSecret: React.Dispatch<
|
|
React.SetStateAction<IEnrollSecret | undefined>
|
|
>;
|
|
globalSecrets?: IEnrollSecret[] | undefined;
|
|
}
|
|
|
|
const baseClass = "enroll-secret-modal";
|
|
|
|
const EnrollSecretModal = ({
|
|
onReturnToApp,
|
|
selectedTeamId,
|
|
primoMode,
|
|
teams,
|
|
toggleSecretEditorModal,
|
|
toggleDeleteSecretModal,
|
|
setSelectedSecret,
|
|
globalSecrets,
|
|
}: IEnrollSecretModal): JSX.Element => {
|
|
const teamInfo =
|
|
selectedTeamId <= 0
|
|
? { name: "Unassigned", secrets: globalSecrets }
|
|
: teams.find((team) => team.id === selectedTeamId);
|
|
|
|
const addNewSecretClick = () => {
|
|
setSelectedSecret(undefined);
|
|
toggleSecretEditorModal();
|
|
};
|
|
return (
|
|
<Modal
|
|
onExit={onReturnToApp}
|
|
onEnter={onReturnToApp}
|
|
title="Manage enroll secrets"
|
|
className={baseClass}
|
|
>
|
|
<div className={`${baseClass} form`}>
|
|
{teamInfo?.secrets?.length ? (
|
|
<>
|
|
<div className={`${baseClass}__header`}>
|
|
<div className={`${baseClass}__description`}>
|
|
Use these secret(s) to enroll hosts
|
|
{primoMode || teamInfo?.name === "Unassigned" ? (
|
|
""
|
|
) : (
|
|
<>
|
|
{" "}
|
|
to <b>{teamInfo?.name}</b>
|
|
</>
|
|
)}
|
|
.
|
|
</div>
|
|
<div className={`${baseClass}__add-secret`}>
|
|
<GitOpsModeTooltipWrapper
|
|
entityType="secrets"
|
|
position="right"
|
|
tipOffset={8}
|
|
renderChildren={(disableChildren) => (
|
|
<Button
|
|
disabled={disableChildren}
|
|
onClick={addNewSecretClick}
|
|
className={`${baseClass}__add-secret-btn`}
|
|
variant="brand-inverse-icon"
|
|
iconStroke
|
|
>
|
|
Add secret <Icon name="plus" color="core-fleet-green" />
|
|
</Button>
|
|
)}
|
|
/>
|
|
</div>
|
|
</div>
|
|
<EnrollSecretTable
|
|
secrets={teamInfo?.secrets}
|
|
toggleSecretEditorModal={toggleSecretEditorModal}
|
|
toggleDeleteSecretModal={toggleDeleteSecretModal}
|
|
setSelectedSecret={setSelectedSecret}
|
|
/>
|
|
</>
|
|
) : (
|
|
<Card color="grey" paddingSize="small">
|
|
<EmptyTable
|
|
header="You have no enroll secrets."
|
|
info={
|
|
<>
|
|
Add secret(s) to enroll hosts
|
|
{primoMode || teamInfo?.name === "Unassigned" ? (
|
|
""
|
|
) : (
|
|
<>
|
|
{" "}
|
|
to <b>{teamInfo?.name}</b>
|
|
</>
|
|
)}
|
|
.
|
|
</>
|
|
}
|
|
primaryButton={
|
|
<GitOpsModeTooltipWrapper
|
|
entityType="secrets"
|
|
position="right"
|
|
tipOffset={8}
|
|
renderChildren={(disableChildren) => (
|
|
<Button
|
|
disabled={disableChildren}
|
|
onClick={addNewSecretClick}
|
|
className={`${baseClass}__add-secret-btn`}
|
|
variant="brand-inverse-icon"
|
|
iconStroke
|
|
>
|
|
Add secret <Icon name="plus" color="core-fleet-green" />
|
|
</Button>
|
|
)}
|
|
/>
|
|
}
|
|
/>
|
|
</Card>
|
|
)}
|
|
<div className="modal-cta-wrap">
|
|
<Button onClick={onReturnToApp}>Close</Button>
|
|
</div>
|
|
</div>
|
|
</Modal>
|
|
);
|
|
};
|
|
|
|
export default EnrollSecretModal;
|