MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update license verifier to use updated keys (#11197)

This commit is contained in:
Kanagaraj M 2021-01-06 23:47:05 +05:30 committed by GitHub
parent 76e2713ffe
commit b78521cd69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/licverifier/verifier.go
View File

@ -34,21 +34,21 @@ type LicenseVerifier struct {
// LicenseInfo holds customer metadata present in the license key. // LicenseInfo holds customer metadata present in the license key.
type LicenseInfo struct { type LicenseInfo struct {
Email string // Email of the license key requestor Email string // Email of the license key requestor
TeamName string // Subnet team name Organization string // Subnet organization name
AccountID int64 // Subnet account id AccountID int64 // Subnet account id
StorageCapacity int64 // Storage capacity used in TB StorageCapacity int64 // Storage capacity used in TB
ServiceType string // Subnet service type Plan string // Subnet plan
ExpiresAt time.Time // Time of license expiry ExpiresAt time.Time // Time of license expiry
} }
// license key JSON field names // license key JSON field names
const ( const (
accountID = "accountId" accountID = "aid"
sub = "sub" sub = "sub"
expiresAt = "exp" expiresAt = "exp"
teamName = "teamName" organization = "org"
capacity = "capacity" capacity = "cap"
serviceType = "serviceType" plan = "plan"
) )
// NewLicenseVerifier returns an initialized license verifier with the given // NewLicenseVerifier returns an initialized license verifier with the given
@ -79,24 +79,24 @@ func toLicenseInfo(claims jwt.MapClaims) (LicenseInfo, error) {
return LicenseInfo{}, errors.New("Invalid time of expiry in claims") return LicenseInfo{}, errors.New("Invalid time of expiry in claims")
} }
expiresAt := time.Unix(int64(expiryTS), 0) expiresAt := time.Unix(int64(expiryTS), 0)
tName, ok := claims[teamName].(string) orgName, ok := claims[organization].(string)
if !ok { if !ok {
return LicenseInfo{}, errors.New("Invalid team name in claims") return LicenseInfo{}, errors.New("Invalid organization in claims")
} }
storageCap, ok := claims[capacity].(float64) storageCap, ok := claims[capacity].(float64)
if !ok { if !ok {
return LicenseInfo{}, errors.New("Invalid storage capacity in claims") return LicenseInfo{}, errors.New("Invalid storage capacity in claims")
} }
sType, ok := claims[serviceType].(string) plan, ok := claims[plan].(string)
if !ok { if !ok {
return LicenseInfo{}, errors.New("Invalid service type in claims") return LicenseInfo{}, errors.New("Invalid plan in claims")
} }
return LicenseInfo{ return LicenseInfo{
Email: email, Email: email,
TeamName: tName, Organization: orgName,
AccountID: int64(accID), AccountID: int64(accID),
StorageCapacity: int64(storageCap), StorageCapacity: int64(storageCap),
ServiceType: sType, Plan: plan,
ExpiresAt: expiresAt, ExpiresAt: expiresAt,
}, nil }, nil

18
pkg/licverifier/verifier_test.go
View File

@ -32,7 +32,7 @@ func at(t time.Time, f func()) {
} }
func areEqLicenseInfo(a, b LicenseInfo) bool { func areEqLicenseInfo(a, b LicenseInfo) bool {
if a.Email == b.Email && a.TeamName == b.TeamName && a.AccountID == b.AccountID && a.ServiceType == b.ServiceType && a.StorageCapacity == b.StorageCapacity && a.ExpiresAt.Equal(b.ExpiresAt) { if a.Email == b.Email && a.Organization == b.Organization && a.AccountID == b.AccountID && a.Plan == b.Plan && a.StorageCapacity == b.StorageCapacity && a.ExpiresAt.Equal(b.ExpiresAt) {
return true return true
} }
return false return false
@ -55,20 +55,20 @@ mr/cKCUyBL7rcAvg0zNq1vcSrUSGlAmY3SEDCu3GOKnjG/U4E7+p957ocWSV+mQU
expectedLicInfo LicenseInfo expectedLicInfo LicenseInfo
shouldPass bool shouldPass bool
}{{"", LicenseInfo{}, false}, }{{"", LicenseInfo{}, false},
{"eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJrcCtjMUBtaW5pby5pbyIsInRlYW1OYW1lIjoiR3JpbmdvdHRzIEluYy4iLCJleHAiOjEuNjI4MjAxODYyNjgwNzM3Nzc1ZTksImNhcGFjaXR5Ijo1MCwiaWF0IjoxLjU5NjY2NTg2MjY4MDczNzc3NWU5LCJhY2NvdW50SWQiOjEsInNlcnZpY2VUeXBlIjoiU1RBTkRBUkQifQ._2EgZpjVGo3hRacO2MNavDqZoaP-hwDQ745Z-t-N6lKDwhHOzwhENb9UhiubOQ_yTJ9Ia5EqMhQrC1QCrk8-ThiftmjFGKTyYw5j7gvox_5L-R8HIegACynVlmBlF6IV", LicenseInfo{ {"eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJrYW5hZ2FyYWorYzFAbWluaW8uaW8iLCJjYXAiOjUwLCJvcmciOiJHcmluZ290dHMgSW5jLiIsImV4cCI6MS42NDE0NDYxNjkwMDExOTg4OTRlOSwicGxhbiI6IlNUQU5EQVJEIiwiaXNzIjoic3VibmV0QG1pbi5pbyIsImFpZCI6MSwiaWF0IjoxLjYwOTkxMDE2OTAwMTE5ODg5NGU5fQ.EhTL2xwMHnUoLQF4UR-5bjUCja3whseLU5mb9XEj7PvAae6HEIDCOMEF8Hhh20DN_v_LRE283j2ZlA5zulcXSZXS0CLcrKqbVy6QLvZfvvLuerOjJI-NBa9dSJWJ0WoN", LicenseInfo{
Email: "kp+c1@minio.io", Email: "kanagaraj+c1@minio.io",
TeamName: "Gringotts Inc.", Organization: "Gringotts Inc.",
AccountID: 1, AccountID: 1,
StorageCapacity: 50, StorageCapacity: 50,
ServiceType: "STANDARD", Plan: "STANDARD",
ExpiresAt: time.Date(2021, time.August, 5, 15, 17, 42, 0, time.FixedZone("PDT", -7*60*60)), ExpiresAt: time.Date(2022, time.January, 6, 5, 16, 9, 0, time.UTC),
}, true}, }, true},
} }
for i, tc := range testCases { for i, tc := range testCases {
// Fixing the jwt.TimeFunc at 2020-08-05 22:17:43 +0000 UTC to // Fixing the jwt.TimeFunc at 2021-01-06 05:16:09 +0000 UTC to
// ensure that the license JWT doesn't expire ever. // ensure that the license JWT doesn't expire ever.
at(time.Unix(int64(1596665863), 0), func() { at(time.Unix(int64(1609910169), 0), func() {
licInfo, err := lv.Verify(tc.lic) licInfo, err := lv.Verify(tc.lic)
if err != nil && tc.shouldPass { if err != nil && tc.shouldPass {
t.Fatalf("%d: Expected license to pass verification but failed with %s", i+1, err) t.Fatalf("%d: Expected license to pass verification but failed with %s", i+1, err)
@ -100,7 +100,7 @@ mr/cKCUyBL7rcAvg0zNq1vcSrUSGlAmY3SEDCu3GOKnjG/U4E7+p957ocWSV+mQU
fmt.Println("Failed to create license verifier", err) fmt.Println("Failed to create license verifier", err)
} }
licenseKey := "eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJrcCtjMUBtaW5pby5pbyIsInRlYW1OYW1lIjoiR3JpbmdvdHRzIEluYy4iLCJleHAiOjEuNjI4MjAxODYyNjgwNzM3Nzc1ZTksImNhcGFjaXR5Ijo1MCwiaWF0IjoxLjU5NjY2NTg2MjY4MDczNzc3NWU5LCJhY2NvdW50SWQiOjEsInNlcnZpY2VUeXBlIjoiU1RBTkRBUkQifQ._2EgZpjVGo3hRacO2MNavDqZoaP-hwDQ745Z-t-N6lKDwhHOzwhENb9UhiubOQ_yTJ9Ia5EqMhQrC1QCrk8-ThiftmjFGKTyYw5j7gvox_5L-R8HIegACynVlmBlF6IV" licenseKey := "eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJrYW5hZ2FyYWorYzFAbWluaW8uaW8iLCJjYXAiOjUwLCJvcmciOiJHcmluZ290dHMgSW5jLiIsImV4cCI6MS42NDE0NDYxNjkwMDExOTg4OTRlOSwicGxhbiI6IlNUQU5EQVJEIiwiaXNzIjoic3VibmV0QG1pbi5pbyIsImFpZCI6MSwiaWF0IjoxLjYwOTkxMDE2OTAwMTE5ODg5NGU5fQ.EhTL2xwMHnUoLQF4UR-5bjUCja3whseLU5mb9XEj7PvAae6HEIDCOMEF8Hhh20DN_v_LRE283j2ZlA5zulcXSZXS0CLcrKqbVy6QLvZfvvLuerOjJI-NBa9dSJWJ0WoN"
licInfo, err := lv.Verify(licenseKey) licInfo, err := lv.Verify(licenseKey)
if err != nil { if err != nil {
fmt.Println("Failed to verify license key", err) fmt.Println("Failed to verify license key", err)