diff --git a/server/middlewares.go b/server/middlewares.go index 92e6a1b6d..1498d8943 100644 --- a/server/middlewares.go +++ b/server/middlewares.go @@ -374,7 +374,9 @@ func UpdateLastAccessMiddleware(ds model.DataStore) func(next http.Handler) http return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { ctx := r.Context() usr, ok := request.UserFrom(ctx) - if ok { + // Internal calls (e.g. plugins) are not user activity: skip the last access update. + _, internal := request.InternalAuthFrom(ctx) + if ok && !internal { userAccessLimiter.Do(usr.ID, func() { start := time.Now() ctx, cancel := context.WithTimeout(ctx, time.Second) diff --git a/server/middlewares_test.go b/server/middlewares_test.go index 2d42d7d4d..941891070 100644 --- a/server/middlewares_test.go +++ b/server/middlewares_test.go @@ -424,6 +424,28 @@ var _ = Describe("middlewares", func() { req = req.WithContext(ctx) callMiddleware(req) + usr, _ := ds.MockedUser.FindByUsername(ctx, "johndoe") + Expect(usr.LastAccessAt).To(Equal(&lastAccessTime)) + }) + }) + Context("when the request is an internal call (e.g. from a plugin)", func() { + BeforeEach(func() { + req = req.WithContext(request.WithInternalAuth(req.Context(), "johndoe")) + }) + + It("calls the next handler", func() { + called := false + middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + called = true + })).ServeHTTP(nil, req) + Expect(called).To(BeTrue()) + }) + + It("does not update the last access time", func() { + time.Sleep(3 * time.Millisecond) + + callMiddleware(req) + usr, _ := ds.MockedUser.FindByUsername(ctx, "johndoe") Expect(usr.LastAccessAt).To(Equal(&lastAccessTime)) })