17785: Adds test exposing a problem when trying to handle other users' tokens.

[arvados.git] / lib / controller / localdb / collection.go

diff --git a/lib/controller/localdb/collection.go b/lib/controller/localdb/collection.go
index 414c9267994359d005e91a0ba4aefd1b50ba7811..96c89252ec0285e58dac4330333070c9898cce9e 100644 (file)
--- a/lib/controller/localdb/collection.go
+++ b/lib/controller/localdb/collection.go
@@ -48,6 +48,48 @@ func (conn *Conn) CollectionList(ctx context.Context, opts arvados.ListOptions)
        return resp, nil
 }
 
+// CollectionCreate defers to railsProxy for everything except blob
+// signatures and vocabulary checking.
+func (conn *Conn) CollectionCreate(ctx context.Context, opts arvados.CreateOptions) (arvados.Collection, error) {
+       err := conn.checkProperties(ctx, opts.Attrs["properties"])
+       if err != nil {
+               return arvados.Collection{}, err
+       }
+       if len(opts.Select) > 0 {
+               // We need to know IsTrashed and TrashAt to implement
+               // signing properly, even if the caller doesn't want
+               // them.
+               opts.Select = append([]string{"is_trashed", "trash_at"}, opts.Select...)
+       }
+       resp, err := conn.railsProxy.CollectionCreate(ctx, opts)
+       if err != nil {
+               return resp, err
+       }
+       conn.signCollection(ctx, &resp)
+       return resp, nil
+}
+
+// CollectionUpdate defers to railsProxy for everything except blob
+// signatures and vocabulary checking.
+func (conn *Conn) CollectionUpdate(ctx context.Context, opts arvados.UpdateOptions) (arvados.Collection, error) {
+       err := conn.checkProperties(ctx, opts.Attrs["properties"])
+       if err != nil {
+               return arvados.Collection{}, err
+       }
+       if len(opts.Select) > 0 {
+               // We need to know IsTrashed and TrashAt to implement
+               // signing properly, even if the caller doesn't want
+               // them.
+               opts.Select = append([]string{"is_trashed", "trash_at"}, opts.Select...)
+       }
+       resp, err := conn.railsProxy.CollectionUpdate(ctx, opts)
+       if err != nil {
+               return resp, err
+       }
+       conn.signCollection(ctx, &resp)
+       return resp, nil
+}
+
 func (conn *Conn) signCollection(ctx context.Context, coll *arvados.Collection) {
        if coll.IsTrashed || coll.ManifestText == "" || !conn.cluster.Collections.BlobSigning {
                return