github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(server):support disable https only ee-2068 (#6232) 

* fix/ee-2068/disable-forcely-https
pull/6279/head
sunportainer 2021-12-14 08:40:44 +08:00 committed by GitHub
parent da422d6ed6
commit 7088da5157
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/cli/cli.go
View File

@ -45,6 +45,7 @@ func (*Service) ParseFlags(version string) (*portainer.CLIFlags, error) {
TLSCert: kingpin.Flag("tlscert", "Path to the TLS certificate file").Default(defaultTLSCertPath).String(), TLSCert: kingpin.Flag("tlscert", "Path to the TLS certificate file").Default(defaultTLSCertPath).String(),
TLSKey: kingpin.Flag("tlskey", "Path to the TLS key").Default(defaultTLSKeyPath).String(), TLSKey: kingpin.Flag("tlskey", "Path to the TLS key").Default(defaultTLSKeyPath).String(),
HTTPDisabled: kingpin.Flag("http-disabled", "Serve portainer only on https").Default(defaultHTTPDisabled).Bool(), HTTPDisabled: kingpin.Flag("http-disabled", "Serve portainer only on https").Default(defaultHTTPDisabled).Bool(),
HTTPEnabled: kingpin.Flag("http-enabled", "Serve portainer on http").Default(defaultHTTPEnabled).Bool(),
SSL: kingpin.Flag("ssl", "Secure Portainer instance using SSL (deprecated)").Default(defaultSSL).Bool(), SSL: kingpin.Flag("ssl", "Secure Portainer instance using SSL (deprecated)").Default(defaultSSL).Bool(),
SSLCert: kingpin.Flag("sslcert", "Path to the SSL certificate used to secure the Portainer instance").String(), SSLCert: kingpin.Flag("sslcert", "Path to the SSL certificate used to secure the Portainer instance").String(),
SSLKey: kingpin.Flag("sslkey", "Path to the SSL key used to secure the Portainer instance").String(), SSLKey: kingpin.Flag("sslkey", "Path to the SSL key used to secure the Portainer instance").String(),

1
api/cli/defaults.go
View File

@ -15,6 +15,7 @@ const (
defaultTLSCertPath = "/certs/cert.pem" defaultTLSCertPath = "/certs/cert.pem"
defaultTLSKeyPath = "/certs/key.pem" defaultTLSKeyPath = "/certs/key.pem"
defaultHTTPDisabled = "false" defaultHTTPDisabled = "false"
defaultHTTPEnabled = "false"
defaultSSL = "false" defaultSSL = "false"
defaultSSLCertPath = "/certs/portainer.crt" defaultSSLCertPath = "/certs/portainer.crt"
defaultSSLKeyPath = "/certs/portainer.key" defaultSSLKeyPath = "/certs/portainer.key"

1
api/cli/defaults_windows.go
View File

@ -13,6 +13,7 @@ const (
defaultTLSCertPath = "C:\\certs\\cert.pem" defaultTLSCertPath = "C:\\certs\\cert.pem"
defaultTLSKeyPath = "C:\\certs\\key.pem" defaultTLSKeyPath = "C:\\certs\\key.pem"
defaultHTTPDisabled = "false" defaultHTTPDisabled = "false"
defaultHTTPEnabled = "false"
defaultSSL = "false" defaultSSL = "false"
defaultSSLCertPath = "C:\\certs\\portainer.crt" defaultSSLCertPath = "C:\\certs\\portainer.crt"
defaultSSLKeyPath = "C:\\certs\\portainer.key" defaultSSLKeyPath = "C:\\certs\\portainer.key"

10
api/cmd/portainer/main.go
View File

@ -234,14 +234,16 @@ func updateSettingsFromFlags(dataStore portainer.DataStore, flags *portainer.CLI
return err return err
} }
httpEnabled := !*flags.HTTPDisabled
sslSettings, err := dataStore.SSLSettings().Settings() sslSettings, err := dataStore.SSLSettings().Settings()
if err != nil { if err != nil {
return err return err
} }
sslSettings.HTTPEnabled = httpEnabled if *flags.HTTPDisabled {
sslSettings.HTTPEnabled = false
} else {
sslSettings.HTTPEnabled = *flags.HTTPEnabled || sslSettings.HTTPEnabled
}
err = dataStore.SSLSettings().UpdateSettings(sslSettings) err = dataStore.SSLSettings().UpdateSettings(sslSettings)
if err != nil { if err != nil {
@ -551,12 +553,10 @@ func buildServer(flags *portainer.CLIFlags) portainer.Server {
log.Fatalf("failed initializing helm package manager: %s", err) log.Fatalf("failed initializing helm package manager: %s", err)
} }
if dataStore.IsNew() {
err = updateSettingsFromFlags(dataStore, flags) err = updateSettingsFromFlags(dataStore, flags)
if err != nil { if err != nil {
log.Fatalf("failed updating settings from flags: %v", err) log.Fatalf("failed updating settings from flags: %v", err)
} }
}
err = edge.LoadEdgeJobs(dataStore, reverseTunnelService) err = edge.LoadEdgeJobs(dataStore, reverseTunnelService)
if err != nil { if err != nil {

1
api/portainer.go
View File

@ -90,6 +90,7 @@ type (
TLSCert *string TLSCert *string
TLSKey *string TLSKey *string
HTTPDisabled *bool HTTPDisabled *bool
HTTPEnabled *bool
SSL *bool SSL *bool
SSLCert *string SSLCert *string
SSLKey *string SSLKey *string