From bc8f82dc822ca29ba2fdc1ca2df0e6f9a34eb9cf Mon Sep 17 00:00:00 2001 From: Jesse Peterson Date: Wed, 9 Jun 2021 16:01:53 -0700 Subject: [PATCH] Fix nil pointer interface assignment (#750) --- CHANGELOG.md | 1 + cmd/micromdm/serve.go | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba1faa04..4b68eac2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - Fix SetFirmwarePassword and VerifyFirmwarePassword parameters (#743) - Command UUID can now be passed in as as a request parameter (#754) - Update to SCEP v2, switch to Mozilla PKCS7 fork, interface cleanup (#737) +- Fix panic when using DEP mdmctl commands with no DEP tokens configured (#750) ## [v1.8.0](https://github.com/micromdm/micromdm/compare/v1.7.1...v1.8.0) February, 2021 diff --git a/cmd/micromdm/serve.go b/cmd/micromdm/serve.go index b2a3193b..b90e685e 100644 --- a/cmd/micromdm/serve.go +++ b/cmd/micromdm/serve.go @@ -232,7 +232,6 @@ func serve(args []string) error { ctx := context.Background() httpLogger := log.With(logger, "transport", "http") - dc := sm.DEPClient appDB := &appsbuiltin.Repo{Path: *flRepoPath} scepEndpoints := scep.MakeServerEndpoints(sm.SCEPService) @@ -296,6 +295,10 @@ func serve(args []string) error { commandEndpoints := command.MakeServerEndpoints(sm.CommandService, basicAuthEndpointMiddleware) command.RegisterHTTPHandlers(r, commandEndpoints, options...) + var dc depapi.DEPClient + if sm.DEPClient != nil { + dc = sm.DEPClient + } depsvc := depapi.New(dc, sm.PubClient) depsvc.Run() depEndpoints := depapi.MakeServerEndpoints(depsvc, basicAuthEndpointMiddleware)