Datasource authentication updates #1289
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| create table IF NOT EXISTS kruize_datasources (version varchar(255), name varchar(255), provider varchar(255), serviceName varchar(255), namespace varchar(255), url varchar(255), authentication jsonb, primary key (name)); | ||
| create table IF NOT EXISTS kruize_dsmetadata (id serial, version varchar(255), datasource_name varchar(255), cluster_name varchar(255), namespace varchar(255), workload_type varchar(255), workload_name varchar(255), container_name varchar(255), container_image_name varchar(255), primary key (id)); | ||
| alter table kruize_experiments add column metadata_id bigint references kruize_dsmetadata(id), alter column datasource type varchar(255); | ||
| create table IF NOT EXISTS kruize_metric_profiles (api_version varchar(255), kind varchar(255), metadata jsonb, name varchar(255) not null, k8s_type varchar(255), profile_version float(53) not null, slo jsonb, primary key (name)); |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| public class APIKeyAuthenticationStrategy implements AuthenticationStrategy { | ||
| private final String apiKey; | ||
|
|
||
| public APIKeyAuthenticationStrategy(String apiKey) { | ||
| this.apiKey = apiKey; | ||
| } | ||
|
|
||
| @Override | ||
| public String applyAuthentication() { | ||
| return "Api-Key " + apiKey; | ||
| } | ||
| } |
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,57 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| import org.apache.http.client.methods.HttpRequestBase; | ||
|
|
||
| import java.util.Base64; | ||
|
|
||
| public class AuthenticationConfig { | ||
| private final String type; // "basic", "bearer", "apiKey", "oauth2" | ||
| private final Credentials credentials; | ||
|
|
||
| public AuthenticationConfig(String type, Credentials credentials) { | ||
| this.type = type; | ||
| this.credentials = credentials; | ||
| } | ||
|
|
||
| public String getType() { | ||
| return type; | ||
| } | ||
|
|
||
| public Credentials getCredentials() { | ||
| return credentials; | ||
| } | ||
|
|
||
| public void applyAuthentication(HttpRequestBase httpRequestBase) { | ||
| switch (type) { | ||
| case "Basic": | ||
| String basicAuth = Base64.getEncoder().encodeToString((credentials.getUsername() + ":" + credentials.getPassword()).getBytes()); | ||
| httpRequestBase.setHeader("Authorization", "Basic " + basicAuth); | ||
| break; | ||
| case "Bearer": | ||
| httpRequestBase.setHeader("Authorization", "Bearer " + credentials.getTokenFilePath()); | ||
| break; | ||
| case "APIKey": | ||
| httpRequestBase.setHeader("Authorization", "ApiKey " + credentials.getApiKey()); | ||
| break; | ||
| case "OAuth2": | ||
| // Assume the token is already retrieved and set | ||
| httpRequestBase.setHeader("Authorization", "Bearer " + credentials.getTokenFilePath()); | ||
| break; | ||
| default: | ||
| throw new IllegalArgumentException("Unsupported authentication type: " + type); | ||
| } | ||
| } | ||
|
|
||
| // Static method to return a no-auth config | ||
| public static AuthenticationConfig noAuth() { | ||
| return new AuthenticationConfig("none", null); // Type "none" or similar to indicate no auth | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "AuthenticationConfig{" + | ||
| "type='" + type + '\'' + | ||
| ", credentials=" + credentials + | ||
| '}'; | ||
| } | ||
| } | ||
|
|
||
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,5 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| public interface AuthenticationStrategy { | ||
| String applyAuthentication(); | ||
| } |
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,27 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| public class AuthenticationStrategyFactory { | ||
|
|
||
| public static AuthenticationStrategy createAuthenticationStrategy(AuthenticationConfig authConfig) { | ||
|
There was a problem hiding this comment. Also support for no auth stratgey There was a problem hiding this comment. Support for no auth has been added in the AuthenticationConfig class: |
||
| String type = authConfig.getType(); | ||
| switch (type) { | ||
| case "basic": | ||
| String username = authConfig.getCredentials().getUsername(); | ||
| String password = authConfig.getCredentials().getPassword(); | ||
| return new BasicAuthenticationStrategy(username, password); | ||
| case "bearer": | ||
| String tokenFilePath = authConfig.getCredentials().getTokenFilePath(); | ||
| return new BearerAuthenticationStrategy(tokenFilePath); | ||
| case "apiKey": | ||
| String apiKey = authConfig.getCredentials().getApiKey(); | ||
| return new APIKeyAuthenticationStrategy(apiKey); | ||
| case "oauth2": | ||
| String tokenEndpoint = authConfig.getCredentials().getTokenEndpoint(); | ||
| String clientId = authConfig.getCredentials().getClientId(); | ||
| String clientSecret = authConfig.getCredentials().getClientSecret(); | ||
| return new OAuth2AuthenticationStrategy(tokenEndpoint, clientId, clientSecret); | ||
| default: | ||
| throw new IllegalArgumentException("Unknown authentication type: " + type); | ||
| } | ||
| } | ||
| } | ||
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,19 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| import java.util.Base64; | ||
|
|
||
| public class BasicAuthenticationStrategy implements AuthenticationStrategy { | ||
| private final String username; | ||
| private final String password; | ||
|
|
||
| public BasicAuthenticationStrategy(String username, String password) { | ||
| this.username = username; | ||
| this.password = password; | ||
| } | ||
|
|
||
| @Override | ||
| public String applyAuthentication() { | ||
| String auth = username + ":" + password; | ||
| return "Basic " + Base64.getEncoder().encodeToString(auth.getBytes()); | ||
| } | ||
| } |
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,26 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| import java.io.BufferedReader; | ||
| import java.io.FileReader; | ||
| import java.io.IOException; | ||
|
|
||
| public class BearerAuthenticationStrategy implements AuthenticationStrategy { | ||
| private final String tokenFilePath; | ||
|
|
||
| public BearerAuthenticationStrategy(String tokenFilePath) { | ||
| this.tokenFilePath = tokenFilePath; | ||
| } | ||
|
|
||
| @Override | ||
| public String applyAuthentication() { | ||
| // Read token from file | ||
| try { | ||
| BufferedReader reader = new BufferedReader(new FileReader(tokenFilePath)); | ||
| String token = reader.readLine(); | ||
| reader.close(); | ||
| return "Bearer " + token; | ||
| } catch (IOException e) { | ||
| throw new RuntimeException("Failed to read Bearer token: " + e.getMessage()); | ||
| } | ||
| } | ||
| } |
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,108 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| public class Credentials { | ||
| private String grantType; // OAuth2 | ||
| private String clientId; // OAuth2 | ||
| private String clientSecret; // OAuth2 | ||
| private String username; // Basic auth | ||
| private String password; // Basic auth | ||
| private String tokenEndpoint; // OAuth2 | ||
| private String tokenFilePath; // Bearer token | ||
| private String apiKey; // API key | ||
| private String headerName; // API key header name | ||
|
|
||
| public Credentials(String username, String password) { | ||
| this.username = username; | ||
| this.password = password; | ||
| } | ||
|
|
||
| public Credentials() { | ||
| } | ||
|
|
||
| public String getUsername() { | ||
| return username; | ||
| } | ||
|
|
||
| public String getGrantType() { | ||
| return grantType; | ||
| } | ||
|
|
||
| public String getClientSecret() { | ||
| return clientSecret; | ||
| } | ||
|
|
||
| public String getClientId() { | ||
| return clientId; | ||
| } | ||
|
|
||
| public String getTokenEndpoint() { | ||
| return tokenEndpoint; | ||
| } | ||
|
|
||
| public String getHeaderName() { | ||
| return headerName; | ||
| } | ||
|
|
||
| public String getApiKey() { | ||
| return apiKey; | ||
| } | ||
|
|
||
| public String getTokenFilePath() { | ||
| return tokenFilePath; | ||
| } | ||
|
|
||
| public String getPassword() { | ||
| return password; | ||
| } | ||
|
|
||
| public void setGrantType(String grantType) { | ||
| this.grantType = grantType; | ||
| } | ||
|
|
||
| public void setClientId(String clientId) { | ||
| this.clientId = clientId; | ||
| } | ||
|
|
||
| public void setClientSecret(String clientSecret) { | ||
| this.clientSecret = clientSecret; | ||
| } | ||
|
|
||
| public void setUsername(String username) { | ||
| this.username = username; | ||
| } | ||
|
|
||
| public void setPassword(String password) { | ||
| this.password = password; | ||
| } | ||
|
|
||
| public void setTokenEndpoint(String tokenEndpoint) { | ||
| this.tokenEndpoint = tokenEndpoint; | ||
| } | ||
|
|
||
| public void setTokenFilePath(String tokenFilePath) { | ||
| this.tokenFilePath = tokenFilePath; | ||
| } | ||
|
|
||
| public void setApiKey(String apiKey) { | ||
| this.apiKey = apiKey; | ||
| } | ||
|
|
||
| public void setHeaderName(String headerName) { | ||
| this.headerName = headerName; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "Credentials{" + | ||
| "grantType='" + grantType + '\'' + | ||
| ", clientId='" + clientId + '\'' + | ||
| ", clientSecret='" + clientSecret + '\'' + | ||
| ", username='" + username + '\'' + | ||
| ", password='" + password + '\'' + | ||
| ", tokenEndpoint='" + tokenEndpoint + '\'' + | ||
| ", tokenFilePath='" + tokenFilePath + '\'' + | ||
| ", apiKey='" + apiKey + '\'' + | ||
| ", headerName='" + headerName + '\'' + | ||
| '}'; | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess this PR is limited to datasource auth , But not for DB ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reverted