Skip to content

fix: check shell meta-characters #5

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: check shell meta-characters #5

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
12 changes: 9 additions & 3 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ type Config struct {

type SecurityConfig struct {
Enabled bool `yaml:"enabled"`
AllowedCommands []string `yaml:"allowed_commands"`
BlockedCommands []string `yaml:"blocked_commands"`
BlockedPatterns []string `yaml:"blocked_patterns"`
AllowedCommands []string `yaml:"allowed_commands"` // Deprecated: use AllowedExecutables
BlockedCommands []string `yaml:"blocked_commands"` // Deprecated: use validation instead
BlockedPatterns []string `yaml:"blocked_patterns"` // Deprecated: use validation instead
AllowedExecutables []string `yaml:"allowed_executables"` // Secure: list of allowed executable paths
MaxExecutionTime time.Duration `yaml:"max_execution_time"`
WorkingDirectory string `yaml:"working_directory"`
RunAsUser string `yaml:"run_as_user"`
MaxOutputSize int `yaml:"max_output_size"`
AuditLog bool `yaml:"audit_log"`
UseShellExecution bool `yaml:"use_shell_execution"` // Legacy mode - enables shell execution (DANGEROUS)
}

type ServerConfig struct {
Expand Down Expand Up @@ -83,11 +85,13 @@ func loadSecurityFromFile(config *Config, filename string) error {
AllowedCommands []string `yaml:"allowed_commands"`
BlockedCommands []string `yaml:"blocked_commands"`
BlockedPatterns []string `yaml:"blocked_patterns"`
AllowedExecutables []string `yaml:"allowed_executables"`
MaxExecutionTime string `yaml:"max_execution_time"`
WorkingDirectory string `yaml:"working_directory"`
RunAsUser string `yaml:"run_as_user"`
MaxOutputSize int `yaml:"max_output_size"`
AuditLog bool `yaml:"audit_log"`
UseShellExecution bool `yaml:"use_shell_execution"`
} `yaml:"security"`
}

Expand All @@ -99,10 +103,12 @@ func loadSecurityFromFile(config *Config, filename string) error {
config.Security.AllowedCommands = yamlConfig.Security.AllowedCommands
config.Security.BlockedCommands = yamlConfig.Security.BlockedCommands
config.Security.BlockedPatterns = yamlConfig.Security.BlockedPatterns
config.Security.AllowedExecutables = yamlConfig.Security.AllowedExecutables
config.Security.WorkingDirectory = yamlConfig.Security.WorkingDirectory
config.Security.RunAsUser = yamlConfig.Security.RunAsUser
config.Security.MaxOutputSize = yamlConfig.Security.MaxOutputSize
config.Security.AuditLog = yamlConfig.Security.AuditLog
config.Security.UseShellExecution = yamlConfig.Security.UseShellExecution

if yamlConfig.Security.MaxExecutionTime != "" {
duration, err := time.ParseDuration(yamlConfig.Security.MaxExecutionTime)
Expand Down
Loading