From 2e3f21afbb193f5c72244f2aea3fbdc90c2b1682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pablo=20Villaf=C3=A1=C3=B1ez?= Date: Tue, 10 Dec 2024 10:21:08 +0100 Subject: [PATCH] fix: fix date formatting --- services/webdav/pkg/constants/constants.go | 2 ++ services/webdav/pkg/service/v0/search.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/webdav/pkg/constants/constants.go b/services/webdav/pkg/constants/constants.go index 19c520a64..cc10ae904 100644 --- a/services/webdav/pkg/constants/constants.go +++ b/services/webdav/pkg/constants/constants.go @@ -7,5 +7,7 @@ const ( ContextKeyPath // RFC1123 time that mimics oc10. time.RFC1123 would end in "UTC", see https://github.com/golang/go/issues/13781 + // Format copied from internal package https://github.com/cs3org/reva/blob/edge/internal/http/services/owncloud/ocdav/net/net.go. + // It's needed to match the times shown in PROPFIND and REPORT requests. RFC1123 = "Mon, 02 Jan 2006 15:04:05 GMT" ) diff --git a/services/webdav/pkg/service/v0/search.go b/services/webdav/pkg/service/v0/search.go index 93697e683..bca14e170 100644 --- a/services/webdav/pkg/service/v0/search.go +++ b/services/webdav/pkg/service/v0/search.go @@ -9,7 +9,6 @@ import ( "path" "strconv" "strings" - "time" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" merrors "go-micro.dev/v4/errors" @@ -21,6 +20,7 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" + "github.com/owncloud/ocis/v2/services/webdav/pkg/constants" "github.com/owncloud/ocis/v2/services/webdav/pkg/net" "github.com/owncloud/ocis/v2/services/webdav/pkg/prop" "github.com/owncloud/ocis/v2/services/webdav/pkg/propfind" @@ -192,7 +192,7 @@ func matchToPropResponse(ctx context.Context, match *searchmsg.Match) (*propfind }))) } propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("oc:name", match.Entity.Name)) - propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("d:getlastmodified", match.Entity.LastModifiedTime.AsTime().Format(time.RFC1123))) + propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("d:getlastmodified", match.Entity.LastModifiedTime.AsTime().Format(constants.RFC1123))) propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("d:getcontenttype", match.Entity.MimeType)) propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("oc:permissions", match.Entity.Permissions)) propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("oc:highlights", match.Entity.Highlights))