Made suggested changes.

Signed-off-by: Cody Littley <[email protected]>

api/proto/relay/relay.proto

@@ -49,12 +49,14 @@ message GetChunksRequest {
   // 1. the operator id
   // 2. for each chunk request:
   //    a. if the chunk request is a request by index:
-  //       i. the blob key
-  //       ii. the start index
-  //       iii. the end index
+  //       i.   a one byte ASCII representation of the character "i" (aka Ox69)
+  //       ii.  the blob key
+  //       iii. the start index
+  //       iv.  the end index
   //    b. if the chunk request is a request by range:
-  //       i. the blob key
-  //       ii. each requested chunk index, in order
+  //       i.   a one byte ASCII representation of the character "r" (aka Ox72)
+  //       ii.  the blob key
+  //       iii. each requested chunk index, in order
   bytes operator_signature = 3;
 }
 

relay/auth/authenticator.go

@@ -166,6 +166,7 @@ func (a *requestAuthenticator) isAuthenticationStillValid(now time.Time, address
 }
 
 // removeOldAuthentications removes any authentications that have expired.
+// This method is not thread safe and should be called with the savedAuthLock held.
 func (a *requestAuthenticator) removeOldAuthentications(now time.Time) {
 	index := 0
 	for ; index < len(a.authenticationTimeouts); index++ {

relay/auth/request_signing.go

@@ -7,6 +7,11 @@ import (
 	"golang.org/x/crypto/sha3"
 )
 
+var (
+	iByte = []byte{0x69}
+	rByte = []byte{0x72}
+)
+
 // HashGetChunksRequest hashes the given GetChunksRequest.
 func HashGetChunksRequest(request *pb.GetChunksRequest) []byte {
 
@@ -19,6 +24,7 @@ func HashGetChunksRequest(request *pb.GetChunksRequest) []byte {
 	for _, chunkRequest := range request.GetChunkRequests() {
 		if chunkRequest.GetByIndex() != nil {
 			getByIndex := chunkRequest.GetByIndex()
+			hasher.Write(iByte)
 			hasher.Write(getByIndex.BlobKey)
 			for _, index := range getByIndex.ChunkIndices {
 				indexBytes := make([]byte, 4)
@@ -27,6 +33,7 @@ func HashGetChunksRequest(request *pb.GetChunksRequest) []byte {
 			}
 		} else {
 			getByRange := chunkRequest.GetByRange()
+			hasher.Write(rByte)
 			hasher.Write(getByRange.BlobKey)
 
 			startBytes := make([]byte, 4)