Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

attempt to fix issue with duplicate doc

Browse Source
This commit is contained in:
fflorent 2024-03-26 17:17:09 +01:00
parent 7e0e21613e
commit ef6957a92c
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/UserAPI.ts
View File

@ -1167,6 +1167,7 @@ export class DocAPIImpl extends BaseAPI implements DocAPI {
*/ */
export function getDocWorkerUrl(homeUrl: string, docWorkerInfo: { export function getDocWorkerUrl(homeUrl: string, docWorkerInfo: {
docWorkerUrl: string|null, docWorkerUrl: string|null,
internalDocWorkerUrl: string|null,
selfPrefix?: string, selfPrefix?: string,
}): string { }): string {
if (!docWorkerInfo.docWorkerUrl) { if (!docWorkerInfo.docWorkerUrl) {
@ -1178,5 +1179,5 @@ export function getDocWorkerUrl(homeUrl: string, docWorkerInfo: {
url.pathname = docWorkerInfo.selfPrefix + url.pathname; url.pathname = docWorkerInfo.selfPrefix + url.pathname;
return url.href; return url.href;
} }
return docWorkerInfo.docWorkerUrl; return docWorkerInfo.internalDocWorkerUrl || docWorkerInfo.docWorkerUrl;
} }

7
app/server/lib/AppEndpoint.ts
View File

@ -59,7 +59,7 @@ export function attachAppEndpoint(options: AttachOptions): void {
// Alternatives could be: have the client to send their base URL // Alternatives could be: have the client to send their base URL
// in the request; or use headers commonly added by reverse proxies. // in the request; or use headers commonly added by reverse proxies.
const selfPrefix = "/dw/self/v/" + gristServer.getTag(); const selfPrefix = "/dw/self/v/" + gristServer.getTag();
res.json({docWorkerUrl: null, selfPrefix}); res.json({docWorkerUrl: null, internalDocWorkerUrl: null, selfPrefix});
return; return;
} }
if (!trustOrigin(req, res)) { throw new Error('Unrecognized origin'); } if (!trustOrigin(req, res)) { throw new Error('Unrecognized origin'); }
@ -73,7 +73,10 @@ export function attachAppEndpoint(options: AttachOptions): void {
if (!docStatus) { if (!docStatus) {
return res.status(500).json({error: 'no worker'}); return res.status(500).json({error: 'no worker'});
} }
res.json({docWorkerUrl: customizeDocWorkerUrl(docStatus.docWorker.publicUrl, req)}); res.json({
docWorkerUrl: customizeDocWorkerUrl(docStatus.docWorker.publicUrl, req),
internalDocWorkerUrl: docStatus.docWorker.internalUrl
});
})); }));
// Handler for serving the document landing pages. Expects the following parameters: // Handler for serving the document landing pages. Expects the following parameters:

5
app/server/lib/FlexServer.ts
View File

@ -319,8 +319,9 @@ export class FlexServer implements GristServer {
/** /**
* Same as getHomeUrl, but for requesting internally. * Same as getHomeUrl, but for requesting internally.
*/ */
public getHomeInternalUrl(req: express.Request, relPath?: string): string { public getHomeInternalUrl(req: express.Request, relPath: string = ''): string {
return this.getHomeUrl(req, relPath, this.getDefaultHomeInternalUrl()); const homeUrl = new URL(relPath, this.getDefaultHomeInternalUrl());
return homeUrl.href;
} }
/** /**

8
app/server/lib/requestUtils.ts
View File

@ -87,6 +87,14 @@ export function trustOrigin(req: IncomingMessage, resp?: Response): boolean {
// Note that the request origin is undefined for non-CORS requests. // Note that the request origin is undefined for non-CORS requests.
const origin = req.headers.origin; const origin = req.headers.origin;
if (!origin) { return true; } // Not a CORS request. if (!origin) { return true; } // Not a CORS request.
if (
(process.env.APP_HOME_INTERNAL_URL && req.hostname === new URL(process.env.APP_HOME_INTERNAL_URL).hostname) ||
(process.env.APP_DOC_INTERNAL_URL && req.hostname === new URL(process.env.APP_DOC_INTERNAL_URL).hostname)
) {
return true;
}
if (!allowHost(req, new URL(origin))) { return false; } if (!allowHost(req, new URL(origin))) { return false; }
if (resp) { if (resp) {