Skip to content

Fix routing and template rendering bugs #40

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

Open
jbalagiya wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix routing and template rendering bugs #40

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
44 changes: 31 additions & 13 deletions worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,40 @@ function decodeBase64(str) {
}
}

function escapeForScript(str) {
if (!str) return '';
return String(str)
.replace(/\\/g, '\\\\')
.replace(/'/g, "\\'")
.replace(/"/g, '\\"')
.replace(/\n/g, '\\n')
.replace(/\r/g, '\\r')
.replace(/</g, '\\u003c')
.replace(/>/g, '\\u003e');
}

function renderTemplate(template, data) {
let rendered = template;

// Replace all placeholders with actual data
rendered = rendered.replace(/REPLACE_UID/g, data.uid || '');
rendered = rendered.replace(/REPLACE_URL/g, data.url || '');
rendered = rendered.replace(/REPLACE_HOST_URL/g, data.a || '');
rendered = rendered.replace(/REPLACE_IP/g, data.ip || '');
rendered = rendered.replace(/REPLACE_TIME/g, data.time || '');
const uid = escapeForScript(data.uid || '');
const url = escapeForScript(data.url || '');
const hostUrl = escapeForScript(data.a || '');
const ip = escapeForScript(data.ip || '');
const time = escapeForScript(data.time || '');

// Replace all placeholders with actual data using callback to prevent $& injection
rendered = rendered.replace(/REPLACE_UID/g, () => uid);
rendered = rendered.replace(/REPLACE_URL/g, () => url);
rendered = rendered.replace(/REPLACE_HOST_URL/g, () => hostUrl);
rendered = rendered.replace(/REPLACE_IP/g, () => ip);
rendered = rendered.replace(/REPLACE_TIME/g, () => time);

// Also handle the newer template format
rendered = rendered.replace(/\{\{UID\}\}/g, data.uid || '');
rendered = rendered.replace(/\{\{REDIRECT_URL\}\}/g, data.url || '');
rendered = rendered.replace(/\{\{HOST_URL\}\}/g, data.a || '');
rendered = rendered.replace(/\{\{IP\}\}/g, data.ip || '');
rendered = rendered.replace(/\{\{TIME\}\}/g, data.time || '');
rendered = rendered.replace(/\{\{UID\}\}/g, () => uid);
rendered = rendered.replace(/\{\{REDIRECT_URL\}\}/g, () => url);
rendered = rendered.replace(/\{\{HOST_URL\}\}/g, () => hostUrl);
rendered = rendered.replace(/\{\{IP\}\}/g, () => ip);
rendered = rendered.replace(/\{\{TIME\}\}/g, () => time);

return rendered;
}
Expand Down Expand Up @@ -395,8 +413,8 @@ async function handleRequest(request, env) {
}

// Handle c/ and w/ paths (cloudflare and webview templates)
const cloudflareMatch = path.match(/^\/c\/([^/]+)\/([^/]+)/);
const webviewMatch = path.match(/^\/w\/([^/]+)\/([^/]+)/);
const cloudflareMatch = path.match(/^\/c\/([^/]+)\/(.+)/);
const webviewMatch = path.match(/^\/w\/([^/]+)\/(.+)/);

if (cloudflareMatch) {
const [, uid, uri] = cloudflareMatch;
Expand Down