Http proxy bypass #718
Merged
Http proxy bypass #718
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* if http proxy is set without an https proxy apt will still attempt to proxy those https sources, resulting in errors. This fix will allow direct connect to the https urls, bypassing the http proxy. This is the most simple fix for this problem, a more complex fix would be to have an https_direct setting. fix test for https proxy bypass
willmeek
requested review from
eputnam,
tphoney,
HelenCampbell,
pmcmaw,
david22swan and
davidmalloncares
tphoney
reviewed
Nov 6, 2017
spec/classes/apt_spec.rb
Outdated
| @@ -84,7 +84,7 @@ | |||
| is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content( | |||
| /Acquire::http::proxy "http:\/\/localhost:8180\/";/, | |||
| ).without_content( | |||
| %r{Acquire::https::proxy}, | |||
| /Acquire::https::proxy/, | |||
There was a problem hiding this comment.
Updated all regexes to use %r notation
tphoney
reviewed
Nov 6, 2017
spec/classes/apt_spec.rb
Outdated
| @@ -72,7 +72,7 @@ | |||
| is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content( | |||
| /Acquire::http::proxy "http:\/\/localhost:8080\/";/, | |||
| ).without_content( | |||
| %r{Acquire::https::proxy}, | |||
| /Acquire::https::proxy/, | |||
There was a problem hiding this comment.
Updated all regexes to use %r notation
|
Otherwise looks good !! |
willmeek
force-pushed
the
http_proxy_bypass
branch
from
17c6ca0 to
7e2fe3c
Compare
|
Would you mind throwing a little blurb about it here? https://github.com/puppetlabs/puppetlabs-apt/blame/master/README.md#L284 I had to use git blame to get a stupid line number. |
This commit adds a 'direct' boolean option to proxy settings. When set to true, if https is not true, the https proxy is set to 'DIRECT'.
willmeek
force-pushed
the
http_proxy_bypass
branch
from
7e2fe3c to
69edb0d
Compare
|
@eputnam Thanks Eric, great suggestion, updated with the new setting. |
eputnam
approved these changes
Nov 8, 2017
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR builds on #699
Rather than always defaulting the https proxy to 'DIRECT', use another proxy setting to determine whether this should be the case.