import { useSaveValuesMutation } from '../../../../queries/settings';
import { AlmKeys } from '../../../../types/alm-settings';
import { ProvisioningType } from '../../../../types/provisioning';
-import { Dict } from '../../../../types/types';
+import { Dict, Provider } from '../../../../types/types';
import { AuthenticationTabs, DOCUMENTATION_LINK_SUFFIXES } from './Authentication';
import AuthenticationFormField from './AuthenticationFormField';
-import GitHubConfirmModal from './GitHubConfirmModal';
import { SettingValue } from './hook/useConfiguration';
import { isAllowToSignUpEnabled, isOrganizationListEmpty } from './hook/useGithubConfiguration';
+import ConfirmProvisioningModal from './ConfirmProvisioningModal';
interface Props {
canBeSave: boolean;
}
/>
{showConfirmModal && (
- <GitHubConfirmModal
+ <ConfirmProvisioningModal
+ allowUsersToSignUp={isAllowToSignUpEnabled(values)}
+ isAllowListEmpty={isOrganizationListEmpty(values)}
onClose={() => setShowConfirmModal(false)}
onConfirm={onSave}
+ provider={Provider.Github}
provisioningStatus={provisioningStatus ?? ProvisioningType.jit}
- values={values}
/>
)}
</>
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+import { FlagMessage } from 'design-system';
+import React from 'react';
+import ConfirmModal from '../../../../components/controls/ConfirmModal';
+import { ProvisioningType } from '../../../../types/provisioning';
+import { Provider } from '../../../../types/types';
+import { useIntl } from 'react-intl';
+
+interface Props {
+ allowUsersToSignUp?: boolean;
+ provider: Provider.Github | Provider.Gitlab;
+ isAllowListEmpty: boolean;
+ onClose: VoidFunction;
+ onConfirm: VoidFunction;
+ hasProvisioningTypeChange?: boolean;
+ provisioningStatus: ProvisioningType;
+}
+
+export default function ConfirmProvisioningModal(props: Readonly<Props>) {
+ const {
+ allowUsersToSignUp,
+ hasProvisioningTypeChange,
+ isAllowListEmpty,
+ onConfirm,
+ onClose,
+ provider,
+ provisioningStatus,
+ } = props;
+
+ const intl = useIntl();
+
+ return (
+ <ConfirmModal
+ onConfirm={onConfirm}
+ header={intl.formatMessage({
+ id: `settings.authentication.${provider}.confirm.${hasProvisioningTypeChange ? provisioningStatus : 'insecure'}`,
+ })}
+ onClose={onClose}
+ confirmButtonText={intl.formatMessage({
+ id: `settings.authentication.${provider}.provisioning_change.confirm_changes`,
+ })}
+ >
+ {hasProvisioningTypeChange &&
+ intl.formatMessage({
+ id: `settings.authentication.${provider}.confirm.${provisioningStatus}.description`,
+ })}
+ {(provisioningStatus === ProvisioningType.auto || allowUsersToSignUp) && isAllowListEmpty && (
+ <FlagMessage className="sw-mt-2" variant="warning">
+ {intl.formatMessage({
+ id: `settings.authentication.${provider}.provisioning_change.insecure_config`,
+ })}
+ </FlagMessage>
+ )}
+ </ConfirmModal>
+ );
+}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2024 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-import { FlagMessage } from 'design-system';
-import React from 'react';
-import ConfirmModal from '../../../../components/controls/ConfirmModal';
-import { translate } from '../../../../helpers/l10n';
-import { ProvisioningType } from '../../../../types/provisioning';
-import { SettingValue } from './hook/useConfiguration';
-import { isAllowToSignUpEnabled, isOrganizationListEmpty } from './hook/useGithubConfiguration';
-
-interface GithubAuthenticationProps {
- onConfirm: () => void;
- onClose: () => void;
- values: Record<string, SettingValue>;
- hasGithubProvisioningTypeChange?: boolean;
- provisioningStatus: ProvisioningType;
-}
-
-export default function GitHubConfirmModal(props: Readonly<GithubAuthenticationProps>) {
- const { onConfirm, onClose, hasGithubProvisioningTypeChange, provisioningStatus, values } = props;
-
- const organizationListIsEmpty = isOrganizationListEmpty(values);
- const allowToSignUpEnabled = isAllowToSignUpEnabled(values);
-
- return (
- <ConfirmModal
- onConfirm={onConfirm}
- header={translate(
- 'settings.authentication.github.confirm',
- hasGithubProvisioningTypeChange ? provisioningStatus : 'insecure',
- )}
- onClose={onClose}
- confirmButtonText={translate(
- 'settings.authentication.github.provisioning_change.confirm_changes',
- )}
- >
- {hasGithubProvisioningTypeChange &&
- translate('settings.authentication.github.confirm', provisioningStatus, 'description')}
- {(provisioningStatus === ProvisioningType.auto || allowToSignUpEnabled) &&
- organizationListIsEmpty && (
- <FlagMessage className="sw-mt-2" variant="warning">
- {translate('settings.authentication.github.provisioning_change.insecure_config')}
- </FlagMessage>
- )}
- </ConfirmModal>
- );
-}
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import { Spinner } from 'design-system';
-import { omitBy } from 'lodash';
+import { isEmpty, omitBy } from 'lodash';
import React, { FormEvent, useContext } from 'react';
import { FormattedMessage } from 'react-intl';
import GitLabSynchronisationWarning from '../../../../app/components/GitLabSynchronisationWarning';
import { AvailableFeaturesContext } from '../../../../app/components/available-features/AvailableFeaturesContext';
import DocumentationLink from '../../../../components/common/DocumentationLink';
-import ConfirmModal from '../../../../components/controls/ConfirmModal';
import { translate, translateWithParameters } from '../../../../helpers/l10n';
import { useIdentityProviderQuery } from '../../../../queries/identity-provider/common';
import {
import GitLabConfigurationValidity from './GitLabConfigurationValidity';
import ProvisioningSection from './ProvisioningSection';
import TabHeader from './TabHeader';
+import ConfirmProvisioningModal from './ConfirmProvisioningModal';
interface ChangesForm {
provisioningType?: GitLabConfigurationUpdateBody['provisioningType'];
const handleSubmit = (e: FormEvent) => {
e.preventDefault();
- if (changes?.provisioningType !== undefined) {
+ if (
+ changes?.provisioningType !== undefined ||
+ (provisioningType === ProvisioningType.jit && allowUsersToSignUp && isEmpty(allowedGroups))
+ ) {
setShowConfirmProvisioningModal(true);
} else {
updateProvisioning();
)}
</div>
{showConfirmProvisioningModal && provisioningType && (
- <ConfirmModal
- onConfirm={updateProvisioning}
- header={translate('settings.authentication.gitlab.confirm', provisioningType)}
+ <ConfirmProvisioningModal
+ allowUsersToSignUp={allowUsersToSignUp}
+ hasProvisioningTypeChange={Boolean(changes?.provisioningType)}
+ isAllowListEmpty={isEmpty(allowedGroups)}
onClose={() => setShowConfirmProvisioningModal(false)}
- confirmButtonText={translate(
- 'settings.authentication.gitlab.provisioning_change.confirm_changes',
- )}
- >
- {translate('settings.authentication.gitlab.confirm', provisioningType, 'description')}
- </ConfirmModal>
+ onConfirm={updateProvisioning}
+ provider={Provider.Gitlab}
+ provisioningStatus={provisioningType}
+ />
)}
{openForm && (
<GitLabConfigurationForm data={configuration ?? null} onClose={() => setOpenForm(false)} />
import ConfigurationDetails from './ConfigurationDetails';
import ConfigurationForm from './ConfigurationForm';
import GitHubConfigurationValidity from './GitHubConfigurationValidity';
-import GitHubConfirmModal from './GitHubConfirmModal';
import GitHubMappingModal from './GitHubMappingModal';
import ProvisioningSection from './ProvisioningSection';
import TabHeader from './TabHeader';
isAllowToSignUpEnabled,
isOrganizationListEmpty,
} from './hook/useGithubConfiguration';
+import ConfirmProvisioningModal from './ConfirmProvisioningModal';
interface GithubAuthenticationProps {
definitions: ExtendedSettingDefinition[];
}
/>
{showConfirmProvisioningModal && (
- <GitHubConfirmModal
- onConfirm={() => changeProvisioning()}
+ <ConfirmProvisioningModal
+ allowUsersToSignUp={isAllowToSignUpEnabled(values)}
+ hasProvisioningTypeChange={hasGithubProvisioningTypeChange}
+ isAllowListEmpty={isOrganizationListEmpty(values)}
onClose={() => setShowConfirmProvisioningModal(false)}
- values={values}
- hasGithubProvisioningTypeChange={hasGithubProvisioningTypeChange}
+ onConfirm={changeProvisioning}
+ provider={Provider.Github}
provisioningStatus={provisioningStatus}
/>
)}
confirmJitProvisioningDialog: byRole('dialog', {
name: 'settings.authentication.gitlab.confirm.JIT',
}),
+ confirmInsecureProvisioningDialog: byRole('dialog', {
+ name: 'settings.authentication.gitlab.confirm.insecure',
+ }),
confirmProvisioningChange: byRole('button', {
name: 'settings.authentication.gitlab.provisioning_change.confirm_changes',
}),
expect(await ui.saveProvisioning.find()).toBeEnabled();
- expect(ui.jitAllowUsersToSignUpToggle.get()).toBeInTheDocument();
+ await user.click(ui.jitAllowUsersToSignUpToggle.get());
+ await user.click(ui.deleteGroupButton.get());
+
+ await user.click(ui.saveProvisioning.get());
+ expect(
+ ui.confirmJitProvisioningDialog
+ .byText('settings.authentication.gitlab.provisioning_change.insecure_config')
+ .get(),
+ ).toBeInTheDocument();
+ await user.click(ui.confirmProvisioningChange.get());
+ expect(ui.confirmJitProvisioningDialog.query()).not.toBeInTheDocument();
+
+ expect(ui.jitProvisioningRadioButton.get()).toBeChecked();
+ expect(await ui.saveProvisioning.find()).toBeDisabled();
+});
+
+it('should show configuration warning with jit provisioning and no groups', async () => {
+ handler.setGitlabConfigurations([
+ mockGitlabConfiguration({
+ allowUsersToSignUp: false,
+ enabled: true,
+ provisioningType: ProvisioningType.jit,
+ allowedGroups: [],
+ isProvisioningTokenSet: true,
+ }),
+ ]);
+ const user = userEvent.setup();
+ renderAuthentication([Feature.GitlabProvisioning]);
+
+ expect(await ui.editConfigButton.find()).toBeInTheDocument();
+ await user.click(ui.jitAllowUsersToSignUpToggle.get());
await user.click(ui.saveProvisioning.get());
- expect(ui.confirmJitProvisioningDialog.get()).toBeInTheDocument();
+
+ expect(
+ ui.confirmInsecureProvisioningDialog
+ .byText('settings.authentication.gitlab.provisioning_change.insecure_config')
+ .get(),
+ ).toBeInTheDocument();
+
await user.click(ui.confirmProvisioningChange.get());
expect(ui.confirmJitProvisioningDialog.query()).not.toBeInTheDocument();
settings.authentication.gitlab.confirm.JIT=Switch to Just-in-Time provisioning
settings.authentication.gitlab.confirm.AUTO_PROVISIONING.description=Once you transition to automatic provisioning users and groups on GitLab projects will be inherited from GitLab. You will no longer have the ability to edit them within SonarQube. Do you want to proceed with this change?
settings.authentication.gitlab.confirm.JIT.description=Switching to Just-in-Time provisioning removes the automatic synchronization of users and groups. Users are provisioned and updated only at user login. Are you sure?
+settings.authentication.gitlab.confirm.insecure=Potentially insecure configuration
settings.authentication.gitlab.provisioning_change.confirm_changes=Confirm Changes
+settings.authentication.gitlab.provisioning_change.insecure_config=Please be aware that your configuration is potentially insecure because you didn't add any groups to the allowlist and you allowed users to sign up. Anyone can install it and gain access to your instance.
settings.authentication.gitlab.form.provisioning_with_gitlab=Automatic user and group provisioning
settings.authentication.gitlab.form.provisioning_with_gitlab.description=Users and groups are automatically provisioned from GitLab. Once activated, users and groups can only be created and modified from GitLab. Existing local users will be kept and can only be deactivated. {documentation}
settings.authentication.gitlab.form.provisioning.disabled=Your current edition does not support provisioning with GitLab. See the {documentation} for more information.
projects / sonarqube.git / commitdiff