[ARVADOS] updated: 1.3.0-2134-g14bb7aa24

[Git user]

Summary of changes:
 lib/controller/federation/conn.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

       via  14bb7aa24ed7a06ce94e59f64ab32bdb44641168 (commit)
      from  e7d4393c847d036c2cf4a4d3c865e2c84636b1f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 14bb7aa24ed7a06ce94e59f64ab32bdb44641168
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Thu Feb 6 11:09:32 2020 -0500

    16133: Don't take multiple hops when getting collections.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index 4d4141ffd..2aebc0e97 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -231,7 +231,13 @@ func (conn *Conn) CollectionGet(ctx context.Context, options arvados.GetOptions)
 		// UUID is a PDH
 		first := make(chan arvados.Collection, 1)
 		err := conn.tryLocalThenRemotes(ctx, func(ctx context.Context, remoteID string, be backend) error {
-			if remoteID != "" && strings.Contains(downstream, remoteID) {
+			if remoteID != "" && downstream != "" {
+				// If remoteID isn't in downstream, we
+				// might find the collection by taking
+				// another hop, but we don't bother:
+				// token salting and blob signature
+				// rewriting don't work over multiple
+				// hops.
 				return notFoundError{}
 			}
 			c, err := be.CollectionGet(ctx, options)

-----------------------------------------------------------------------


hooks/post-receive
--