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

fix forwarding with clinet authentication over TLS (forward to gmail) #1803

Merged
merged 7 commits into from Feb 6, 2017

Conversation

Projects
None yet
3 participants
@ayankel
Contributor

ayankel commented Feb 4, 2017

No new features.

Fixes Incorrect sequence of events (AUTH and STARTTLS) when operate as forwarding proxy when upstream server requires both authentication and secure connection. also fix extra \r\n that choke gmail .

Running tests: [ 'tests/plugins/queue/smtp_forward.js' ]
OK: 11 assertions (253ms)

Show outdated Hide outdated plugins/queue/smtp_forward.js
Show outdated Hide outdated smtp_client.js
Show outdated Hide outdated smtp_client.js
Show outdated Hide outdated smtp_client.js
Show outdated Hide outdated smtp_client.js
Show outdated Hide outdated smtp_client.js
Show outdated Hide outdated plugins/queue/smtp_forward.js
@ayankel

This comment has been minimized.

Show comment
Hide comment
@ayankel

ayankel Feb 6, 2017

Contributor

updated as requested

Contributor

ayankel commented Feb 6, 2017

updated as requested

Show outdated Hide outdated smtp_client.js
@codecov-io

This comment has been minimized.

Show comment
Hide comment
@codecov-io

codecov-io Feb 6, 2017

Codecov Report

Merging #1803 into master will increase coverage by 0.11%.

@@            Coverage Diff             @@
##           master    #1803      +/-   ##
==========================================
+ Coverage    46.1%   46.21%   +0.11%     
==========================================
  Files          22       22              
  Lines        5804     5857      +53     
  Branches     1456     1475      +19     
==========================================
+ Hits         2676     2707      +31     
- Misses       3128     3150      +22
Impacted Files Coverage Δ
smtp_client.js 6.84% <ø> (-0.26%)
logger.js 78.74% <ø> (-2.37%)
mailbody.js 73.44% <ø> (-1.35%)
attachment_stream.js 21.42% <ø> (-1.22%)
plugins.js 73.52% <ø> (ø)
connection.js 46.86% <ø> (ø)
transaction.js 80.67% <ø> (+0.16%)
outbound.js 13.46% <ø> (+2%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 175493e...11dd7c0. Read the comment docs.

codecov-io commented Feb 6, 2017

Codecov Report

Merging #1803 into master will increase coverage by 0.11%.

@@            Coverage Diff             @@
##           master    #1803      +/-   ##
==========================================
+ Coverage    46.1%   46.21%   +0.11%     
==========================================
  Files          22       22              
  Lines        5804     5857      +53     
  Branches     1456     1475      +19     
==========================================
+ Hits         2676     2707      +31     
- Misses       3128     3150      +22
Impacted Files Coverage Δ
smtp_client.js 6.84% <ø> (-0.26%)
logger.js 78.74% <ø> (-2.37%)
mailbody.js 73.44% <ø> (-1.35%)
attachment_stream.js 21.42% <ø> (-1.22%)
plugins.js 73.52% <ø> (ø)
connection.js 46.86% <ø> (ø)
transaction.js 80.67% <ø> (+0.16%)
outbound.js 13.46% <ø> (+2%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 175493e...11dd7c0. Read the comment docs.

@msimerson

This comment has been minimized.

Show comment
Hide comment
@msimerson

msimerson Feb 6, 2017

Member

Looks good @ayankel , thanks!

Member

msimerson commented Feb 6, 2017

Looks good @ayankel , thanks!

@msimerson msimerson merged commit 623b77d into haraka:master Feb 6, 2017

2 of 3 checks passed

codecov/patch 0% of diff hit (target 46.1%)
Details
codecov/project 46.21% (+0.11%) compared to 175493e
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

msimerson added a commit that referenced this pull request Feb 11, 2017

merge master to v3 (#1818)
* More changes to try and fix unaquired socket errors

* Fix lint errors

* Fix log functions and more lint cleanups

* Another small logging fix

* Test for log methods added

* This may or may not fix issues with short atts.

More force end attempts

Finish cleaning up sending of all data

* Fix logger errors

* Don't error on re-release with non-pool sockets

* Fix error logging in test

* add an additional plugin search path to account for the module-based plugins that live in the same node_modules folder as the Haraka installed via NPM (#1805)

* replace connect.fcrdns with npm package (#1810)

* replace connect.fcrdns with npm package

* Create an outbound queue filename handler (#1792)

* create a new method for handling filenames within the outbound queue
* convert to result store module

* when proxy enabled, update remote.is_private too (#1811)

reported by golden_receiver on #haraka

* fix forwarding with clinet authentication  over TLS (forward to gmail) (#1803)

* fix forwarding with client authentication  over TLS (forward to gmail etc).

msimerson added a commit that referenced this pull request Feb 11, 2017

merge master to v2 (#1819)
* More changes to try and fix unaquired socket errors

* Fix lint errors

* Fix log functions and more lint cleanups

* Another small logging fix

* Test for log methods added

* This may or may not fix issues with short atts.

More force end attempts

Finish cleaning up sending of all data

* Fix logger errors

* Don't error on re-release with non-pool sockets

* Fix error logging in test

* add an additional plugin search path to account for the module-based plugins that live in the same node_modules folder as the Haraka installed via NPM (#1805)

* replace connect.fcrdns with npm package (#1810)

* replace connect.fcrdns with npm package

* Create an outbound queue filename handler (#1792)

* create a new method for handling filenames within the outbound queue
* convert to result store module

* when proxy enabled, update remote.is_private too (#1811)

reported by golden_receiver on #haraka

* fix forwarding with clinet authentication  over TLS (forward to gmail) (#1803)

* fix forwarding with client authentication  over TLS (forward to gmail etc).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment