From 45e9d943dfbca8fadd011ebb66fee9fb3ad9cc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 22 Jul 2020 12:46:42 +0200 Subject: [PATCH] prevent segfault in create home middleware MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/fix-createhome-segfault.md | 5 +++++ pkg/middleware/create_home.go | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/fix-createhome-segfault.md diff --git a/changelog/unreleased/fix-createhome-segfault.md b/changelog/unreleased/fix-createhome-segfault.md new file mode 100644 index 0000000..46623fe --- /dev/null +++ b/changelog/unreleased/fix-createhome-segfault.md @@ -0,0 +1,5 @@ +Bugfix: Provide token configuration from config + +Fixed a bug that causes the createHome middleware to crash if the createHome response has no Status set + +https://github.com/owncloud/ocis-proxy/pull/76 diff --git a/pkg/middleware/create_home.go b/pkg/middleware/create_home.go index e282543..b67ca77 100644 --- a/pkg/middleware/create_home.go +++ b/pkg/middleware/create_home.go @@ -66,11 +66,9 @@ func CreateHome(opts ...Option) func(next http.Handler) http.Handler { if err != nil { opt.Logger.Err(err).Msg("error calling CreateHome") - } - - if createHomeRes.Status.Code != rpc.Code_CODE_OK { + } else if createHomeRes.Status.Code != rpc.Code_CODE_OK { err := status.NewErrorFromCode(createHomeRes.Status.Code, "gateway") - opt.Logger.Err(err).Msg("error calling Createhome") + opt.Logger.Err(err).Msg("error when calling Createhome") } next.ServeHTTP(w, r)