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

[Improve] minor improvement #3980

Merged
merged 1 commit into from
Aug 20, 2024
Merged

[Improve] minor improvement #3980

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
2 changes: 1 addition & 1 deletion streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object YarnUtils extends Logger {
*
* @return
*/
private lazy val hasYarnHttpKerberosAuth: Boolean = {
lazy val hasYarnHttpKerberosAuth: Boolean = {
val yarnHttpAuth: String = InternalConfigHolder.get[String](CommonConfig.STREAMPARK_YARN_AUTH)
"kerberos".equalsIgnoreCase(yarnHttpAuth)
}
Expand Down
56 changes: 14 additions & 42 deletions ...rvice/src/main/java/org/apache/streampark/console/core/service/impl/ProxyServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
package org.apache.streampark.console.core.service.impl;

import org.apache.streampark.common.util.HadoopUtils;
import org.apache.streampark.common.util.SystemPropertyUtils;
import org.apache.streampark.common.util.YarnUtils;
import org.apache.streampark.console.base.util.EncryptUtils;
import org.apache.streampark.console.core.entity.Application;
import org.apache.streampark.console.core.entity.ApplicationLog;
import org.apache.streampark.console.core.entity.FlinkCluster;
Expand Down Expand Up @@ -84,9 +82,7 @@ public class ProxyServiceImpl implements ProxyService {

private final RestTemplate proxyRestTemplate;

private final boolean hasYarnHttpKerberosAuth;

private String lastUsername = "";
private String httpAuthUsername = "";

public ProxyServiceImpl(RestTemplateBuilder restTemplateBuilder) {
this.proxyRestTemplate =
Expand All @@ -99,9 +95,6 @@ public void handleError(@Nonnull ClientHttpResponse response) {
}
})
.build();

String yarnHttpAuth = SystemPropertyUtils.get("streampark.yarn.http-auth");
this.hasYarnHttpKerberosAuth = "kerberos".equalsIgnoreCase(yarnHttpAuth);
}

@Override
Expand Down Expand Up @@ -174,8 +167,7 @@ public ResponseEntity<?> proxyJobManager(HttpServletRequest request, Long logId)
return proxyRequest(request, url);
}

private HttpEntity<?> getRequestEntity(HttpServletRequest request, String url, boolean setAuth)
throws Exception {
private HttpEntity<?> getRequestEntity(HttpServletRequest request, String url) throws Exception {
HttpHeaders headers = new HttpHeaders();
Enumeration<String> headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
Expand All @@ -187,47 +179,33 @@ private HttpEntity<?> getRequestEntity(HttpServletRequest request, String url, b
URI uri = new URI(url);
headers.set("Host", uri.getHost());

if (setAuth) {
String token = serviceHelper.getAuthorization();
if (token != null) {
headers.set("Authorization", EncryptUtils.encrypt(token));
}
}

byte[] body = null;
if (request.getInputStream().available() > 0) {
InputStream inputStream = request.getInputStream();
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
IOUtils.copy(inputStream, byteArrayOutputStream);
body = byteArrayOutputStream.toByteArray();
}

HttpEntity<?> requestEntity = new HttpEntity<>(body, headers);
return requestEntity;
return new HttpEntity<>(body, headers);
}

private ResponseEntity<?> proxyRequest(HttpServletRequest request, String url) throws Exception {
HttpEntity<?> requestEntity = getRequestEntity(request, url, true);
HttpEntity<?> requestEntity = getRequestEntity(request, url);
return proxyRestTemplate.exchange(
url, HttpMethod.valueOf(request.getMethod()), requestEntity, byte[].class);
}

private ResponseEntity<?> proxyYarnRequest(HttpServletRequest request, String url)
throws Exception {
if (hasYarnHttpKerberosAuth) {
if (YarnUtils.hasYarnHttpKerberosAuth()) {
UserGroupInformation ugi = HadoopUtils.getUgi();

HttpEntity<?> requestEntity = getRequestEntity(request, url, false);
HttpEntity<?> requestEntity = getRequestEntity(request, url);
setRestTemplateCredentials(ugi.getShortUserName());

return ugi.doAs(
new PrivilegedExceptionAction<ResponseEntity<?>>() {
@Override
public ResponseEntity<?> run() throws Exception {
return proxyRestTemplate.exchange(
url, HttpMethod.valueOf(request.getMethod()), requestEntity, byte[].class);
}
});
(PrivilegedExceptionAction<ResponseEntity<?>>)
() ->
proxyRestTemplate.exchange(
url, HttpMethod.valueOf(request.getMethod()), requestEntity, byte[].class));
} else {
return proxyRequest(request, url);
}
Expand All @@ -238,34 +216,28 @@ private String getRequestURL(HttpServletRequest request) {
+ (request.getQueryString() != null ? "?" + request.getQueryString() : "");
}

private void setRestTemplateCredentials(String username) {
setRestTemplateCredentials(username, null);
}

/**
* Configures the RestTemplate's HttpClient connector. This method is primarily used to configure
* the HttpClient authentication information and SSL certificate validation policies.
*
* @param username The username for HTTP basic authentication.
* @param password The password for HTTP basic authentication.
*/
private void setRestTemplateCredentials(String username, String password) {
private void setRestTemplateCredentials(String username) {
// Check if the username is not null and has changed since the last configuration
if (username != null && !this.lastUsername.equals(username)) {
if (username != null && !this.httpAuthUsername.equals(username)) {
// Create a new credentials provider
BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
// Add the username and password for HTTP basic authentication
credentialsProvider.setCredentials(
AuthScope.ANY, new UsernamePasswordCredentials(username, password));

AuthScope.ANY, new UsernamePasswordCredentials(username, null));
// Customize the HttpClient with the credentials provider
CloseableHttpClient httpClient =
HttpClients.custom().setDefaultCredentialsProvider(credentialsProvider).build();
// Set the HttpClient request factory for the RestTemplate
this.proxyRestTemplate.setRequestFactory(
new HttpComponentsClientHttpRequestFactory(httpClient));
// Update the last known username
this.lastUsername = username;
this.httpAuthUsername = username;
}
}
}
Loading