Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Require URL contains valid protocol in MDM settings end user migration form (#19124)

Browse source
This commit is contained in:
Sarah Gillespie 2024-05-20 11:14:19 -05:00 committed by GitHub
parent 229c080e1a
commit 8dd3c70a3c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EndUserMigrationSection/EndUserMigrationSection.tsx
View file

@ -2,18 +2,23 @@ import React, { useContext, useState } from "react";
import { InjectedRouter } from "react-router";
import classnames from "classnames";
import isURL from "validator/lib/isURL";
import PATHS from "router/paths";
import configAPI from "services/entities/config";
import { AppContext } from "context/app";
import { NotificationContext } from "context/notification";
import { getErrorReason } from "interfaces/errors";
import configAPI from "services/entities/config";
// @ts-ignore
import InputField from "components/forms/fields/InputField";
import Radio from "components/forms/fields/Radio/Radio";
import Slider from "components/forms/fields/Slider/Slider";
import Button from "components/buttons/Button/Button";
import SectionHeader from "components/SectionHeader";
import validateUrl from "components/forms/validators/valid_url";
import PremiumFeatureMessage from "components/PremiumFeatureMessage/PremiumFeatureMessage";
import EmptyTable from "components/EmptyTable/EmptyTable";
@ -39,7 +44,11 @@ interface IEndUserMigrationSectionProps {
}
const validateWebhookUrl = (val: string) => {
return validateUrl({ url: val });
return isURL(val, {
protocols: ["http", "https"],
require_protocol: true,
require_valid_protocol: true,
});
};
const EndUserMigrationSection = ({ router }: IEndUserMigrationSectionProps) => {
@ -82,6 +91,7 @@ const EndUserMigrationSection = ({ router }: IEndUserMigrationSectionProps) => {
const onChangeWebhookUrl = (webhookUrl: string) => {
setFormData((prevFormData) => ({ ...prevFormData, webhookUrl }));
setIsValidWebhookUrl(validateWebhookUrl(webhookUrl));
};
const onSubmit = async (e: React.FormEvent<SubmitEvent>) => {
@ -105,6 +115,14 @@ const EndUserMigrationSection = ({ router }: IEndUserMigrationSectionProps) => {
renderFlash("success", "Successfully updated end user migration!");
setConfig(updatedConfig);
} catch (err) {
if (
getErrorReason(err, {
nameEquals: "macos_migration.webhook_url",
})
) {
setIsValidWebhookUrl(false);
return;
}
renderFlash("error", "Could not update. Please try again.");
}
};