Skip to content

Hardened ASM for RAC and Shell interpolation #236

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

Open
s1saurabh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Hardened ASM for RAC and Shell interpolation #236

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
26 changes: 26 additions & 0 deletions apis/database/v4/asm_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@
*/
package v4

import (
"regexp"
"strings"
)

var (
asmDiskGroupNamePattern = regexp.MustCompile(`^\+?[A-Za-z][A-Za-z0-9_]*$`)
asmDiskPathPattern = regexp.MustCompile(`^/[A-Za-z0-9._/+:-]+$`)
)

type AsmDiskGroupDetails struct {
Name string `json:"name,omitempty"`
Redundancy string `json:"redundancy,omitempty"`
Expand Down Expand Up @@ -69,3 +79,19 @@ type AsmDiskGroupStatus struct {
StorageClass string `json:"storageClass,omitempty"`
Disks []AsmDiskStatus `json:"disks,omitempty"` // More detail than spec
}

// IsValidAsmDiskGroupName constrains disk group names to ASM-style identifiers.
func IsValidAsmDiskGroupName(name string) bool {
if strings.TrimSpace(name) == "" {
return false
}
return asmDiskGroupNamePattern.MatchString(name)
}

// IsValidAsmDiskPath constrains disk paths to absolute paths with shell-safe characters.
func IsValidAsmDiskPath(path string) bool {
if strings.TrimSpace(path) == "" {
return false
}
return asmDiskPathPattern.MatchString(path)
}
26 changes: 26 additions & 0 deletions apis/database/v4/oraclerestart_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,32 @@ func (r *OracleRestart) validateAsmStorage() field.ErrorList {
))
}

for idx, dg := range r.Spec.AsmStorageDetails {
dp := field.NewPath("spec").Child("asmDiskGroupDetails").Index(idx)

if dg.Name != "" && !IsValidAsmDiskGroupName(dg.Name) {
validationErrs = append(validationErrs,
field.Invalid(
dp.Child("name"),
dg.Name,
"ASM disk group name must start with a letter and contain only letters, digits, underscores, and an optional leading '+'",
),
)
}

for didx, disk := range dg.Disks {
if !IsValidAsmDiskPath(disk) {
validationErrs = append(validationErrs,
field.Invalid(
dp.Child("disks").Index(didx),
disk,
"ASM disk entry must be an absolute path and contain only letters, digits, '/', '.', '_', ':', '+', or '-'",
),
)
}
}
}

return validationErrs
}

Expand Down
22 changes: 22 additions & 0 deletions apis/database/v4/racdatabase_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,28 @@ func (cr *RacDatabase) validateAsmStorage() field.ErrorList {
continue
}
}

if dg.Name != "" && !IsValidAsmDiskGroupName(dg.Name) {
allErrs = append(allErrs,
field.Invalid(
dp.Child("name"),
dg.Name,
"ASM disk group name must start with a letter and contain only letters, digits, underscores, and an optional leading '+'",
),
)
}

