mirror of
https://github.com/pgsty/minio.git
synced 2026-08-09 07:43:29 +03:00
77bdc4c0cd
Two coupled changes that must land together, because the same files carry both: the server now identifies itself as Silo, and every path that would have called home to a MinIO-operated service is closed. Product identity - build-constants.go: store name, UA name and startup banner become Silo. The Go identifiers (MinioStoreName, MinioBannerName, ...) keep their names on purpose - renaming exported symbols would churn the compatibility surface for a cosmetic gain, and the rebrand guard freezes that surface. - main.go, server-startup-msg.go, ftp-server.go and the user-visible log, help and error strings across cmd/ and internal/ switch to Silo. Original MinIO copyright, LICENSE, NOTICE and CREDITS are untouched; --version now prints the upstream copyright, the pgsty modification notice, and the trademark policy's approved "based on MinIO technology" attribution. - api-headers.go: the HTTP Server header becomes "Silo". This is the one externally observable identity change, so TestCommonHeadersUseSiloProductName pins it - probes that sniff for "MinIO" must move to capability detection. - Prometheus metric HELP strings keep their MinIO wording. They are part of the metrics contract the guard protects, not product copy. Configuration directory - config-dir.go: new installs use ~/.silo. If only ~/.minio exists it is still read, with a one-time notice and no files moved. If both exist ~/.silo wins and an ambiguity warning is emitted; an explicit --config-dir always wins. Covered by TestSelectDefaultConfigDir. The internal .minio.sys layout is never renamed - this rule applies to the user config directory only. Upstream service lockdown - globalInplaceUpdateDisabled is now true at initialization rather than being set from MINIO_UPDATE. common-main.go still parses MINIO_UPDATE so upgrading nodes do not fail on an unknown key, but warns that the value is ignored; there is no way to re-enable the updater. TestInplaceUpdateCannotBeEnabled guards that. Without this, an admin with mc could have overwritten /usr/bin/silo with an upstream MinIO binary. - verifyBinary and commitBinary refuse early; the ServerUpdate v1/v2 admin routes and the peer-rest update endpoints stay registered and keep returning the existing programmatic error, so clients see a stable failure rather than a 404. - MinioReleaseBaseURL and defaultMinisignPubkey are emptied: no dl.min.io download root, and upstream's minisign key is no longer a trust root for anything this fork ships. - cmd/callhome.go is deleted and internal/config/subnet/ is reduced to parsing its old keys and reporting that the integration is disabled. config-current.go warns instead of failing when callhome or SUBNET settings are present, so an upgraded node with those keys still starts. - internal/config/errors.go replaces the MinIO Slack and support entry points with Silo documentation and issue links. Error codes and programmatic fields are unchanged. Verified: the compatibility baseline is unchanged except for the deliberate removal of the /api/health/upload SUBNET route; go build, go vet and the full cmd/ and internal/ unit suites pass; a locally built binary starts, serves S3/Admin/metrics on the unchanged /minio/* routes, answers with Server: Silo, and falls back to a pre-existing ~/.minio with the expected notice. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
139 lines
3.8 KiB
Go
139 lines
3.8 KiB
Go
// Copyright (c) 2015-2021 MinIO, Inc.
|
|
//
|
|
// This file is part of MinIO Object Storage stack
|
|
//
|
|
// 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 subnet
|
|
|
|
import (
|
|
"net/http"
|
|
"net/url"
|
|
"os"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/minio/minio/internal/config"
|
|
"github.com/minio/pkg/v3/env"
|
|
xnet "github.com/minio/pkg/v3/net"
|
|
)
|
|
|
|
// DefaultKVS - default KV config for subnet settings
|
|
var DefaultKVS = config.KVS{
|
|
config.KV{
|
|
Key: config.License, // Deprecated Dec 2021
|
|
Value: "",
|
|
},
|
|
config.KV{
|
|
Key: config.APIKey,
|
|
Value: "",
|
|
},
|
|
config.KV{
|
|
Key: config.Proxy,
|
|
Value: "",
|
|
},
|
|
}
|
|
|
|
// Config represents the subnet related configuration
|
|
type Config struct {
|
|
// The subnet license token - Deprecated Dec 2021
|
|
License string `json:"license"`
|
|
|
|
// The subnet api key
|
|
APIKey string `json:"apiKey"`
|
|
|
|
// The HTTP(S) proxy URL to use for connecting to SUBNET
|
|
Proxy string `json:"proxy"`
|
|
|
|
// Transport configured with proxy_url if set optionally.
|
|
transport http.RoundTripper
|
|
|
|
// The subnet base URL
|
|
BaseURL string
|
|
}
|
|
|
|
var configLock sync.RWMutex
|
|
|
|
// Registered reports false because Silo does not use MinIO SUBNET. The
|
|
// inherited credentials remain parseable for configuration compatibility.
|
|
func (c *Config) Registered() bool {
|
|
return false
|
|
}
|
|
|
|
// ApplyEnv - applies the current subnet config to Console UI specific environment variables.
|
|
func (c *Config) ApplyEnv() {
|
|
// Do not expose inherited commercial-service credentials or an endpoint to
|
|
// the embedded Console. These names are outputs, not the MINIO_* input
|
|
// compatibility surface.
|
|
os.Unsetenv("CONSOLE_SUBNET_LICENSE")
|
|
os.Unsetenv("CONSOLE_SUBNET_API_KEY")
|
|
os.Unsetenv("CONSOLE_SUBNET_PROXY")
|
|
os.Unsetenv("CONSOLE_SUBNET_URL")
|
|
}
|
|
|
|
// Update - in-place update with new license and registration information.
|
|
func (c *Config) Update(ncfg Config, isDevEnv bool) {
|
|
configLock.Lock()
|
|
defer configLock.Unlock()
|
|
|
|
c.License = ncfg.License
|
|
c.APIKey = ncfg.APIKey
|
|
c.Proxy = ncfg.Proxy
|
|
c.transport = nil
|
|
c.BaseURL = ""
|
|
|
|
// Retain the hidden compatibility input but deliberately ignore its value.
|
|
_ = os.Getenv("_MINIO_SUBNET_URL")
|
|
_ = isDevEnv
|
|
}
|
|
|
|
// LookupConfig - lookup config and override with valid environment settings if any.
|
|
func LookupConfig(kvs config.KVS, transport http.RoundTripper) (cfg Config, err error) {
|
|
if err = config.CheckValidKeys(config.SubnetSubSys, kvs, DefaultKVS); err != nil {
|
|
return cfg, err
|
|
}
|
|
|
|
var proxyURL *xnet.URL
|
|
proxy := env.Get(config.EnvMinIOSubnetProxy, kvs.Get(config.Proxy))
|
|
if len(proxy) > 0 {
|
|
proxyURL, err = xnet.ParseHTTPURL(proxy)
|
|
if err != nil {
|
|
return cfg, err
|
|
}
|
|
}
|
|
|
|
cfg.License = strings.TrimSpace(env.Get(config.EnvMinIOSubnetLicense, kvs.Get(config.License)))
|
|
cfg.APIKey = strings.TrimSpace(env.Get(config.EnvMinIOSubnetAPIKey, kvs.Get(config.APIKey)))
|
|
cfg.Proxy = proxy
|
|
|
|
if transport == nil {
|
|
// when transport is nil, it means we are just validating the
|
|
// inputs not performing any network calls.
|
|
return cfg, nil
|
|
}
|
|
|
|
// Make sure to clone the transport before editing the ProxyURL
|
|
if proxyURL != nil {
|
|
if tr, ok := transport.(*http.Transport); ok {
|
|
ctransport := tr.Clone()
|
|
ctransport.Proxy = http.ProxyURL((*url.URL)(proxyURL))
|
|
cfg.transport = ctransport
|
|
}
|
|
} else {
|
|
cfg.transport = transport
|
|
}
|
|
|
|
return cfg, nil
|
|
}
|