mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring trace, watch, heal and logs back to user console UI (#491)

Browse Source
This commit is contained in:
Cesar N
2020-12-09 17:10:39 -06:00
committed by GitHub
parent 2d6f949359
commit a4ad341a18
39 changed files with 585 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
restapi/admin_console.go
View File

@@ -21,8 +21,6 @@ import (
"encoding/json"
"fmt"
"log"
"net/http"
"regexp"
"strings"
"time"
@@ -95,29 +93,3 @@ func getLogTime(lt string) string {
}
return tm.Format(logTimeFormat)
}
// getConsoleLogOptionsFromReq return tenant name from url
// path come as : `/console/<namespace>/<tenantName>`
func getConsoleLogOptionsFromReq(req *http.Request) (namespace, tenant string, err error) {
re := regexp.MustCompile(`(/console/)(.*?)/(.*?)(\?.*?$|$)`)
matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
if len(matches) == 0 || len(matches[0]) < 4 {
return "", "", fmt.Errorf("invalid url: %s", req.URL.Path)
}
namespace = strings.TrimSpace(string(matches[0][2]))
tenant = strings.TrimSpace(string(matches[0][3]))
return namespace, tenant, nil
}
// getTraceOptionsFromReq return tenant name from url
// path come as : `/trace/<namespace>/<tenantName>`
func getTraceOptionsFromReq(req *http.Request) (namespace, tenant string, err error) {
re := regexp.MustCompile(`(/trace/)(.*?)/(.*?)(\?.*?$|$)`)
matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
if len(matches) == 0 || len(matches[0]) < 4 {
return "", "", fmt.Errorf("invalid url: %s", req.URL.Path)
}
namespace = strings.TrimSpace(string(matches[0][2]))
tenant = strings.TrimSpace(string(matches[0][3]))
return namespace, tenant, nil
}

12
restapi/admin_heal.go
View File

@@ -103,8 +103,6 @@ type healStatus struct {
}
type healOptions struct {
Namespace string
Tenant string
BucketName string
Prefix string
ForceStart bool
@@ -319,18 +317,16 @@ func getHRITypeAndName(i madmin.HealResultItem) (typ, name string) {
// and query params come on request form
func getHealOptionsFromReq(req *http.Request) (*healOptions, error) {
hOptions := healOptions{}
re := regexp.MustCompile(`(/heal/)(.*?)/(.*?)/(.*?)(\?.*?$|$)`)
re := regexp.MustCompile(`(/heal/)(.*?)(\?.*?$|$)`)
matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
// matches comes as e.g.
// [["...", "/heal/", "namespace", "tenant", "bucket1"]]
// [["...", "/heal/", "bucket1"]]
// [["/heal/" "/heal/" ""]]
if len(matches) == 0 || len(matches[0]) < 5 {
if len(matches) == 0 || len(matches[0]) < 3 {
return nil, fmt.Errorf("invalid url: %s", req.URL.Path)
}
hOptions.Namespace = strings.TrimSpace(string(matches[0][2]))
hOptions.Tenant = strings.TrimSpace(string(matches[0][3]))
hOptions.BucketName = strings.TrimSpace(string(matches[0][4]))
hOptions.BucketName = strings.TrimSpace(string(matches[0][2]))
hOptions.Prefix = req.FormValue("prefix")
hOptions.HealOpts.ScanMode = transformScanStr(req.FormValue("scan"))

12
restapi/admin_heal_test.go
View File

@@ -205,7 +205,7 @@ func TestHeal(t *testing.T) {
}
// Test-3: getHealOptionsFromReq return heal options from request
u, _ := url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
u, _ := url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
req := &http.Request{
URL: u,
}
@@ -231,7 +231,7 @@ func TestHeal(t *testing.T) {
}
// Test-4: getHealOptionsFromReq return error if boolean value not valid
u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=nonbool&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=nonbool&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
req = &http.Request{
URL: u,
}
@@ -240,7 +240,7 @@ func TestHeal(t *testing.T) {
assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
}
// Test-5: getHealOptionsFromReq return error if boolean value not valid
u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=nonbool&dry-run=true&scan=deep")
u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=nonbool&dry-run=true&scan=deep")
req = &http.Request{
URL: u,
}
@@ -249,7 +249,7 @@ func TestHeal(t *testing.T) {
assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
}
// Test-6: getHealOptionsFromReq return error if boolean value not valid
u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=nonbool&force-stop=true&remove=true&dry-run=true&scan=deep")
u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=nonbool&force-stop=true&remove=true&dry-run=true&scan=deep")
req = &http.Request{
URL: u,
}
@@ -258,7 +258,7 @@ func TestHeal(t *testing.T) {
assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
}
// Test-7: getHealOptionsFromReq return error if boolean value not valid
u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=nonbool&remove=true&dry-run=true&scan=deep")
u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=nonbool&remove=true&dry-run=true&scan=deep")
req = &http.Request{
URL: u,
}
@@ -267,7 +267,7 @@ func TestHeal(t *testing.T) {
assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
}
// Test-8: getHealOptionsFromReq return error if boolean value not valid
u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=nonbool&scan=deep")
u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=nonbool&scan=deep")
req = &http.Request{
URL: u,
}

23
restapi/client.go
View File

@@ -387,29 +387,6 @@ func newS3BucketClient(claims *models.Principal, bucketName string, prefix strin
return s3Client, nil
}
// newTenantS3BucketClient creates a new mc S3Client for an specific tenant on a namespace to talk to the server based on a bucket
func newTenantS3BucketClient(claims *models.Principal, tenantEndpoint, bucketName string) (*mc.S3Client, error) {
if strings.TrimSpace(bucketName) != "" {
tenantEndpoint += fmt.Sprintf("/%s", bucketName)
}
if claims == nil {
return nil, fmt.Errorf("the provided credentials are invalid")
}
s3Config := newS3Config(tenantEndpoint, claims.STSAccessKeyID, claims.STSSecretAccessKey, claims.STSSessionToken, false)
client, pErr := mc.S3New(s3Config)
if pErr != nil {
return nil, pErr.Cause
}
s3Client, ok := client.(*mc.S3Client)
if !ok {
return nil, fmt.Errorf("the provided url doesn't point to a S3 server")
}
return s3Client, nil
}
// newS3Config simply creates a new Config struct using the passed
// parameters.
func newS3Config(endpoint, accessKey, secretKey, sessionToken string, insecure bool) *mc.Config {

2
restapi/configure_console.go
View File

@@ -135,8 +135,6 @@ func configureAPI(api *operations.ConsoleAPI) http.Handler {
registerObjectsHandlers(api)
// Register Bucket Quota's Handlers
registerBucketQuotaHandlers(api)
// List buckets
registerOperatorBucketsHandlers(api)
// Register Account handlers
registerAccountHandlers(api)

74
restapi/embedded_spec.go
View File

@@ -2088,43 +2088,6 @@ func init() {
}
}
},
"/operator/{namespace}/{tenant}/buckets": {
"get": {
"tags": [
"OperatorAPI"
],
"summary": "List Buckets for Operator Console",
"operationId": "OperatorListBuckets",
"parameters": [
{
"type": "string",
"name": "namespace",
"in": "path",
"required": true
},
{
"type": "string",
"name": "tenant",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "A successful response.",
"schema": {
"$ref": "#/definitions/listBucketsResponse"
}
},
"default": {
"description": "Generic error response.",
"schema": {
"$ref": "#/definitions/error"
}
}
}
}
},
"/policies": {
"get": {
"tags": [
@@ -7202,43 +7165,6 @@ func init() {
}
}
},
"/operator/{namespace}/{tenant}/buckets": {
"get": {
"tags": [
"OperatorAPI"
],
"summary": "List Buckets for Operator Console",
"operationId": "OperatorListBuckets",
"parameters": [
{
"type": "string",
"name": "namespace",
"in": "path",
"required": true
},
{
"type": "string",
"name": "tenant",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "A successful response.",
"schema": {
"$ref": "#/definitions/listBucketsResponse"
}
},
"default": {
"description": "Generic error response.",
"schema": {
"$ref": "#/definitions/error"
}
}
}
}
},
"/policies": {
"get": {
"tags": [

13
restapi/operations/console_api.go
View File

@@ -38,7 +38,6 @@ import (
"github.com/minio/console/models"
"github.com/minio/console/restapi/operations/admin_api"
"github.com/minio/console/restapi/operations/operator_api"
"github.com/minio/console/restapi/operations/user_api"
)
@@ -227,9 +226,6 @@ func NewConsoleAPI(spec *loads.Document) *ConsoleAPI {
AdminAPINotificationEndpointListHandler: admin_api.NotificationEndpointListHandlerFunc(func(params admin_api.NotificationEndpointListParams, principal *models.Principal) middleware.Responder {
return middleware.NotImplemented("operation admin_api.NotificationEndpointList has not yet been implemented")
}),
OperatorAPIOperatorListBucketsHandler: operator_api.OperatorListBucketsHandlerFunc(func(params operator_api.OperatorListBucketsParams, principal *models.Principal) middleware.Responder {
return middleware.NotImplemented("operation operator_api.OperatorListBuckets has not yet been implemented")
}),
AdminAPIPolicyInfoHandler: admin_api.PolicyInfoHandlerFunc(func(params admin_api.PolicyInfoParams, principal *models.Principal) middleware.Responder {
return middleware.NotImplemented("operation admin_api.PolicyInfo has not yet been implemented")
}),
@@ -477,8 +473,6 @@ type ConsoleAPI struct {
UserAPIMakeBucketHandler user_api.MakeBucketHandler
// AdminAPINotificationEndpointListHandler sets the operation handler for the notification endpoint list operation
AdminAPINotificationEndpointListHandler admin_api.NotificationEndpointListHandler
// OperatorAPIOperatorListBucketsHandler sets the operation handler for the operator list buckets operation
OperatorAPIOperatorListBucketsHandler operator_api.OperatorListBucketsHandler
// AdminAPIPolicyInfoHandler sets the operation handler for the policy info operation
AdminAPIPolicyInfoHandler admin_api.PolicyInfoHandler
// UserAPIPostBucketsBucketNameObjectsUploadHandler sets the operation handler for the post buckets bucket name objects upload operation
@@ -775,9 +769,6 @@ func (o *ConsoleAPI) Validate() error {
if o.AdminAPINotificationEndpointListHandler == nil {
unregistered = append(unregistered, "admin_api.NotificationEndpointListHandler")
}
if o.OperatorAPIOperatorListBucketsHandler == nil {
unregistered = append(unregistered, "operator_api.OperatorListBucketsHandler")
}
if o.AdminAPIPolicyInfoHandler == nil {
unregistered = append(unregistered, "admin_api.PolicyInfoHandler")
}
@@ -1186,10 +1177,6 @@ func (o *ConsoleAPI) initHandlerCache() {
if o.handlers["GET"] == nil {
o.handlers["GET"] = make(map[string]http.Handler)
}
o.handlers["GET"]["/operator/{namespace}/{tenant}/buckets"] = operator_api.NewOperatorListBuckets(o.context, o.OperatorAPIOperatorListBucketsHandler)
if o.handlers["GET"] == nil {
o.handlers["GET"] = make(map[string]http.Handler)
}
o.handlers["GET"]["/policies/{name}"] = admin_api.NewPolicyInfo(o.context, o.AdminAPIPolicyInfoHandler)
if o.handlers["POST"] == nil {
o.handlers["POST"] = make(map[string]http.Handler)

90
restapi/operations/operator_api/operator_list_buckets.go
View File

@@ -1,90 +0,0 @@
// Code generated by go-swagger; DO NOT EDIT.
// 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 operator_api
// This file was generated by the swagger tool.
// Editing this file might prove futile when you re-run the generate command
import (
"net/http"
"github.com/go-openapi/runtime/middleware"
"github.com/minio/console/models"
)
// OperatorListBucketsHandlerFunc turns a function with the right signature into a operator list buckets handler
type OperatorListBucketsHandlerFunc func(OperatorListBucketsParams, *models.Principal) middleware.Responder
// Handle executing the request and returning a response
func (fn OperatorListBucketsHandlerFunc) Handle(params OperatorListBucketsParams, principal *models.Principal) middleware.Responder {
return fn(params, principal)
}
// OperatorListBucketsHandler interface for that can handle valid operator list buckets params
type OperatorListBucketsHandler interface {
Handle(OperatorListBucketsParams, *models.Principal) middleware.Responder
}
// NewOperatorListBuckets creates a new http.Handler for the operator list buckets operation
func NewOperatorListBuckets(ctx *middleware.Context, handler OperatorListBucketsHandler) *OperatorListBuckets {
return &OperatorListBuckets{Context: ctx, Handler: handler}
}
/*OperatorListBuckets swagger:route GET /operator/{namespace}/{tenant}/buckets OperatorAPI operatorListBuckets
List Buckets for Operator Console
*/
type OperatorListBuckets struct {
Context *middleware.Context
Handler OperatorListBucketsHandler
}
func (o *OperatorListBuckets) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
route, rCtx, _ := o.Context.RouteInfo(r)
if rCtx != nil {
r = rCtx
}
var Params = NewOperatorListBucketsParams()
uprinc, aCtx, err := o.Context.Authorize(r, route)
if err != nil {
o.Context.Respond(rw, r, route.Produces, route, err)
return
}
if aCtx != nil {
r = aCtx
}
var principal *models.Principal
if uprinc != nil {
principal = uprinc.(*models.Principal) // this is really a models.Principal, I promise
}
if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
o.Context.Respond(rw, r, route.Produces, route, err)
return
}
res := o.Handler.Handle(Params, principal) // actually handle the request
o.Context.Respond(rw, r, route.Produces, route, res)
}

114
restapi/operations/operator_api/operator_list_buckets_parameters.go
View File

@@ -1,114 +0,0 @@
// Code generated by go-swagger; DO NOT EDIT.
// 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 operator_api
// This file was generated by the swagger tool.
// Editing this file might prove futile when you re-run the swagger generate command
import (
"net/http"
"github.com/go-openapi/errors"
"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/strfmt"
)
// NewOperatorListBucketsParams creates a new OperatorListBucketsParams object
// no default values defined in spec.
func NewOperatorListBucketsParams() OperatorListBucketsParams {
return OperatorListBucketsParams{}
}
// OperatorListBucketsParams contains all the bound params for the operator list buckets operation
// typically these are obtained from a http.Request
//
// swagger:parameters OperatorListBuckets
type OperatorListBucketsParams struct {
// HTTP Request Object
HTTPRequest *http.Request `json:"-"`
/*
Required: true
In: path
*/
Namespace string
/*
Required: true
In: path
*/
Tenant string
}
// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
// for simple values it will use straight method calls.
//
// To ensure default values, the struct must have been initialized with NewOperatorListBucketsParams() beforehand.
func (o *OperatorListBucketsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
var res []error
o.HTTPRequest = r
rNamespace, rhkNamespace, _ := route.Params.GetOK("namespace")
if err := o.bindNamespace(rNamespace, rhkNamespace, route.Formats); err != nil {
res = append(res, err)
}
rTenant, rhkTenant, _ := route.Params.GetOK("tenant")
if err := o.bindTenant(rTenant, rhkTenant, route.Formats); err != nil {
res = append(res, err)
}
if len(res) > 0 {
return errors.CompositeValidationError(res...)
}
return nil
}
// bindNamespace binds and validates parameter Namespace from path.
func (o *OperatorListBucketsParams) bindNamespace(rawData []string, hasKey bool, formats strfmt.Registry) error {
var raw string
if len(rawData) > 0 {
raw = rawData[len(rawData)-1]
}
// Required: true
// Parameter is provided by construction from the route
o.Namespace = raw
return nil
}
// bindTenant binds and validates parameter Tenant from path.
func (o *OperatorListBucketsParams) bindTenant(rawData []string, hasKey bool, formats strfmt.Registry) error {
var raw string
if len(rawData) > 0 {
raw = rawData[len(rawData)-1]
}
// Required: true
// Parameter is provided by construction from the route
o.Tenant = raw
return nil
}

133
restapi/operations/operator_api/operator_list_buckets_responses.go
View File

@@ -1,133 +0,0 @@
// Code generated by go-swagger; DO NOT EDIT.
// 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 operator_api
// This file was generated by the swagger tool.
// Editing this file might prove futile when you re-run the swagger generate command
import (
"net/http"
"github.com/go-openapi/runtime"
"github.com/minio/console/models"
)
// OperatorListBucketsOKCode is the HTTP code returned for type OperatorListBucketsOK
const OperatorListBucketsOKCode int = 200
/*OperatorListBucketsOK A successful response.
swagger:response operatorListBucketsOK
*/
type OperatorListBucketsOK struct {
/*
In: Body
*/
Payload *models.ListBucketsResponse `json:"body,omitempty"`
}
// NewOperatorListBucketsOK creates OperatorListBucketsOK with default headers values
func NewOperatorListBucketsOK() *OperatorListBucketsOK {
return &OperatorListBucketsOK{}
}
// WithPayload adds the payload to the operator list buckets o k response
func (o *OperatorListBucketsOK) WithPayload(payload *models.ListBucketsResponse) *OperatorListBucketsOK {
o.Payload = payload
return o
}
// SetPayload sets the payload to the operator list buckets o k response
func (o *OperatorListBucketsOK) SetPayload(payload *models.ListBucketsResponse) {
o.Payload = payload
}
// WriteResponse to the client
func (o *OperatorListBucketsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
rw.WriteHeader(200)
if o.Payload != nil {
payload := o.Payload
if err := producer.Produce(rw, payload); err != nil {
panic(err) // let the recovery middleware deal with this
}
}
}
/*OperatorListBucketsDefault Generic error response.
swagger:response operatorListBucketsDefault
*/
type OperatorListBucketsDefault struct {
_statusCode int
/*
In: Body
*/
Payload *models.Error `json:"body,omitempty"`
}
// NewOperatorListBucketsDefault creates OperatorListBucketsDefault with default headers values
func NewOperatorListBucketsDefault(code int) *OperatorListBucketsDefault {
if code <= 0 {
code = 500
}
return &OperatorListBucketsDefault{
_statusCode: code,
}
}
// WithStatusCode adds the status to the operator list buckets default response
func (o *OperatorListBucketsDefault) WithStatusCode(code int) *OperatorListBucketsDefault {
o._statusCode = code
return o
}
// SetStatusCode sets the status to the operator list buckets default response
func (o *OperatorListBucketsDefault) SetStatusCode(code int) {
o._statusCode = code
}
// WithPayload adds the payload to the operator list buckets default response
func (o *OperatorListBucketsDefault) WithPayload(payload *models.Error) *OperatorListBucketsDefault {
o.Payload = payload
return o
}
// SetPayload sets the payload to the operator list buckets default response
func (o *OperatorListBucketsDefault) SetPayload(payload *models.Error) {
o.Payload = payload
}
// WriteResponse to the client
func (o *OperatorListBucketsDefault) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
rw.WriteHeader(o._statusCode)
if o.Payload != nil {
payload := o.Payload
if err := producer.Produce(rw, payload); err != nil {
panic(err) // let the recovery middleware deal with this
}
}
}

124
restapi/operations/operator_api/operator_list_buckets_urlbuilder.go
View File

@@ -1,124 +0,0 @@
// Code generated by go-swagger; DO NOT EDIT.
// 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 operator_api
// This file was generated by the swagger tool.
// Editing this file might prove futile when you re-run the generate command
import (
"errors"
"net/url"
golangswaggerpaths "path"
"strings"
)
// OperatorListBucketsURL generates an URL for the operator list buckets operation
type OperatorListBucketsURL struct {
Namespace string
Tenant string
_basePath string
// avoid unkeyed usage
_ struct{}
}
// WithBasePath sets the base path for this url builder, only required when it's different from the
// base path specified in the swagger spec.
// When the value of the base path is an empty string
func (o *OperatorListBucketsURL) WithBasePath(bp string) *OperatorListBucketsURL {
o.SetBasePath(bp)
return o
}
// SetBasePath sets the base path for this url builder, only required when it's different from the
// base path specified in the swagger spec.
// When the value of the base path is an empty string
func (o *OperatorListBucketsURL) SetBasePath(bp string) {
o._basePath = bp
}
// Build a url path and query string
func (o *OperatorListBucketsURL) Build() (*url.URL, error) {
var _result url.URL
var _path = "/operator/{namespace}/{tenant}/buckets"
namespace := o.Namespace
if namespace != "" {
_path = strings.Replace(_path, "{namespace}", namespace, -1)
} else {
return nil, errors.New("namespace is required on OperatorListBucketsURL")
}
tenant := o.Tenant
if tenant != "" {
_path = strings.Replace(_path, "{tenant}", tenant, -1)
} else {
return nil, errors.New("tenant is required on OperatorListBucketsURL")
}
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
return &_result, nil
}
// Must is a helper function to panic when the url builder returns an error
func (o *OperatorListBucketsURL) Must(u *url.URL, err error) *url.URL {
if err != nil {
panic(err)
}
if u == nil {
panic("url can't be nil")
}
return u
}
// String returns the string representation of the path with query string
func (o *OperatorListBucketsURL) String() string {
return o.Must(o.Build()).String()
}
// BuildFull builds a full url with scheme, host, path and query string
func (o *OperatorListBucketsURL) BuildFull(scheme, host string) (*url.URL, error) {
if scheme == "" {
return nil, errors.New("scheme is required for a full url on OperatorListBucketsURL")
}
if host == "" {
return nil, errors.New("host is required for a full url on OperatorListBucketsURL")
}
base, err := o.Build()
if err != nil {
return nil, err
}
base.Scheme = scheme
base.Host = host
return base, nil
}
// StringFull returns the string representation of a complete url
func (o *OperatorListBucketsURL) StringFull(scheme, host string) string {
return o.Must(o.BuildFull(scheme, host)).String()
}

93
restapi/operator_buckets.go
View File

@@ -1,93 +0,0 @@
// 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"
"time"
"github.com/go-openapi/runtime/middleware"
"github.com/minio/console/cluster"
"github.com/minio/console/models"
"github.com/minio/console/restapi/operations"
"github.com/minio/console/restapi/operations/operator_api"
)
func registerOperatorBucketsHandlers(api *operations.ConsoleAPI) {
// list buckets
api.OperatorAPIOperatorListBucketsHandler = operator_api.OperatorListBucketsHandlerFunc(func(params operator_api.OperatorListBucketsParams, session *models.Principal) middleware.Responder {
listBucketsResponse, err := getOperatorListBucketsResponse(session, params.Namespace, params.Tenant)
if err != nil {
return operator_api.NewOperatorListBucketsDefault(int(err.Code)).WithPayload(err)
}
return operator_api.NewOperatorListBucketsOK().WithPayload(listBucketsResponse)
})
}
// getListBucketsResponse performs listBuckets() and serializes it to the handler's output
func getOperatorListBucketsResponse(session *models.Principal, namespace, tenant string) (*models.ListBucketsResponse, *models.Error) {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
if err != nil {
return nil, prepareError(err)
}
clientSet, err := cluster.K8sClient(session.STSSessionToken)
if err != nil {
return nil, prepareError(err)
}
opClient := &operatorClient{
client: opClientClientSet,
}
k8sClient := &k8sClient{
client: clientSet,
}
minTenant, err := getTenant(ctx, opClient, namespace, tenant)
if err != nil {
return nil, prepareError(err)
}
minTenant.EnsureDefaults()
svcURL := GetTenantServiceURL(minTenant)
// getTenantAdminClient will use all certificates under ~/.console/certs/CAs to trust the TLS connections with MinIO tenants
mAdmin, err := getTenantAdminClient(
ctx,
k8sClient,
minTenant,
svcURL,
)
if err != nil {
return nil, prepareError(err)
}
// create a minioClient interface implementation
// defining the client to be used
adminClient := adminClient{client: mAdmin}
buckets, err := getAccountInfo(ctx, adminClient)
if err != nil {
return nil, prepareError(err)
}
// serialize output
listBucketsResponse := &models.ListBucketsResponse{
Buckets: buckets,
Total: int64(len(buckets)),
}
return listBucketsResponse, nil
}

12
restapi/user_watch.go
View File

@@ -30,8 +30,6 @@ import (
)
type watchOptions struct {
Namespace string
Tenant string
BucketName string
mc.WatchOptions
}
@@ -89,19 +87,17 @@ func getWatchOptionsFromReq(req *http.Request) (*watchOptions, error) {
// Default Events if not defined
wOptions.Events = []string{"put", "get", "delete"}
re := regexp.MustCompile(`(/watch/)(.*?)/(.*?)/(.*?)(\?.*?$|$)`)
re := regexp.MustCompile(`(/watch/)(.*?$)`)
matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
// matches comes as e.g.
// [["...", "/watch/", "namespace", "tenant", "bucket1"]]
// [["...", "/watch/", "bucket1"]]
// [["/watch/" "/watch/" ""]]
if len(matches) == 0 || len(matches[0]) < 5 {
if len(matches) == 0 || len(matches[0]) < 3 {
return nil, fmt.Errorf("invalid url: %s", req.URL.Path)
}
wOptions.Namespace = strings.TrimSpace(string(matches[0][2]))
wOptions.Tenant = strings.TrimSpace(string(matches[0][3]))
wOptions.BucketName = strings.TrimSpace(string(matches[0][4]))
wOptions.BucketName = strings.TrimSpace(string(matches[0][2]))
events := req.FormValue("events")
if strings.TrimSpace(events) != "" {

6
restapi/user_watch_test.go
View File

@@ -199,7 +199,7 @@ func TestWatch(t *testing.T) {
}
// Test-6: getWatchOptionsFromReq return parameters from path
u, err := url.Parse("http://localhost/api/v1/watch/namespace/tenantName/bucket1?prefix=&suffix=.jpg&events=put,get")
u, err := url.Parse("http://localhost/api/v1/watch/bucket1?prefix=&suffix=.jpg&events=put,get")
if err != nil {
t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
}
@@ -221,7 +221,7 @@ func TestWatch(t *testing.T) {
}
// Test-7: getWatchOptionsFromReq return default events if not defined
u, err = url.Parse("http://localhost/api/v1/watch/namespace/tenantName/bucket1?prefix=&suffix=.jpg&events=")
u, err = url.Parse("http://localhost/api/v1/watch/bucket1?prefix=&suffix=.jpg&events=")
if err != nil {
t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
}
@@ -244,7 +244,7 @@ func TestWatch(t *testing.T) {
}
// Test-8: getWatchOptionsFromReq return default events if not defined
u, err = url.Parse("http://localhost/api/v1/watch/namespace/tenantName/bucket2?prefix=&suffix=")
u, err = url.Parse("http://localhost/api/v1/watch/bucket2?prefix=&suffix=")
if err != nil {
t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
}

112
restapi/ws_handle.go
View File

@@ -22,11 +22,9 @@ import (
"net"
"net/http"
"strings"
"time"
"github.com/go-openapi/errors"
"github.com/gorilla/websocket"
"github.com/minio/console/cluster"
"github.com/minio/console/models"
"github.com/minio/console/pkg/auth"
)
@@ -121,28 +119,14 @@ func serveWS(w http.ResponseWriter, req *http.Request) {
wsPath := strings.TrimPrefix(req.URL.Path, wsBasePath)
switch {
case strings.HasPrefix(wsPath, `/trace`):
// Trace api only for operator Console
namespace, tenant, err := getTraceOptionsFromReq(req)
if err != nil {
log.Println("error getting trace options:", err)
closeWsConn(conn)
return
}
wsAdminClient, err := newWebSocketTenantAdminClient(conn, session, namespace, tenant)
wsAdminClient, err := newWebSocketAdminClient(conn, session)
if err != nil {
closeWsConn(conn)
return
}
go wsAdminClient.trace()
case strings.HasPrefix(wsPath, `/console`):
// Trace api only for operator Console
namespace, tenant, err := getConsoleLogOptionsFromReq(req)
if err != nil {
log.Println("error getting log options:", err)
closeWsConn(conn)
return
}
wsAdminClient, err := newWebSocketTenantAdminClient(conn, session, namespace, tenant)
wsAdminClient, err := newWebSocketAdminClient(conn, session)
if err != nil {
closeWsConn(conn)
return
@@ -155,7 +139,7 @@ func serveWS(w http.ResponseWriter, req *http.Request) {
closeWsConn(conn)
return
}
wsAdminClient, err := newWebSocketTenantAdminClient(conn, session, hOptions.Namespace, hOptions.Tenant)
wsAdminClient, err := newWebSocketAdminClient(conn, session)
if err != nil {
closeWsConn(conn)
return
@@ -168,7 +152,7 @@ func serveWS(w http.ResponseWriter, req *http.Request) {
closeWsConn(conn)
return
}
wsS3Client, err := newWebSocketS3Client(conn, session, wOptions.Namespace, wOptions.Tenant, wOptions.BucketName)
wsS3Client, err := newWebSocketS3Client(conn, session, wOptions.BucketName)
if err != nil {
closeWsConn(conn)
return
@@ -180,44 +164,13 @@ func serveWS(w http.ResponseWriter, req *http.Request) {
}
}
// newWebSocketTenantAdminClient creates a ws Client with a k8s tenant client
// this is to be used for a kubernetes environment and for a particular tenant
// in a defined namespace
func newWebSocketTenantAdminClient(conn *websocket.Conn, session *models.Principal, namespace, tenant string) (*wsAdminClient, error) {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
if err != nil {
return nil, err
}
clientSet, err := cluster.K8sClient(session.STSSessionToken)
if err != nil {
return nil, err
}
opClient := &operatorClient{
client: opClientClientSet,
}
k8sClient := &k8sClient{
client: clientSet,
}
minTenant, err := getTenant(ctx, opClient, namespace, tenant)
if err != nil {
return nil, err
}
minTenant.EnsureDefaults()
svcURL := GetTenantServiceURL(minTenant)
// getTenantAdminClient will use all certificates under ~/.console/certs/CAs to trust the TLS connections with MinIO tenants
mAdmin, err := getTenantAdminClient(
ctx,
k8sClient,
minTenant,
svcURL,
)
// newWebSocketAdminClient returns a wsAdminClient authenticated as an admin user
func newWebSocketAdminClient(conn *websocket.Conn, autClaims *models.Principal) (*wsAdminClient, error) {
// Only start Websocket Interaction after user has been
// authenticated with MinIO
mAdmin, err := newAdminFromClaims(autClaims)
if err != nil {
log.Println("error creating Madmin Client:", err)
return nil, err
}
// create a websocket connection interface implementation
@@ -232,53 +185,12 @@ func newWebSocketTenantAdminClient(conn *websocket.Conn, session *models.Princip
}
// newWebSocketS3Client returns a wsAdminClient authenticated as Console admin
func newWebSocketS3Client(conn *websocket.Conn, claims *models.Principal, namespace, tenant, bucketName string) (*wsS3Client, error) {
func newWebSocketS3Client(conn *websocket.Conn, claims *models.Principal, bucketName string) (*wsS3Client, error) {
// Only start Websocket Interaction after user has been
// authenticated with MinIO
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
opClientClientSet, err := cluster.OperatorClient(claims.STSSessionToken)
if err != nil {
return nil, err
}
clientSet, err := cluster.K8sClient(claims.STSSessionToken)
if err != nil {
return nil, err
}
opClient := &operatorClient{
client: opClientClientSet,
}
k8sClient := &k8sClient{
client: clientSet,
}
minTenant, err := getTenant(ctx, opClient, namespace, tenant)
if err != nil {
return nil, err
}
minTenant.EnsureDefaults()
// Get Tenant Creds and substitute session ones
tenantCreds, err := getTenantCreds(ctx, k8sClient, minTenant)
if err != nil {
return nil, err
}
tenantClaims := &models.Principal{
STSAccessKeyID: tenantCreds.accessKey,
STSSecretAccessKey: tenantCreds.secretKey,
}
svcURL := GetTenantServiceURL(minTenant)
s3Client, err := newTenantS3BucketClient(tenantClaims, svcURL, bucketName)
s3Client, err := newS3BucketClient(claims, bucketName, "")
if err != nil {
log.Println("error creating S3Client:", err)
_ = conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
_ = conn.Close()
return nil, err
}
// create a websocket connection interface implementation