diff --git a/cmd/mdmctl/apply_app.go b/cmd/mdmctl/apply_app.go index 44dd89ab..246c7059 100644 --- a/cmd/mdmctl/apply_app.go +++ b/cmd/mdmctl/apply_app.go @@ -15,7 +15,7 @@ import ( "path/filepath" "strings" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/pkg/errors" "github.com/micromdm/micromdm/mdm/appmanifest" diff --git a/cmd/mdmctl/apply_user.go b/cmd/mdmctl/apply_user.go index e67ea0e7..0366d6c5 100644 --- a/cmd/mdmctl/apply_user.go +++ b/cmd/mdmctl/apply_user.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "os" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/pkg/errors" "github.com/micromdm/micromdm/pkg/crypto/password" diff --git a/go.mod b/go.mod index 65e3a08c..009d79ce 100644 --- a/go.mod +++ b/go.mod @@ -9,10 +9,10 @@ require ( github.com/gorilla/handlers v1.5.2 github.com/gorilla/mux v1.8.1 github.com/groob/finalizer v0.0.0-20170707115354-4c2ed49aabda - github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5 - github.com/jessepeterson/cfgprofiles v0.4.0 + github.com/jessepeterson/cfgprofiles v0.4.1 github.com/korylprince/go-macos-pkg v1.4.2 github.com/micromdm/go4 v0.0.0-20240215190618-908f27575419 + github.com/micromdm/plist v0.2.0 github.com/micromdm/scep/v2 v2.2.0 github.com/pkg/errors v0.9.1 github.com/smallstep/pkcs7 v0.1.1 diff --git a/go.sum b/go.sum index 9263e2d5..61f5f6a3 100644 --- a/go.sum +++ b/go.sum @@ -200,7 +200,6 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -217,8 +216,6 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/groob/finalizer v0.0.0-20170707115354-4c2ed49aabda h1:5ikpG9mYCMFiZX0nkxoV6aU2IpCHPdws3gCNgdZeEV0= github.com/groob/finalizer v0.0.0-20170707115354-4c2ed49aabda/go.mod h1:MyndkAZd5rUMdNogn35MWXBX1UiBigrU8eTj8DoAC2c= -github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5 h1:saaSiB25B1wgaxrshQhurfPKUGJ4It3OxNJUy0rdOjU= -github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5/go.mod h1:itkABA+w2cw7x5nYUS/pLRef6ludkZKOigbROmCTaFw= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.14.0/go.mod h1:bcaw5CSZ7NE9qfOfKCI1xb7ZKjzu/MyvQkCLTfqLqxQ= @@ -260,8 +257,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jessepeterson/cfgprofiles v0.4.0 h1:jjrQafO+uKyHMiiJ1mJrkXrwECa8R9x3HHMKZAwVfoo= -github.com/jessepeterson/cfgprofiles v0.4.0/go.mod h1:RFwCi5vxmxUM0OisisiXYb/P3fMFhUa9y75JFpQZjZ8= +github.com/jessepeterson/cfgprofiles v0.4.1 h1:4/eZDgpR0hp4UoWzAziE25Q7r5D/gvRXZHIHRYn+9k0= +github.com/jessepeterson/cfgprofiles v0.4.1/go.mod h1:uYhx8ebySx/g5uFyrvGuKf9AxRNuSfnpmrg+tLNkfzo= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= @@ -310,6 +307,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/micromdm/go4 v0.0.0-20240215190618-908f27575419 h1:vIJ+N4FitO3izetK3FJTQrjF3besjgWWvQMxtSdffZI= github.com/micromdm/go4 v0.0.0-20240215190618-908f27575419/go.mod h1:uZTekMktf1ayaNK9onByUXwKleUvJNQw/cpZaNkvvRo= +github.com/micromdm/plist v0.2.0 h1:W/AuDP/0EB1xNhWvoP5qpE14oYeQSE+IaJqoeAU5SJ0= +github.com/micromdm/plist v0.2.0/go.mod h1:flkfm0od6GzyXBqI28h5sgEyi3iPO28W2t1Zm9LpwWs= github.com/micromdm/scep/v2 v2.2.0 h1:MO2vZl5dSyojC2KpN4ik3671ZjdZvM8lpxS/YukhIMs= github.com/micromdm/scep/v2 v2.2.0/go.mod h1:mEmykFaZklQfGZ1Dl9oRJOx/3fxvF2D1l+cDJokzDwk= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= diff --git a/mdm/checkin.go b/mdm/checkin.go index b2d78519..dfe35298 100644 --- a/mdm/checkin.go +++ b/mdm/checkin.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/kit/endpoint" "github.com/google/uuid" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/pkg/errors" ) diff --git a/mdm/enroll/service.go b/mdm/enroll/service.go index c2442d86..c0ee6cf8 100644 --- a/mdm/enroll/service.go +++ b/mdm/enroll/service.go @@ -13,8 +13,8 @@ import ( "github.com/micromdm/micromdm/platform/pubsub" "github.com/micromdm/scep/v2/challenge" - "github.com/groob/plist" "github.com/jessepeterson/cfgprofiles" + "github.com/micromdm/plist" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/mdm/enroll/transport_http.go b/mdm/enroll/transport_http.go index c38d29eb..14679478 100644 --- a/mdm/enroll/transport_http.go +++ b/mdm/enroll/transport_http.go @@ -10,7 +10,7 @@ import ( "github.com/micromdm/micromdm/pkg/crypto" httptransport "github.com/go-kit/kit/transport/http" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/smallstep/pkcs7" ) diff --git a/mdm/mdm/marshal_plist.go b/mdm/mdm/marshal_plist.go index 94a60f10..4c7713c0 100644 --- a/mdm/mdm/marshal_plist.go +++ b/mdm/mdm/marshal_plist.go @@ -3,7 +3,7 @@ package mdm import ( "fmt" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/pkg/errors" ) diff --git a/mdm/mdm/mdm_command_test.go b/mdm/mdm/mdm_command_test.go index 1fffce63..8fee389c 100644 --- a/mdm/mdm/mdm_command_test.go +++ b/mdm/mdm/mdm_command_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/groob/plist" + "github.com/micromdm/plist" ) /* diff --git a/mdm/server.go b/mdm/server.go index 6bdf0174..fd2127fd 100644 --- a/mdm/server.go +++ b/mdm/server.go @@ -12,8 +12,8 @@ import ( "github.com/go-kit/kit/log" httptransport "github.com/go-kit/kit/transport/http" "github.com/gorilla/mux" - "github.com/groob/plist" "github.com/micromdm/micromdm/pkg/crypto" + "github.com/micromdm/plist" "github.com/pkg/errors" "github.com/smallstep/pkcs7" ) diff --git a/pkg/crypto/mdmcertutil/certutil.go b/pkg/crypto/mdmcertutil/certutil.go index 430165e9..22fac5b9 100644 --- a/pkg/crypto/mdmcertutil/certutil.go +++ b/pkg/crypto/mdmcertutil/certutil.go @@ -17,7 +17,7 @@ import ( "net/http" "strings" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/pkg/errors" ) diff --git a/platform/appstore/builtin/appstore.go b/platform/appstore/builtin/appstore.go index a7de159e..cedb9499 100644 --- a/platform/appstore/builtin/appstore.go +++ b/platform/appstore/builtin/appstore.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/pkg/errors" "github.com/micromdm/micromdm/mdm/appmanifest" diff --git a/platform/appstore/get_apps.go b/platform/appstore/get_apps.go index b42b9419..ddf11339 100644 --- a/platform/appstore/get_apps.go +++ b/platform/appstore/get_apps.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/go-kit/kit/endpoint" - "github.com/groob/plist" "github.com/micromdm/micromdm/pkg/httputil" + "github.com/micromdm/plist" "github.com/pkg/errors" ) diff --git a/platform/command/new_command.go b/platform/command/new_command.go index 26e68626..5461f0c9 100644 --- a/platform/command/new_command.go +++ b/platform/command/new_command.go @@ -8,7 +8,7 @@ import ( "github.com/go-kit/kit/endpoint" "github.com/gorilla/mux" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/pkg/errors" "golang.org/x/net/context" diff --git a/platform/profile/profile.go b/platform/profile/profile.go index 63efc2c4..5f50c16b 100644 --- a/platform/profile/profile.go +++ b/platform/profile/profile.go @@ -3,7 +3,7 @@ package profile import ( "github.com/micromdm/micromdm/platform/profile/internal/profileproto" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/pkg/errors" "github.com/smallstep/pkcs7" "google.golang.org/protobuf/proto" diff --git a/platform/queue/inmem/inmem.go b/platform/queue/inmem/inmem.go index 090deb2a..2ff5e170 100644 --- a/platform/queue/inmem/inmem.go +++ b/platform/queue/inmem/inmem.go @@ -11,7 +11,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/groob/plist" + "github.com/micromdm/plist" ) // QueueInMem represents an in-memory command queue diff --git a/platform/queue/queue.go b/platform/queue/queue.go index 8f61f86a..b47d79ff 100644 --- a/platform/queue/queue.go +++ b/platform/queue/queue.go @@ -9,7 +9,7 @@ import ( "github.com/boltdb/bolt" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/groob/plist" + "github.com/micromdm/plist" "github.com/pkg/errors" "github.com/micromdm/micromdm/mdm"