Skip to content

Fix Notion public-domain routing for proxied sites #54

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
Azilone wants to merge 1 commit into
base: v1
Choose a base branch
from
Open

Fix Notion public-domain routing for proxied sites #54

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions src/proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ async function reverseProxy(request: Request, siteConfig: NooxySiteConfigFull):

// Modify response headers
const modifiedResponseHeaders = modifyResponseHeaders(response.headers, hostname, siteConfig);
modifiedResponseHeaders.delete('content-encoding');
modifiedResponseHeaders.delete('content-length');
modifiedResponseHeaders.delete('content-digest');
modifiedResponseHeaders.delete('etag');

return new Response(modifiedData, {
status: response.status,
Expand Down
39 changes: 37 additions & 2 deletions src/rewriters/data-rewriter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { HEAD_JS_STRING } from './custom/generated/_head-js-string';
import { HEAD_CSS_STRING } from './custom/generated/_head-css-string';
import { rewriteMetaTags } from './meta-rewriter';

const ASSET_PATCH_VERSION = '1';

function escapeForJS(str: string): string {
return str
.replace(/\\/g, '\\\\') // Escape backslashes first
Expand All @@ -16,6 +18,20 @@ function escapeForJS(str: string): string {
.replace(/>/g, '\\x3e'); // Escape > for safety
}

function removePublicDomainInterstitial(responseData: string): string {
try {
const payload = JSON.parse(responseData) as Record<string, unknown>;
if (!Object.prototype.hasOwnProperty.call(payload, 'requireInterstitial')) {
return responseData;
}

payload.requireInterstitial = undefined;
return JSON.stringify(payload);
} catch (_error) {
return responseData;
}
}

// Helper function to modify response data
export function modifyResponseData(
responseData: string,
Expand Down Expand Up @@ -84,12 +100,27 @@ export function modifyResponseData(
// // console.log('[DEBUG]', pathname, found);
// }

if (pathname === '/api/v3/getPublicPageData' || pathname === '/api/v3/getPublicPageDataForDomain') {
data = removePublicDomainInterstitial(data);
}

// IMPORTANT: This must happen BEFORE script injection to avoid replacing the notionDomain variable
const escapedNotionDomain = notionDomain.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
const notionDomainPattern = new RegExp(`https?://${escapedNotionDomain}(?=[/?"'>#\\s]|$)`, 'gi');

if (/^\/_assets\/[^/]*\.js$/.test(pathname)) {
data = data.replace(/window\.location\.href(?=[^=]|={2,})/g, 'window.nooxy.href()'); // Exclude 'window.location.href=' but not 'window.location.href=='
if (/^\/_assets\/.+\.js$/.test(pathname)) {
data = data
.replace(/nooxy=\d+/g, `nooxy=${ASSET_PATCH_VERSION}`)
// Exclude assignments like window.location.href=, but keep reads and comparisons patched.
.replace(/window\.location\.href(?=[^=]|={2,})/g, 'window.nooxy.href()')
.replace(
/baseUrl:[^,;{}]+\.domainBaseUrl,publicDomainName:[^,;{}]+\.publicDomainName/g,
'baseUrl:new URL(window.nooxy.href()).origin,publicDomainName:void 0',
)
.replace(
/(\.src=)([a-zA-Z_$][\w$]*)(\),[a-zA-Z_$][\w$]*\[[a-zA-Z_$][\w$]*\]=\[)/g,
`$1$2+($2.indexOf("?")===-1?"?nooxy=${ASSET_PATCH_VERSION}":"&nooxy=${ASSET_PATCH_VERSION}")$3`,
);
} else if (/<html/i.test(data) || /<!DOCTYPE/i.test(data)) {
// Assume HTML (case-insensitive check for <html> and <!DOCTYPE>)
// Apply meta tag rewriting first
Expand All @@ -99,6 +130,10 @@ export function modifyResponseData(
data = data.replace(notionDomainPattern, `${protocol}//${targetDomain}`);

data = data
.replace(/(<script\b[^>]*\bsrc=["'])(\/_assets\/[^"']+\.js)(["'][^>]*>)/gi, (_match, prefix, src, suffix) => {
const separator = src.includes('?') ? '&' : '?';
return `${prefix}${src}${separator}nooxy=${ASSET_PATCH_VERSION}${suffix}`;
})
.replace(
/<\/head>/i,
`${googleFontInject}<script>${customHeadJS}</script><script>${customJSCode}</script><style>${customHeadCSS}</style><style>${HEAD_CSS_STRING}</style></head>`,
Expand Down