Skip to content

refactor: simplify load rule function #56

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
Agustindeleon merged 2 commits into from
Jan 31, 2026
Merged

refactor: simplify load rule function #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ccb680
refactor: simplify load rule function after removing condition interface
Agustindeleon Jan 31, 2026
8b546a1
refactor: remove unused type
Agustindeleon Jan 31, 2026
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
48 changes: 3 additions & 45 deletions types/condition_directives.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,6 @@ type yamlLoaderConditionRules struct {
Marker ConfigurationDirective `yaml:"marker,omitempty"`
}

// conditionDirectiveLoader is a auxiliary struct to load condition directives
type conditionDirectiveLoader struct {
Kind string `yaml:"kind"`
Metadata SecRuleMetadata `yaml:"metadata,omitempty"`
Conditions yaml.Node `yaml:"conditions,omitempty"`
Actions SeclangActions `yaml:"actions,omitempty"`
ChainedRule yaml.Node `yaml:"chainedRule"`
}

// UnmarshalYAML unmarshals a YAML node into a SeclangActions struct
// it converts the actions to their respective types
func (s *SeclangActions) UnmarshalYAML(value *yaml.Node) error {
Expand Down Expand Up @@ -394,46 +385,13 @@ func loadRuleWithConditions(yamlDirective yaml.Node) *RuleWithCondition {
panic(err)
}

loaderDirective := conditionDirectiveLoader{}
err = yaml.Unmarshal(rawDirective, &loaderDirective)
directive := RuleWithCondition{}
err = yaml.Unmarshal(rawDirective, &directive)
if err != nil {
print(string(rawDirective))
panic(err)
}
directive := &RuleWithCondition{
Kind: RuleKind,
Metadata: loaderDirective.Metadata,
Actions: loaderDirective.Actions,
}
if loaderDirective.Conditions.Kind == yaml.SequenceNode {
for _, condition := range loaderDirective.Conditions.Content {
loadedCondition, err := castConditions(condition)
if err != nil {
panic(err)
}
directive.Conditions = append(directive.Conditions, loadedCondition)
}
}
var loadedChainedRule *RuleWithCondition
if len(loaderDirective.ChainedRule.Content) > 0 {
loadedChainedRule = loadRuleWithConditions(loaderDirective.ChainedRule)
directive.ChainedRule = loadedChainedRule
}
return directive
}

// castConditions casts a directive condition to the correct type
func castConditions(condition *yaml.Node) (Condition, error) {
rawDirective, err := yaml.Marshal(condition)
if err != nil {
return Condition{}, err
}
ruleCondition := Condition{}
err = yaml.Unmarshal(rawDirective, &ruleCondition)
if err != nil {
return Condition{}, err
}
return ruleCondition, nil
return &directive
}

func FromCRSLangToUnformattedDirectives(configListWrapped ConfigurationList) *ConfigurationList {
Expand Down