emit linkaccessfailed event when share is nil (#2643)

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
cs3org · Mar 17, 2022 · 701b083 · 701b083
1 parent 9911567
commit 701b083
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/changelog/unreleased/make-linkaccessfailed-more-robust.md b/changelog/unreleased/make-linkaccessfailed-more-robust.md
@@ -0,0 +1,5 @@
+Bugfix: emit linkaccessfailed event when share is nil
+
+The code no longer panics when a link access failed event has no share.
+
+https://github.com/cs3org/reva/pull/2643
diff --git a/internal/grpc/interceptors/eventsmiddleware/conversion.go b/internal/grpc/interceptors/eventsmiddleware/conversion.go
@@ -126,12 +126,15 @@ func LinkAccessed(r *link.GetPublicShareByTokenResponse) events.LinkAccessed {
 
 // LinkAccessFailed converts the response to an event
 func LinkAccessFailed(r *link.GetPublicShareByTokenResponse, req *link.GetPublicShareByTokenRequest) events.LinkAccessFailed {
-	return events.LinkAccessFailed{
-		ShareID: r.Share.Id,
-		Token:   r.Share.Token,
+	e := events.LinkAccessFailed{
 		Status:  r.Status.Code,
 		Message: r.Status.Message,
 	}
+	if r.Share != nil {
+		e.ShareID = r.Share.Id
+		e.Token = r.Share.Token
+	}
+	return e
 }
 
 // LinkRemoved converts the response to an event