-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1289 from khansaad/datasource-auth
Datasource authentication updates
- Loading branch information
Showing
23 changed files
with
528 additions
and
156 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
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), primary key (name)); | ||
| 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
14 changes: 14 additions & 0 deletions
14
src/main/java/com/autotune/common/auth/APIKeyAuthenticationStrategy.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,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; | ||
| } | ||
| } |
76 changes: 76 additions & 0 deletions
76
src/main/java/com/autotune/common/auth/AuthenticationConfig.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,76 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| import com.autotune.analyzer.utils.AnalyzerConstants; | ||
| import com.autotune.utils.KruizeConstants; | ||
| import org.json.JSONObject; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class AuthenticationConfig { | ||
| private String type; // "basic", "bearer", "apiKey", "oauth2" | ||
| private Credentials credentials; | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticationConfig.class); | ||
|
|
||
| public AuthenticationConfig(String type, Credentials credentials) { | ||
| this.type = type; | ||
| this.credentials = credentials; | ||
| } | ||
|
|
||
| public AuthenticationConfig() { | ||
| } | ||
|
|
||
| public String getType() { | ||
| return type; | ||
| } | ||
|
|
||
| public Credentials getCredentials() { | ||
| return credentials; | ||
| } | ||
|
|
||
| public static AuthenticationConfig createAuthenticationConfigObject(JSONObject authenticationObj) { | ||
| // Parse and map authentication methods if they exist | ||
| if (authenticationObj != null) { | ||
| String type = authenticationObj.getString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_TYPE); | ||
| JSONObject credentialsObj = authenticationObj.getJSONObject(KruizeConstants.AuthenticationConstants.AUTHENTICATION_CREDENTIALS); | ||
|
|
||
| Credentials credentials = new Credentials(); | ||
| switch (type.toLowerCase()) { | ||
| case KruizeConstants.AuthenticationConstants.BASIC: | ||
| credentials.setUsername(credentialsObj.getString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_USERNAME)); | ||
| credentials.setPassword(credentialsObj.getString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_PASSWORD)); | ||
| break; | ||
| case KruizeConstants.AuthenticationConstants.BEARER: | ||
| credentials.setTokenFilePath(credentialsObj.getString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_TOKEN_FILE)); | ||
| break; | ||
| case KruizeConstants.AuthenticationConstants.API_KEY: | ||
| credentials.setApiKey(credentialsObj.getString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_API_KEY)); | ||
| credentials.setHeaderName(credentialsObj.optString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_HEADER_NAME, "X-API-Key")); | ||
| break; | ||
| case KruizeConstants.AuthenticationConstants.OAUTH2: | ||
| credentials.setTokenEndpoint(credentialsObj.getString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_TOKEN_ENDPOINT)); | ||
| credentials.setClientId(credentialsObj.getString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_CLIENT_ID)); | ||
| credentials.setClientSecret(credentialsObj.getString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_CLIENT_SECRET)); | ||
| credentials.setGrantType(credentialsObj.getString(KruizeConstants.AuthenticationConstants.AUTHENTICATION_GRANT_TYPE)); | ||
| break; | ||
| default: | ||
| LOGGER.error(KruizeConstants.AuthenticationConstants.UNKNOWN_AUTHENTICATION + "{}", type); | ||
| } | ||
|
|
||
| return new AuthenticationConfig(type, credentials); | ||
| } | ||
| return noAuth(); | ||
| } | ||
|
|
||
| // Static method to return a no-auth config | ||
| public static AuthenticationConfig noAuth() { | ||
| return new AuthenticationConfig(AnalyzerConstants.NONE, null); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "AuthenticationConfig{" + | ||
| "type='" + type + '\'' + | ||
| ", credentials=" + credentials + | ||
| '}'; | ||
| } | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/main/java/com/autotune/common/auth/AuthenticationStrategy.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,5 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| public interface AuthenticationStrategy { | ||
| String applyAuthentication(); | ||
| } |
29 changes: 29 additions & 0 deletions
29
src/main/java/com/autotune/common/auth/AuthenticationStrategyFactory.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,29 @@ | ||
| package com.autotune.common.auth; | ||
|
|
||
| import com.autotune.utils.KruizeConstants; | ||
|
|
||
| public class AuthenticationStrategyFactory { | ||
|
|
||
| public static AuthenticationStrategy createAuthenticationStrategy(AuthenticationConfig authConfig) { | ||
| String type = authConfig.getType(); | ||
| switch (type) { | ||
| case KruizeConstants.AuthenticationConstants.BASIC: | ||
| String username = authConfig.getCredentials().getUsername(); | ||
| String password = authConfig.getCredentials().getPassword(); | ||
| return new BasicAuthenticationStrategy(username, password); | ||
| case KruizeConstants.AuthenticationConstants.BEARER: | ||
| String tokenFilePath = authConfig.getCredentials().getTokenFilePath(); | ||
| return new BearerAuthenticationStrategy(tokenFilePath); | ||
| case KruizeConstants.AuthenticationConstants.API_KEY: | ||
| String apiKey = authConfig.getCredentials().getApiKey(); | ||
| return new APIKeyAuthenticationStrategy(apiKey); | ||
| case KruizeConstants.AuthenticationConstants.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(KruizeConstants.AuthenticationConstants.UNKNOWN_AUTHENTICATION+ type); | ||
| } | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
src/main/java/com/autotune/common/auth/BasicAuthenticationStrategy.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,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()); | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
src/main/java/com/autotune/common/auth/BearerAuthenticationStrategy.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,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()); | ||
| } | ||
| } | ||
| } |
108 changes: 108 additions & 0 deletions
108
src/main/java/com/autotune/common/auth/Credentials.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,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.