mirrors/opensnitch
1
0
Fork 0
mirror of https://github.com/evilsocket/opensnitch.git synced 2025-03-04 08:34:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed loading rules when Created field is a timestamp

Browse source 
When exporting rules from the GUI, the Created field was exported as
timestamp. Importing rules worked fine, because json.Marshall() accepts
the timestamp format.

However, when the daemon was loading a rule with the Created field as
timestamp, since the field was defined as time.Time, it expected a RFC3339
string (https://pkg.go.dev/time#Time.UnmarshalJSON)
so it failed to parse the timestamp and the rule was not loaded.

Now the field is defined as string, it's always saved as RFC3339, and if
we fail to parse these fields we'll use a temporary date instead of
failing loading the rule.

More info:
https://github.com/evilsocket/opensnitch/issues/1140#issuecomment-2140904847

Closes #1140
This commit is contained in:
Gustavo Iñiguez Goia 2024-06-10 23:54:54 +02:00
parent 7a878e9516
commit 58aa979cae
Failed to generate hash of commit
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/rule/loader.go
View file

@ -182,7 +182,8 @@ func (l *Loader) Replace(rule *Rule, saveToDisk bool) error {
// Save a rule to disk. // Save a rule to disk.
func (l *Loader) Save(rule *Rule, path string) error { func (l *Loader) Save(rule *Rule, path string) error {
rule.Updated = time.Now() // When saving the rule, use always RFC3339 format for the Created field (#1140).
rule.Updated = time.Now().Format(time.RFC3339)
raw, err := json.MarshalIndent(rule, "", " ") raw, err := json.MarshalIndent(rule, "", " ")
if err != nil { if err != nil {
return fmt.Errorf("Error while saving rule %s to %s: %s", rule, path, err) return fmt.Errorf("Error while saving rule %s to %s: %s", rule, path, err)

17
daemon/rule/rule.go
View file

@ -38,8 +38,10 @@ const (
// The fields match the ones saved as json to disk. // The fields match the ones saved as json to disk.
// If a .json rule file is modified on disk, it's reloaded automatically. // If a .json rule file is modified on disk, it's reloaded automatically.
type Rule struct { type Rule struct {
Created time.Time `json:"created"` // Save date fields as string, to avoid issues marshalling Time (#1140).
Updated time.Time `json:"updated"` Created string `json:"created"`
Updated string `json:"updated"`
Name string `json:"name"` Name string `json:"name"`
Description string `json:"description"` Description string `json:"description"`
Action Action `json:"action"` Action Action `json:"action"`
@ -53,7 +55,7 @@ type Rule struct {
// Create creates a new rule object with the specified parameters. // Create creates a new rule object with the specified parameters.
func Create(name, description string, enabled, precedence, nolog bool, action Action, duration Duration, op *Operator) *Rule { func Create(name, description string, enabled, precedence, nolog bool, action Action, duration Duration, op *Operator) *Rule {
return &Rule{ return &Rule{
Created: time.Now(), Created: time.Now().Format(time.RFC3339),
Enabled: enabled, Enabled: enabled,
Precedence: precedence, Precedence: precedence,
Nolog: nolog, Nolog: nolog,
@ -135,8 +137,15 @@ func (r *Rule) Serialize() *protocol.Rule {
r.Operator.Lock() r.Operator.Lock()
defer r.Operator.Unlock() defer r.Operator.Unlock()
created, err := time.Parse(time.RFC3339, r.Created)
if err != nil {
log.Warning("Error parsing rule Created date (it should be in RFC3339 format): %s (%s)", err, string(r.Name))
log.Warning("using current time instead: %s", created)
created = time.Now()
}
protoRule := &protocol.Rule{ protoRule := &protocol.Rule{
Created: r.Created.Unix(), Created: created.Unix(),
Name: string(r.Name), Name: string(r.Name),
Description: string(r.Description), Description: string(r.Description),
Enabled: bool(r.Enabled), Enabled: bool(r.Enabled),