+
+
{LL.settingsPage.enterprise.fields.clientTrafficPolicy.header()}
+
+
+
+
+ -
+
{LL.settingsPage.enterprise.fields.clientTrafficPolicy.none.helper()}
+
+ -
+
+ {LL.settingsPage.enterprise.fields.clientTrafficPolicy.disableAllTraffic.helper()}
+
+
+ -
+
+ {LL.settingsPage.enterprise.fields.clientTrafficPolicy.forceAllTraffic.helper()}
+
+
+
+
+ {options.map(({ key, value, label, disabled = false }) => {
+ const active = fieldValue === value;
+ return (
+
{
+ if (!disabled) {
+ onChange(value);
+ }
+ }}
+ >
+
{label}
+
+
+ );
+ })}
+
+
{showDirsync ? (
<>
-
- {/* FIXME: Really buggy when using the controller, investigate why */}
- setValue('directory_sync_enabled', val)}
- // controller={{ control, name: 'directory_sync_enabled' }}
- />
-
+
{
disabled={isLoading}
/>
{providerName === 'Microsoft' ? (
- {parse(localLL.form.labels.group_match.helper())}
- }
- required={false}
- >
+ <>
+
+
+ {localLL.form.labels.prefetch_users.helper()}
+
+ {parse(localLL.form.labels.group_match.helper())}
+ }
+ required={false}
+ />
+
) : null}
{providerName === 'Okta' ? (
<>
diff --git a/web/src/pages/settings/components/OpenIdSettings/components/OpenIdSettingsForm.tsx b/web/src/pages/settings/components/OpenIdSettings/components/OpenIdSettingsForm.tsx
index ec3215c2b4..992c57a543 100644
--- a/web/src/pages/settings/components/OpenIdSettings/components/OpenIdSettingsForm.tsx
+++ b/web/src/pages/settings/components/OpenIdSettings/components/OpenIdSettingsForm.tsx
@@ -102,6 +102,7 @@ export const OpenIdSettingsForm = () => {
google_service_account_email: z.string(),
google_service_account_key: z.string(),
directory_sync_enabled: z.boolean(),
+ prefetch_users: z.boolean(),
directory_sync_interval: z.number().min(60, LL.form.error.invalid()),
directory_sync_user_behavior: z.enum(['keep', 'disable', 'delete']),
directory_sync_admin_behavior: z.enum(['keep', 'disable', 'delete']),
@@ -175,6 +176,7 @@ export const OpenIdSettingsForm = () => {
google_service_account_email: '',
google_service_account_key: '',
directory_sync_enabled: false,
+ prefetch_users: false,
directory_sync_interval: 600,
directory_sync_user_behavior: 'keep',
directory_sync_admin_behavior: 'keep',
diff --git a/web/src/pages/settings/components/OpenIdSettings/components/style.scss b/web/src/pages/settings/components/OpenIdSettings/components/style.scss
index 017b6c9d4e..0e9f73a849 100644
--- a/web/src/pages/settings/components/OpenIdSettings/components/style.scss
+++ b/web/src/pages/settings/components/OpenIdSettings/components/style.scss
@@ -76,8 +76,14 @@
justify-content: flex-end;
}
- .labeled-checkbox {
- padding-bottom: var(--spacing-s);
+ #directory-sync-settings {
+ & > .form-checkbox {
+ padding-bottom: var(--spacing-s);
+ }
+
+ .helper-row {
+ padding-bottom: var(--spacing-s);
+ }
}
}
diff --git a/web/src/pages/settings/components/SmtpSettings/components/SmtpSettingsForm/SmtpSettingsForm.tsx b/web/src/pages/settings/components/SmtpSettings/components/SmtpSettingsForm/SmtpSettingsForm.tsx
index 55db9997b5..f28d33c025 100644
--- a/web/src/pages/settings/components/SmtpSettings/components/SmtpSettingsForm/SmtpSettingsForm.tsx
+++ b/web/src/pages/settings/components/SmtpSettings/components/SmtpSettingsForm/SmtpSettingsForm.tsx
@@ -27,7 +27,7 @@ import { patternValidEmail } from '../../../../../../shared/patterns';
import { QueryKeys } from '../../../../../../shared/queries';
import type { SettingsSMTP } from '../../../../../../shared/types';
import { invalidateMultipleQueries } from '../../../../../../shared/utils/invalidateMultipleQueries';
-import { validateIpOrDomain } from '../../../../../../shared/validators';
+import { Validate } from '../../../../../../shared/validators';
import { useSettingsPage } from '../../../../hooks/useSettingsPage';
import { SmtpTestModal } from '../SmtpTest/SmtpTestModal';
import { useSmtpTestModal } from '../SmtpTest/useSmtpTestModal';
@@ -112,8 +112,14 @@ export const SmtpSettingsForm = () => {
.trim()
.min(1, LL.form.error.required())
.refine(
- (val) => (!val ? true : validateIpOrDomain(val, false, true)),
- LL.form.error.endpoint(),
+ (val) =>
+ Validate.any(val, [
+ Validate.IPv4,
+ Validate.IPv6,
+ Validate.Domain,
+ Validate.Empty,
+ ]),
+ LL.form.error.address(),
),
smtp_port: z
.number({
diff --git a/web/src/pages/wizard/components/WizardNetworkConfiguration/WizardNetworkConfiguration.tsx b/web/src/pages/wizard/components/WizardNetworkConfiguration/WizardNetworkConfiguration.tsx
index caa6ef8530..993154b893 100644
--- a/web/src/pages/wizard/components/WizardNetworkConfiguration/WizardNetworkConfiguration.tsx
+++ b/web/src/pages/wizard/components/WizardNetworkConfiguration/WizardNetworkConfiguration.tsx
@@ -10,6 +10,7 @@ import { shallow } from 'zustand/shallow';
import { useI18nContext } from '../../../../i18n/i18n-react';
import { FormAclDefaultPolicy } from '../../../../shared/components/Form/FormAclDefaultPolicySelect/FormAclDefaultPolicy.tsx';
import { FormLocationMfaModeSelect } from '../../../../shared/components/Form/FormLocationMfaModeSelect/FormLocationMfaModeSelect.tsx';
+import { FormServiceLocationModeSelect } from '../../../../shared/components/Form/FormServiceLocationModeSelect/FormServiceLocationModeSelect.tsx';
import { RenderMarkdown } from '../../../../shared/components/Layout/RenderMarkdown/RenderMarkdown.tsx';
import { FormCheckBox } from '../../../../shared/defguard-ui/components/Form/FormCheckBox/FormCheckBox.tsx';
import { FormInput } from '../../../../shared/defguard-ui/components/Form/FormInput/FormInput';
@@ -22,10 +23,10 @@ import { useAppStore } from '../../../../shared/hooks/store/useAppStore.ts';
import useApi from '../../../../shared/hooks/useApi';
import { useToaster } from '../../../../shared/hooks/useToaster';
import { QueryKeys } from '../../../../shared/queries';
-import { LocationMfaMode } from '../../../../shared/types.ts';
+import { LocationMfaMode, ServiceLocationMode } from '../../../../shared/types.ts';
import { titleCase } from '../../../../shared/utils/titleCase';
import { trimObjectStrings } from '../../../../shared/utils/trimObjectStrings.ts';
-import { validateIpList, validateIpOrDomainList } from '../../../../shared/validators';
+import { Validate } from '../../../../shared/validators';
import { useWizardStore } from '../../hooks/useWizardStore';
import { DividerHeader } from './components/DividerHeader.tsx';
@@ -106,27 +107,52 @@ export const WizardNetworkConfiguration = () => {
.string()
.trim()
.min(1, LL.form.error.required())
- .refine((value) => {
- return validateIpList(value, ',', true);
- }, LL.form.error.addressNetmask()),
- endpoint: z.string().trim().min(1, LL.form.error.required()),
+ .refine(
+ (val) => Validate.any(val, [Validate.CIDRv4, Validate.CIDRv6]),
+ LL.form.error.addressNetmask(),
+ ),
+ endpoint: z
+ .string()
+ .trim()
+ .min(1, LL.form.error.required())
+ .refine(
+ (val) =>
+ Validate.any(val, [Validate.IPv4, Validate.IPv6, Validate.Domain], true),
+ LL.form.error.endpoint(),
+ ),
port: z
.number({
invalid_type_error: LL.form.error.invalid(),
})
.max(65535, LL.form.error.portMax())
.nonnegative(),
- allowed_ips: z.string().trim(),
+ allowed_ips: z
+ .string()
+ .trim()
+ .refine(
+ (val) =>
+ Validate.any(
+ val,
+ [
+ Validate.CIDRv4,
+ Validate.IPv4,
+ Validate.CIDRv6,
+ Validate.IPv6,
+ Validate.Empty,
+ ],
+ true,
+ ),
+ LL.form.error.address(),
+ ),
dns: z
.string()
.trim()
.optional()
- .refine((val) => {
- if (val === '' || !val) {
- return true;
- }
- return validateIpOrDomainList(val, ',', true);
- }, LL.form.error.allowedIps()),
+ .refine(
+ (val) =>
+ Validate.any(val, [Validate.IPv4, Validate.IPv6, Validate.Empty], true),
+ LL.form.error.address(),
+ ),
allowed_groups: z.array(z.string().trim().min(1, LL.form.error.minimumLength())),
keepalive_interval: z
.number({
@@ -141,6 +167,7 @@ export const WizardNetworkConfiguration = () => {
acl_enabled: z.boolean(),
acl_default_allow: z.boolean(),
location_mfa_mode: z.nativeEnum(LocationMfaMode),
+ service_location_mode: z.nativeEnum(ServiceLocationMode),
}),
[LL.form.error],
);
@@ -171,6 +198,15 @@ export const WizardNetworkConfiguration = () => {
() => locationMfaMode === LocationMfaMode.DISABLED,
[locationMfaMode],
);
+ const serviceLocationMode = useWatch({
+ control,
+ name: 'service_location_mode',
+ defaultValue: getDefaultValues.service_location_mode,
+ });
+ const serviceLocationEnabled = useMemo(
+ () => serviceLocationMode !== ServiceLocationMode.DISABLED,
+ [serviceLocationMode],
+ );
const handleValidSubmit: SubmitHandler = (values) => {
const trimmed = trimObjectStrings(values);
@@ -282,7 +318,17 @@ export const WizardNetworkConfiguration = () => {
-
+ {serviceLocationEnabled && (
+
+
+ {LL.networkConfiguration.form.helpers.locationMfaMode.serviceLocationWarning()}
+
+
+ )}
+
{LL.networkConfiguration.form.helpers.peerDisconnectThreshold()}
@@ -292,6 +338,15 @@ export const WizardNetworkConfiguration = () => {
type="number"
disabled={mfaDisabled}
/>
+ {!mfaDisabled && (
+
+ {LL.networkConfiguration.form.helpers.serviceLocation.mfaWarning()}
+
+ )}
+
diff --git a/web/src/pages/wizard/components/WizardNetworkImport/WizardNetworkImport.tsx b/web/src/pages/wizard/components/WizardNetworkImport/WizardNetworkImport.tsx
index 52c798c0ee..7f38c6d255 100644
--- a/web/src/pages/wizard/components/WizardNetworkImport/WizardNetworkImport.tsx
+++ b/web/src/pages/wizard/components/WizardNetworkImport/WizardNetworkImport.tsx
@@ -27,7 +27,7 @@ import { QueryKeys } from '../../../../shared/queries';
import type { ImportNetworkRequest } from '../../../../shared/types';
import { invalidateMultipleQueries } from '../../../../shared/utils/invalidateMultipleQueries';
import { titleCase } from '../../../../shared/utils/titleCase';
-import { validateIpOrDomain } from '../../../../shared/validators';
+import { Validate } from '../../../../shared/validators';
import { useWizardStore } from '../../hooks/useWizardStore';
interface FormInputs extends Omit {
@@ -70,7 +70,10 @@ export const WizardNetworkImport = () => {
.string()
.trim()
.min(1, LL.form.error.required())
- .refine((val) => validateIpOrDomain(val), LL.form.error.endpoint()),
+ .refine(
+ (val) => Validate.any(val, [Validate.IPv4, Validate.IPv6, Validate.Domain]),
+ LL.form.error.endpoint(),
+ ),
fileName: z.string().trim().min(1, LL.form.error.required()),
config: z.string().trim().min(1, LL.form.error.required()),
allowed_groups: z.array(z.string().min(1, LL.form.error.minimumLength())),
diff --git a/web/src/pages/wizard/hooks/useWizardStore.ts b/web/src/pages/wizard/hooks/useWizardStore.ts
index 0206902238..944f9b48f0 100644
--- a/web/src/pages/wizard/hooks/useWizardStore.ts
+++ b/web/src/pages/wizard/hooks/useWizardStore.ts
@@ -7,6 +7,7 @@ import {
type ImportedDevice,
LocationMfaMode,
type Network,
+ ServiceLocationMode,
} from '../../../shared/types';
export enum WizardSetupType {
@@ -34,6 +35,7 @@ const defaultValues: StoreFields = {
acl_enabled: false,
acl_default_allow: false,
location_mfa_mode: LocationMfaMode.DISABLED,
+ service_location_mode: ServiceLocationMode.DISABLED,
},
};
@@ -90,6 +92,7 @@ type StoreFields = {
acl_enabled: boolean;
acl_default_allow: boolean;
location_mfa_mode: LocationMfaMode;
+ service_location_mode: ServiceLocationMode;
};
};
diff --git a/web/src/shared/components/Form/FormLocationMfaModeSelect/FormLocationMfaModeSelect.tsx b/web/src/shared/components/Form/FormLocationMfaModeSelect/FormLocationMfaModeSelect.tsx
index 0c87aae1c7..23e89e11c0 100644
--- a/web/src/shared/components/Form/FormLocationMfaModeSelect/FormLocationMfaModeSelect.tsx
+++ b/web/src/shared/components/Form/FormLocationMfaModeSelect/FormLocationMfaModeSelect.tsx
@@ -14,10 +14,12 @@ import { LocationMfaMode } from '../../../types';
type Props = {
controller: UseControllerProps;
+ disabled?: boolean;
};
export const FormLocationMfaModeSelect = ({
controller,
+ disabled = false,
}: Props) => {
const { LL } = useI18nContext();
const {
@@ -38,12 +40,13 @@ export const FormLocationMfaModeSelect = ({
key: LocationMfaMode.INTERNAL,
value: LocationMfaMode.INTERNAL,
label: LL.components.locationMfaModeSelect.options.internal(),
+ disabled: disabled,
},
{
key: LocationMfaMode.EXTERNAL,
value: LocationMfaMode.EXTERNAL,
label: LL.components.locationMfaModeSelect.options.external(),
- disabled: externalMfaDisabled,
+ disabled: externalMfaDisabled || disabled,
},
],
[
@@ -51,6 +54,7 @@ export const FormLocationMfaModeSelect = ({
LL.components.locationMfaModeSelect.options.external,
LL.components.locationMfaModeSelect.options.internal,
externalMfaDisabled,
+ disabled,
],
);
diff --git a/web/src/shared/components/Form/FormServiceLocationModeSelect/FormServiceLocationModeSelect.tsx b/web/src/shared/components/Form/FormServiceLocationModeSelect/FormServiceLocationModeSelect.tsx
new file mode 100644
index 0000000000..150c158f1d
--- /dev/null
+++ b/web/src/shared/components/Form/FormServiceLocationModeSelect/FormServiceLocationModeSelect.tsx
@@ -0,0 +1,84 @@
+import './style.scss';
+import clsx from 'clsx';
+import { useMemo } from 'react';
+import {
+ type FieldValues,
+ type UseControllerProps,
+ useController,
+} from 'react-hook-form';
+import { useI18nContext } from '../../../../i18n/i18n-react';
+import { RadioButton } from '../../../defguard-ui/components/Layout/RadioButton/Radiobutton';
+import type { SelectOption } from '../../../defguard-ui/components/Layout/Select/types';
+import { useAppStore } from '../../../hooks/store/useAppStore';
+import { ServiceLocationMode } from '../../../types';
+
+type Props = {
+ controller: UseControllerProps;
+ disabled?: boolean;
+};
+
+export const FormServiceLocationModeSelect = ({
+ controller,
+ disabled = false,
+}: Props) => {
+ const { LL } = useI18nContext();
+ const {
+ field: { onChange, value: fieldValue },
+ } = useController(controller);
+ const enterpriseEnabled = useAppStore((s) => s.appInfo?.license_info.enterprise);
+
+ const options = useMemo(
+ (): SelectOption[] => [
+ {
+ key: ServiceLocationMode.DISABLED,
+ value: ServiceLocationMode.DISABLED,
+ label: LL.components.serviceLocationModeSelect.options.disabled(),
+ },
+ {
+ key: ServiceLocationMode.PRELOGON,
+ value: ServiceLocationMode.PRELOGON,
+ label: LL.components.serviceLocationModeSelect.options.prelogon(),
+ disabled: !enterpriseEnabled || disabled,
+ },
+ {
+ key: ServiceLocationMode.ALWAYSON,
+ value: ServiceLocationMode.ALWAYSON,
+ label: LL.components.serviceLocationModeSelect.options.alwayson(),
+ disabled: !enterpriseEnabled || disabled,
+ },
+ ],
+ [
+ LL.components.serviceLocationModeSelect.options.disabled,
+ LL.components.serviceLocationModeSelect.options.prelogon,
+ LL.components.serviceLocationModeSelect.options.alwayson,
+ disabled,
+ enterpriseEnabled,
+ ],
+ );
+
+ return (
+
+
+ {options.map(({ key, value, label, disabled = false }) => {
+ const active = fieldValue === value;
+ return (
+
{
+ if (!disabled) {
+ onChange(value);
+ }
+ }}
+ >
+
{label}
+
+
+ );
+ })}
+