Skip to content

fix(iaas): prevent nil pointer dereference on empty volume name #799

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
merged 1 commit into from
Jun 16, 2025
Merged

fix(iaas): prevent nil pointer dereference on empty volume name #799

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions internal/cmd/affinity-groups/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
Expand Down Expand Up @@ -93,7 +93,7 @@ func buildRequest(ctx context.Context, model inputModel, apiClient *iaas.APIClie
func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputModel, error) {
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
return nil, &cliErr.ProjectIdError{}
}

model := inputModel{
Expand Down
6 changes: 2 additions & 4 deletions internal/cmd/image/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
Expand Down Expand Up @@ -57,8 +57,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get image name: %v", err)
imageName = model.ImageId
} else if imageName == "" {
imageName = model.ImageId
}

if !model.AssumeYes {
Expand Down Expand Up @@ -87,7 +85,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputModel, error) {
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
return nil, &cliErr.ProjectIdError{}
}

model := inputModel{
Expand Down
6 changes: 2 additions & 4 deletions internal/cmd/image/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
Expand Down Expand Up @@ -135,8 +135,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.WarningLevel, "cannot retrieve image name: %v", err)
imageLabel = model.Id
} else if imageLabel == "" {
imageLabel = model.Id
}

if !model.AssumeYes {
Expand Down Expand Up @@ -194,7 +192,7 @@ func configureFlags(cmd *cobra.Command) {
func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputModel, error) {
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
return nil, &cliErr.ProjectIdError{}
}

model := inputModel{
Expand Down
2 changes: 0 additions & 2 deletions internal/cmd/network-area/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get network area name: %v", err)
networkAreaLabel = model.AreaId
} else if networkAreaLabel == "" {
networkAreaLabel = model.AreaId
}

if !model.AssumeYes {
Expand Down
5 changes: 4 additions & 1 deletion internal/cmd/network-area/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package describe
import (
"context"
"encoding/json"
"errors"
"fmt"
"strings"

Expand Down Expand Up @@ -79,7 +80,9 @@ func NewCmd(params *params.CmdParams) *cobra.Command {

if model.ShowAttachedProjects {
projects, err = iaasUtils.ListAttachedProjects(ctx, apiClient, *model.OrganizationId, model.AreaId)
if err != nil {
if err != nil && errors.Is(err, iaasUtils.ErrItemsNil) {
projects = []string{}
} else if err != nil {
return fmt.Errorf("get attached projects: %w", err)
}
}
Expand Down
2 changes: 0 additions & 2 deletions internal/cmd/network-area/network-range/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get network area name: %v", err)
networkAreaLabel = *model.NetworkAreaId
} else if networkAreaLabel == "" {
networkAreaLabel = *model.NetworkAreaId
}
networkRangeLabel, err := iaasUtils.GetNetworkRangePrefix(ctx, apiClient, *model.OrganizationId, *model.NetworkAreaId, model.NetworkRangeId)
if err != nil {
Expand Down
6 changes: 2 additions & 4 deletions internal/cmd/network-area/network-range/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/goccy/go-yaml"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
Expand Down Expand Up @@ -81,8 +81,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
networkAreaLabel = *model.NetworkAreaId
} else if networkAreaLabel == "" {
networkAreaLabel = *model.NetworkAreaId
}
params.Printer.Info("No network ranges found for SNA %q\n", networkAreaLabel)
return nil
Expand Down Expand Up @@ -114,7 +112,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
globalFlags := globalflags.Parse(p, cmd)
limit := flags.FlagToInt64Pointer(p, cmd, limitFlag)
if limit != nil && *limit < 1 {
return nil, &errors.FlagValidationError{
return nil, &cliErr.FlagValidationError{
Flag: limitFlag,
Details: "must be greater than 0",
}
Expand Down
2 changes: 0 additions & 2 deletions internal/cmd/network-area/route/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get network area name: %v", err)
networkAreaLabel = *model.NetworkAreaId
} else if networkAreaLabel == "" {
networkAreaLabel = *model.NetworkAreaId
}

if !model.AssumeYes {
Expand Down
2 changes: 0 additions & 2 deletions internal/cmd/network-area/route/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get network area name: %v", err)
networkAreaLabel = *model.NetworkAreaId
} else if networkAreaLabel == "" {
networkAreaLabel = *model.NetworkAreaId
}

if !model.AssumeYes {
Expand Down
6 changes: 2 additions & 4 deletions internal/cmd/network-area/route/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
Expand Down Expand Up @@ -80,8 +80,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get network area name: %v", err)
networkAreaLabel = *model.NetworkAreaId
} else if networkAreaLabel == "" {
networkAreaLabel = *model.NetworkAreaId
}
params.Printer.Info("No static routes found for STACKIT Network Area %q\n", networkAreaLabel)
return nil
Expand Down Expand Up @@ -113,7 +111,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
globalFlags := globalflags.Parse(p, cmd)
limit := flags.FlagToInt64Pointer(p, cmd, limitFlag)
if limit != nil && *limit < 1 {
return nil, &errors.FlagValidationError{
return nil, &cliErr.FlagValidationError{
Flag: limitFlag,
Details: "must be greater than 0",
}
Expand Down
6 changes: 2 additions & 4 deletions internal/cmd/network-area/route/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
Expand Down Expand Up @@ -70,8 +70,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get network area name: %v", err)
networkAreaLabel = *model.NetworkAreaId
} else if networkAreaLabel == "" {
networkAreaLabel = *model.NetworkAreaId
}

// Call API
Expand Down Expand Up @@ -104,7 +102,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
labels := flags.FlagToStringToStringPointer(p, cmd, labelFlag)

if labels == nil {
return nil, &errors.EmptyUpdateError{}
return nil, &cliErr.EmptyUpdateError{}
}

model := inputModel{
Expand Down
6 changes: 2 additions & 4 deletions internal/cmd/server/volume/attach/attach.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
Expand Down Expand Up @@ -69,8 +69,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get volume name: %v", err)
volumeLabel = model.VolumeId
} else if volumeLabel == "" {
volumeLabel = model.VolumeId
}

serverLabel, err := iaasUtils.GetServerName(ctx, apiClient, model.ProjectId, *model.ServerId)
Expand Down Expand Up @@ -115,7 +113,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
volumeId := inputArgs[0]
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
return nil, &cliErr.ProjectIdError{}
}

model := inputModel{
Expand Down
6 changes: 2 additions & 4 deletions internal/cmd/server/volume/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
Expand Down Expand Up @@ -69,8 +69,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get volume name: %v", err)
volumeLabel = model.VolumeId
} else if volumeLabel == "" {
volumeLabel = model.VolumeId
}

serverLabel, err := iaasUtils.GetServerName(ctx, apiClient, model.ProjectId, *model.ServerId)
Expand Down Expand Up @@ -106,7 +104,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
volumeId := inputArgs[0]
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
return nil, &cliErr.ProjectIdError{}
}

model := inputModel{
Expand Down
6 changes: 2 additions & 4 deletions internal/cmd/server/volume/detach/detach.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
Expand Down Expand Up @@ -59,8 +59,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get volume name: %v", err)
volumeLabel = model.VolumeId
} else if volumeLabel == "" {
volumeLabel = model.VolumeId
}

serverLabel, err := iaasUtils.GetServerName(ctx, apiClient, model.ProjectId, *model.ServerId)
Expand Down Expand Up @@ -105,7 +103,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
volumeId := inputArgs[0]
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
return nil, &cliErr.ProjectIdError{}
}

model := inputModel{
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/server/volume/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
Expand Down Expand Up @@ -83,6 +83,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
volumeLabel, err := iaasUtils.GetVolumeName(ctx, apiClient, model.ProjectId, *volumes[i].VolumeId)
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get volume name: %v", err)
volumeLabel = ""
}
volumeNames = append(volumeNames, volumeLabel)
}
Expand All @@ -104,7 +105,7 @@ func configureFlags(cmd *cobra.Command) {
func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
return nil, &cliErr.ProjectIdError{}
}

model := inputModel{
Expand Down
6 changes: 2 additions & 4 deletions internal/cmd/server/volume/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
Expand Down Expand Up @@ -65,8 +65,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get volume name: %v", err)
volumeLabel = model.VolumeId
} else if volumeLabel == "" {
volumeLabel = model.VolumeId
}

serverLabel, err := iaasUtils.GetServerName(ctx, apiClient, model.ProjectId, *model.ServerId)
Expand Down Expand Up @@ -111,7 +109,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
volumeId := inputArgs[0]
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
return nil, &cliErr.ProjectIdError{}
}

model := inputModel{
Expand Down
10 changes: 4 additions & 6 deletions internal/cmd/volume/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stackitcloud/stackit-cli/internal/cmd/params"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
Expand Down Expand Up @@ -57,12 +57,10 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
return err
}

volumeLabel := model.VolumeId
volumeName, err := iaasUtils.GetVolumeName(ctx, apiClient, model.ProjectId, model.VolumeId)
volumeLabel, err := iaasUtils.GetVolumeName(ctx, apiClient, model.ProjectId, model.VolumeId)
if err != nil {
params.Printer.Debug(print.ErrorLevel, "get volume name: %v", err)
} else if volumeName != "" {
volumeLabel = volumeName
volumeLabel = model.VolumeId
}

if !model.AssumeYes {
Expand Down Expand Up @@ -107,7 +105,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu

globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
return nil, &cliErr.ProjectIdError{}
}

model := inputModel{
Expand Down
Loading
Loading