remitly-oss
diff --git a/‎verify.go‎
Lines changed: 24 additions & 6 deletions b/‎verify.go‎
Lines changed: 24 additions & 6 deletions
@@ -612,42 +612,60 @@ type metadataProviderFromParams struct {
 
 func (mp metadataProviderFromParams) Created() (int, error) {
 	if val, ok := mp.Params.Get(string(MetaCreated)); ok {
-		return int(val.(int64)), nil
+		if intVal, ok := val.(int64); ok {
+			return int(intVal), nil
+		}
+		return 0, newError(ErrInvalidMetadata, fmt.Sprintf("created parameter has invalid type %T, expected int64", val))
 	}
 	return 0, fmt.Errorf("No created value")
 }
 
 func (mp metadataProviderFromParams) Expires() (int, error) {
 	if val, ok := mp.Params.Get(string(MetaExpires)); ok {
-		return int(val.(int64)), nil
+		if intVal, ok := val.(int64); ok {
+			return int(intVal), nil
+		}
+		return 0, newError(ErrInvalidMetadata, fmt.Sprintf("expires parameter has invalid type %T, expected int64", val))
 	}
 	return 0, fmt.Errorf("No expires value")
 }
 
 func (mp metadataProviderFromParams) Nonce() (string, error) {
 	if val, ok := mp.Params.Get(string(MetaNonce)); ok {
-		return val.(string), nil
+		if strVal, ok := val.(string); ok {
+			return strVal, nil
+		}
+		return "", newError(ErrInvalidMetadata, fmt.Sprintf("nonce parameter has invalid type %T, expected string", val))
 	}
 	return "", fmt.Errorf("No nonce value")
 }
 
 func (mp metadataProviderFromParams) Alg() (string, error) {
 	if val, ok := mp.Params.Get(string(MetaAlgorithm)); ok {
-		return val.(string), nil
+		if strVal, ok := val.(string); ok {
+			return strVal, nil
+		}
+		return "", newError(ErrInvalidMetadata, fmt.Sprintf("alg parameter has invalid type %T, expected string", val))
 	}
 	return "", fmt.Errorf("No alg value")
 }
 
 func (mp metadataProviderFromParams) KeyID() (string, error) {
 	if val, ok := mp.Params.Get(string(MetaKeyID)); ok {
-		return val.(string), nil
+		if strVal, ok := val.(string); ok {
+			return strVal, nil
+		}
+		return "", newError(ErrInvalidMetadata, fmt.Sprintf("keyid parameter has invalid type %T, expected string", val))
 	}
 	return "", fmt.Errorf("No keyid value")
 }
 
 func (mp metadataProviderFromParams) Tag() (string, error) {
 	if val, ok := mp.Params.Get(string(MetaTag)); ok {
-		return val.(string), nil
+		if strVal, ok := val.(string); ok {
+			return strVal, nil
+		}
+		return "", newError(ErrInvalidMetadata, fmt.Sprintf("tag parameter has invalid type %T, expected string", val))
 	}
 	return "", fmt.Errorf("No tag value")
 }
Original file line number	Diff line number	Diff line change
`@@ -612,42 +612,60 @@ type metadataProviderFromParams struct {`
`612`	`612`
`613`	`613`	`func (mp metadataProviderFromParams) Created() (int, error) {`
`614`	`614`	`if val, ok := mp.Params.Get(string(MetaCreated)); ok {`
`615`		`- return int(val.(int64)), nil`
	`615`	`+ if intVal, ok := val.(int64); ok {`
	`616`	`+ return int(intVal), nil`
	`617`	`+ }`
	`618`	`+ return 0, newError(ErrInvalidMetadata, fmt.Sprintf("created parameter has invalid type %T, expected int64", val))`
`616`	`619`	`}`
`617`	`620`	`return 0, fmt.Errorf("No created value")`
`618`	`621`	`}`
`619`	`622`
`620`	`623`	`func (mp metadataProviderFromParams) Expires() (int, error) {`
`621`	`624`	`if val, ok := mp.Params.Get(string(MetaExpires)); ok {`
`622`		`- return int(val.(int64)), nil`
	`625`	`+ if intVal, ok := val.(int64); ok {`
	`626`	`+ return int(intVal), nil`
	`627`	`+ }`
	`628`	`+ return 0, newError(ErrInvalidMetadata, fmt.Sprintf("expires parameter has invalid type %T, expected int64", val))`
`623`	`629`	`}`
`624`	`630`	`return 0, fmt.Errorf("No expires value")`
`625`	`631`	`}`
`626`	`632`
`627`	`633`	`func (mp metadataProviderFromParams) Nonce() (string, error) {`
`628`	`634`	`if val, ok := mp.Params.Get(string(MetaNonce)); ok {`
`629`		`- return val.(string), nil`
	`635`	`+ if strVal, ok := val.(string); ok {`
	`636`	`+ return strVal, nil`
	`637`	`+ }`
	`638`	`+ return "", newError(ErrInvalidMetadata, fmt.Sprintf("nonce parameter has invalid type %T, expected string", val))`
`630`	`639`	`}`
`631`	`640`	`return "", fmt.Errorf("No nonce value")`
`632`	`641`	`}`
`633`	`642`
`634`	`643`	`func (mp metadataProviderFromParams) Alg() (string, error) {`
`635`	`644`	`if val, ok := mp.Params.Get(string(MetaAlgorithm)); ok {`
`636`		`- return val.(string), nil`
	`645`	`+ if strVal, ok := val.(string); ok {`
	`646`	`+ return strVal, nil`
	`647`	`+ }`
	`648`	`+ return "", newError(ErrInvalidMetadata, fmt.Sprintf("alg parameter has invalid type %T, expected string", val))`
`637`	`649`	`}`
`638`	`650`	`return "", fmt.Errorf("No alg value")`
`639`	`651`	`}`
`640`	`652`
`641`	`653`	`func (mp metadataProviderFromParams) KeyID() (string, error) {`
`642`	`654`	`if val, ok := mp.Params.Get(string(MetaKeyID)); ok {`
`643`		`- return val.(string), nil`
	`655`	`+ if strVal, ok := val.(string); ok {`
	`656`	`+ return strVal, nil`
	`657`	`+ }`
	`658`	`+ return "", newError(ErrInvalidMetadata, fmt.Sprintf("keyid parameter has invalid type %T, expected string", val))`
`644`	`659`	`}`
`645`	`660`	`return "", fmt.Errorf("No keyid value")`
`646`	`661`	`}`
`647`	`662`
`648`	`663`	`func (mp metadataProviderFromParams) Tag() (string, error) {`
`649`	`664`	`if val, ok := mp.Params.Get(string(MetaTag)); ok {`
`650`		`- return val.(string), nil`
	`665`	`+ if strVal, ok := val.(string); ok {`
	`666`	`+ return strVal, nil`
	`667`	`+ }`
	`668`	`+ return "", newError(ErrInvalidMetadata, fmt.Sprintf("tag parameter has invalid type %T, expected string", val))`
`651`	`669`	`}`
`652`	`670`	`return "", fmt.Errorf("No tag value")`
`653`	`671`	`}`