Merge branch '18943-created-at-index' refs #18943

[arvados.git] / services / keep-web / handler.go

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index d76cedaec3e44bfb4364b5c620e717a078c41c7d..ef61b06873c50661bb29f622bfb1b5e9a1097495 100644 (file)
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -897,9 +897,13 @@ func (h *handler) logUploadOrDownload(
        log := ctxlog.FromContext(r.Context())
        props := make(map[string]string)
        props["reqPath"] = r.URL.Path
+       var useruuid string
        if user != nil {
                log = log.WithField("user_uuid", user.UUID).
                        WithField("user_full_name", user.FullName)
+               useruuid = user.UUID
+       } else {
+               useruuid = fmt.Sprintf("%s-tpzed-anonymouspublic", h.Config.cluster.ClusterID)
        }
        if collection == nil && fs != nil {
                collection, filepath = h.determineCollection(fs, filepath)
@@ -909,13 +913,21 @@ func (h *handler) logUploadOrDownload(
                        WithField("collection_file_path", filepath)
                props["collection_uuid"] = collection.UUID
                props["collection_file_path"] = filepath
+               // h.determineCollection populates the collection_uuid prop with the PDH, if
+               // this collection is being accessed via PDH. In that case, blank the
+               // collection_uuid field so that consumers of the log entries can rely on it
+               // being a UUID, or blank. The PDH remains available via the
+               // portable_data_hash property.
+               if props["collection_uuid"] == collection.PortableDataHash {
+                       props["collection_uuid"] = ""
+               }
        }
        if r.Method == "PUT" || r.Method == "POST" {
                log.Info("File upload")
                if h.Config.cluster.Collections.WebDAVLogEvents {
                        go func() {
                                lr := arvadosclient.Dict{"log": arvadosclient.Dict{
-                                       "object_uuid": user.UUID,
+                                       "object_uuid": useruuid,
                                        "event_type":  "file_upload",
                                        "properties":  props}}
                                err := client.Create("logs", lr, nil)
@@ -933,7 +945,7 @@ func (h *handler) logUploadOrDownload(
                if h.Config.cluster.Collections.WebDAVLogEvents {
                        go func() {
                                lr := arvadosclient.Dict{"log": arvadosclient.Dict{
-                                       "object_uuid": user.UUID,
+                                       "object_uuid": useruuid,
                                        "event_type":  "file_download",
                                        "properties":  props}}
                                err := client.Create("logs", lr, nil)