forked from geonetwork/core-geonetwork
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Don't override proxy configuration when saving the settings, if the h…
…ttp proxy is configured in Java system properties
- Loading branch information
Showing
8 changed files
with
222 additions
and
42 deletions.
There are no files selected for viewing
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
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
111 changes: 111 additions & 0 deletions
111
core/src/main/java/org/fao/geonet/lib/ProxyConfiguration.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| //============================================================================= | ||
| //=== Copyright (C) 2001-2023 Food and Agriculture Organization of the | ||
| //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) | ||
| //=== and United Nations Environment Programme (UNEP) | ||
| //=== | ||
| //=== This program is free software; you can redistribute it and/or modify | ||
| //=== it under the terms of the GNU General Public License as published by | ||
| //=== the Free Software Foundation; either version 2 of the License, or (at | ||
| //=== your option) any later version. | ||
| //=== | ||
| //=== This program is distributed in the hope that it will be useful, but | ||
| //=== WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| //=== MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| //=== General Public License for more details. | ||
| //=== | ||
| //=== You should have received a copy of the GNU General Public License | ||
| //=== along with this program; if not, write to the Free Software | ||
| //=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| //=== | ||
| //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, | ||
| //=== Rome - Italy. email: [email protected] | ||
| //============================================================================== | ||
|
|
||
| package org.fao.geonet.lib; | ||
|
|
||
| import org.apache.commons.lang.StringUtils; | ||
| import org.fao.geonet.kernel.setting.SettingManager; | ||
| import org.fao.geonet.kernel.setting.Settings; | ||
|
|
||
| /** | ||
| * Class to abstract the http proxy configuration from Java system properties or GeoNetwork configuration. | ||
| */ | ||
| public class ProxyConfiguration { | ||
| private boolean enabled = false; | ||
|
|
||
| private boolean isProxyConfiguredInSystemProperties = false; | ||
| private String host; | ||
| private String port; | ||
| private String username; | ||
| private String password; | ||
| private String ignoreHostList; | ||
|
|
||
| public boolean isEnabled() { | ||
| return enabled; | ||
| } | ||
|
|
||
| public boolean isProxyConfiguredInSystemProperties() { | ||
| return isProxyConfiguredInSystemProperties; | ||
| } | ||
|
|
||
| public String getHost() { | ||
| return host; | ||
| } | ||
|
|
||
| public String getPort() { | ||
| return port; | ||
| } | ||
|
|
||
| public String getUsername() { | ||
| return username; | ||
| } | ||
|
|
||
| public String getPassword() { | ||
| return password; | ||
| } | ||
|
|
||
| public String getIgnoreHostList() { | ||
| return ignoreHostList; | ||
| } | ||
|
|
||
| public ProxyConfiguration(boolean isProxyConfiguredInSystemProperties) { | ||
| this.isProxyConfiguredInSystemProperties = isProxyConfiguredInSystemProperties; | ||
| if (this.isProxyConfiguredInSystemProperties) { | ||
| this.enabled = true; | ||
| } | ||
| } | ||
|
|
||
| public void refresh(SettingManager settingManager) { | ||
| this.enabled = this.isProxyConfiguredInSystemProperties || | ||
| settingManager.getValueAsBool(Settings.SYSTEM_PROXY_USE, false); | ||
|
|
||
| if (this.enabled) { | ||
| if (this.isProxyConfiguredInSystemProperties) { | ||
| if (StringUtils.isNotBlank(System.getProperty("https.proxyHost"))) { | ||
| this.host = System.getProperty("https.proxyHost"); | ||
| this.port = System.getProperty("https.proxyPort"); | ||
| this.username = System.getProperty("https.proxyUser", ""); | ||
| this.password = System.getProperty("https.proxyPassword", ""); | ||
| } else { | ||
| this.host = System.getProperty("http.proxyHost"); | ||
| this.port = System.getProperty("http.proxyPort"); | ||
| this.username = System.getProperty("http.proxyUser", ""); | ||
| this.password = System.getProperty("http.proxyPassword", ""); | ||
| } | ||
|
|
||
| // Escape characters for regular expression matching | ||
| this.ignoreHostList = System.getProperty("http.nonProxyHosts", "") | ||
| .replace("\\.", "\\\\.") | ||
| .replace("\\*", "\\.\\*"); | ||
|
|
||
| } else { | ||
| this.host = settingManager.getValue(Settings.SYSTEM_PROXY_HOST); | ||
| this.port = settingManager.getValue(Settings.SYSTEM_PROXY_PORT); | ||
| this.username = settingManager.getValue(Settings.SYSTEM_PROXY_USERNAME); | ||
| this.password = settingManager.getValue(Settings.SYSTEM_PROXY_PASSWORD); | ||
| this.ignoreHostList = settingManager.getValue(Settings.SYSTEM_PROXY_IGNOREHOSTLIST); | ||
|
|
||
| } | ||
| } | ||
| } | ||
| } |
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
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
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
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
Oops, something went wrong.