LogalDeveloper/owncast
0
Fork 0
Code Activity

Fix default protocol validation list

Browse Source
This commit is contained in:
Gabe Kangas
2022-12-14 23:33:32 -08:00
parent 5951ce527b
commit 7d2e2537cf
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/pages/admin/actions.tsx
View File

@@ -69,16 +69,7 @@ const ActionModal = (props: Props) => {
} }
function canSave(): Boolean { function canSave(): Boolean {
try { return isValidUrl(actionUrl, ['https:']) && actionTitle !== '';
const validationObject = new URL(actionUrl);
if (validationObject.protocol !== 'https:') {
return false;
}
} catch {
return false;
}
return isValidUrl(actionUrl) && actionTitle !== '';
} }
const okButtonProps = { const okButtonProps = {

4
web/utils/urls.ts
View File

@@ -7,10 +7,10 @@ export const DEFAULT_TEXTFIELD_URL_PATTERN = 'https?://.*';
* @param {string[]} validProtocols - An array of valid protocols. Defaults to web. * @param {string[]} validProtocols - An array of valid protocols. Defaults to web.
* @returns {boolean} - True if the URI is valid, false otherwise. * @returns {boolean} - True if the URI is valid, false otherwise.
*/ */
export function isValidUrl(url: string, validProtocols: string[] = ['http', 'https']): boolean { export function isValidUrl(url: string, validProtocols: string[] = ['http:', 'https:']): boolean {
console.log(url, validProtocols);
try { try {
const validationObject = new URL(url); const validationObject = new URL(url);
if ( if (
validationObject.protocol === '' || validationObject.protocol === '' ||
validationObject.hostname === '' || validationObject.hostname === '' ||