-
Notifications
You must be signed in to change notification settings - Fork 1.9k
IGNITE-11183 Fixed proxy in Web Console agent. #6010
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
42 changes: 42 additions & 0 deletions
42
...b-console/web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthException.java
This file contains hidden or 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,42 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.ignite.console.agent; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * This class extends {@link IOException} and represents an authentication failure to the proxy. | ||
| */ | ||
| public class ProxyAuthException extends IOException { | ||
| /** */ | ||
| private static final long serialVersionUID = 0L; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public ProxyAuthException(String msg) { | ||
| super(msg); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public ProxyAuthException(String msg, Throwable ex) { | ||
| super(msg, ex); | ||
| } | ||
| } |
82 changes: 82 additions & 0 deletions
82
...b-console/web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthenticator.java
This file contains hidden or 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,82 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.ignite.console.agent; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.InetSocketAddress; | ||
| import java.net.PasswordAuthentication; | ||
| import java.net.Proxy; | ||
| import java.util.List; | ||
| import okhttp3.Authenticator; | ||
| import okhttp3.Challenge; | ||
| import okhttp3.Credentials; | ||
| import okhttp3.HttpUrl; | ||
| import okhttp3.OkHttpClient; | ||
| import okhttp3.Request; | ||
| import okhttp3.Response; | ||
| import okhttp3.Route; | ||
|
|
||
| import static java.net.Authenticator.RequestorType.PROXY; | ||
|
|
||
| /** | ||
| * Request interactive proxy credentials. | ||
| * | ||
| * Configure OkHttp to use {@link OkHttpClient.Builder#proxyAuthenticator(Authenticator)}. | ||
| */ | ||
| public class ProxyAuthenticator implements Authenticator { | ||
| /** Latest credential hash code. */ | ||
| private int latestCredHashCode = 0; | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override public Request authenticate(Route route, Response res) throws IOException { | ||
| List<Challenge> challenges = res.challenges(); | ||
|
|
||
| for (Challenge challenge : challenges) { | ||
| if (!"Basic".equalsIgnoreCase(challenge.scheme())) | ||
| continue; | ||
|
|
||
| Request req = res.request(); | ||
| HttpUrl url = req.url(); | ||
| Proxy proxy = route.proxy(); | ||
|
|
||
| InetSocketAddress proxyAddr = (InetSocketAddress)proxy.address(); | ||
|
|
||
| PasswordAuthentication auth = java.net.Authenticator.requestPasswordAuthentication( | ||
| proxyAddr.getHostName(), proxyAddr.getAddress(), proxyAddr.getPort(), | ||
| url.scheme(), challenge.realm(), challenge.scheme(), url.url(), PROXY); | ||
|
|
||
| if (auth != null) { | ||
| String cred = Credentials.basic(auth.getUserName(), new String(auth.getPassword()), challenge.charset()); | ||
|
|
||
| if (latestCredHashCode == cred.hashCode()) { | ||
| latestCredHashCode = 0; | ||
|
|
||
| throw new ProxyAuthException("Failed to authenticate with proxy"); | ||
| } | ||
|
|
||
| latestCredHashCode = cred.hashCode(); | ||
|
|
||
| return req.newBuilder() | ||
| .header("Proxy-Authorization", cred) | ||
| .build(); | ||
| } | ||
| } | ||
|
|
||
| return null; // No challenges were satisfied! | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.