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.

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

Jump to bottom

Fix HttpClientProxyCredentialProvider.getPasswordAuthentication #78

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Fix HttpClientProxyCredentialProvider.getPasswordAuthentication #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...ndles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="TimeServiceHost XmlRpc Zeroconf Discovery" uid="com.mycorp.examples.timeservice.xmlrpc.j8.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<product name="TimeServiceHost XmlRpc Zeroconf Discovery" uid="com.mycorp.examples.timeservice.xmlrpc.j8.product" version="1.1.1.qualifier" useFeatures="false" includeLaunchers="false">

<configIni use="default">
</configIni>
Expand Down Expand Up @@ -37,7 +37,7 @@
<plugin id="com.mycorp.examples.timeservice.async"/>
<plugin id="com.mycorp.examples.timeservice.host"/>
<plugin id="javax.servlet"/>
<plugin id="org.apache.commons.codec"/>
<plugin id="org.apache.commons.commons-codec"/>
<plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.runtime"/>
Expand Down Expand Up @@ -86,7 +86,7 @@
<configurations>
<plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="0" />
<plugin id="javax.servlet" autoStart="true" startLevel="0" />
<plugin id="org.apache.commons.codec" autoStart="true" startLevel="0" />
<plugin id="org.apache.commons.commons-codec" autoStart="true" startLevel="0" />
<plugin id="org.apache.commons.logging" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
Expand Down
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<tycho-version>2.7.5</tycho-version>
<cbi-version>1.3.2</cbi-version>
<target-platform>2022-03</target-platform>
<execution-environment>JavaSE-17</execution-environment>
<eclipserun-repo>https://download.eclipse.org/eclipse/updates/latest/</eclipserun-repo>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<project.resources.sourceEncoding>ISO-8859-1</project.resources.sourceEncoding>
Expand Down Expand Up @@ -285,6 +286,7 @@
<version>1.0.0-SNAPSHOT</version>
</artifact>
</target>
<executionEnvironment>${execution-environment}</executionEnvironment>
<environments>
<environment>
<os>win32</os>
Expand Down Expand Up @@ -405,7 +407,7 @@
<url>${eclipserun-repo}</url>
</repository>
</repositories>
<executionEnvironment>JavaSE-11</executionEnvironment>
<executionEnvironment>${execution-environment}</executionEnvironment>
</configuration>
</plugin>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion .../ecf/internal/provider/filetransfer/httpclientjava/HttpClientProxyCredentialProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ protected NTCredentials getNTLMCredentials(Proxy proxy) {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
if (getRequestorType() == RequestorType.PROXY) {
Credentials credential = getCredentials(null); // TODO
Credentials credential = getCredentials(new AuthScope(getRequestingHost(), getRequestingPort()));
if (credential != null) {
return new PasswordAuthentication(credential.getUserName(), credential.getPassword());
}
Expand Down
4 changes: 2 additions & 2 deletions releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.filetransfer.httpclient4.feature"
label="%featureName"
version="3.14.32.qualifier"
version="3.14.33.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down Expand Up @@ -31,7 +31,7 @@
unpack="false"/>

<plugin
id="org.apache.commons.codec"
id="org.apache.commons.commons-codec"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.filetransfer.httpclient4.feature</artifactId>
<version>3.14.32-SNAPSHOT</version>
<version>3.14.33-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
4 changes: 2 additions & 2 deletions releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.filetransfer.httpclient45.feature"
label="%featureName"
version="1.1.100.qualifier"
version="1.1.101.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down Expand Up @@ -39,7 +39,7 @@
unpack="false"/>

<plugin
id="org.apache.commons.codec"
id="org.apache.commons.commons-codec"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.filetransfer.httpclient45.feature</artifactId>
<version>1.1.100-SNAPSHOT</version>
<version>1.1.101-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
9 changes: 1 addition & 8 deletions releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,7 @@
unpack="false"/>

<plugin
id="org.apache.commons.codec"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.apache.commons.logging"
id="org.apache.commons.commons-codec"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did org.apache.commons.logging get dropped on purpose here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, because I checked and there are no requirements on this by any of the http5 stuff. I suspect it was just copied from the 4.x stuff. Here is SimRel after you contributed httpclient5:

image

Note the image from the previous comment resolves using planner mode, so if something actually required it, even only transitively, it would still be present in the target for that location...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Ed for confirming.

download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services

<requires>
<import feature="org.eclipse.ecf.remoteservice.feature" version="2.1" match="compatible"/>
<import plugin="org.apache.commons.codec" version="1.6" match="compatible"/>
<import plugin="org.apache.commons.commons-codec" version="1.6" match="compatible"/>
<import plugin="org.apache.commons.logging" version="1.2.0" match="compatible"/>
<import plugin="org.apache.httpcomponents.httpclient" version="4.2" match="compatible"/>
<import plugin="org.apache.httpcomponents.httpcore" version="4.2" match="compatible"/>
Expand Down
Loading
Loading