agecem/bottin
5
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Permettre d'exposer le serveur API par https #54

Merged
vlbeaudoin merged 3 commits from vlbeaudoin/feature/tls-api into main 2024-09-03 14:29:12 -04:00 AGit
Conversation 0 Commits 3 Files changed 3 +45
1 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 150782c42f - Show all commits

45
config.go
View file

@ -11,6 +11,21 @@ import (
) )
const ( const (
ViperAPITLSEnabled string = "api.tls.enabled"
FlagAPITLSEnabled string = "api-tls-enabled"
DefaultAPITLSEnabled bool = false
DescriptionAPITLSEnabled string = "Whether to use TLS or not. Requires certificate and private key files."
ViperAPITLSCertificateFile string = "api.tls.certificate_file"
FlagAPITLSCertificateFile string = "api-tls-certificate-file"
DefaultAPITLSCertificateFile string = ""
DescriptionAPITLSCertificateFile string = "Path to TLS certificate file"
ViperAPITLSPrivateKeyFile string = "api.tls.private_key_file"
FlagAPITLSPrivateKeyFile string = "api-tls-private-key-file"
DefaultAPITLSPrivateKeyFile string = ""
DescriptionAPITLSPrivateKeyFile string = "Path to TLS private key file"
ViperAPIPort string = "api.port" ViperAPIPort string = "api.port"
FlagAPIPort string = "api-port" FlagAPIPort string = "api-port"
DefaultAPIPort int = 1312 DefaultAPIPort int = 1312
@ -89,6 +104,15 @@ const (
type Config struct { type Config struct {
API struct { API struct {
TLS struct {
Enabled bool `yaml:"enabled"`
// Path to file containing TLS certificate
CertificateFile string `yaml:"certificate_file"`
// Path to file containing TLS private key
PrivateKeyFile string `yaml:"private_key_file"`
}
Port int `yaml:"port"` Port int `yaml:"port"`
Key string `yaml:"key"` Key string `yaml:"key"`
} `yaml:"api"` } `yaml:"api"`
@ -116,6 +140,9 @@ type Config struct {
// DefaultConfig returns a Config filled with the default values from the // DefaultConfig returns a Config filled with the default values from the
// `Default*` constants defined in this file. // `Default*` constants defined in this file.
func DefaultConfig() (cfg Config) { func DefaultConfig() (cfg Config) {
cfg.API.TLS.Enabled = DefaultAPITLSEnabled
cfg.API.TLS.CertificateFile = DefaultAPITLSCertificateFile
cfg.API.TLS.PrivateKeyFile = DefaultAPITLSPrivateKeyFile
cfg.API.Port = DefaultAPIPort cfg.API.Port = DefaultAPIPort
cfg.API.Key = DefaultAPIKey cfg.API.Key = DefaultAPIKey
cfg.DB.Database = DefaultDBDatabase cfg.DB.Database = DefaultDBDatabase
@ -145,6 +172,24 @@ func init() {
rootCmd.AddCommand(apiCmd) rootCmd.AddCommand(apiCmd)
// api.tls.enabled
apiCmd.Flags().Bool(FlagAPITLSEnabled, DefaultAPITLSEnabled, DescriptionAPITLSEnabled)
if err := viper.BindPFlag(ViperAPITLSEnabled, apiCmd.Flags().Lookup(FlagAPITLSEnabled)); err != nil {
log.Fatal(err)
}
// api.tls.certificate_file
apiCmd.Flags().String(FlagAPITLSCertificateFile, DefaultAPITLSCertificateFile, DescriptionAPITLSCertificateFile)
if err := viper.BindPFlag(ViperAPITLSCertificateFile, apiCmd.Flags().Lookup(FlagAPITLSCertificateFile)); err != nil {
log.Fatal(err)
}
// api.tls.private_key_file
apiCmd.Flags().String(FlagAPITLSPrivateKeyFile, DefaultAPITLSPrivateKeyFile, DescriptionAPITLSPrivateKeyFile)
if err := viper.BindPFlag(ViperAPITLSPrivateKeyFile, apiCmd.Flags().Lookup(FlagAPITLSPrivateKeyFile)); err != nil {
log.Fatal(err)
}
// api.key // api.key
apiCmd.Flags().String(FlagAPIKey, DefaultAPIKey, DescriptionAPIKey) apiCmd.Flags().String(FlagAPIKey, DefaultAPIKey, DescriptionAPIKey)
if err := viper.BindPFlag(ViperAPIKey, apiCmd.Flags().Lookup(FlagAPIKey)); err != nil { if err := viper.BindPFlag(ViperAPIKey, apiCmd.Flags().Lookup(FlagAPIKey)); err != nil {