]> source.dussan.org Git - gitea.git/commitdiff
Warn users when they try to use a non-root-url to sign in/up (#32272)
authorwxiaoguang <wxiaoguang@gmail.com>
Thu, 17 Oct 2024 02:28:51 +0000 (10:28 +0800)
committerGitHub <noreply@github.com>
Thu, 17 Oct 2024 02:28:51 +0000 (10:28 +0800)
web_src/js/features/common-page.ts
web_src/js/features/user-auth.ts
web_src/js/index.ts

index 1a4decd752ee8615f9bd533ebfab95ca3a6f2c04..77fe2cc1ca71a9bead96085d816777a7e8320280 100644 (file)
@@ -91,3 +91,11 @@ export function checkAppUrl() {
   showGlobalErrorMessage(`Your ROOT_URL in app.ini is "${appUrl}", it's unlikely matching the site you are visiting.
 Mismatched ROOT_URL config causes wrong URL links for web UI/mail content/webhook notification/OAuth2 sign-in.`, 'warning');
 }
+
+export function checkAppUrlScheme() {
+  const curUrl = window.location.href;
+  // some users visit "http://domain" while appUrl is "https://domain", COOKIE_SECURE makes it impossible to sign in
+  if (curUrl.startsWith('http:') && appUrl.startsWith('https:')) {
+    showGlobalErrorMessage(`This instance is configured to run under HTTPS (by ROOT_URL config), you are accessing by HTTP. Mismatched scheme might cause problems for sign-in/sign-up.`, 'warning');
+  }
+}
index f1f34bc806e6284aeec0aba6d4c0fd561907e613..b716287ff27e605f5a3115f029c19b557fc83e9a 100644 (file)
@@ -1,4 +1,9 @@
-import {checkAppUrl} from './common-page.ts';
+import {checkAppUrl, checkAppUrlScheme} from './common-page.ts';
+
+export function initUserCheckAppUrl() {
+  if (!document.querySelector('.page-content.user.signin, .page-content.user.signup, .page-content.user.link-account')) return;
+  checkAppUrlScheme();
+}
 
 export function initUserAuthOauth2() {
   const outer = document.querySelector('#oauth2-login-navigator');
index db678a25ba3886d1589c7b40ca43f77e33abbd92..13dfe1f3efe1ccf059eec8fdba02c1cb19d295c3 100644 (file)
@@ -24,7 +24,7 @@ import {initFindFileInRepo} from './features/repo-findfile.ts';
 import {initCommentContent, initMarkupContent} from './markup/content.ts';
 import {initPdfViewer} from './render/pdf.ts';
 
-import {initUserAuthOauth2} from './features/user-auth.ts';
+import {initUserAuthOauth2, initUserCheckAppUrl} from './features/user-auth.ts';
 import {
   initRepoIssueDue,
   initRepoIssueReferenceRepositorySearch,
@@ -219,6 +219,7 @@ onDomReady(() => {
     initCommitStatuses,
     initCaptcha,
 
+    initUserCheckAppUrl,
     initUserAuthOauth2,
     initUserAuthWebAuthn,
     initUserAuthWebAuthnRegister,