rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-04-27 02:10:48 +00:00
Code Issues Releases Wiki Activity

Revert "token hashing"

Browse Source
This commit is contained in:
Caleb Bron 2020-03-06 16:48:40 -07:00 committed by GitHub
parent 37f04dbaa0
commit 684ae0d3fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/context.go
View File

@ -29,7 +29,6 @@ import (
rbacv1 "github.com/rancher/types/apis/rbac.authorization.k8s.io/v1"
storagev1 "github.com/rancher/types/apis/storage.k8s.io/v1"
"github.com/rancher/types/config/dialer"
"github.com/rancher/types/config/systemtokens"
"github.com/rancher/types/peermanager"
"github.com/rancher/types/user"
"github.com/rancher/wrangler-api/pkg/generated/controllers/rbac"
@ -58,7 +57,6 @@ type ScaledContext struct {
Schemas *types.Schemas
AccessControl types.AccessControl
Dialer dialer.Factory
SystemTokens systemtokens.Interface
UserManager user.Manager
PeerManager peermanager.PeerManager
@ -91,8 +89,6 @@ func (c *ScaledContext) NewManagementContext() (*ManagementContext, error) {
}
mgmt.Dialer = c.Dialer
mgmt.UserManager = c.UserManager
mgmt.SystemTokens = c.SystemTokens
c.managementContext = mgmt
return mgmt, nil
}
@ -171,7 +167,6 @@ type ManagementContext struct {
Scheme *runtime.Scheme
Dialer dialer.Factory
UserManager user.Manager
SystemTokens systemtokens.Interface
Management managementv3.Interface
Project projectv3.Interface

5
config/systemtokens/systemtokens.go
View File

@ -1,5 +0,0 @@
package systemtokens
type Interface interface {
EnsureSystemToken(name, description, kind, username string, overrideTTL *int64) (string, error)
}

4
user/manager.go
View File

@ -9,8 +9,8 @@ import (
type Manager interface {
SetPrincipalOnCurrentUser(apiContext *types.APIContext, principal v3.Principal) (*v3.User, error)
GetUser(apiContext *types.APIContext) string
EnsureToken(tokenName, description, kind, userName string, ttl *int64) (string, error)
EnsureClusterToken(clusterName, tokenName, description, kind, userName string, ttl *int64) (string, error)
EnsureToken(tokenName, description, kind, userName string) (string, error)
EnsureClusterToken(clusterName, tokenName, description, kind, userName string) (string, error)
EnsureUser(principalName, displayName string) (*v3.User, error)
CheckAccess(accessMode string, allowedPrincipalIDs []string, userPrincipalID string, groups []v3.Principal) (bool, error)
SetPrincipalOnCurrentUserByUserID(userID string, principal v3.Principal) (*v3.User, error)