Merge branch 'master' into 7490-datamanager-dont-die-return-error

[arvados.git] / sdk / go / keepclient / perms.go

diff --git a/sdk/go/keepclient/perms.go b/sdk/go/keepclient/perms.go
index a73db76bbbebc8a1c9bedae5df19c54faa4bdb9f..12105c6cfca72f19ec424890fe6f8fc1c275822e 100644 (file)
--- a/sdk/go/keepclient/perms.go
+++ b/sdk/go/keepclient/perms.go
@@ -76,14 +76,14 @@ func VerifySignature(signedLocator, apiToken string, permissionSecret []byte) er
                return ErrSignatureMissing
        }
        blobHash := matches[1]
-       sigHex := matches[2]
-       expHex := matches[3]
-       if expTime, err := parseHexTimestamp(expHex); err != nil {
+       signatureHex := matches[2]
+       expiryHex := matches[3]
+       if expiryTime, err := parseHexTimestamp(expiryHex); err != nil {
                return ErrSignatureInvalid
-       } else if expTime.Before(time.Now()) {
+       } else if expiryTime.Before(time.Now()) {
                return ErrSignatureExpired
        }
-       if sigHex != makePermSignature(blobHash, apiToken, expHex, permissionSecret) {
+       if signatureHex != makePermSignature(blobHash, apiToken, expiryHex, permissionSecret) {
                return ErrSignatureInvalid
        }
        return nil