Merge pull request #3748 from kobergj/UnmarshalPPEvents

[tests-only] Unmarshal PP events correctly
cs3org · Mar 24, 2023 · ec9d381 · ec9d381
2 parents aa41afd + bf61e67
commit ec9d381
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/changelog/unreleased/unmarshal-pp-events.md b/changelog/unreleased/unmarshal-pp-events.md
@@ -0,0 +1,5 @@
+Bugfix: Prevent service from panicking
+
+Changelog is unneccessary
+
+https://github.com/cs3org/reva/pull/3748
diff --git a/pkg/events/postprocessing.go b/pkg/events/postprocessing.go
@@ -105,6 +105,19 @@ type PostprocessingStepFinished struct {
 func (PostprocessingStepFinished) Unmarshal(v []byte) (interface{}, error) {
 	e := PostprocessingStepFinished{}
 	err := json.Unmarshal(v, &e)
+	if err != nil {
+		return nil, err
+	}
+
+	switch e.FinishedStep {
+	case PPStepAntivirus:
+		var res VirusscanResult
+		b, _ := json.Marshal(e.Result)
+		err = json.Unmarshal(b, &res)
+		e.Result = res
+	case PPStepPolicies:
+		// nothing to do, but this makes the linter happy
+	}
 	return e, err
 }