Skip to content

Only add x-requested-with header in requests to Nextcloud #40471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julien-nc merged 2 commits into from
Oct 16, 2023
Merged

Only add x-requested-with header in requests to Nextcloud #40471

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2cc4c4
only add x-requested-with header if requests point to NC
julien-nc Sep 18, 2023
b58c3dd
compile assets
julien-nc Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
only add x-requested-with header if requests point to NC 
Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
@julien-nc
julien-nc committed Oct 16, 2023
commit d2cc4c47986b7ebe3cbe2eb93e58287725660373
13 changes: 12 additions & 1 deletion core/src/utils/xhr-request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import { getRootUrl } from '@nextcloud/router'

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
*
Expand All @@ -28,14 +36,17 @@ export const interceptRequests = () => {
XMLHttpRequest.prototype.open = (function(open) {
return function(method, url, async) {
open.apply(this, arguments)
if (!this.getResponseHeader('X-Requested-With')) {
if (isNextcloudUrl(url) && !this.getResponseHeader('X-Requested-With')) {
this.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
}
}
})(XMLHttpRequest.prototype.open)

window.fetch = (function(fetch) {
return (input, init) => {
if (!isNextcloudUrl(input.url)) {
return fetch(input, init)
}
if (!init) {
init = {}
}
Expand Down