CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-28 17:46:09 +12:00
Code Issues Projects Releases Wiki Activity

Getting basic regex in place to make sure role names can be IDs.

Browse source
This commit is contained in:
mike12345567 2023-06-21 17:08:54 +01:00
parent e0debf8d25
commit 45120c60ba
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
View file

@ -12,15 +12,14 @@
let selectedRole = BASE_ROLE let selectedRole = BASE_ROLE
let errors = [] let errors = []
let builtInRoles = ["Admin", "Power", "Basic", "Public"] let builtInRoles = ["Admin", "Power", "Basic", "Public"]
let validRegex = /^[a-zA-Z0-9_]*$/
// Don't allow editing of public role // Don't allow editing of public role
$: editableRoles = $roles.filter(role => role._id !== "PUBLIC") $: editableRoles = $roles.filter(role => role._id !== "PUBLIC")
$: selectedRoleId = selectedRole._id $: selectedRoleId = selectedRole._id
$: otherRoles = editableRoles.filter(role => role._id !== selectedRoleId) $: otherRoles = editableRoles.filter(role => role._id !== selectedRoleId)
$: isCreating = selectedRoleId == null || selectedRoleId === "" $: isCreating = selectedRoleId == null || selectedRoleId === ""
$: hasUniqueRoleName = !otherRoles $: roleNameError = getRoleNameError(selectedRole.name)
?.map(role => role.name)
?.includes(selectedRole.name)
$: valid = $: valid =
selectedRole.name && selectedRole.name &&
@ -101,6 +100,20 @@
} }
} }
const getRoleNameError = name => {
const hasUniqueRoleName = !otherRoles
?.map(role => role.name)
?.includes(name)
const invalidRoleName = !validRegex.test(name)
if (!hasUniqueRoleName) {
return "Select a unique role name."
} else if (invalidRoleName) {
return "Please enter a role name consisting of only alphanumeric symbols and underscores"
} else {
return null
}
}
onMount(fetchBasePermissions) onMount(fetchBasePermissions)
</script> </script>
@ -108,7 +121,7 @@
title="Edit Roles" title="Edit Roles"
confirmText={isCreating ? "Create" : "Save"} confirmText={isCreating ? "Create" : "Save"}
onConfirm={saveRole} onConfirm={saveRole}
disabled={!valid || !hasUniqueRoleName} disabled={!valid || roleNameError}
> >
{#if errors.length} {#if errors.length}
<ErrorsBox {errors} /> <ErrorsBox {errors} />
@ -129,7 +142,7 @@
label="Name" label="Name"
bind:value={selectedRole.name} bind:value={selectedRole.name}
disabled={shouldDisableRoleInput} disabled={shouldDisableRoleInput}
error={!hasUniqueRoleName ? "Select a unique role name." : null} error={roleNameError}
/> />
<Select <Select
label="Inherits Role" label="Inherits Role"

2
packages/server/src/api/routes/utils/validators.ts
View file

@ -134,7 +134,7 @@ export function roleValidator() {
return auth.joiValidator.body(Joi.object({ return auth.joiValidator.body(Joi.object({
_id: OPTIONAL_STRING, _id: OPTIONAL_STRING,
_rev: OPTIONAL_STRING, _rev: OPTIONAL_STRING,
name: Joi.string().required(), name: Joi.string().regex(/^[a-zA-Z0-9_]*$/).required(),
// this is the base permission ID (for now a built in) // this is the base permission ID (for now a built in)
permissionId: Joi.string().valid(...Object.values(permissions.BuiltinPermissionID)).required(), permissionId: Joi.string().valid(...Object.values(permissions.BuiltinPermissionID)).required(),
permissions: Joi.object() permissions: Joi.object()