OpenStack Keystone Token Authentication #25391
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
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
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,109 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
|
||
| 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 openstack | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/golang/glog" | ||
| "github.com/rackspace/gophercloud" | ||
| "github.com/rackspace/gophercloud/openstack" | ||
| "gopkg.in/gcfg.v1" | ||
| ) | ||
|
|
||
| type KeystoneAuthOpts struct { | ||
|
There was a problem hiding this comment. this package seems like a weird place for this, but I'm not sure where a better place would be. does this map to a config file or struct in keystone, or is it something made up for Kubernetes' use? There was a problem hiding this comment. It was pulled out from existing code in Kubernetes that authenticated with OpenStack to do stuff like volume and load balancer management and made generic enough that it can be shared between the CloudProviders use case and the Keystone Authn/z plugin. The more specific code was in pkg/cloudprovider/providers/openstack/openstack.go |
||
| AuthUrl string `gcfg:"auth-url"` | ||
| Username string | ||
| UserId string `gcfg:"user-id"` | ||
| Password string | ||
| ApiKey string `gcfg:"api-key"` | ||
| TenantId string `gcfg:"tenant-id"` | ||
| TenantName string `gcfg:"tenant-name"` | ||
| DomainId string `gcfg:"domain-id"` | ||
| DomainName string `gcfg:"domain-name"` | ||
| Region string | ||
| } | ||
|
|
||
| type Config struct { | ||
| Global KeystoneAuthOpts `gcfg:"Global"` | ||
| } | ||
|
|
||
| func (cfg KeystoneAuthOpts) ToAuthOptions() gophercloud.AuthOptions { | ||
| return gophercloud.AuthOptions{ | ||
| IdentityEndpoint: cfg.AuthUrl, | ||
| Username: cfg.Username, | ||
| UserID: cfg.UserId, | ||
| Password: cfg.Password, | ||
| APIKey: cfg.ApiKey, | ||
| TenantID: cfg.TenantId, | ||
| TenantName: cfg.TenantName, | ||
| DomainID: cfg.DomainId, | ||
| DomainName: cfg.DomainName, | ||
|
|
||
| // Persistent service, so we need to be able to renew tokens. | ||
| AllowReauth: true, | ||
| } | ||
| } | ||
|
|
||
| func ReadConfig(config io.Reader) (Config, error) { | ||
| if config == nil { | ||
| err := fmt.Errorf("no OpenStack config file given") | ||
| return Config{}, err | ||
| } | ||
|
|
||
| var cfg Config | ||
| err := gcfg.ReadInto(&cfg, config) | ||
| return cfg, err | ||
| } | ||
|
|
||
| func ConfigToProvider(config io.Reader) (Config, *gophercloud.ProviderClient, error) { | ||
| cfg, err := ReadConfig(config) | ||
| if err != nil { | ||
| return cfg, nil, err | ||
| } | ||
| provider, err := openstack.AuthenticatedClient(cfg.Global.ToAuthOptions()) | ||
| if err != nil { | ||
| return cfg, nil, err | ||
| } | ||
| return cfg, provider, nil | ||
| } | ||
|
|
||
| func ConfigFileToProvider(configPath string) (Config, *gophercloud.ProviderClient, error) { | ||
| var cf *os.File | ||
| var err error | ||
| cf, err = os.Open(configPath) | ||
| if err != nil { | ||
| glog.Fatalf("Couldn't open configuration %s: %#v", | ||
|
There was a problem hiding this comment. a util method shouldn't be making decisions about exiting the process |
||
| configPath, err) | ||
| } | ||
| defer cf.Close() | ||
| cfg, provider, err := ConfigToProvider(cf) | ||
| if err != nil { | ||
| return cfg, nil, err | ||
| } | ||
| if !strings.HasPrefix(cfg.Global.AuthUrl, "https") { | ||
| return cfg, nil, errors.New("Auth URL should be secure and start with https") | ||
| } | ||
| if cfg.Global.AuthUrl == "" { | ||
| return cfg, nil, errors.New("Auth URL is empty") | ||
| } | ||
| return cfg, provider, nil | ||
| } | ||
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 don't see why password and token auth are mutually exclusive here... I'd sort of expect to be able to set up keystone basic auth (with just the URL, as you can today?) and/or keystone token auth (by providing a config file like this?)
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 tried that originally, but it would try and authenticate to both, not just one, which always broke. If there is a way to enable them both at the same time, that would be great. Maybe I missed something?
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.
it'll try each in turn until one succeeds... if a bearer token is passed, the token auth would get called, if basic auth is passed, the password one would get called.
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.
Yeah. but it wasn't doing that. At the time, I think I had both the token plugin and the basicauth plugin combined into one plugin with both types of validators in it. Maybe that was the problem?