self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-20 17:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed default role to admin role.

Browse source
This commit is contained in:
Russell Jones 2017-09-05 12:20:57 -07:00
parent 9406ab714a
commit e9ae5a1e27
7 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants.go
View file

@ -194,9 +194,9 @@ const (
TraitInternalRoleVariable = "{{internal.logins}}"
)
// DefaultRole is the name of the default role for all local users if
// DefaultRole is the name of the default admin role for all local users if
// another role is not explicitly assigned (Enterprise only).
const DefaultRoleName = "default"
const AdminRoleName = "admin"
// DefaultImplicitRole is implicit role that gets added to all service.RoleSet
// objects.

4
lib/auth/init.go
View file

@ -191,8 +191,8 @@ func Init(cfg InitConfig, dynamicConfig bool) (*AuthServer, *Identity, error) {
}
log.Infof("[INIT] Created Namespace: %q", defaults.Namespace)
// always create a default role
defaultRole := services.NewDefaultRole()
// always create a default admin role
defaultRole := services.NewAdminRole()
err = asrv.UpsertRole(defaultRole, backend.Forever)
if err != nil {
return nil, nil, trace.Wrap(err)

2
lib/auth/new_web_user.go
View file

@ -289,7 +289,7 @@ func (a *AuthServer) createUserAndSession(stoken *services.SignupToken) (service
// to services.UserV2 we convert allowed logins to traits.
user := stoken.User.V2()
if len(user.GetRoles()) == 0 {
user.SetRoles([]string{teleport.DefaultRoleName})
user.SetRoles([]string{teleport.AdminRoleName})
}
// upsert user into the backend

2
lib/auth/tun_test.go
View file

@ -101,7 +101,7 @@ func (s *TunSuite) SetUpTest(c *C) {
c.Assert(err, IsNil)
// create the default role
c.Assert(s.a.UpsertRole(services.NewDefaultRole(), backend.Forever), IsNil)
c.Assert(s.a.UpsertRole(services.NewAdminRole(), backend.Forever), IsNil)
// set up host private key and certificate
c.Assert(s.a.UpsertCertAuthority(

22
lib/services/role.go
View file

@ -35,11 +35,11 @@ import (
"github.com/vulcand/predicate"
)
// DefaultUserRules provides access to the default set of rules assigned to
// AdminUserRules provides access to the default set of rules assigned to
// all users.
var DefaultUserRules = []Rule{
NewRule(KindRole, RO()),
NewRule(KindAuthConnector, RO()),
var AdminUserRules = []Rule{
NewRule(KindRole, RW()),
NewRule(KindAuthConnector, RW()),
NewRule(KindSession, RO()),
NewRule(KindTrustedCluster, RW()),
}
@ -77,14 +77,14 @@ func RoleNameForCertAuthority(name string) string {
return "ca:" + name
}
// NewDefaultRole is the default role for all local users if another role
// NewAdminRole is the default admin role for all local users if another role
// is not explicitly assigned (Enterprise only).
func NewDefaultRole() Role {
func NewAdminRole() Role {
return &RoleV3{
Kind: KindRole,
Version: V3,
Metadata: Metadata{
Name: teleport.DefaultRoleName,
Name: teleport.AdminRoleName,
Namespace: defaults.Namespace,
},
Spec: RoleSpecV3{
@ -95,7 +95,7 @@ func NewDefaultRole() Role {
Namespaces: []string{defaults.Namespace},
Logins: []string{teleport.TraitInternalRoleVariable},
NodeLabels: map[string]string{Wildcard: Wildcard},
Rules: CopyRulesSlice(DefaultUserRules),
Rules: CopyRulesSlice(AdminUserRules),
},
},
}
@ -125,7 +125,7 @@ func NewImplicitRole() Role {
}
}
// RoleForUser creates role for a services.User.
// RoleForUser creates an admin role for a services.User.
func RoleForUser(u User) Role {
return &RoleV3{
Kind: KindRole,
@ -141,7 +141,7 @@ func RoleForUser(u User) Role {
Allow: RoleConditions{
Namespaces: []string{defaults.Namespace},
NodeLabels: map[string]string{Wildcard: Wildcard},
Rules: CopyRulesSlice(DefaultUserRules),
Rules: CopyRulesSlice(AdminUserRules),
},
},
}
@ -491,7 +491,7 @@ func (r *RoleV3) CheckAndSetDefaults() error {
r.Spec.Allow.NodeLabels = map[string]string{Wildcard: Wildcard}
}
if r.Spec.Allow.Rules == nil {
r.Spec.Allow.Rules = CopyRulesSlice(DefaultUserRules)
r.Spec.Allow.Rules = CopyRulesSlice(AdminUserRules)
}
// if we find {{ or }} but the syntax is invalid, the role is invalid

4
lib/services/role_test.go
View file

@ -104,8 +104,8 @@ func (s *RoleSuite) TestRoleParse(c *C) {
NodeLabels: map[string]string{Wildcard: Wildcard},
Namespaces: []string{defaults.Namespace},
Rules: []Rule{
NewRule(KindRole, RO()),
NewRule(KindAuthConnector, RO()),
NewRule(KindRole, RW()),
NewRule(KindAuthConnector, RW()),
NewRule(KindSession, RO()),
NewRule(KindTrustedCluster, RW()),
},

2
lib/web/apiserver_test.go
View file

@ -189,7 +189,7 @@ func (s *WebSuite) SetUpTest(c *C) {
c.Assert(err, IsNil)
// create the default role
c.Assert(s.authServer.UpsertRole(services.NewDefaultRole(), backend.Forever), IsNil)
c.Assert(s.authServer.UpsertRole(services.NewAdminRole(), backend.Forever), IsNil)
// configure cluster authentication preferences
cap, err := services.NewAuthPreference(services.AuthPreferenceSpecV2{