-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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 #7265 from planetscale/jg_vault_9.0
Cherry pick version of #7233 for release-9.0
- Loading branch information
Showing
20 changed files
with
1,290 additions
and
5 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 |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| Copyright 2020 The Vitess Authors. | ||
| Licensed 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 agreedto 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 main | ||
|
|
||
| // This plugin imports InitAuthServerVault to register the HashiCorp Vault implementation of AuthServer. | ||
|
|
||
| import ( | ||
| "vitess.io/vitess/go/mysql" | ||
| "vitess.io/vitess/go/vt/vtgate" | ||
| ) | ||
|
|
||
| func init() { | ||
| vtgate.RegisterPluginInitializer(func() { mysql.InitAuthServerVault() }) | ||
| } |
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,302 @@ | ||
| /* | ||
| Copyright 2020 The Vitess Authors. | ||
| Licensed 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 mysql | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "flag" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "net" | ||
| "os" | ||
| "os/signal" | ||
| "strings" | ||
| "sync" | ||
| "syscall" | ||
| "time" | ||
|
|
||
| vaultapi "github.com/aquarapid/vaultlib" | ||
|
|
||
| "vitess.io/vitess/go/vt/log" | ||
| ) | ||
|
|
||
| var ( | ||
| vaultAddr = flag.String("mysql_auth_vault_addr", "", "URL to Vault server") | ||
| vaultTimeout = flag.Duration("mysql_auth_vault_timeout", 10*time.Second, "Timeout for vault API operations") | ||
| vaultCACert = flag.String("mysql_auth_vault_tls_ca", "", "Path to CA PEM for validating Vault server certificate") | ||
| vaultPath = flag.String("mysql_auth_vault_path", "", "Vault path to vtgate credentials JSON blob, e.g.: secret/data/prod/vtgatecreds") | ||
| vaultCacheTTL = flag.Duration("mysql_auth_vault_ttl", 30*time.Minute, "How long to cache vtgate credentials from the Vault server") | ||
| vaultTokenFile = flag.String("mysql_auth_vault_tokenfile", "", "Path to file containing Vault auth token; token can also be passed using VAULT_TOKEN environment variable") | ||
| vaultRoleID = flag.String("mysql_auth_vault_roleid", "", "Vault AppRole id; can also be passed using VAULT_ROLEID environment variable") | ||
| vaultRoleSecretIDFile = flag.String("mysql_auth_vault_role_secretidfile", "", "Path to file containing Vault AppRole secret_id; can also be passed using VAULT_SECRETID environment variable") | ||
| vaultRoleMountPoint = flag.String("mysql_auth_vault_role_mountpoint", "approle", "Vault AppRole mountpoint; can also be passed using VAULT_MOUNTPOINT environment variable") | ||
| ) | ||
|
|
||
| // AuthServerVault implements AuthServer with a config loaded from Vault. | ||
| type AuthServerVault struct { | ||
| mu sync.Mutex | ||
| // method can be set to: | ||
| // - MysqlNativePassword | ||
| // - MysqlClearPassword | ||
| // - MysqlDialog | ||
| // It defaults to MysqlNativePassword. | ||
| method string | ||
| // users, passwords and user data | ||
| // We use the same JSON format as for -mysql_auth_server_static | ||
| // Acts as a cache for the in-Vault data | ||
| entries map[string][]*AuthServerStaticEntry | ||
| vaultCacheExpireTicker *time.Ticker | ||
| vaultClient *vaultapi.Client | ||
| vaultPath string | ||
| vaultTTL time.Duration | ||
|
|
||
| sigChan chan os.Signal | ||
| } | ||
|
|
||
| // InitAuthServerVault - entrypoint for initialization of Vault AuthServer implementation | ||
| func InitAuthServerVault() { | ||
| // Check critical parameters. | ||
| if *vaultAddr == "" { | ||
| log.Infof("Not configuring AuthServerVault, as -mysql_auth_vault_addr is empty.") | ||
| return | ||
| } | ||
| if *vaultPath == "" { | ||
| log.Exitf("If using Vault auth server, -mysql_auth_vault_path is required.") | ||
| } | ||
|
|
||
| registerAuthServerVault(*vaultAddr, *vaultTimeout, *vaultCACert, *vaultPath, *vaultCacheTTL, *vaultTokenFile, *vaultRoleID, *vaultRoleSecretIDFile, *vaultRoleMountPoint) | ||
| } | ||
|
|
||
| func registerAuthServerVault(addr string, timeout time.Duration, caCertPath string, path string, ttl time.Duration, tokenFilePath string, roleID string, secretIDPath string, roleMountPoint string) { | ||
| authServerVault, err := newAuthServerVault(addr, timeout, caCertPath, path, ttl, tokenFilePath, roleID, secretIDPath, roleMountPoint) | ||
| if err != nil { | ||
| log.Exitf("%s", err) | ||
| } | ||
| RegisterAuthServerImpl("vault", authServerVault) | ||
| } | ||
|
|
||
| func newAuthServerVault(addr string, timeout time.Duration, caCertPath string, path string, ttl time.Duration, tokenFilePath string, roleID string, secretIDPath string, roleMountPoint string) (*AuthServerVault, error) { | ||
| // Validate more parameters | ||
| token, err := readFromFile(tokenFilePath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("No Vault token in provided filename for -mysql_auth_vault_tokenfile") | ||
| } | ||
| secretID, err := readFromFile(secretIDPath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("No Vault secret_id in provided filename for -mysql_auth_vault_role_secretidfile") | ||
| } | ||
|
|
||
| config := vaultapi.NewConfig() | ||
|
|
||
| // All these can be overriden by environment | ||
| // so we need to check if they have been set by NewConfig | ||
| if config.Address == "" { | ||
| config.Address = addr | ||
| } | ||
| if config.Timeout == (0 * time.Second) { | ||
| config.Timeout = timeout | ||
| } | ||
| if config.CACert == "" { | ||
| config.CACert = caCertPath | ||
| } | ||
| if config.Token == "" { | ||
| config.Token = token | ||
| } | ||
| if config.AppRoleCredentials.RoleID == "" { | ||
| config.AppRoleCredentials.RoleID = roleID | ||
| } | ||
| if config.AppRoleCredentials.SecretID == "" { | ||
| config.AppRoleCredentials.SecretID = secretID | ||
| } | ||
| if config.AppRoleCredentials.MountPoint == "" { | ||
| config.AppRoleCredentials.MountPoint = roleMountPoint | ||
| } | ||
|
|
||
| if config.CACert != "" { | ||
| // If we provide a CA, ensure we actually use it | ||
| config.InsecureSSL = false | ||
| } | ||
|
|
||
| client, err := vaultapi.NewClient(config) | ||
| if err != nil || client == nil { | ||
| log.Errorf("Error in vault client initialization, will retry: %v", err) | ||
| } | ||
|
|
||
| a := &AuthServerVault{ | ||
| vaultClient: client, | ||
| vaultPath: path, | ||
| vaultTTL: ttl, | ||
| method: MysqlNativePassword, | ||
| entries: make(map[string][]*AuthServerStaticEntry), | ||
| } | ||
|
|
||
| a.reloadVault() | ||
| a.installSignalHandlers() | ||
| return a, nil | ||
| } | ||
|
|
||
| func (a *AuthServerVault) setTTLTicker(ttl time.Duration) { | ||
| a.mu.Lock() | ||
| defer a.mu.Unlock() | ||
| if a.vaultCacheExpireTicker == nil { | ||
| a.vaultCacheExpireTicker = time.NewTicker(ttl) | ||
| go func() { | ||
| for range a.vaultCacheExpireTicker.C { | ||
| a.sigChan <- syscall.SIGHUP | ||
| } | ||
| }() | ||
| } else { | ||
| a.vaultCacheExpireTicker.Reset(ttl) | ||
| } | ||
| } | ||
|
|
||
| // Reload JSON auth key from Vault. Return true if successful, false if not | ||
| func (a *AuthServerVault) reloadVault() error { | ||
| a.mu.Lock() | ||
| secret, err := a.vaultClient.GetSecret(a.vaultPath) | ||
| a.mu.Unlock() | ||
| a.setTTLTicker(10 * time.Second) // Reload frequently on error | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("Error in vtgate Vault auth server params: %v", err) | ||
| } | ||
|
|
||
| if secret.JSONSecret == nil { | ||
| return fmt.Errorf("Empty vtgate credentials retrieved from Vault server") | ||
| } | ||
|
|
||
| entries := make(map[string][]*AuthServerStaticEntry) | ||
| if err := parseConfig(secret.JSONSecret, &entries); err != nil { | ||
| return fmt.Errorf("Error parsing vtgate Vault auth server config: %v", err) | ||
| } | ||
| if len(entries) == 0 { | ||
| return fmt.Errorf("vtgate credentials from Vault empty! Not updating previously cached values") | ||
| } | ||
|
|
||
| log.Infof("reloadVault(): success. Client status: %s", a.vaultClient.GetStatus()) | ||
| a.mu.Lock() | ||
| a.entries = entries | ||
| a.mu.Unlock() | ||
| a.setTTLTicker(a.vaultTTL) | ||
| return nil | ||
| } | ||
|
|
||
| func (a *AuthServerVault) installSignalHandlers() { | ||
| a.mu.Lock() | ||
| defer a.mu.Unlock() | ||
|
|
||
| a.sigChan = make(chan os.Signal, 1) | ||
| signal.Notify(a.sigChan, syscall.SIGHUP) | ||
| go func() { | ||
| for range a.sigChan { | ||
| err := a.reloadVault() | ||
| if err != nil { | ||
| log.Errorf("%s", err) | ||
| } | ||
|
|
||
| } | ||
| }() | ||
| } | ||
|
|
||
| func (a *AuthServerVault) close() { | ||
| log.Warningf("Closing AuthServerVault instance.") | ||
| a.mu.Lock() | ||
| defer a.mu.Unlock() | ||
| if a.vaultCacheExpireTicker != nil { | ||
| a.vaultCacheExpireTicker.Stop() | ||
| } | ||
| if a.sigChan != nil { | ||
| signal.Stop(a.sigChan) | ||
| } | ||
| } | ||
|
|
||
| // AuthMethod is part of the AuthServer interface. | ||
| func (a *AuthServerVault) AuthMethod(user string) (string, error) { | ||
| return a.method, nil | ||
| } | ||
|
|
||
| // Salt is part of the AuthServer interface. | ||
| func (a *AuthServerVault) Salt() ([]byte, error) { | ||
| return NewSalt() | ||
| } | ||
|
|
||
| // ValidateHash is part of the AuthServer interface. | ||
| func (a *AuthServerVault) ValidateHash(salt []byte, user string, authResponse []byte, remoteAddr net.Addr) (Getter, error) { | ||
| a.mu.Lock() | ||
| userEntries, ok := a.entries[user] | ||
| a.mu.Unlock() | ||
|
|
||
| if !ok { | ||
| return &StaticUserData{}, NewSQLError(ERAccessDeniedError, SSAccessDeniedError, "Access denied for user '%v'", user) | ||
| } | ||
|
|
||
| for _, entry := range userEntries { | ||
| if entry.MysqlNativePassword != "" { | ||
| isPass := isPassScrambleMysqlNativePassword(authResponse, salt, entry.MysqlNativePassword) | ||
| if matchSourceHost(remoteAddr, entry.SourceHost) && isPass { | ||
| return &StaticUserData{entry.UserData, entry.Groups}, nil | ||
| } | ||
| } else { | ||
| computedAuthResponse := ScramblePassword(salt, []byte(entry.Password)) | ||
| // Validate the password. | ||
| if matchSourceHost(remoteAddr, entry.SourceHost) && bytes.Equal(authResponse, computedAuthResponse) { | ||
| return &StaticUserData{entry.UserData, entry.Groups}, nil | ||
| } | ||
| } | ||
| } | ||
| return &StaticUserData{}, NewSQLError(ERAccessDeniedError, SSAccessDeniedError, "Access denied for user '%v'", user) | ||
| } | ||
|
|
||
| // Negotiate is part of the AuthServer interface. | ||
| // It will be called if method is anything else than MysqlNativePassword. | ||
| // We only recognize MysqlClearPassword and MysqlDialog here. | ||
| func (a *AuthServerVault) Negotiate(c *Conn, user string, remoteAddr net.Addr) (Getter, error) { | ||
| // Finish the negotiation. | ||
| password, err := AuthServerNegotiateClearOrDialog(c, a.method) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| a.mu.Lock() | ||
| userEntries, ok := a.entries[user] | ||
| a.mu.Unlock() | ||
|
|
||
| if !ok { | ||
| return &StaticUserData{}, NewSQLError(ERAccessDeniedError, SSAccessDeniedError, "Access denied for user '%v'", user) | ||
| } | ||
| for _, entry := range userEntries { | ||
| // Validate the password. | ||
| if matchSourceHost(remoteAddr, entry.SourceHost) && entry.Password == password { | ||
| return &StaticUserData{entry.UserData, entry.Groups}, nil | ||
| } | ||
| } | ||
| return &StaticUserData{}, NewSQLError(ERAccessDeniedError, SSAccessDeniedError, "Access denied for user '%v'", user) | ||
| } | ||
|
|
||
| // We ignore most errors here, to allow us to retry cleanly | ||
| // or ignore the cases where the input is not passed by file, but via env | ||
| func readFromFile(filePath string) (string, error) { | ||
| if filePath == "" { | ||
| return "", nil | ||
| } | ||
| fileBytes, err := ioutil.ReadFile(filePath) | ||
| if err != nil { | ||
| log.Errorf("Could not read file: %s", filePath) | ||
| return "", err | ||
| } | ||
| return strings.TrimSpace(string(fileBytes)), nil | ||
| } |
Oops, something went wrong.