Skip to content

[stable1.0] fix: Ensure context icon is valid #2356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enjeck merged 2 commits into from
Mar 4, 2026
+81 −5
Merged

[stable1.0] fix: Ensure context icon is valid #2356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5e9577
fix: Ensure context icon is valid
enjeck Jan 16, 2026
c8b4075
fix: api spec
blizzz Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion lib/Controller/ContextController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ public function show(int $contextId): DataResponse {
#[NoAdminRequired]
public function create(string $name, string $iconName, string $description = '', array $nodes = []): DataResponse {
try {
if (!$this->isValidIcon($iconName)) {
return new DataResponse(['message' => 'Invalid icon name'], Http::STATUS_BAD_REQUEST);
}
return new DataResponse($this->contextService->create(
$name,
$iconName,
Expand All @@ -128,9 +131,10 @@ public function create(string $name, string $iconName, string $description = '',
* @param ?string $description provide this parameter to set a new description
* @param ?array{id: int, type: int, permissions: int, order: int} $nodes provide this parameter to set a new list of nodes.
*
* @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND|Http::STATUS_FORBIDDEN, array{message: string}, array{}>
* @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND|Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST, array{message: string}, array{}>
*
* 200: returning the full context information
* 400: bad request
* 403: No permissions
* 404: Not found
*
Expand All @@ -139,6 +143,9 @@ public function create(string $name, string $iconName, string $description = '',
#[NoAdminRequired]
public function update(int $contextId, ?string $name, ?string $iconName, ?string $description, ?array $nodes): DataResponse {
try {
if ($iconName !== null && !$this->isValidIcon($iconName)) {
return new DataResponse(['message' => 'Invalid icon name'], Http::STATUS_BAD_REQUEST);
}
$nodes = $nodes !== null ? $this->sanitizeInputNodes($nodes) : null;
return new DataResponse($this->contextService->update(
$contextId,
Expand Down Expand Up @@ -271,6 +278,14 @@ public function updateContentOrder(int $contextId, int $pageId, array $content):
return new DataResponse($this->contextService->updateContentOrder($pageId, $content));
}

protected function isValidIcon(string $iconName): bool {
if ($iconName === '' || !preg_match('/^[a-zA-Z0-9-]+$/', $iconName)) {
return false;
}
$iconPath = dirname(__DIR__, 2) . '/img/material/' . $iconName . '.svg';
return file_exists($iconPath);
}

/**
* @param Context[] $contexts
* @return array
Expand Down
38 changes: 38 additions & 0 deletions openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10889,6 +10889,44 @@
}
}
},
"400": {
"description": "bad request",
"content": {
"application/json": {
"schema": {
"type": "object",
"required": [
"ocs"
],
"properties": {
"ocs": {
"type": "object",
"required": [
"meta",
"data"
],
"properties": {
"meta": {
"$ref": "#/components/schemas/OCSMeta"
},
"data": {
"type": "object",
"required": [
"message"
],
"properties": {
"message": {
"type": "string"
}
}
}
}
}
}
}
}
}
},
"401": {
"description": "Current user is not logged in",
"content": {
Expand Down
15 changes: 11 additions & 4 deletions src/shared/components/ncIconPicker/mixins/svgHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
export default {
methods: {
async getContextIcon(iconName) {
const { default: icon } = await import(
`./../../../../../img/material/${iconName}.svg?raw`
)
try {
const { default: icon } = await import(
`./../../../../../img/material/${iconName}.svg?raw`
)

return icon.replaceAll(/#fff/g, 'currentColor')
return icon.replaceAll(/#fff/g, 'currentColor')
} catch (e) {
if (iconName !== 'apps') {
return this.getContextIcon('apps')
}
throw e
}
},
},
}
16 changes: 16 additions & 0 deletions src/types/openapi/openapi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6223,6 +6223,22 @@ export interface operations {
};
};
};
/** @description bad request */
readonly 400: {
headers: {
readonly [name: string]: unknown;
};
content: {
readonly "application/json": {
readonly ocs: {
readonly meta: components["schemas"]["OCSMeta"];
readonly data: {
readonly message: string;
};
};
};
};
};
/** @description Current user is not logged in */
readonly 401: {
headers: {
Expand Down
Loading