for didx, disk := range dg.Disks {
if !IsValidAsmDiskPath(disk) {
allErrs = append(allErrs,
field.Invalid(
dp.Child("disks").Index(didx),
disk,
"ASM disk entry must be an absolute path and contain only letters, digits, '/', '.', '_', ':', '+', or '-'",
),
)
}
}
}
diskToGroup := make(map[string]string)
seenTypes := make(map[AsmDiskDGTypes]string)
Expand Down
18 changes: 12 additions & 6 deletions controllers/database/oraclerestart_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3247,8 +3247,11 @@ func executeDiskGroupCommand(podName string, cmd []string, kubeClient kubernetes
// within a pod.
func (r *OracleRestartReconciler) diskGroupExists(podName, diskGroupName string, kubeClient kubernetes.Interface, kubeConfig clientcmd.ClientConfig, instance *oraclerestartdb.OracleRestart, logger logr.Logger) (bool, error) {
reqLogger := r.Log.WithValues("Instance.Namespace", instance.Namespace, "Instance.Name", instance.Name)
cmd := "python3 /opt/scripts/startup/scripts/main.py --getasmdiskgroup=true"
stdout, _, err := oraclerestartcommon.ExecCommand(podName, []string{"bash", "-c", cmd}, r.kubeClient, r.kubeConfig, instance, reqLogger)
if !oraclerestartdb.IsValidAsmDiskGroupName(diskGroupName) {
return false, fmt.Errorf("invalid ASM disk group name %q", diskGroupName)
}

stdout, _, err := oraclerestartcommon.ExecCommand(podName, []string{"python3", "/opt/scripts/startup/scripts/main.py", "--getasmdiskgroup=true"}, r.kubeClient, r.kubeConfig, instance, reqLogger)
if err != nil {
return false, err
}
Expand Down Expand Up @@ -3283,12 +3286,15 @@ func (r *OracleRestartReconciler) addDisks(ctx context.Context, podList *corev1.
}

for _, disk := range deviceList {
cmd := fmt.Sprintf("python3 /opt/scripts/startup/scripts/main.py --updateasmdevices=\"diskname=%s;diskgroup=%s;processtype=addition\"", disk, diskGroupName)
reqLogger.Info("Executing command to add disk", "Pod.Name", podName, "Command", cmd)
stdout, stderr, err := oraclerestartcommon.ExecCommand(podName, []string{"bash", "-c", cmd}, r.kubeClient, r.kubeConfig, instance, reqLogger)
if !oraclerestartdb.IsValidAsmDiskPath(disk) {
return fmt.Errorf("invalid ASM disk path %q", disk)
}
cmdArg := fmt.Sprintf("--updateasmdevices=diskname=%s;diskgroup=%s;processtype=addition", disk, diskGroupName)
reqLogger.Info("Executing command to add disk", "Pod.Name", podName, "Disk", disk, "DiskGroup", diskGroupName)
stdout, stderr, err := oraclerestartcommon.ExecCommand(podName, []string{"python3", "/opt/scripts/startup/scripts/main.py", cmdArg}, r.kubeClient, r.kubeConfig, instance, reqLogger)
if err != nil {
instance.Spec.IsFailed = true
reqLogger.Error(err, "Failed to execute command", "Pod.Name", podName, "Command", cmd, "Stdout", stdout, "Stderr", stderr)
reqLogger.Error(err, "Failed to execute command", "Pod.Name", podName, "Disk", disk, "DiskGroup", diskGroupName, "Stdout", stdout, "Stderr", stderr)
return err
}
}
Expand Down
27 changes: 20 additions & 7 deletions controllers/database/racdatabase_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4271,13 +4271,23 @@ func (r *RacDatabaseReconciler) ensureStatefulSetUpdated(ctx context.Context,
// specific disk group is present, aiding add/remove workflows.
func (r *RacDatabaseReconciler) diskGroupExists(podName, diskGroupName string, kubeClient kubernetes.Interface, kubeConfig clientcmd.ClientConfig, instance *racdb.RacDatabase, logger logr.Logger) (bool, error) {
reqLogger := r.Log.WithValues("Instance.Namespace", instance.Namespace, "Instance.Name", instance.Name)
cmd := fmt.Sprintf("su - grid -c 'asmcmd lsdg | grep -w %s'", diskGroupName)
stdout, _, err := raccommon.ExecCommand(podName, []string{"bash", "-c", cmd}, r.kubeClient, r.kubeConfig, instance, reqLogger)
if !racdb.IsValidAsmDiskGroupName(diskGroupName) {
return false, fmt.Errorf("invalid ASM disk group name %q", diskGroupName)
}

stdout, _, err := raccommon.ExecCommand(podName, []string{"su", "-", "grid", "-c", "asmcmd lsdg"}, r.kubeClient, r.kubeConfig, instance, reqLogger)
if err != nil {
return false, err
}
if strings.Contains(stdout, diskGroupName) {
return true, nil

for _, line := range strings.Split(stdout, "\n") {
fields := strings.Fields(line)
if len(fields) == 0 {
continue
}
if strings.TrimSuffix(fields[len(fields)-1], "/") == diskGroupName {
return true, nil
}
}
return false, nil
}
Expand Down Expand Up @@ -4327,8 +4337,11 @@ func (r *RacDatabaseReconciler) addDisks(

// Add all disks ONCE
for _, disk := range deviceList {
cmd := fmt.Sprintf(
"python3 /opt/scripts/startup/scripts/main.py --updateasmdevices=\"diskname=%s;diskgroup=%s;processtype=addition\"",
if !racdb.IsValidAsmDiskPath(disk) {
return fmt.Errorf("invalid ASM disk path %q", disk)
}
cmdArg := fmt.Sprintf(
"--updateasmdevices=diskname=%s;diskgroup=%s;processtype=addition",
disk,
diskGroupName,
)
Expand All @@ -4341,7 +4354,7 @@ func (r *RacDatabaseReconciler) addDisks(

stdout, stderr, err := raccommon.ExecCommand(
podName,
[]string{"bash", "-c", cmd},
[]string{"python3", "/opt/scripts/startup/scripts/main.py", cmdArg},
r.kubeClient,
r.kubeConfig,
instance,
Expand Down