Skip to content

Small changes to the "integration" package #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
klizhentas merged 1 commit into from
Sep 12, 2016
Merged

Small changes to the "integration" package #528

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions integration/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func (i *TeleInstance) CreateEx(trustedSecrets []*InstanceSecrets, tconf *servic
if err != nil {
return trace.Wrap(err)
}
// create users:
// create users if they don't exist, or sign their keys if they're already present
auth := i.Process.GetAuthServer()
for _, user := range i.Secrets.Users {
err := auth.UpsertUser(&services.TeleportUser{
Expand All @@ -249,18 +249,20 @@ func (i *TeleInstance) CreateEx(trustedSecrets []*InstanceSecrets, tconf *servic
if err != nil {
return trace.Wrap(err)
}
priv, pub, _ := tconf.Keygen.GenerateKeyPair("")
//priv, pub := makeKey()
// if user keys are not present, auto-geneate keys:
if user.Key == nil || len(user.Key.Pub) == 0 {
priv, pub, _ := tconf.Keygen.GenerateKeyPair("")
user.Key = &client.Key{
Priv: priv,
Pub: pub,
}
}
// sign user's keys:
ttl := time.Duration(time.Hour * 24)
cert, err := auth.GenerateUserCert(pub, user.Username, ttl)
user.Key.Cert, err = auth.GenerateUserCert(user.Key.Pub, user.Username, ttl)
if err != nil {
return err
}
user.Key = &client.Key{
Priv: priv,
Pub: pub,
Cert: cert,
}
}
return nil
}
Expand All @@ -277,15 +279,17 @@ func (i *TeleInstance) Reset() (err error) {

// Adds a new user into i Teleport instance. 'mappings' is a comma-separated
// list of OS users
func (i *TeleInstance) AddUser(username string, mappings []string) {
func (i *TeleInstance) AddUser(username string, mappings []string) *User {
log.Infof("teleInstance.AddUser(%v) mapped to %v", username, mappings)
if mappings == nil {
mappings = make([]string, 0)
}
i.Secrets.Users[username] = &User{
user := &User{
Username: username,
AllowedLogins: mappings,
}
i.Secrets.Users[username] = user
return user
}

func (i *TeleInstance) Start() (err error) {
Expand Down