Skip to content

The open alternative to Salesforce, designed for AI.

Send cookies with the web app manifest request (#28531)

Paul Rastoin34a34df60a25
diff --git a/packages/twenty-front/index.html b/packages/twenty-front/index.html
index 82b5c70740f..943339cf547 100644
--- a/packages/twenty-front/index.html
+++ b/packages/twenty-front/index.html
@@ -10,7 +10,7 @@
data-rh="true"
/>
<link rel="apple-touch-icon" href="/images/icons/ios/192.png" />
- <link rel="manifest" href="/manifest.json" />
+ <link rel="manifest" href="/manifest.json" crossorigin="use-credentials" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="A modern open-source CRM" />
diff --git a/packages/twenty-server/src/engine/core-modules/frontend/constants/document-content-security-policy-directives.constant.ts b/packages/twenty-server/src/engine/core-modules/frontend/constants/document-content-security-policy-directives.constant.ts
new file mode 100644
index 00000000000..80508c0404f
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/frontend/constants/document-content-security-policy-directives.constant.ts
@@ -0,0 +1,3 @@
+// manifest-src keeps the credentialed manifest fetch (index.html) on our own origin, redirects included.
+export const DOCUMENT_CONTENT_SECURITY_POLICY_DIRECTIVES =
+ "object-src 'none'; base-uri 'self'; manifest-src 'self'";
diff --git a/packages/twenty-server/src/engine/core-modules/frontend/frontend.module.ts b/packages/twenty-server/src/engine/core-modules/frontend/frontend.module.ts
index d0ed6f1245a..7a00747ede3 100644
--- a/packages/twenty-server/src/engine/core-modules/frontend/frontend.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/frontend/frontend.module.ts
@@ -11,6 +11,7 @@ import { isDefined } from 'twenty-shared/utils';
import { ClientConfigModule } from 'src/engine/core-modules/client-config/client-config.module';
import { WorkspaceDomainsModule } from 'src/engine/core-modules/domain/workspace-domains/workspace-domains.module';
+import { DOCUMENT_CONTENT_SECURITY_POLICY_DIRECTIVES } from 'src/engine/core-modules/frontend/constants/document-content-security-policy-directives.constant';
import { FrontendService } from 'src/engine/core-modules/frontend/frontend.service';
@Module({
@@ -43,7 +44,7 @@ export class FrontendModule implements OnModuleInit {
response.setHeader('Cloudflare-CDN-Cache-Control', 'no-store');
response.setHeader(
'Content-Security-Policy',
- "frame-ancestors 'none'",
+ `frame-ancestors 'none'; ${DOCUMENT_CONTENT_SECURITY_POLICY_DIRECTIVES}`,
);
response.setHeader('X-Frame-Options', 'DENY');
}
diff --git a/packages/twenty-server/src/engine/core-modules/frontend/frontend.service.ts b/packages/twenty-server/src/engine/core-modules/frontend/frontend.service.ts
index 964212a2c15..a3b9b083519 100644
--- a/packages/twenty-server/src/engine/core-modules/frontend/frontend.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/frontend/frontend.service.ts
@@ -10,6 +10,7 @@ import { isDefined, normalizeAllowedIframeOrigin } from 'twenty-shared/utils';
import { ClientConfigService } from 'src/engine/core-modules/client-config/services/client-config.service';
import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';
+import { DOCUMENT_CONTENT_SECURITY_POLICY_DIRECTIVES } from 'src/engine/core-modules/frontend/constants/document-content-security-policy-directives.constant';
import { isFrontendDocumentRequest } from 'src/engine/core-modules/frontend/utils/is-frontend-document-request.util';
import { renderFrontendHtml } from 'src/engine/core-modules/frontend/utils/render-frontend-html.util';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
@@ -109,7 +110,7 @@ export class FrontendService {
response.setHeader('X-Frame-Options', 'SAMEORIGIN');
response.setHeader(
'Content-Security-Policy',
- "frame-ancestors 'self'; object-src 'none'; base-uri 'self'",
+ `frame-ancestors 'self'; ${DOCUMENT_CONTENT_SECURITY_POLICY_DIRECTIVES}`,
);
try {
@@ -141,7 +142,7 @@ export class FrontendService {
if (allowedOrigins.length > 0) {
response.setHeader(
'Content-Security-Policy',
- `frame-ancestors 'self' ${[...new Set(allowedOrigins)].join(' ')}; object-src 'none'; base-uri 'self'`,
+ `frame-ancestors 'self' ${[...new Set(allowedOrigins)].join(' ')}; ${DOCUMENT_CONTENT_SECURITY_POLICY_DIRECTIVES}`,
);
response.removeHeader('X-Frame-Options');
}