Skip to content

[JENKINS-61193] Export no_proxy hosts when using HTTP proxy #516

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

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

[JENKINS-61193] Export no_proxy hosts when using HTTP proxy #516

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
66fe435
Added no proxy hosts when using proxy in CliGitAPIImpl
Gyanesha Feb 26, 2020
dc2644a
Added automated test and removed the hard coded part
Gyanesha Mar 5, 2020
7ce63be
Merge branch 'master' into JENKINS-61193
MarkEWaite Feb 27, 2021
97fa81f
Use the proxy hosts getter rather than the field
MarkEWaite Feb 27, 2021
9b1adbe
Merge branch 'master' into JENKINS-61193
MarkEWaite Apr 11, 2023
64142fa
Merge branch 'spotless' into JENKINS-61193
MarkEWaite Apr 11, 2023
6bc44b9
Format source changes
MarkEWaite Apr 11, 2023
288cfe5
Replace Guava reference with pure Java
MarkEWaite Apr 11, 2023
300ee16
Merge branch 'master' into JENKINS-61193
MarkEWaite Apr 11, 2023
1283af9
Merge branch 'master' into JENKINS-61193
MarkEWaite Sep 13, 2023
ef709b0
Initialize proxy in CliGitAPIImpl constructor
MarkEWaite Sep 13, 2023
91a64cc
Make getNoProxyHosts package protected for testing
MarkEWaite Sep 13, 2023
10ebd1f
Guard against null pointer exceptions
MarkEWaite Sep 13, 2023
ee7c2fd
Use constructor to simplify test
MarkEWaite Sep 13, 2023
37847ce
Test with JUnit 4, not JUnit 3
MarkEWaite Sep 13, 2023
106a3fb
Merge branch 'master' into JENKINS-61193
MarkEWaite Jan 17, 2024
63caa06
Merge branch 'master' into JENKINS-61193
MarkEWaite Mar 9, 2024
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
3 changes: 3 additions & 0 deletions src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,6 +2013,8 @@ private String launchCommandWithCredentials(ArgumentListBuilder args, File workD

if ("http".equalsIgnoreCase(url.getScheme()) || "https".equalsIgnoreCase(url.getScheme())) {
if (proxy != null) {
List<String>listOfConfiguredNoProxyHosts = new ArrayList<String>();
listOfConfiguredNoProxyHosts.add("169.254.169.254");
boolean shouldProxy = true;
for(Pattern p : proxy.getNoProxyHostPatterns()) {
if(p.matcher(url.getHost()).matches()) {
Expand All @@ -2034,6 +2036,7 @@ private String launchCommandWithCredentials(ArgumentListBuilder args, File workD
URI http_proxy = new URI("http", userInfo, proxy.name, proxy.port, null, null, null);
env.put("http_proxy", http_proxy.toString());
env.put("https_proxy", http_proxy.toString());
env.put("NO_PROXY", String.join(", ",listOfConfiguredNoProxyHosts));
} catch (URISyntaxException ex) {
throw new GitException("Failed to create http proxy uri", ex);
}
Expand Down