infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

comments for some cases where sframe blocks loading

pull/1/head
ansuz 2022-03-24 13:21:01 +05:30
parent e6c51e3dff
commit 34d2ae5fd5
1 changed files with 8 additions and 1 deletions

9
www/common/sframe-common-outer.js
View File

@ -21,6 +21,10 @@ define([
common.initIframe = function (waitFor, isRt, pathname) {
if (window.top !== window) {
// this is triggered if the intance's HTTP headers have permitted the app
// to be loaded within an iframe, but the instance admin has not explicitly
// enabled embedding via the admin panel. Their checkup page should tell them
// how to correct this (Access-Control-Allow-Origin and CSP frame-ancestors).
if (!ApiConfig.enableEmbedding) {
return void window.alert(Messages.error_embeddingDisabled);
}
@ -30,7 +34,10 @@ define([
return void window.alert(Messages.error_embeddingDisabledSpecific);
}
}
// this is triggered in two situations:
// 1. a user has somehow loaded the page via an unexpected origin
// 2. the admin has configured their httpUnsafeOrigin incorrectly
// in case #2 the checkup page will advise them on correct configuration
if (window.location.origin !== ApiConfig.httpUnsafeOrigin) {
return void window.alert(Messages._getKey('error_incorrectAccess', [ApiConfig.httpUnsafeOrigin]));
}