From 852c7c50c0af9bc118d06bbf4bc99c8d994ed81b Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Thu, 17 Feb 2022 19:18:46 +0100 Subject: [PATCH] Fix IDPManagement initialization when no config (#234) * initialize idpmanage only if config was set * removed LetsEncryption information for local selfhosted deployments --- go.sum | 2 -- infrastructure_files/management.json.tmpl | 3 --- management/cmd/management.go | 11 ++++++++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.sum b/go.sum index 05dd1a827..8399fb3aa 100644 --- a/go.sum +++ b/go.sum @@ -469,8 +469,6 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= diff --git a/infrastructure_files/management.json.tmpl b/infrastructure_files/management.json.tmpl index b55d57497..f26fbdd66 100644 --- a/infrastructure_files/management.json.tmpl +++ b/infrastructure_files/management.json.tmpl @@ -28,9 +28,6 @@ }, "Datadir": "", "HttpConfig": { - "LetsEncryptDomain": "", - "CertFile":"/etc/letsencrypt/live/$WIRETRUSTEE_DOMAIN/fullchain.pem", - "CertKey":"/etc/letsencrypt/live/$WIRETRUSTEE_DOMAIN/privkey.pem", "Address": "0.0.0.0:33071", "AuthIssuer": "https://$WIRETRUSTEE_AUTH0_DOMAIN/", "AuthAudience": "$WIRETRUSTEE_AUTH0_AUDIENCE", diff --git a/management/cmd/management.go b/management/cmd/management.go index cc8dcc6fe..b490ec369 100644 --- a/management/cmd/management.go +++ b/management/cmd/management.go @@ -69,10 +69,15 @@ var ( log.Fatalf("failed creating a store: %s: %v", config.Datadir, err) } peersUpdateManager := server.NewPeersUpdateManager() - idpManager, err := idp.NewManager(*config.IdpManagerConfig) - if err != nil { - log.Fatalln("failed retrieving a new idp manager with err: ", err) + + var idpManager idp.Manager + if config.IdpManagerConfig != nil { + idpManager, err = idp.NewManager(*config.IdpManagerConfig) + if err != nil { + log.Fatalln("failed retrieving a new idp manager with err: ", err) + } } + accountManager := server.NewManager(store, peersUpdateManager, idpManager) var opts []grpc.ServerOption