aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2023-08-17 08:29:25 +0200
committernextcloud-command <nextcloud-command@users.noreply.github.com>2023-08-18 18:22:14 +0000
commit0904c843194cbeeb839fd7748e2eb0ea9f6cdf5d (patch)
treea556efde7bd023b7a5549e9be2b84d77874e6802 /core
parentf3a3ece9cc423634c616ce4ef1639e5e1533eded (diff)
downloadnextcloud-server-0904c843194cbeeb839fd7748e2eb0ea9f6cdf5d.tar.gz
nextcloud-server-0904c843194cbeeb839fd7748e2eb0ea9f6cdf5d.zip
fix: Set X-Requested-With header on all requests to avoid browser auth dialogs
Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Diffstat (limited to 'core')
-rw-r--r--core/src/init.js3
-rw-r--r--core/src/utils/xhr-request.js55
2 files changed, 58 insertions, 0 deletions
diff --git a/core/src/init.js b/core/src/init.js
index f366dba5d1e..5c72f087630 100644
--- a/core/src/init.js
+++ b/core/src/init.js
@@ -35,6 +35,7 @@ import { setUp as setUpContactsMenu } from './components/ContactsMenu.js'
import { setUp as setUpMainMenu } from './components/MainMenu.js'
import { setUp as setUpUserMenu } from './components/UserMenu.js'
import PasswordConfirmation from './OC/password-confirmation.js'
+import { interceptRequests } from './utils/xhr-request.js'
// keep in sync with core/css/variables.scss
const breakpointMobileWidth = 1024
@@ -78,6 +79,8 @@ moment.locale(locale)
* Initializes core
*/
export const initCore = () => {
+ interceptRequests()
+
$(window).on('unload.main', () => { OC._unloadCalled = true })
$(window).on('beforeunload.main', () => {
// super-trick thanks to http://stackoverflow.com/a/4651049
diff --git a/core/src/utils/xhr-request.js b/core/src/utils/xhr-request.js
new file mode 100644
index 00000000000..f124dc38f0d
--- /dev/null
+++ b/core/src/utils/xhr-request.js
@@ -0,0 +1,55 @@
+/*
+ * @copyright Copyright (c) 2023 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Intercept XMLHttpRequest and fetch API calls to add X-Requested-With header
+ *
+ * This is also done in @nextcloud/axios but not all requests pass through that
+ */
+export const interceptRequests = () => {
+ XMLHttpRequest.prototype.open = (function(open) {
+ return function(method, url, async) {
+ open.apply(this, arguments)
+ if (!this.getResponseHeader('X-Requested-With')) {
+ this.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
+ }
+ }
+ })(XMLHttpRequest.prototype.open)
+
+ window.fetch = (function(fetch) {
+ return (input, init) => {
+ if (!init) {
+ init = {}
+ }
+ if (!init.headers) {
+ init.headers = new Headers()
+ }
+
+ if (init.headers instanceof Headers && !init.headers.has('X-Requested-With')) {
+ init.headers.append('X-Requested-With', 'XMLHttpRequest')
+ } else if (init.headers instanceof Object && !init.headers['X-Requested-With']) {
+ init.headers['X-Requested-With'] = 'XMLHttpRequest'
+ }
+
+ return fetch(input, init)
+ }
+ })(window.fetch)
+}