Skip to content
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

Jump to bottom

✨ [release-1.5] Improve session handling with a secure session key #2191

Merged
merged 1 commit into from
Aug 9, 2023
Merged

✨ [release-1.5] Improve session handling with a secure session key #2191

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
19 changes: 14 additions & 5 deletions pkg/session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package session

import (
"context"
"crypto/sha256"
"fmt"
"net/netip"
"net/url"
Expand Down Expand Up @@ -109,14 +110,22 @@ func (p *Params) WithFeatures(feature Feature) *Params {
// GetOrCreate gets a cached session or creates a new one if one does not
// already exist.
func GetOrCreate(ctx context.Context, params *Params) (*Session, error) {
logger := ctrl.LoggerFrom(ctx).WithName("session")
logger := ctrl.LoggerFrom(ctx).WithName("session").WithValues(
"server", params.server,
"datacenter", params.datacenter,
"username", params.userinfo.Username())

sessionMU.Lock()
defer sessionMU.Unlock()

sessionKey := params.server + params.userinfo.Username() + params.datacenter
userPassword, _ := params.userinfo.Password()
h := sha256.New()
h.Write([]byte(userPassword))
hashedUserPassword := h.Sum(nil)
sessionKey := fmt.Sprintf("%s#%s#%s#%x", params.server, params.datacenter, params.userinfo.Username(),
hashedUserPassword)
if cachedSession, ok := sessionCache.Load(sessionKey); ok {
s := cachedSession.(*Session)
logger = logger.WithValues("server", params.server, "datacenter", params.datacenter)

vimSessionActive, err := s.SessionManager.SessionIsActive(ctx)
if err != nil {
Expand Down Expand Up @@ -214,7 +223,7 @@ func newClient(ctx context.Context, logger logr.Logger, sessionKey string, url *
_, err := methods.GetCurrentTime(ctx, tripper)
if err != nil {
logger.Error(err, "failed to keep alive govmomi client")
logger.Info("clearing the session", "key", sessionKey)
logger.Info("clearing the session")
sessionCache.Delete(sessionKey)
}
return err
Expand All @@ -239,7 +248,7 @@ func newManager(ctx context.Context, logger logr.Logger, sessionKey string, clie
return nil
}

logger.Info("rest client session expired, clearing session", "key", sessionKey)
logger.Info("rest client session expired, clearing session")
sessionCache.Delete(sessionKey)
return errors.New("rest client session expired")
})
Expand Down