tq,lfsapi/auth: change expires_in to be a whole number of seconds

ttaylorr · ttaylorr · commit b65800a06d10 · 2017-04-05T14:32:37.000-06:00
diff --git a/docs/api/batch.md b/docs/api/batch.md
@@ -83,8 +83,9 @@ omitted.
     * `href` - String URL to download the object.
     * `header` - Optional hash of String HTTP header key/value pairs to apply
     to the request.
-    * `expires_in` - Nanoseconds after local client time when transfer will
-      expire. Preferred over `expires_at` if both are provided.
+    * `expires_in` - Whole number of seconds after local client time when
+      transfer will expire. Preferred over `expires_at` if both are provided.
+      Maximum of 9223372036, minimum of -9223372036.
     * `expires_at` - String ISO 8601 formatted timestamp for when the given
     action expires (usually due to a temporary token).
 
diff --git a/lfsapi/ssh.go b/lfsapi/ssh.go
@@ -58,11 +58,11 @@ type sshAuthResponse struct {
 	Href      string            `json:"href"`
 	Header    map[string]string `json:"header"`
 	ExpiresAt time.Time         `json:"expires_at"`
-	ExpiresIn time.Duration     `json:"expires_in"`
+	ExpiresIn int64             `json:"expires_in"`
 }
 
 func (r *sshAuthResponse) IsExpiredWithin(d time.Duration) (time.Time, bool) {
-	return tools.IsExpiredAtOrIn(d, r.ExpiresAt, r.ExpiresIn)
+	return tools.IsExpiredAtOrIn(d, r.ExpiresAt, time.Duration(r.ExpiresIn)*time.Second)
 }
 
 type sshAuthClient struct {
diff --git a/test/cmd/lfstest-gitserver.go b/test/cmd/lfstest-gitserver.go
@@ -180,7 +180,7 @@ type lfsLink struct {
 	Href      string            `json:"href"`
 	Header    map[string]string `json:"header,omitempty"`
 	ExpiresAt time.Time         `json:"expires_at,omitempty"`
-	ExpiresIn time.Duration     `json:"expires_in,omitempty"`
+	ExpiresIn int64             `json:"expires_in,omitempty"`
 }
 
 type lfsError struct {
@@ -484,10 +484,10 @@ func serveExpired(a *lfsLink, repo, handler string) *lfsLink {
 	case "expired-absolute":
 		a.ExpiresAt = at
 	case "expired-relative":
-		a.ExpiresIn = dur
+		a.ExpiresIn = -5
 	case "expired-both":
 		a.ExpiresAt = at
-		a.ExpiresIn = dur
+		a.ExpiresIn = -5
 	}
 
 	return a
diff --git a/test/cmd/ssh-echo.go b/test/cmd/ssh-echo.go
@@ -14,7 +14,7 @@ type sshResponse struct {
 	Href      string            `json:"href"`
 	Header    map[string]string `json:"header"`
 	ExpiresAt time.Time         `json:"expires_at,omitempty"`
-	ExpiresIn time.Duration     `json:"expires_in,omitempty"`
+	ExpiresIn int64             `json:"expires_in,omitempty"`
 }
 
 func main() {
@@ -40,10 +40,10 @@ func main() {
 	case "ssh-expired-absolute":
 		r.ExpiresAt = time.Now().Add(-5 * time.Minute)
 	case "ssh-expired-relative":
-		r.ExpiresIn = -5 * time.Minute
+		r.ExpiresIn = -5
 	case "ssh-expired-both":
 		r.ExpiresAt = time.Now().Add(-5 * time.Minute)
-		r.ExpiresIn = -5 * time.Minute
+		r.ExpiresIn = -5
 	}
 
 	json.NewEncoder(os.Stdout).Encode(r)
diff --git a/tq/schemas/http-batch-response-schema.json b/tq/schemas/http-batch-response-schema.json
@@ -14,6 +14,11 @@
           "type": "object",
           "additionalProperties": true
         },
+        "expires_in": {
+            "type": "number",
+            "maximum": 9223372036,
+            "minimum": -9223372036
+        },
         "expires_at": {
           "type": "string"
         }
diff --git a/tq/transfer.go b/tq/transfer.go
@@ -113,11 +113,11 @@ type Action struct {
 	Href      string            `json:"href"`
 	Header    map[string]string `json:"header,omitempty"`
 	ExpiresAt time.Time         `json:"expires_at,omitempty"`
-	ExpiresIn time.Duration     `json:"expires_in,omitempty"`
+	ExpiresIn int64             `json:"expires_in,omitempty"`
 }
 
 func (a *Action) IsExpiredWithin(d time.Duration) (time.Time, bool) {
-	return tools.IsExpiredAtOrIn(d, a.ExpiresAt, a.ExpiresIn)
+	return tools.IsExpiredAtOrIn(d, a.ExpiresAt, time.Duration(a.ExpiresIn)*time.Second)
 }
 
 type ActionSet map[string]*Action

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,11 @@ type sshAuthResponse struct {`
`58`	`58`	Href string `json:"href"`
`59`	`59`	Header map[string]string `json:"header"`
`60`	`60`	ExpiresAt time.Time `json:"expires_at"`
`61`		- ExpiresIn time.Duration `json:"expires_in"`
	`61`	+ ExpiresIn int64 `json:"expires_in"`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`func (r *sshAuthResponse) IsExpiredWithin(d time.Duration) (time.Time, bool) {`
`65`		`- return tools.IsExpiredAtOrIn(d, r.ExpiresAt, r.ExpiresIn)`
	`65`	`+ return tools.IsExpiredAtOrIn(d, r.ExpiresAt, time.Duration(r.ExpiresIn)*time.Second)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`type sshAuthClient struct {`
Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,11 @@ type Action struct {`
`113`	`113`	Href string `json:"href"`
`114`	`114`	Header map[string]string `json:"header,omitempty"`
`115`	`115`	ExpiresAt time.Time `json:"expires_at,omitempty"`
`116`		- ExpiresIn time.Duration `json:"expires_in,omitempty"`
	`116`	+ ExpiresIn int64 `json:"expires_in,omitempty"`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`func (a *Action) IsExpiredWithin(d time.Duration) (time.Time, bool) {`
`120`		`- return tools.IsExpiredAtOrIn(d, a.ExpiresAt, a.ExpiresIn)`
	`120`	`+ return tools.IsExpiredAtOrIn(d, a.ExpiresAt, time.Duration(a.ExpiresIn)*time.Second)`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`type ActionSet map[string]*Action`