frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3017 from hardillb/dev

Browse Source 
Fix for basic auth with @ in username
This commit is contained in:
Nick O'Leary 2021-06-11 14:51:38 +01:00 committed by GitHub
commit ac159bb52e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/node_modules/@node-red/nodes/core/network/21-httprequest.js vendored
View File

@ -207,12 +207,23 @@ module.exports = function(RED) {
} }
if (this.credentials) { if (this.credentials) {
if (this.authType === "basic") { if (this.authType === "basic") {
// Workaround for https://github.com/sindresorhus/got/issues/1169
var cred = ""
var parsedURL = new URL(url)
if (this.credentials.user) { if (this.credentials.user) {
opts.username = this.credentials.user; // opts.username = this.credentials.user;
cred = this.credentials.user
} else if (parsedURL.username) {
cred = parsedURL.username
} }
if (this.credentials.password) { if (this.credentials.password) {
opts.password = this.credentials.password; // opts.password = this.credentials.password;
cred += ":" + this.credentials.password
} else if (parsedURL.password) {
cred += ":" + parsedURL.password
} }
// build own basic auth header
opts.headers.Authorization = "Basic " + Buffer.from(cred).toString("base64");
} else if (this.authType === "digest") { } else if (this.authType === "digest") {
let digestCreds = this.credentials; let digestCreds = this.credentials;
let sentCreds = false; let sentCreds = false;

20
test/nodes/core/network/21-httprequest_spec.js
View File

@ -1624,6 +1624,26 @@ describe('HTTP Request Node', function() {
n1.receive({payload:"foo"}); n1.receive({payload:"foo"});
}); });
}); });
it('should authenticate on server - basic', function(done) {
var flow = [{id:"n1",type:"http request",wires:[["n2"]],method:"GET",ret:"obj",url:getTestURL('/authenticate')},
{id:"n2", type:"helper"}];
helper.load(httpRequestNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n1.credentials = {user:'foo@example.com', password:'passwordfoo'};
n2.on("input", function(msg) {
try {
msg.should.have.property('statusCode',200);
msg.payload.should.have.property('user', 'foo@example.com');
msg.payload.should.have.property('pass', 'passwordfoo');
done();
} catch(err) {
done(err);
}
});
n1.receive({payload:"foo"});
});
});
it('should authenticate on server - bearer', function(done) { it('should authenticate on server - bearer', function(done) {
var flow = [{id:"n1",type:"http request",wires:[["n2"]],method:"GET",ret:"obj",authType:"bearer", url:getTestURL('/authenticate')}, var flow = [{id:"n1",type:"http request",wires:[["n2"]],method:"GET",ret:"obj",authType:"bearer", url:getTestURL('/authenticate')},
{id:"n2", type:"helper"}]; {id:"n2", type:"helper"}];