From e89cf4d4bca2e16b035693ddb7d6300835119109 Mon Sep 17 00:00:00 2001
From: vishalnayak <vishalnayakv@gmail.com>
Date: Fri, 2 Oct 2015 15:41:35 -0400
Subject: [PATCH] Use SanitizeTTL in credential request path instead of config

---
 builtin/credential/github/path_config.go | 30 ++++++++++++++++++++----
 builtin/credential/github/path_login.go  | 11 ++++++---
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/builtin/credential/github/path_config.go b/builtin/credential/github/path_config.go
index cc32a5dcb1..cf36950e5b 100644
--- a/builtin/credential/github/path_config.go
+++ b/builtin/credential/github/path_config.go
@@ -51,11 +51,31 @@ func (b *backend) pathConfigWrite(
 		}
 	}
 
-	ttlStr := data.Get("ttl").(string)
-	maxTTLStr := data.Get("max_ttl").(string)
-	ttl, maxTTL, err := b.SanitizeTTL(ttlStr, maxTTLStr)
-	if err != nil {
-		return logical.ErrorResponse(fmt.Sprintf("err: %s", err)), nil
+	var ttl time.Duration
+	var err error
+	ttlRaw, ok := data.GetOk("ttl")
+	if !ok {
+		ttl = b.System().DefaultLeaseTTL()
+	} else if len(ttlRaw.(string)) == 0 {
+		ttl = 0
+	} else {
+		ttl, err = time.ParseDuration(ttlRaw.(string))
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf("Invalid 'ttl':%s", err)), nil
+		}
+	}
+
+	var maxTTL time.Duration
+	maxTTLRaw, ok := data.GetOk("max_ttl")
+	if !ok {
+		maxTTL = b.System().MaxLeaseTTL()
+	} else if len(maxTTLRaw.(string)) == 0 {
+		maxTTL = 0
+	} else {
+		maxTTL, err = time.ParseDuration(maxTTLRaw.(string))
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf("Invalid 'max_ttl':%s", err)), nil
+		}
 	}
 
 	entry, err := logical.StorageEntryJSON("config", config{
diff --git a/builtin/credential/github/path_login.go b/builtin/credential/github/path_login.go
index bc858de4a5..84672da3fc 100644
--- a/builtin/credential/github/path_login.go
+++ b/builtin/credential/github/path_login.go
@@ -124,6 +124,11 @@ func (b *backend) pathLogin(
 		return nil, err
 	}
 
+	ttl, _, err := b.SanitizeTTL(config.TTL.String(), config.MaxTTL.String())
+	if err != nil {
+		return nil, err
+	}
+
 	return &logical.Response{
 		Auth: &logical.Auth{
 			Policies: policiesList,
@@ -133,9 +138,9 @@ func (b *backend) pathLogin(
 			},
 			DisplayName: *user.Login,
 			LeaseOptions: logical.LeaseOptions{
-				TTL:         config.TTL,
-				GracePeriod: config.TTL / 10,
-				Renewable:   config.TTL > 0,
+				TTL:         ttl,
+				GracePeriod: ttl / 10,
+				Renewable:   ttl > 0,
 			},
 		},
 	}, nil