697bc4cd1d
Previously every Handler function was receiving the session token in the form of a jwt string, in consequence every time we want to access the encrypted claims of the jwt we needed to run a decryption process, additionally we were decrypting the jwt twice, first at the session validation then inside each handler function, this was also causing a lot of using related to the merge between m3 and mcs What changed: Now we validate and decrypt the jwt once in `configure_mcs.go`, this works for both, mcs (console) and operator sessions, and then pass the decrypted claims to all the functions that need it, so no further token validation or decryption is need it.
76 lines
2.4 KiB
Go
76 lines
2.4 KiB
Go
// This file is part of MinIO Console Server
|
|
// Copyright (c) 2020 MinIO, Inc.
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package restapi
|
|
|
|
import (
|
|
"context"
|
|
"log"
|
|
"time"
|
|
|
|
"github.com/go-openapi/runtime/middleware"
|
|
"github.com/go-openapi/swag"
|
|
"github.com/minio/mcs/models"
|
|
"github.com/minio/mcs/restapi/operations"
|
|
"github.com/minio/mcs/restapi/operations/admin_api"
|
|
)
|
|
|
|
func registerAdminArnsHandlers(api *operations.McsAPI) {
|
|
// return a list of arns
|
|
api.AdminAPIArnListHandler = admin_api.ArnListHandlerFunc(func(params admin_api.ArnListParams, session *models.Principal) middleware.Responder {
|
|
arnsResp, err := getArnsResponse(session)
|
|
if err != nil {
|
|
return admin_api.NewArnListDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())})
|
|
}
|
|
return admin_api.NewArnListOK().WithPayload(arnsResp)
|
|
})
|
|
|
|
}
|
|
|
|
// getArns invokes admin info and returns a list of arns
|
|
func getArns(ctx context.Context, client MinioAdmin) (*models.ArnsResponse, error) {
|
|
serverInfo, err := client.serverInfo(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// build response
|
|
return &models.ArnsResponse{
|
|
Arns: serverInfo.SQSARN,
|
|
}, nil
|
|
}
|
|
|
|
// getArnsResponse returns a list of active arns in the instance
|
|
func getArnsResponse(session *models.Principal) (*models.ArnsResponse, error) {
|
|
mAdmin, err := newMAdminClient(session)
|
|
if err != nil {
|
|
log.Println("error creating Madmin Client:", err)
|
|
return nil, err
|
|
}
|
|
// create a minioClient interface implementation
|
|
// defining the client to be used
|
|
adminClient := adminClient{client: mAdmin}
|
|
// 20 seconds timeout
|
|
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
|
|
defer cancel()
|
|
// serialize output
|
|
arnsList, err := getArns(ctx, adminClient)
|
|
if err != nil {
|
|
log.Println("error getting arn list:", err)
|
|
return nil, err
|
|
}
|
|
return arnsList, nil
|
|
}
|