Skip to content

Fix g-flag regex in getValidId and CSS selector injection in getIdFromUrl #853

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
dmarcos merged 1 commit into from
Apr 20, 2026
Merged

Fix g-flag regex in getValidId and CSS selector injection in getIdFromUrl #853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions src/lib/assetsUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ export function getUrlFromId(assetId) {
}

export function getIdFromUrl(url) {
return document.querySelector("a-assets > [src='" + url + "']")?.id;
const escaped = url.replace(/'/g, "\\'");
return document.querySelector(`a-assets > [src='${escaped}']`)?.id;
}

export function getFilename(url, converted = false) {
Expand All @@ -20,19 +21,23 @@ export function getFilename(url, converted = false) {

export function isValidId(id) {
// The correct re should include : and . but A-frame seems to fail while accessing them
var re = /^[A-Za-z]+[\w-]*$/;
var re = /^[A-Za-z_]+[\w-]*$/;
return re.test(id);
}

export function getValidId(name) {
// info.name.replace(/\.[^/.]+$/, '').replace(/\s+/g, '')
return name
.split('.')
.shift()
.replace(/\s/, '-')
.replace(/^\d+\s*/, '')
.replace(/[\W]/, '')
.toLowerCase();
return (
name
.split('.')
.shift()
// Replace spaces with hyphens
.replace(/\s+/g, '-')
// Remove characters that are not letters (A–Z, a–z), numbers (0–9), underscore (_), and hyphen (-)
.replace(/[^\w-]+/g, '')
// Strip leading hyphens and digits
.replace(/^[-\d]+/, '')
.toLowerCase()
);
}

export function insertNewAsset(type, id, src, onLoadedCallback = undefined) {
Expand Down
Loading