Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename TLSSecretFileMode to ReadWriteOnlyFileMode #6854

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Rename TLSSecretFileMode to ReadWriteOnlyFileMode #6854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a1b694
rename TLSSecretFileMode to ReadWriteOnlyFileMode
pdabelf5 Nov 22, 2024
03b1754
Merge branch 'main' into file-mode-refactor
pdabelf5 Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/nginx-ingress/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ func processDefaultServerSecret(ctx context.Context, kubeClient *kubernetes.Clie
}

bytes := configs.GenerateCertAndKeyFileContent(secret)
nginxManager.CreateSecret(configs.DefaultServerSecretFileName, bytes, nginx.TLSSecretFileMode)
nginxManager.CreateSecret(configs.DefaultServerSecretFileName, bytes, nginx.ReadWriteOnlyFileMode)
} else {
_, err := os.Stat(configs.DefaultServerSecretPath)
if err != nil {
Expand All @@ -596,7 +596,7 @@ func processWildcardSecret(ctx context.Context, kubeClient *kubernetes.Clientset
}

bytes := configs.GenerateCertAndKeyFileContent(secret)
nginxManager.CreateSecret(configs.WildcardSecretFileName, bytes, nginx.TLSSecretFileMode)
nginxManager.CreateSecret(configs.WildcardSecretFileName, bytes, nginx.ReadWriteOnlyFileMode)
}
return *wildcardTLSSecret != ""
}
Expand Down
8 changes: 4 additions & 4 deletions internal/configs/configurator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,8 +823,8 @@ func (cnf *Configurator) addOrUpdateCASecret(secret *api_v1.Secret) string {
crtData, crlData := GenerateCAFileContent(secret)
crtSecretName := fmt.Sprintf("%s-%s", name, CACrtKey)
crlSecretName := fmt.Sprintf("%s-%s", name, CACrlKey)
crtFileName := cnf.nginxManager.CreateSecret(crtSecretName, crtData, nginx.TLSSecretFileMode)
crlFileName := cnf.nginxManager.CreateSecret(crlSecretName, crlData, nginx.TLSSecretFileMode)
crtFileName := cnf.nginxManager.CreateSecret(crtSecretName, crtData, nginx.ReadWriteOnlyFileMode)
crlFileName := cnf.nginxManager.CreateSecret(crlSecretName, crlData, nginx.ReadWriteOnlyFileMode)
return fmt.Sprintf("%s %s", crtFileName, crlFileName)
}

Expand Down Expand Up @@ -919,7 +919,7 @@ func (cnf *Configurator) AddOrUpdateResources(resources ExtendedResources, reloa
func (cnf *Configurator) addOrUpdateTLSSecret(secret *api_v1.Secret) string {
name := objectMetaToFileName(&secret.ObjectMeta)
data := GenerateCertAndKeyFileContent(secret)
return cnf.nginxManager.CreateSecret(name, data, nginx.TLSSecretFileMode)
return cnf.nginxManager.CreateSecret(name, data, nginx.ReadWriteOnlyFileMode)
}

// AddOrUpdateSpecialTLSSecrets adds or updates a file with a TLS cert and a key from a Special TLS Secret (eg. DefaultServerSecret, WildcardTLSSecret).
Expand All @@ -929,7 +929,7 @@ func (cnf *Configurator) AddOrUpdateSpecialTLSSecrets(secret *api_v1.Secret, sec
data := GenerateCertAndKeyFileContent(secret)

for _, secretName := range secretNames {
cnf.nginxManager.CreateSecret(secretName, data, nginx.TLSSecretFileMode)
cnf.nginxManager.CreateSecret(secretName, data, nginx.ReadWriteOnlyFileMode)
}

if !cnf.DynamicSSLReloadEnabled() {
Expand Down
4 changes: 2 additions & 2 deletions internal/nginx/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ const (
ReloadForEndpointsUpdate = true
// ReloadForOtherUpdate means that a reload is caused by an update for a resource(s) other than endpoints.
ReloadForOtherUpdate = false
// TLSSecretFileMode defines the default filemode for files with TLS Secrets.
TLSSecretFileMode = 0o600
// ReadWriteOnlyFileMode defines the default filemode for files with Secrets.
ReadWriteOnlyFileMode = 0o600
// JWKSecretFileMode defines the default filemode for files with JWK Secrets.
JWKSecretFileMode = 0o644
// HtpasswdSecretFileMode defines the default filemode for HTTP basic auth user files.
Expand Down