Release v2.1.0 (#75)

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## [2.1.0] - 2022-10-21
+### Added
+- Define TokenAuthHandlers [#73](https://github.com/rokwire/core-auth-library-go/issues/73)
+
 ## [2.0.3] - 2022-10-21
 ### Added
 - Scope utility functions [#70](https://github.com/rokwire/core-auth-library-go/issues/70)
@@ -79,7 +85,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/rokwire/core-auth-library-go/compare/v2.0.3....HEAD
+[Unreleased]: https://github.com/rokwire/core-auth-library-go/compare/v2.1.0....HEAD
+[2.1.0]: https://github.com/rokwire/core-auth-library-go/compare/v2.0.3...v2.1.0
 [2.0.3]: https://github.com/rokwire/core-auth-library-go/compare/v2.0.2...v2.0.3
 [2.0.2]: https://github.com/rokwire/core-auth-library-go/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/rokwire/core-auth-library-go/compare/v1.0.9...v2.0.1

SECURITY.md

@@ -4,8 +4,8 @@
 Patches for **Core Auth Library** in this repository will only be applied to the following versions:
 | Version | Supported          |
 | ------- | ------------------ |
-| 2.0.3   | :white_check_mark: |
-| < 2.0.3 | :x:                |
+| 2.1.0   | :white_check_mark: |
+| < 2.1.0 | :x:                |
 
 ## Reporting a Bug or Vulnerability
 

authorization/authorization.go

@@ -52,7 +52,7 @@ type Authorization interface {
 
 // CasbinAuthorization is a Casbin implementation of the authorization interface.
 type CasbinAuthorization struct {
-	enforcer *casbin.Enforcer
+	enforcer casbin.Enforcer
 }
 
 // Any will validate that if the casbin enforcer gives access to one or more of the provided values
@@ -84,26 +84,28 @@ func (c *CasbinAuthorization) All(values []string, object string, action string)
 // NewCasbinStringAuthorization returns a new Casbin enforcer with the string model
 func NewCasbinStringAuthorization(policyPath string) *CasbinAuthorization {
 	enforcer, err := casbin.NewEnforcer(basepath+"/authorization_model_string.conf", policyPath)
-	if err != nil {
-		fmt.Printf("NewCasbinStringAuthorization() -> error: %s\n", err.Error())
+	if err != nil || enforcer == nil {
+		fmt.Printf("NewCasbinStringAuthorization() -> error: %v\n", err)
+		return nil
 	}
 
-	return &CasbinAuthorization{enforcer}
+	return &CasbinAuthorization{*enforcer}
 }
 
 // NewCasbinAuthorization returns a new Casbin enforcer
 func NewCasbinAuthorization(modelPath string, policyPath string) *CasbinAuthorization {
 	enforcer, err := casbin.NewEnforcer(modelPath, policyPath)
-	if err != nil {
-		fmt.Printf("NewCasbinAuthorization() -> error: %s\n", err.Error())
+	if err != nil || enforcer == nil {
+		fmt.Printf("NewCasbinAuthorization() -> error: %v\n", err)
+		return nil
 	}
 
-	return &CasbinAuthorization{enforcer}
+	return &CasbinAuthorization{*enforcer}
 }
 
 // CasbinScopeAuthorization is a Casbin implementation of the authorization interface for scope values.
 type CasbinScopeAuthorization struct {
-	enforcer  *casbin.Enforcer
+	enforcer  casbin.Enforcer
 	serviceID string
 }
 
@@ -163,11 +165,12 @@ func (c *CasbinScopeAuthorization) All(values []string, object string, action st
 // NewCasbinScopeAuthorization returns a new casbin enforcer
 func NewCasbinScopeAuthorization(policyPath string, serviceID string) *CasbinScopeAuthorization {
 	enforcer, err := casbin.NewEnforcer(basepath+"/authorization_model_scope.conf", policyPath)
-	if err != nil {
-		fmt.Printf("NewCasbinScopeAuthorization() -> error: %s\n", err.Error())
+	if err != nil || enforcer == nil {
+		fmt.Printf("NewCasbinScopeAuthorization() -> error: %v\n", err)
+		return nil
 	}
 
-	return &CasbinScopeAuthorization{enforcer, serviceID}
+	return &CasbinScopeAuthorization{*enforcer, serviceID}
 }
 
 // -------------------------- Scope --------------------------

coreservice/core_service.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/rokwire/core-auth-library-go/v2/authservice"
 	"github.com/rokwire/core-auth-library-go/v2/authutils"
-	"github.com/rokwire/logging-library-go/logs"
+	"github.com/rokwire/logging-library-go/v2/logs"
 )
 
 // CoreService contains configurations and helper functions required to utilize certain core services

envloader/envloader.go

@@ -22,8 +22,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/secretsmanager"
-	"github.com/rokwire/logging-library-go/logs"
-	"github.com/rokwire/logging-library-go/logutils"
+	"github.com/rokwire/logging-library-go/v2/logs"
+	"github.com/rokwire/logging-library-go/v2/logutils"
 )
 
 // -------------------- EnvLoader --------------------

example/coreservice/app.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/rokwire/core-auth-library-go/v2/authservice"
 	"github.com/rokwire/core-auth-library-go/v2/coreservice"
-	"github.com/rokwire/logging-library-go/logs"
+	"github.com/rokwire/logging-library-go/v2/logs"
 )
 
 func main() {

example/envloader/app.go

@@ -16,7 +16,7 @@ package main
 
 import (
 	"github.com/rokwire/core-auth-library-go/v2/envloader"
-	"github.com/rokwire/logging-library-go/logs"
+	"github.com/rokwire/logging-library-go/v2/logs"
 )
 
 var (

example/token/app.go

@@ -26,13 +26,13 @@ import (
 
 // WebAdapter is the web adapter for token auth
 type WebAdapter struct {
-	tokenAuth *tokenauth.TokenAuth
+	handlers tokenauth.Handlers
 }
 
 // Start starts the web adapter for token auth
 func (we WebAdapter) Start() {
-	http.HandleFunc("/test", we.tokenAuthWrapFunc(we.test))
-	http.HandleFunc("/admin/test", we.adminTokenWrapFunc(we.adminTest))
+	http.HandleFunc("/test", we.tokenAuthWrapFunc(we.test, we.handlers.Standard))
+	http.HandleFunc("/admin/test", we.tokenAuthWrapFunc(we.adminTest, we.handlers.Permissions))
 
 	http.ListenAndServe(":5000", nil)
 }
@@ -52,55 +52,25 @@ func (we WebAdapter) adminTest(w http.ResponseWriter, req *http.Request) {
 }
 
 // tokenAuthWrapFunc provides a standard wrapper that performs token auth
-func (we WebAdapter) tokenAuthWrapFunc(handler http.HandlerFunc) http.HandlerFunc {
+func (we WebAdapter) tokenAuthWrapFunc(handler http.HandlerFunc, authorization tokenauth.Handler) http.HandlerFunc {
 	// Receive request with tokens generated by auth service
 	return func(w http.ResponseWriter, req *http.Request) {
-		// Authenticate token
-		claims, err := we.tokenAuth.CheckRequestTokens(req)
-		if err != nil {
-			log.Printf("Authentication error: %v\n", err)
-			http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
-			return
+		if authorization != nil {
+			responseStatus, claims, err := authorization.Check(req)
+			if err != nil {
+				log.Printf("authorization error: %v\n", err)
+				http.Error(w, err.Error(), responseStatus)
+				return
+			}
+			log.Printf("Authorization successful for user: %v", claims)
 		}
-
-		err = we.tokenAuth.AuthorizeRequestScope(claims, req)
-		if err != nil {
-			log.Printf("Scope error: %v\n", err)
-			http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
-			return
-		}
-
-		log.Printf("Authentication successful for user: %v", claims)
-		handler(w, req)
-	}
-}
-
-// adminTokenWrapFunc
-func (we WebAdapter) adminTokenWrapFunc(handler http.HandlerFunc) http.HandlerFunc {
-	return func(w http.ResponseWriter, req *http.Request) {
-		// Authenticate token
-		claims, err := we.tokenAuth.CheckRequestTokens(req)
-		if err != nil {
-			log.Printf("Authentication error: %v\n", err)
-			http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
-			return
-		}
-
-		err = we.tokenAuth.AuthorizeRequestPermissions(claims, req)
-		if err != nil {
-			log.Printf("Permission error: %v\n", err)
-			http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
-			return
-		}
-
-		log.Printf("Authentication successful for user: %v", claims)
 		handler(w, req)
 	}
 }
 
 // NewWebAdapter creates new WebAdapter instance
-func NewWebAdapter(tokenAuth *tokenauth.TokenAuth) WebAdapter {
-	return WebAdapter{tokenAuth: tokenAuth}
+func NewWebAdapter(handlers tokenauth.Handlers) WebAdapter {
+	return WebAdapter{handlers: handlers}
 }
 
 func main() {
@@ -128,12 +98,14 @@ func main() {
 	scopeAuth := authorization.NewCasbinScopeAuthorization("./scope_authorization_policy.csv", authService.ServiceID)
 	// Instantiate TokenAuth instance to perform token validation
 	tokenAuth, err := tokenauth.NewTokenAuth(true, serviceRegManager, permissionAuth, scopeAuth)
-	if err != nil {
-		log.Fatalf("Error intitializing token auth: %v", err)
+	if err != nil || tokenAuth == nil {
+		log.Fatalf("Error initializing token auth: %v", err)
 	}
+	authHandlers := tokenauth.NewHandlers(tokenauth.NewScopeHandler(*tokenAuth))
+
 	fmt.Println("Setup complete")
 
 	// Instantiate and start a new WebAdapter
-	adapter := NewWebAdapter(tokenAuth)
+	adapter := NewWebAdapter(authHandlers)
 	adapter.Start()
 }

go.mod

@@ -3,11 +3,11 @@ module github.com/rokwire/core-auth-library-go/v2
 go 1.18
 
 require (
-	github.com/aws/aws-sdk-go v1.44.120
-	github.com/casbin/casbin/v2 v2.56.0
+	github.com/aws/aws-sdk-go v1.44.138
+	github.com/casbin/casbin/v2 v2.57.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/rokwire/logging-library-go v1.0.3
-	github.com/stretchr/testify v1.8.0
+	github.com/rokwire/logging-library-go/v2 v2.0.0
+	github.com/stretchr/testify v1.8.1
 	golang.org/x/sync v0.1.0
 	gopkg.in/go-playground/validator.v9 v9.31.0
 )
@@ -24,7 +24,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/sys v0.2.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -1,9 +1,11 @@
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
-github.com/aws/aws-sdk-go v1.44.120 h1:dsOxGf17H9hCVCA4aWpFWEcJMHkX+Uw7l4pGcxb27wM=
-github.com/aws/aws-sdk-go v1.44.120/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/casbin/casbin/v2 v2.56.0 h1:4qM+hDfj+i9M6lBbguafWKE/8tJA+9vRY5+l0ZB5WTo=
-github.com/casbin/casbin/v2 v2.56.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
+github.com/aws/aws-sdk-go v1.44.137 h1:GH2bUPiW7/gHtB04NxQOSOrKqFNjLGKmqt5YaO+K1SE=
+github.com/aws/aws-sdk-go v1.44.137/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.138 h1:9aoHAowstvD0s4cktYwT4Ok3oFLl3Hfbap8iFLamsdc=
+github.com/aws/aws-sdk-go v1.44.138/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/casbin/casbin/v2 v2.57.0 h1:J7PTgUe13Ag5WzwZe2l/hpj0/hRKuQlqyO8+1+FAWug=
+github.com/casbin/casbin/v2 v2.57.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -15,7 +17,6 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -32,40 +33,55 @@ github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ic
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rokwire/logging-library-go v1.0.3 h1:ONaEJO0NbBYtG+gV7+fn2zQqtPDkpSCif+nMuXvJFBA=
-github.com/rokwire/logging-library-go v1.0.3/go.mod h1:yntksZF2TDmxid9MwDnAAt95TeLMYo6chL0VUyIaFHk=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/rokwire/logging-library-go/v2 v2.0.0 h1:Uo088Hs3G2LjLveyUCOK3ii0AWYYobb+oDs/dH9uCSY=
+github.com/rokwire/logging-library-go/v2 v2.0.0/go.mod h1:6QSqTlk5nNQcZweqg0sLCCoIwpRpTu3AmOi7EJy38Tg=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=