ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-11 20:45:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Guard against errors due to DEP token bucket not existing yet (#146)

Browse Source
This commit is contained in:
Jesse Peterson
2017-04-26 09:25:14 -07:00
committed by GitHub
parent ad22a7a932
commit 93a8b481e0
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/list/service.go
View File

@@ -58,7 +58,11 @@ const (
func GetDEPTokens(db *bolt.DB) ([]DEPToken, error) {
var result []DEPToken
err := db.View(func(tx *bolt.Tx) error {
c := tx.Bucket([]byte(depTokenBucket)).Cursor()
b := tx.Bucket([]byte(depTokenBucket))
if b == nil {
return nil
}
c := b.Cursor()
prefix := []byte("CK_")
for k, v := c.Seek(prefix); k != nil && bytes.HasPrefix(k, prefix); k, v = c.Next() {
@@ -86,8 +90,11 @@ func generateAndStoreDEPKeypair(db *bolt.DB) (key *rsa.PrivateKey, cert *x509.Ce
certBytes := cert.Raw
err = db.Update(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte(depTokenBucket))
err := b.Put([]byte("key"), pkBytes)
b, err := tx.CreateBucketIfNotExists([]byte(depTokenBucket))
if err != nil {
return err
}
err = b.Put([]byte("key"), pkBytes)
if err != nil {
return err
}
@@ -106,6 +113,9 @@ func GetDEPKeypair(db *bolt.DB) (key *rsa.PrivateKey, cert *x509.Certificate, er
var keyBytes, certBytes []byte
err = db.View(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte(depTokenBucket))
if b == nil {
return nil
}
keyBytes = b.Get([]byte("key"))
certBytes = b.Get([]byte("certificate"))
return nil