Skip to content

Digest Authentication changes #3

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
merged 2 commits into from
Jul 28, 2023
Merged

Digest Authentication changes #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc97ee9
Digest Authentication changes
RogerHardiman Jul 8, 2023
c026b1e
Merge branch 'master' into digest
RogerHardiman Jul 28, 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
22 changes: 16 additions & 6 deletions lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Server.prototype._requestListener = function(req, res) {
if (typeof self.log === 'function') {
self.log("received", xml);
}
self._process(xml, req.url, function (result) {
self._process(req, xml, req.url, function (result) {
res.setHeader('Content-Length', result.length);
res.write(result);
res.end();
Expand All @@ -131,8 +131,18 @@ Server.prototype._requestListener = function(req, res) {
});
}
catch (err) {
error = err.stack || err;
res.write(error);
if (err.httpHeader) {
res.setHeader(err.httpHeader.key, err.httpHeader.value);
}
if (err.statusCode) {
res.statusCode = Number(err.statusCode);
}
if (err.httpContents) {
res.write(err.httpContents);
} else {
error = err.stack || err
res.write(error.toString());
}
res.end();
if (typeof self.log === 'function') {
self.log("error", error);
Expand All @@ -145,7 +155,7 @@ Server.prototype._requestListener = function(req, res) {
}
};

Server.prototype._process = function(input, URL, callback) {
Server.prototype._process = function(httpRequest, input, URL, callback) {
var trimmedInput = input.replace(/\0.*$/g,'').trim(); // includes removing any NULL characters as ODTT 22.12 sends some for GetStreamUri in test Media-7-1-2-v18.06
var self = this,
pathname = url.parse(URL).pathname.replace(/\/$/, ''),
Expand Down Expand Up @@ -208,7 +218,7 @@ Server.prototype._process = function(input, URL, callback) {
if (binding.style === 'rpc') {
methodName = Object.keys(body)[0];

self.emit('request', obj, methodName);
self.emit('request', obj, methodName, httpRequest);
if (headers)
self.emit('headers', headers, methodName);

Expand All @@ -225,7 +235,7 @@ Server.prototype._process = function(input, URL, callback) {
var messageElemName = (Object.keys(body)[0] === 'attributes' ? Object.keys(body)[1] : Object.keys(body)[0]);
var pair = binding.topElements[messageElemName];

self.emit('request', obj, pair.methodName);
self.emit('request', obj, pair.methodName, httpRequest);
if (headers)
self.emit('headers', headers, pair.methodName);

Expand Down