fix: Set X-Requested-With header on all requests to avoid browser auth dialogs

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
pull/41322/head
Julien Veyssier 6 months ago
parent ba87099a85
commit b642d10f8d
No known key found for this signature in database
GPG Key ID: 4141FEE162030638

@ -36,6 +36,7 @@ import { setUp as setUpContactsMenu } from './components/ContactsMenu'
import { setUp as setUpMainMenu } from './components/MainMenu'
import { setUp as setUpUserMenu } from './components/UserMenu'
import PasswordConfirmation from './OC/password-confirmation'
import { interceptRequests } from './utils/xhr-request.js'
// keep in sync with core/css/variables.scss
const breakpointMobileWidth = 1024
@ -133,6 +134,8 @@ moment.locale(locale)
* Initializes core
*/
export const initCore = () => {
interceptRequests()
const userAgent = window.navigator.userAgent
const edge = userAgent.indexOf('Edge/')

@ -0,0 +1,71 @@
/*
* @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/>.
*/
import { getRootUrl } from '@nextcloud/router'
/**
* @param {string} url The URL to check
* @return {boolean} true if the URL points to this nextcloud instance
*/
const isNextcloudUrl = (url) => {
const nextcloudBaseUrl = window.location.protocol + '//' + window.location.host + getRootUrl()
// try with relative and absolute URL
return url.startsWith(nextcloudBaseUrl) || url.startsWith(getRootUrl())
}
/**
* 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 (isNextcloudUrl(url) && !this.getResponseHeader('X-Requested-With')) {
this.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
}
}
})(XMLHttpRequest.prototype.open)
window.fetch = (function(fetch) {
return (resource, options) => {
// fetch allows the `input` to be either a Request object or any stringifyable value
if (!isNextcloudUrl(resource.url ?? resource.toString())) {
return fetch(resource, options)
}
if (!options) {
options = {}
}
if (!options.headers) {
options.headers = new Headers()
}
if (options.headers instanceof Headers && !options.headers.has('X-Requested-With')) {
options.headers.append('X-Requested-With', 'XMLHttpRequest')
} else if (options.headers instanceof Object && !options.headers['X-Requested-With']) {
options.headers['X-Requested-With'] = 'XMLHttpRequest'
}
return fetch(resource, options)
}
})(window.fetch)
}
Loading…
Cancel
Save