diff options
Diffstat (limited to 'web/source')
3 files changed, 35 insertions, 14 deletions
diff --git a/web/source/settings/lib/query/admin/domain-permissions/export.ts b/web/source/settings/lib/query/admin/domain-permissions/export.ts index b6ef560f4..868e3f7a4 100644 --- a/web/source/settings/lib/query/admin/domain-permissions/export.ts +++ b/web/source/settings/lib/query/admin/domain-permissions/export.ts @@ -56,12 +56,12 @@ function exportProcess(formData: ExportDomainPermsParams): _exportProcess { if (formData.exportType == "csv") { return { transformEntry: (entry) => [ - entry.domain, // #domain - "suspend", // #severity - false, // #reject_media - false, // #reject_reports - entry.public_comment, // #public_comment - entry.obfuscate ?? false // #obfuscate + entry.domain, // domain + "suspend", // severity + false, // reject_media + false, // reject_reports + entry.public_comment ?? "", // public_comment + entry.obfuscate ?? false // obfuscate ], stringify: (list) => csvUnparse({ fields: [ diff --git a/web/source/settings/lib/query/admin/domain-permissions/process.ts b/web/source/settings/lib/query/admin/domain-permissions/process.ts index 017d02bb4..10ba88cc3 100644 --- a/web/source/settings/lib/query/admin/domain-permissions/process.ts +++ b/web/source/settings/lib/query/admin/domain-permissions/process.ts @@ -27,7 +27,7 @@ import { isValidDomainPermission, hasBetterScope } from "../../../util/domain-pe import { gtsApi } from "../../gts-api"; import { - isDomainPerms, + validateDomainPerms, type DomainPerm, } from "../../../types/domain-permission"; @@ -43,19 +43,39 @@ function parseDomainList(list: string): DomainPerm[] { if (list.startsWith("[")) { // Assume JSON array. const data = JSON.parse(list); - if (!isDomainPerms(data)) { - throw "parsed JSON was not array of DomainPermission"; + + const validateRes = validateDomainPerms(data); + if (!validateRes.success) { + throw `parsed JSON was not array of DomainPermission: ${JSON.stringify(validateRes.errors)}`; } return data; } else if (list.startsWith("#domain") || list.startsWith("domain,severity")) { // Assume Mastodon-style CSV. const csvParseCfg: CSVParseConfig = { + // Key by header. header: true, - // Remove leading '#' if present. + // Remove leading '#' from headers if present. transformHeader: (header) => header.startsWith("#") ? header.slice(1) : header, + // Massage weird boolean values. + transform: (value, _field) => { + if (value == "False" || value == "True") { + return value.toLowerCase(); + } else { + return value; + } + }, skipEmptyLines: true, - dynamicTyping: true + // Only dynamic type boolean values, + // leave the rest as strings. + dynamicTyping: { + "domain": false, + "severity": false, + "reject_media": true, + "reject_reports": true, + "public_comment": false, + "obfuscate": true, + } }; const { data, errors } = csvParse(list, csvParseCfg); @@ -67,8 +87,9 @@ function parseDomainList(list: string): DomainPerm[] { throw error; } - if (!isDomainPerms(data)) { - throw "parsed CSV was not array of DomainPermission"; + const validateRes = validateDomainPerms(data); + if (!validateRes.success) { + throw `parsed CSV was not array of DomainPermission: ${JSON.stringify(validateRes.errors)}`; } return data; diff --git a/web/source/settings/lib/types/domain-permission.ts b/web/source/settings/lib/types/domain-permission.ts index f90c8d8a9..93df883f2 100644 --- a/web/source/settings/lib/types/domain-permission.ts +++ b/web/source/settings/lib/types/domain-permission.ts @@ -19,7 +19,7 @@ import typia from "typia"; -export const isDomainPerms = typia.createIs<DomainPerm[]>(); +export const validateDomainPerms = typia.createValidate<DomainPerm[]>(); export type PermType = "block" | "allow"; |