diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go index 8a882a1f1..4eaef2952 100644 --- a/cmd/admin-handlers.go +++ b/cmd/admin-handlers.go @@ -1847,6 +1847,7 @@ func (a adminAPIHandlers) HealthInfoHandler(w http.ResponseWriter, r *http.Reque }, }) } + healthInfo.Minio.Info = madmin.MinioInfo{ Mode: infoMessage.Mode, Domain: infoMessage.Domain, @@ -1859,6 +1860,7 @@ func (a adminAPIHandlers) HealthInfoHandler(w http.ResponseWriter, r *http.Reque Services: infoMessage.Services, Backend: infoMessage.Backend, Servers: servers, + TLS: getTLSInfo(), } partialWrite(healthInfo) } @@ -1888,6 +1890,25 @@ func (a adminAPIHandlers) HealthInfoHandler(w http.ResponseWriter, r *http.Reque } +func getTLSInfo() madmin.TLSInfo { + tlsInfo := madmin.TLSInfo{ + TLSEnabled: globalIsTLS, + Certs: []madmin.TLSCert{}, + } + + if globalIsTLS { + for _, c := range globalPublicCerts { + tlsInfo.Certs = append(tlsInfo.Certs, madmin.TLSCert{ + PubKeyAlgo: c.PublicKeyAlgorithm.String(), + SignatureAlgo: c.SignatureAlgorithm.String(), + NotBefore: c.NotBefore, + NotAfter: c.NotAfter, + }) + } + } + return tlsInfo +} + // BandwidthMonitorHandler - GET /minio/admin/v3/bandwidth // ---------- // Get bandwidth consumption information diff --git a/go.mod b/go.mod index 7e60ef9c5..566955119 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/minio/csvparser v1.0.0 github.com/minio/highwayhash v1.0.2 github.com/minio/kes v0.14.0 - github.com/minio/madmin-go v1.1.7 + github.com/minio/madmin-go v1.1.10 github.com/minio/minio-go/v7 v7.0.15 github.com/minio/parquet-go v1.0.0 github.com/minio/pkg v1.1.5 diff --git a/go.sum b/go.sum index aface8ae0..df6427fa1 100644 --- a/go.sum +++ b/go.sum @@ -1022,8 +1022,8 @@ github.com/minio/kes v0.14.0 h1:plCGm4LwR++T1P1sXsJbyFRX54CE1WRuo9PAPj6MC3Q= github.com/minio/kes v0.14.0/go.mod h1:OUensXz2BpgMfiogslKxv7Anyx/wj+6bFC6qA7BQcfA= github.com/minio/madmin-go v1.0.12/go.mod h1:BK+z4XRx7Y1v8SFWXsuLNqQqnq5BO/axJ8IDJfgyvfs= github.com/minio/madmin-go v1.1.6/go.mod h1:vw+c3/u+DeVKqReEavo///Cl2OO8nt5s4ee843hJeLs= -github.com/minio/madmin-go v1.1.7 h1:vZCnIfPlb40sBap+bmwvxG4/dSfkwF8QCRUHZL16Ylg= -github.com/minio/madmin-go v1.1.7/go.mod h1:Iu0OnrMWNBYx1lqJTW+BFjBMx0Hi0wjw8VmqhiOs2Jo= +github.com/minio/madmin-go v1.1.10 h1:pfMgXkzdwADnNfVdNMJbwok2fjb2sJ7Q76kDt89RGzE= +github.com/minio/madmin-go v1.1.10/go.mod h1:Iu0OnrMWNBYx1lqJTW+BFjBMx0Hi0wjw8VmqhiOs2Jo= github.com/minio/mc v0.0.0-20210626002108-cebf3318546f h1:hyFvo5hSFw2K417YvDr/vAKlgCG69uTuhZW/5LNdL0U= github.com/minio/mc v0.0.0-20210626002108-cebf3318546f/go.mod h1:tuaonkPjVApCXkbtKENHBtsqUf7YTV33qmFrC+Pgp5g= github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=