Skip to content

Commit cff712f

Browse files
AlevskAlevsk
authored
rename SSL to TLS in labels, env variables and normal variables/constants (#242)
1 parent b8bca9d commit cff712f

File tree

11 files changed

+41
-41
lines changed

11 files changed

+41
-41
lines changed

‎cmd/console/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ var serverCmd = cli.Command{
4747
},
4848
cli.StringFlag{
4949
Name: "tls-host",
50-
Value: restapi.GetSSLHostname(),
50+
Value: restapi.GetTLSHostname(),
5151
Usage: "HTTPS server hostname",
5252
},
5353
cli.IntFlag{
5454
Name: "tls-port",
55-
Value: restapi.GetSSLPort(),
55+
Value: restapi.GetTLSPort(),
5656
Usage: "HTTPS server port",
5757
},
5858
cli.StringFlag{

‎k8s/console/base/minio-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ spec:
426426
externalCertSecret:
427427
description:
428428
ExternalCertSecret allows a user to specify custom
429-
CA certificate, and private key for group replication SSL.
429+
CA certificate, and private key for group replication TLS.
430430
properties:
431431
name:
432432
type: string

‎models/idp_configuration.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎portal-ui/src/screens/Console/Tenants/ListTenants/AddTenant.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const AddTenant = ({
111111
const [accessKey, setAccessKey] = useState<string>("");
112112
const [secretKey, setSecretKey] = useState<string>("");
113113
const [enableConsole, setEnableConsole] = useState<boolean>(true);
114-
const [enableSSL, setEnableSSL] = useState<boolean>(false);
114+
const [enableTLS, setEnableTLS] = useState<boolean>(false);
115115
const [sizeFactor, setSizeFactor] = useState<string>("Gi");
116116
const [storageClasses, setStorageClassesList] = useState<Opts[]>([]);
117117
const [validationErrors, setValidationErrors] = useState<any>({});
@@ -274,7 +274,7 @@ const AddTenant = ({
274274
name: tenantName,
275275
service_name: tenantName,
276276
image: imageName,
277-
enable_ssl: enableSSL,
277+
enable_tls: enableTLS,
278278
enable_console: enableConsole,
279279
access_key: accessKey,
280280
secret_key: secretKey,
@@ -750,17 +750,17 @@ const AddTenant = ({
750750
</Grid>
751751
<Grid item xs={12}>
752752
<CheckboxWrapper
753-
value="enable_ssl"
754-
id="enable_ssl"
755-
name="enable_ssl"
756-
checked={enableSSL}
753+
value="enable_tls"
754+
id="enable_tls"
755+
name="enable_tls"
756+
checked={enableTLS}
757757
onChange={(e) => {
758758
const targetD = e.target;
759759
const checked = targetD.checked;
760760

761-
setEnableSSL(checked);
761+
setEnableTLS(checked);
762762
}}
763-
label={"Enable SSL"}
763+
label={"Enable TLS"}
764764
/>
765765
</Grid>
766766
</React.Fragment>
@@ -882,9 +882,9 @@ const AddTenant = ({
882882
<React.Fragment>
883883
<TableRow>
884884
<TableCell align="right" className={classes.tableTitle}>
885-
Enable SSL
885+
Enable TLS
886886
</TableCell>
887-
<TableCell>{enableSSL ? "Enabled" : "Disabled"}</TableCell>
887+
<TableCell>{enableTLS ? "Enabled" : "Disabled"}</TableCell>
888888
</TableRow>
889889
<TableRow>
890890
<TableCell align="right" className={classes.tableTitle}>

‎restapi/admin_tenants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
420420
url := *tenantReq.Idp.ActiveDirectory.URL
421421
userNameFormat := *tenantReq.Idp.ActiveDirectory.UsernameFormat
422422
userSearchFilter := *tenantReq.Idp.ActiveDirectory.UserSearchFilter
423-
tlsSkipVerify := tenantReq.Idp.ActiveDirectory.SkipSslVerification
423+
tlsSkipVerify := tenantReq.Idp.ActiveDirectory.SkipTLSVerification
424424
serverInsecure := tenantReq.Idp.ActiveDirectory.ServerInsecure
425425
groupSearchDN := tenantReq.Idp.ActiveDirectory.GroupSearchBaseDn
426426
groupSearchFilter := tenantReq.Idp.ActiveDirectory.GroupSearchFilter

‎restapi/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func newMinioClient(claims *models.Principal) (*minio.Client, error) {
249249
// newS3BucketClient creates a new mc S3Client to talk to the server based on a bucket
250250
func newS3BucketClient(claims *models.Principal, bucketName string) (*mc.S3Client, error) {
251251
endpoint := getMinIOServer()
252-
useSSL := getMinIOEndpointIsSecure()
252+
useTLS := getMinIOEndpointIsSecure()
253253

254254
if strings.TrimSpace(bucketName) != "" {
255255
endpoint += fmt.Sprintf("/%s", bucketName)
@@ -259,7 +259,7 @@ func newS3BucketClient(claims *models.Principal, bucketName string) (*mc.S3Clien
259259
return nil, fmt.Errorf("the provided credentials are invalid")
260260
}
261261

262-
s3Config := newS3Config(endpoint, claims.AccessKeyID, claims.SecretAccessKey, claims.SessionToken, !useSSL)
262+
s3Config := newS3Config(endpoint, claims.AccessKeyID, claims.SecretAccessKey, claims.SessionToken, !useTLS)
263263
client, pErr := mc.S3New(s3Config)
264264
if pErr != nil {
265265
return nil, pErr.Cause

‎restapi/config.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ func GetPort() int {
105105
return port
106106
}
107107

108-
// GetSSLHostname gets console ssl hostname set on env variable
108+
// GetTLSHostname gets console tls hostname set on env variable
109109
// or default one
110-
func GetSSLHostname() string {
110+
func GetTLSHostname() string {
111111
return strings.ToLower(env.Get(ConsoleTLSHostname, TLSHostname))
112112
}
113113

114-
// GetSSLPort gets console ssl port set on env variable
114+
// GetTLSPort gets console tls port set on env variable
115115
// or default one
116-
func GetSSLPort() int {
116+
func GetTLSPort() int {
117117
port, err := strconv.Atoi(env.Get(ConsoleTLSPort, TLSPort))
118118
if err != nil {
119119
port = 9443
@@ -171,14 +171,14 @@ func getSecureHostsProxyHeaders() []string {
171171
return []string{}
172172
}
173173

174-
// If SSLRedirect is set to true, then only allow HTTPS requests. Default is true.
175-
func getSSLRedirect() bool {
176-
return strings.ToLower(env.Get(ConsoleSecureSSLRedirect, TLSRedirect)) == "on"
174+
// If TLSRedirect is set to true, then only allow HTTPS requests. Default is true.
175+
func getTLSRedirect() bool {
176+
return strings.ToLower(env.Get(ConsoleSecureTLSRedirect, TLSRedirect)) == "on"
177177
}
178178

179-
// SSLHost is the host name that is used to redirect HTTP requests to HTTPS. Default is "", which indicates to use the same host.
180-
func getSecureSSLHost() string {
181-
return env.Get(ConsoleSecureSSLHost, fmt.Sprintf("%s:%s", TLSHostname, TLSPort))
179+
// TLSHost is the host name that is used to redirect HTTP requests to HTTPS. Default is "", which indicates to use the same host.
180+
func getSecureTLSHost() string {
181+
return env.Get(ConsoleSecureTLSHost, fmt.Sprintf("%s:%s", TLSHostname, TLSPort))
182182
}
183183

184184
// STSSeconds is the max-age of the Strict-Transport-Security header. Default is 0, which would NOT include the header.
@@ -200,9 +200,9 @@ func getSecureSTSPreload() bool {
200200
return strings.ToLower(env.Get(ConsoleSecureSTSPreload, "off")) == "on"
201201
}
202202

203-
// If SSLTemporaryRedirect is true, the a 302 will be used while redirecting. Default is false (301).
204-
func getSecureSSLTemporaryRedirect() bool {
205-
return strings.ToLower(env.Get(ConsoleSecureSSLTemporaryRedirect, "off")) == "on"
203+
// If TLSTemporaryRedirect is true, the a 302 will be used while redirecting. Default is false (301).
204+
func getSecureTLSTemporaryRedirect() bool {
205+
return strings.ToLower(env.Get(ConsoleSecureTLSTemporaryRedirect, "off")) == "on"
206206
}
207207

208208
// STS header is only included when the connection is HTTPS.

‎restapi/configure_console.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ func setupGlobalMiddleware(handler http.Handler) http.Handler {
149149
AllowedHosts: getSecureAllowedHosts(),
150150
AllowedHostsAreRegex: getSecureAllowedHostsAreRegex(),
151151
HostsProxyHeaders: getSecureHostsProxyHeaders(),
152-
SSLRedirect: getSSLRedirect(),
153-
SSLHost: getSecureSSLHost(),
152+
SSLRedirect: getTLSRedirect(),
153+
SSLHost: getSecureTLSHost(),
154154
STSSeconds: getSecureSTSSeconds(),
155155
STSIncludeSubdomains: getSecureSTSIncludeSubdomains(),
156156
STSPreload: getSecureSTSPreload(),
157-
SSLTemporaryRedirect: getSecureSSLTemporaryRedirect(),
157+
SSLTemporaryRedirect: getSecureTLSTemporaryRedirect(),
158158
SSLHostFunc: nil,
159159
ForceSTSHeader: getSecureForceSTSHeader(),
160160
FrameDeny: getSecureFrameDeny(),

‎restapi/consts.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ const (
4141
ConsoleSecureSTSSeconds = "CONSOLE_SECURE_STS_SECONDS"
4242
ConsoleSecureSTSIncludeSubdomains = "CONSOLE_SECURE_STS_INCLUDE_SUB_DOMAINS"
4343
ConsoleSecureSTSPreload = "CONSOLE_SECURE_STS_PRELOAD"
44-
ConsoleSecureSSLRedirect = "CONSOLE_SECURE_SSL_REDIRECT"
45-
ConsoleSecureSSLHost = "CONSOLE_SECURE_SSL_HOST"
46-
ConsoleSecureSSLTemporaryRedirect = "CONSOLE_SECURE_SSL_TEMPORARY_REDIRECT"
44+
ConsoleSecureTLSRedirect = "CONSOLE_SECURE_TLS_REDIRECT"
45+
ConsoleSecureTLSHost = "CONSOLE_SECURE_TLS_HOST"
46+
ConsoleSecureTLSTemporaryRedirect = "CONSOLE_SECURE_TLS_TEMPORARY_REDIRECT"
4747
ConsoleSecureForceSTSHeader = "CONSOLE_SECURE_FORCE_STS_HEADER"
4848
ConsoleSecurePublicKey = "CONSOLE_SECURE_PUBLIC_KEY"
4949
ConsoleSecureReferrerPolicy = "CONSOLE_SECURE_REFERRER_POLICY"

‎restapi/embedded_spec.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)