fix: bug with contexts (#280)

CGI-FR · Dec 23, 2023 · 919fdf0 · 919fdf0
1 parent c0c663a
commit 919fdf0
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ Types of changes
 
 - `Added` new features `findInCSV` mask to get one or multiple csv lines which matched with Json entry value from CSV files.
 - `Added` new flag `--serve` to start a HTTP server that apply masking to JSON body of requests.
+- `Fixed` some bugs with selectors.
 
 ## [1.20.0]
 

diff --git a/pkg/add/add.go b/pkg/add/add.go
@@ -48,7 +48,7 @@ func (am MaskEngine) MaskContext(context model.Dictionary, key string, contexts
 	if !present {
 		if am.template != nil {
 			var output bytes.Buffer
-			if err := am.template.Execute(&output, contexts[0].UnpackAsDict().Unordered()); err != nil {
+			if err := am.template.Execute(&output, contexts[0].UnpackUnordered()); err != nil {
 				return context, err
 			}
 			context.Set(key, output.String())

diff --git a/pkg/addtransient/add-transient.go b/pkg/addtransient/add-transient.go
@@ -48,7 +48,7 @@ func (am MaskEngine) MaskContext(context model.Dictionary, key string, contexts
 	if !present {
 		if am.template != nil {
 			var output bytes.Buffer
-			if err := am.template.Execute(&output, contexts[0].UnpackAsDict().Unordered()); err != nil {
+			if err := am.template.Execute(&output, contexts[0].UnpackUnordered()); err != nil {
 				return context, err
 			}
 			context.Set(key, output.String())

diff --git a/pkg/ff1/ff1.go b/pkg/ff1/ff1.go
@@ -58,10 +58,9 @@ func (ff1m MaskEngine) Mask(e model.Entry, context ...model.Dictionary) (model.E
 
 	// Extract tweak from the Dictionary (context)
 	tweak := ""
-	if rootCtx, ctxExist := context[0].TryUnpackAsDict(); ctxExist {
-		if rootCtx.Get(ff1m.tweakField) != nil {
-			tweak = rootCtx.Get(ff1m.tweakField).(string)
-		}
+	tweakSelector := model.NewPackedPathSelector(ff1m.tweakField)
+	if value, found := tweakSelector.Read(context[0]); found {
+		tweak = value.(string)
 	}
 	// Get encryption key as byte array
 	envKey := os.Getenv(ff1m.keyFromEnv)
@@ -214,7 +213,7 @@ func fromFF1Domain(value string, domain string, preserved map[int]rune) string {
 
 func executeTemplate(engine *template.Engine, contexts []model.Dictionary) (string, error) {
 	var output bytes.Buffer
-	if err := engine.Execute(&output, contexts[0].UnpackAsDict().Unordered()); err != nil {
+	if err := engine.Execute(&output, contexts[0].UnpackUnordered()); err != nil {
 		return "", err
 	}
 	return output.String(), nil

diff --git a/pkg/findincsv/findincsv.go b/pkg/findincsv/findincsv.go
@@ -132,7 +132,7 @@ func (me *MaskEngine) Mask(e model.Entry, context ...model.Dictionary) (model.En
 	if len(context) == 0 {
 		context = []model.Dictionary{model.NewPackedDictionary()}
 	}
-	if err := me.templateURI.Execute(&filenameBuffer, context[0].UnpackAsDict().Unordered()); err != nil {
+	if err := me.templateURI.Execute(&filenameBuffer, context[0].UnpackUnordered()); err != nil {
 		return nil, err
 	}
 	filename := filenameBuffer.String()
@@ -158,7 +158,7 @@ func (me *MaskEngine) Mask(e model.Entry, context ...model.Dictionary) (model.En
 // getJaccardMatchResults calculates Jaccard similarity for the given CSV filename and exact match results.
 func (me *MaskEngine) getJaccardMatchResults(filename string, exactMatchResults []model.Entry, context []model.Dictionary) ([]model.Entry, error) {
 	var jaccardEntryBuffer bytes.Buffer
-	if err := me.temJaccardEntry.Execute(&jaccardEntryBuffer, context[0].UnpackAsDict().Unordered()); err != nil {
+	if err := me.temJaccardEntry.Execute(&jaccardEntryBuffer, context[0].UnpackUnordered()); err != nil {
 		return nil, err
 	}
 	jaccardEntryString := jaccardEntryBuffer.String()
@@ -212,7 +212,7 @@ func (me *MaskEngine) ExactMatch(filename string, context []model.Dictionary) (b
 		}
 
 		var exactEntryBuffer bytes.Buffer
-		if err := me.temExactMatchEntry.Execute(&exactEntryBuffer, context[0].UnpackAsDict().Unordered()); err != nil {
+		if err := me.temExactMatchEntry.Execute(&exactEntryBuffer, context[0].UnpackUnordered()); err != nil {
 			return false, nil, err
 		}
 		exactEntryString := exactEntryBuffer.String()

diff --git a/pkg/hashcsv/hashcsv.go b/pkg/hashcsv/hashcsv.go
@@ -76,10 +76,10 @@ func (mrl MaskEngine) Mask(e model.Entry, context ...model.Dictionary) (model.En
 
 	var output bytes.Buffer
 	var tmplContext any
-	if len(context) == 0 || !context[0].CanUnpackAsDict() {
+	if len(context) == 0 {
 		tmplContext = nil
 	} else {
-		tmplContext = context[0].UnpackAsDict().Unordered()
+		tmplContext = context[0].UnpackUnordered()
 	}
 
 	if err := mrl.template.Execute(&output, tmplContext); err != nil {

diff --git a/pkg/model/model.go b/pkg/model/model.go
@@ -366,7 +366,7 @@ func (p RepeaterUntilProcess) ProcessDictionary(dictionary Dictionary, out Colle
 			err = fmt.Errorf("Cannot execute template, error: %v", r)
 		}
 	}()
-	err = p.tmpl.Execute(&output, dictionary.UnpackAsDict().Untyped())
+	err = p.tmpl.Execute(&output, dictionary.UnpackUntyped())
 
 	if err != nil && skipLineOnError {
 		log.Warn().AnErr("error", err).Msg("Line skipped")

diff --git a/pkg/model/ordered_dict.go b/pkg/model/ordered_dict.go
@@ -306,6 +306,14 @@ func (d Dictionary) Unpack() Entry {
 	return d.Get(".")
 }
 
+func (d Dictionary) UnpackUnordered() Entry {
+	return d.Unordered()["."]
+}
+
+func (d Dictionary) UnpackUntyped() interface{} {
+	return d.Untyped()["."]
+}
+
 func (d Dictionary) UnpackAsDict() Dictionary {
 	return d.Get(".").(Dictionary)
 }

diff --git a/pkg/randomcsv/randomcsv.go b/pkg/randomcsv/randomcsv.go
@@ -77,7 +77,7 @@ func (mrl MaskEngine) Mask(e model.Entry, context ...model.Dictionary) (model.En
 	if len(context) == 0 {
 		context = []model.Dictionary{model.NewPackedDictionary()}
 	}
-	if err := mrl.template.Execute(&output, context[0].UnpackAsDict().Unordered()); err != nil {
+	if err := mrl.template.Execute(&output, context[0].UnpackUnordered()); err != nil {
 		return nil, err
 	}
 	filename := output.String()

diff --git a/pkg/randomuri/randomuri.go b/pkg/randomuri/randomuri.go
@@ -61,7 +61,7 @@ func (mrl MaskEngine) Mask(e model.Entry, context ...model.Dictionary) (model.En
 	if len(context) == 0 {
 		context = []model.Dictionary{model.NewPackedDictionary()}
 	}
-	if err := mrl.template.Execute(&output, context[0].UnpackAsDict().Unordered()); err != nil {
+	if err := mrl.template.Execute(&output, context[0].UnpackUnordered()); err != nil {
 		return nil, err
 	}
 	filename := output.String()

diff --git a/pkg/templatemask/templatemask.go b/pkg/templatemask/templatemask.go
@@ -41,7 +41,7 @@ func NewMask(text string, funcs tmpl.FuncMap, seed int64, seedField string) (Mas
 func (tmpl MaskEngine) Mask(e model.Entry, context ...model.Dictionary) (model.Entry, error) {
 	log.Info().Msg("Mask template")
 	var output bytes.Buffer
-	err := tmpl.template.Execute(&output, context[0].UnpackAsDict().Unordered())
+	err := tmpl.template.Execute(&output, context[0].UnpackUnordered())
 	return output.String(), err
 }
 

diff --git a/test/suites/repeat-until-while.yml b/test/suites/repeat-until-while.yml
@@ -99,3 +99,17 @@ testcases:
     assertions:
       - result.systemout ShouldStartWith '{"name":"Aaron"}'
       - result.systemout ShouldEndWith '{"name":"Zazie"}'
+
+- name: use repeat-while to extract content of referential
+  steps:
+  - script: |-
+      cat > script.sh <<EOF
+      pimo --empty-input --repeat-while '[[ eq "string" (printf "%T" .) ]]' --mask '.={fluxUri: "pimo://nameFR"}'
+      EOF
+  - script: sed -i  "s/\[\[/\{\{/g"  script.sh
+  - script: sed -i  "s/\]\]/\}\}/g"  script.sh
+  - script: chmod +x script.sh
+  - script: ./script.sh
+    assertions:
+      - result.systemout ShouldStartWith '"Aaron"'
+      - result.systemout ShouldEndWith '"Zazie"'