chore: more miscellaneous updates

pkg/bmc/bmc.go

@@ -10,6 +10,13 @@ import (
 type BMCCredentials struct {
 	Username      string            `json:"username"`
 	Password      string            `json:"password"`
+	SessionTokens map[string]string `json:"session-tokens"`
+}
+
+func (c BMCCredentials) IsEmpty() bool {
+	return c.Username == "" &&
+		c.Password == "" &&
+		len(c.SessionTokens) == 0
 }
 
 func GetBMCCredentialsDefault(store secrets.SecretStore) (BMCCredentials, error) {

pkg/collect.go

@@ -41,6 +41,7 @@ type CollectParams struct {
 	Format       string              // set the output format
 	ForceUpdate  bool                // set whether to force updating SMD with 'force-update' flag
 	AccessToken  string              // set the access token to include in request with 'access-token' flag
+	SessionToken string              // set the session token to use for auth
 	SecretStore  secrets.SecretStore // set BMC credentials
 }
 
@@ -71,7 +72,7 @@ func CollectInventory(assets *[]RemoteAsset, params *CollectParams, store secret
 
 	// set the client's params from CLI
 	wg.Add(params.Concurrency)
-	for i := 0; i < params.Concurrency; i++ {
+	for _ = range params.Concurrency {
 		go func() {
 			for {
 				sr, ok := <-chanAssets
@@ -129,7 +130,7 @@ func CollectInventory(assets *[]RemoteAsset, params *CollectParams, store secret
 
 				// get BMC username to send
 				bmcCreds := bmc.GetBMCCredentialsOrDefault(params.SecretStore, config.URI)
-				if bmcCreds == (bmc.BMCCredentials{}) {
+				if bmcCreds.IsEmpty() {
 					log.Warn().Str("id", config.URI).Msg("username will be blank")
 				}
 

pkg/crawler/main.go

@@ -16,11 +16,13 @@ type CrawlerConfig struct {
 	URI             string // URI of the BMC
 	Insecure        bool   // Whether to ignore SSL errors
 	CredentialStore secrets.SecretStore
+	SessionID       string
+	SessionToken    string
 	UseDefault      bool
 }
 
 func (cc *CrawlerConfig) GetUserPass() (bmc.BMCCredentials, error) {
-	return loadBMCCreds(*cc)
+	return LoadBMCCreds(*cc)
 }
 
 type EthernetInterface struct {
@@ -124,7 +126,7 @@ func CrawlBMCForSystems(config CrawlerConfig) ([]InventoryDetail, error) {
 		rf_systems []*redfish.ComputerSystem
 	)
 	// get username and password from secret store
-	bmc_creds, err := loadBMCCreds(config)
+	bmc_creds, err := LoadBMCCreds(config)
 	if err != nil {
 		event := log.Error()
 		event.Err(err)
@@ -138,8 +140,13 @@ func CrawlBMCForSystems(config CrawlerConfig) ([]InventoryDetail, error) {
 		Username: bmc_creds.Username,
 		Password: bmc_creds.Password,
 		Insecure: config.Insecure,
+		Session: &gofish.Session{
+			ID:    config.SessionID,
+			Token: bmc_creds.SessionTokens[config.SessionID],
+		},
 		BasicAuth: true,
 	})
+
 	if err != nil {
 		if strings.HasPrefix(err.Error(), "404:") {
 			err = fmt.Errorf("no ServiceRoot found.  This is probably not a BMC: %s", config.URI)
@@ -219,7 +226,7 @@ func CrawlBMCForSystems(config CrawlerConfig) ([]InventoryDetail, error) {
 func CrawlBMCForManagers(config CrawlerConfig) ([]Manager, error) {
 
 	// get username and password from secret store
-	bmc_creds, err := loadBMCCreds(config)
+	bmc_creds, err := LoadBMCCreds(config)
 	if err != nil {
 		event := log.Error()
 		event.Err(err)
@@ -262,7 +269,7 @@ func CrawlBMCForManagers(config CrawlerConfig) ([]Manager, error) {
 
 func CrawlBMCForStorage(config CrawlerConfig) ([]Storage, error) {
 	// get username and password from secret store
-	bmc_creds, err := loadBMCCreds(config)
+	bmc_creds, err := LoadBMCCreds(config)
 	if err != nil {
 		event := log.Error()
 		event.Err(err)
@@ -555,12 +562,12 @@ func walkStorage(rf_storage []*redfish.Storage, baseURI string) ([]Storage, erro
 	return storage, nil
 }
 
-func loadBMCCreds(config CrawlerConfig) (bmc.BMCCredentials, error) {
+func LoadBMCCreds(config CrawlerConfig) (bmc.BMCCredentials, error) {
 	// NOTE: it is possible for the SecretStore to be nil, so we need a check
 	if config.CredentialStore == nil {
 		return bmc.BMCCredentials{}, fmt.Errorf("credential store is invalid")
 	}
-	if creds := util.GetBMCCredentials(config.CredentialStore, config.URI); creds == (bmc.BMCCredentials{}) {
+	if creds := util.GetBMCCredentials(config.CredentialStore, config.URI); creds.IsEmpty() {
 		return creds, fmt.Errorf("%s: credentials blank for BMC", config.URI)
 	} else {
 		return creds, nil

pkg/list.go

@@ -18,27 +18,27 @@ func PrintRemoteAssets(data []RemoteAsset, format string) {
 		util.PrintJSON(data)
 	case "yaml":
 		util.PrintYAML(data)
-	case "none":
+	case "list":
 		for _, r := range data {
 			fmt.Printf("%s:%d (%s) @%s\n", r.Host, r.Port, r.Protocol, r.Timestamp.Format(time.UnixDate))
 		}
 	default:
-		log.Error().Msg("unrecognized format")
+		log.Error().Msg("PrintRemoteAssets: unrecognized format")
 	}
 }
 
-func PrintMapFormat(data map[string]any, format string) {
+func PrintMapWithFormat(data map[string]any, format string) {
 	switch strings.ToLower(format) {
 	case "json":
 		util.PrintJSON(data)
 	case "yaml":
 		util.PrintYAML(data)
-	case "none":
+	case "list":
 		for k, v := range data {
 			fmt.Printf("%s: %v\n", k, v)
 		}
 	default:
-		log.Error().Msg("unrecognized format")
+		log.Error().Msg("PrintMapWithFormat: unrecognized format")
 	}
 }
 

pkg/secrets/localstore.go

@@ -95,7 +95,11 @@ func (l *LocalSecretStore) ListSecrets() (map[string]string, error) {
 	defer l.mu.RUnlock()
 
 	secretsCopy := make(map[string]string)
-	for key, value := range l.Secrets {
+	for key, _ := range l.Secrets {
+		value, err := l.GetSecretByID(key)
+		if err != nil {
+			continue
+		}
 		secretsCopy[key] = value
 	}
 	return secretsCopy, nil

pkg/secrets/main.go

@@ -1,7 +1,13 @@
 package secrets
 
+import "errors"
+
 const DEFAULT_KEY = "default"
 
+var (
+	ErrLoadFailedCreds = errors.New("failed to load BMC credentials")
+)
+
 type SecretStore interface {
 	GetSecretByID(secretID string) (string, error)
 	StoreSecretByID(secretID, secret string) error