Use default entryPoints when certificates are added with no entryPoints. #2534
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nmengin
added
area/tls
kind/enhancement
2 tasks
ldez
suggested changes
Dec 6, 2017
tls/tls.go
Outdated
| if len(certName) > 50 { | ||
| certName = certName[0:50] | ||
| } | ||
| log.Debugf("No entryPoint is defined to add the certificate %s, it will be added to the default entryPoints: %s", certName, strings.Join(defaultEntryPoints, ",")) |
There was a problem hiding this comment.
if log.GetLevel() >= logrus.DebugLevel {
certName := conf.Certificate.CertFile.String()
// Keep only 50 characters to generate a readable log
if len(certName) > 50 {
certName = certName[:50]
}
log.Debugf("No entryPoint is defined to add the certificate %s, it will be added to the default entryPoints: %s", certName, strings.Join(defaultEntryPoints, ","))
}
nmengin
force-pushed
the
feature/add-default-entrypoints-to-dynamic-certificates
branch
from
9e5f1c0
to
3bff3b0
Compare
ldez
suggested changes
Dec 7, 2017
tls/tls.go
Outdated
| if conf.Certificate.CertFile.Path() { | ||
| certName = conf.Certificate.CertFile.String() | ||
| } else { | ||
| certName = strings.TrimPrefix(conf.Certificate.CertFile.String(), "-----BEGIN CERTIFICATE-----\n")[:50] |
There was a problem hiding this comment.
if the CertFile content if empty or malformed, this can panicing.
juliens
requested changes
Dec 8, 2017
tls/tls.go
Outdated
| if log.GetLevel() >= logrus.DebugLevel { | ||
| certName := conf.Certificate.CertFile.String() | ||
| // Truncate certificate information only if it's a well formed certificate content with more than 50 characters | ||
| if !conf.Certificate.CertFile.Path() && strings.Index(conf.Certificate.CertFile.String(), certificateHeader) == 0 && len(conf.Certificate.CertFile.String()) > 50 { |
There was a problem hiding this comment.
HasPrefix instead of Index ?
You need to compare len with 50+len(certificateHeader)
tls/certificate.go
Outdated
| @@ -67,6 +67,12 @@ func (f FileOrContent) String() string { | |||
| return string(f) | |||
| } | |||
|
|
|||
| // Path returns true if the FileOrContent is a file path, otherwise returns false | |||
| func (f FileOrContent) Path() bool { | |||
There was a problem hiding this comment.
if it's a boolean, isPath or you must return a string with filepath if you have one ?
| @@ -435,8 +435,12 @@ func (s *Server) loadConfiguration(configMsg types.ConfigMessage) { | |||
| if err == nil { | |||
| for newServerEntryPointName, newServerEntryPoint := range newServerEntryPoints { | |||
| s.serverEntryPoints[newServerEntryPointName].httpRouter.UpdateHandler(newServerEntryPoint.httpRouter.GetHandler()) | |||
| if &newServerEntryPoint.certs != nil { | |||
| s.serverEntryPoints[newServerEntryPointName].certs.Set(newServerEntryPoint.certs.Get()) | |||
| if newServerEntryPoint.certs.Get() != nil { | |||
There was a problem hiding this comment.
It's not possible because it's a struct and not a pointer
nmengin
force-pushed
the
feature/add-default-entrypoints-to-dynamic-certificates
branch
from
995acc9
to
546c710
Compare
nmengin
force-pushed
the
feature/add-default-entrypoints-to-dynamic-certificates
branch
from
546c710
to
29b61e6
Compare
nmengin
deleted the
feature/add-default-entrypoints-to-dynamic-certificates
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
The PR allows introducing a mechanism by default for all the providers which add TLScertificates dynamically.
If no entryPoints are given, the certificates are added to all of the
defaultEntryPoints(from Træfik global configuration) wich have a TLS configuration.Motivation
This PR helps to create the certificates management from K8s secret (#2439)
More