Skip to content
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.

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

tls socket peer info #2648

Merged
merged 4 commits into from
May 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -1448,16 +1448,16 @@ class Connection {
let sslheader;

if (this.get('tls.cipher.version')) {
sslheader = `(version=${this.tls.cipher.version} cipher=${this.tls.cipher.name} verify=`;
sslheader = `(cipher=${this.tls.cipher.name}`;
if (this.tls.verified) {
sslheader += 'OK)';
sslheader += ' verify=OK)';
}
else {
if (this.tls.verifyError && this.tls.verifyError.code === 'UNABLE_TO_GET_ISSUER_CERT') {
sslheader += 'NO)';
sslheader += ' verify=NO)';
}
else {
sslheader += 'FAIL)';
sslheader += ')';
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ logger.levels = {

for (const le in logger.levels) {
logger.levels[`LOG${le}`] = logger.levels[le];
logger['LOG' + le] = logger.levels[le];
logger[`LOG${le}`] = logger.levels[le];
}

logger.formats = {
Expand Down
2 changes: 1 addition & 1 deletion outbound/hmail.js
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ class HMailItem extends events.EventEmitter {
// check if there are any MXs left
if (this.mxlist.length === 0) {
this.todo.rcpt_to.forEach(rcpt => {
self.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Tried all MXs${self.todo.domain}`));
self.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Tried all MXs ${self.todo.domain}`));
});
return this.temp_fail("Tried all MXs");
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/queue/discard.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exports.discard = (next, connection) => {
if (q_wants && q_wants !== 'discard') return next();

function discard () {
connection.loginfo(this, 'discarding message');
connection.loginfo('discarding message');
// Pretend we delivered the message
return next(OK);
}
Expand Down