towk/magellan
1
0
Fork 0
mirror of https://github.com/davidallendj/magellan.git synced 2025-12-20 11:37:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added URL sanitization for SMD host and moved auth from util

Browse source
This commit is contained in:
David Allen 2024-08-12 13:04:52 -06:00
parent f7159c9b66
commit dce823c6d8
No known key found for this signature in database
GPG key ID: 717C593FF60A2ACC
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cmd/collect.go
View file

@ -3,10 +3,11 @@ package cmd
import ( import (
"fmt" "fmt"
"os/user" "os/user"
"strings"
magellan "github.com/OpenCHAMI/magellan/internal" magellan "github.com/OpenCHAMI/magellan/internal"
"github.com/OpenCHAMI/magellan/internal/cache/sqlite" "github.com/OpenCHAMI/magellan/internal/cache/sqlite"
"github.com/OpenCHAMI/magellan/internal/util" "github.com/OpenCHAMI/magellan/pkg/auth"
"github.com/cznic/mathutil" "github.com/cznic/mathutil"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -35,10 +36,14 @@ var collectCmd = &cobra.Command{
log.Error().Err(err).Msgf("failed to get scanned results from cache") log.Error().Err(err).Msgf("failed to get scanned results from cache")
} }
// URL sanitanization for host argument
host = strings.TrimSuffix(host, "/")
host = strings.ReplaceAll(host, "//", "/")
// try to load access token either from env var, file, or config if var not set // try to load access token either from env var, file, or config if var not set
if accessToken == "" { if accessToken == "" {
var err error var err error
accessToken, err = util.LoadAccessToken(tokenPath) accessToken, err = auth.LoadAccessToken(tokenPath)
if err != nil && verbose { if err != nil && verbose {
log.Warn().Err(err).Msgf("could not load access token") log.Warn().Err(err).Msgf("could not load access token")
} }
@ -72,7 +77,7 @@ var collectCmd = &cobra.Command{
func init() { func init() {
currentUser, _ = user.Current() currentUser, _ = user.Current()
collectCmd.PersistentFlags().StringVar(&host, "host", "", "Set the URI to the SMD API") collectCmd.PersistentFlags().StringVar(&host, "host", "", "Set the URI to the SMD root endpoint")
collectCmd.PersistentFlags().StringVar(&username, "username", "", "Set the BMC user") collectCmd.PersistentFlags().StringVar(&username, "username", "", "Set the BMC user")
collectCmd.PersistentFlags().StringVar(&password, "password", "", "Set the BMC password") collectCmd.PersistentFlags().StringVar(&password, "password", "", "Set the BMC password")
collectCmd.PersistentFlags().StringVar(&scheme, "scheme", "https", "Set the scheme used to query") collectCmd.PersistentFlags().StringVar(&scheme, "scheme", "https", "Set the scheme used to query")