mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 03:57:21 +00:00
Code Issues Releases Wiki Activity

Do not add X-Requested-With header for simple requests (#5931)

Browse Source
This commit is contained in:
Saq Imtiaz 2021-08-17 10:56:52 +02:00 committed by GitHub
parent 199ca57f1c
commit 24956087cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/modules/utils/dom/http.js
View File

@ -34,6 +34,23 @@ exports.httpRequest = function(options) {
}); });
return result; return result;
}, },
getHeader = function(targetHeader) {
return headers[targetHeader] || headers[targetHeader.toLowerCase()];
},
isSimpleRequest = function(type,headers) {
if(["GET","HEAD","POST"].indexOf(type) === -1) {
return false;
}
for(var header in headers) {
if(["accept","accept-language","content-language","content-type"].indexOf(header.toLowerCase()) === -1) {
return false;
}
}
if(hasHeader("Content-Type") && ["application/x-www-form-urlencoded","multipart/form-data","text/plain"].indexOf(getHeader["Content-Type"]) === -1) {
return false;
}
return true;
},
returnProp = options.returnProp || "responseText", returnProp = options.returnProp || "responseText",
request = new XMLHttpRequest(), request = new XMLHttpRequest(),
data = "", data = "",
@ -76,7 +93,7 @@ exports.httpRequest = function(options) {
if(data && !hasHeader("Content-Type")) { if(data && !hasHeader("Content-Type")) {
request.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8"); request.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");
} }
if(!hasHeader("X-Requested-With")) { if(!hasHeader("X-Requested-With") && !isSimpleRequest(type,headers)) {
request.setRequestHeader("X-Requested-With","TiddlyWiki"); request.setRequestHeader("X-Requested-With","TiddlyWiki");
} }
try { try {

8
plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
View File

@ -114,6 +114,10 @@ TiddlyWebAdaptor.prototype.login = function(username,password,callback) {
}, },
callback: function(err) { callback: function(err) {
callback(err); callback(err);
},
headers: {
"accept": "application/json",
"X-Requested-With": "TiddlyWiki"
} }
}; };
this.logger.log("Logging in:",options); this.logger.log("Logging in:",options);
@ -132,6 +136,10 @@ TiddlyWebAdaptor.prototype.logout = function(callback) {
}, },
callback: function(err,data) { callback: function(err,data) {
callback(err); callback(err);
},
headers: {
"accept": "application/json",
"X-Requested-With": "TiddlyWiki"
} }
}; };
this.logger.log("Logging out:",options); this.logger.log("Logging out:",options);