Add multiple certs support, close #31 #48
Merged
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
xxx7xxxx
reviewed
Jun 18, 2021
pkg/object/httpserver/spec.go
Outdated
| if spec.KeyBase64 == "" { | ||
| return fmt.Errorf("keyBase64 is empty when https enabled") | ||
| if spec.CertBase64 == "" && spec.KeyBase64 == "" && spec.Certs == nil && spec.Keys == nil { | ||
| return fmt.Errorf("certBase64, keyBase64, certs, keys can't be both empty when https enabled") |
There was a problem hiding this comment.
We give the direct failure reason instead of xxx can't yyy.
Propose certBase64/keyBase64, certs/keys are both empty when https enabled
pkg/object/httpserver/spec.go
Outdated
| } | ||
| certificates = append(certificates, cert) | ||
| } else { | ||
| logger.Warnf("certs %s hasn't secret corresponded to it", k) |
There was a problem hiding this comment.
IMO, make it strict, just return error.
xxx7xxxx
approved these changes
Jun 18, 2021
benja-wu
reviewed
Jun 18, 2021
pkg/object/httpserver/spec.go
Outdated
| KeyBase64 string `yaml:"keyBase64" jsonschema:"omitempty,format=base64"` | ||
|
|
||
| // Certs saved as map, key is domain name, value is cert | ||
| Certs map[string]string `yaml:"certs" jonschema:"omitempty"` |
There was a problem hiding this comment.
jonschema should be jsonschema.
There was a problem hiding this comment.
Good catch! Updated.
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.
Support multiple certs configuration
YAML support breaking a string in multiple lines natively [1], I think that wrapping certs/keys content with base64 is redundant. So it's just good with raw contents for these.
Configuration items of
certsBase64andkeysBase64are preserved for backward compatibleAdd
certsandkeysfor multiple certs configuration.Configurations look like:
The change has been verified by [2][3]
[1] https://yaml-multiline.info/
[2] https://dev.megaease.cn/megacloud/app/
[3] https://api.dev.megaease.cn/megacloud/app/