Start rejigging JWT
This commit is contained in:
parent
e38c21e0ca
commit
f10343921b
|
@ -19,7 +19,6 @@ func Backend() *framework.Backend {
|
|||
pathRoles(&b),
|
||||
pathIssue(&b),
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
return b.Backend
|
||||
|
|
|
@ -86,7 +86,6 @@ func testAccStepReadRole(t *testing.T, name string, algorithm string, key string
|
|||
return fmt.Errorf("missing response")
|
||||
}
|
||||
var d struct {
|
||||
Name string `json:"name" mapstructure:"name"`
|
||||
Algorithm string `json:"algorithm" structs:"algorithm" mapstructure:"algorithm"`
|
||||
Key string `json:"key" structs:"key" mapstructure:"key"`
|
||||
Issuer string `json:"iss" structs:"iss" mapstructure:"iss"`
|
||||
|
@ -97,14 +96,11 @@ func testAccStepReadRole(t *testing.T, name string, algorithm string, key string
|
|||
return err
|
||||
}
|
||||
|
||||
if d.Name != name {
|
||||
return fmt.Errorf("bad: %#v", d)
|
||||
}
|
||||
if d.Algorithm != algorithm {
|
||||
return fmt.Errorf("bad: %#v", d)
|
||||
return fmt.Errorf("bad algorithm: expected %s, got %#v", algorithm, d)
|
||||
}
|
||||
if d.Key != key {
|
||||
return fmt.Errorf("bad: %#v", d)
|
||||
if d.Key != "" {
|
||||
return fmt.Errorf("bad key: expected %s, got %#v", key, d)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
@ -41,8 +41,8 @@ func pathIssue(b *backend) *framework.Path {
|
|||
Description: "Defines the time before which the JWT MUST NOT be accepted for processing",
|
||||
},
|
||||
"issued_at": &framework.FieldSchema{
|
||||
Type: framework.TypeInt,
|
||||
Description: "The time the JWT was issued",
|
||||
Type: framework.TypeBool,
|
||||
Description: "Whether to include the issued_at claim",
|
||||
},
|
||||
"jti": &framework.FieldSchema{
|
||||
Type: framework.TypeString,
|
||||
|
@ -90,7 +90,7 @@ func (b *backend) pathIssueWrite(
|
|||
if data.Get("not_before") == 0 {
|
||||
claims["nbf"] = int(time.Now().Unix())
|
||||
}
|
||||
if data.Get("issued_at") == 0 {
|
||||
if data.Get("issued_at").(bool) {
|
||||
claims["iat"] = int(time.Now().Unix())
|
||||
}
|
||||
if data.Get("jti") == "" {
|
||||
|
@ -112,9 +112,6 @@ func (b *backend) pathIssueWrite(
|
|||
if data.Get("not_before").(int) > 0 {
|
||||
claims["nbf"] = data.Get("not_before").(int)
|
||||
}
|
||||
if data.Get("issued_at").(int) > 0 {
|
||||
claims["iat"] = data.Get("issued_at").(int)
|
||||
}
|
||||
if data.Get("jti") != "" {
|
||||
claims["jti"] = data.Get("jti").(string)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue