ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-06 17:53:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

correctly encode the pkgurl in the manifest (#287)

Browse Source 
Closes #286
This commit is contained in:
Victor Vrantchan
2017-10-30 18:04:08 -04:00
committed by GitHub
parent 382b3d0cec
commit 3f0238719c
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/mdmctl/apply_app.go
View File

@@ -169,7 +169,10 @@ func (cmd *applyCommand) serverRepoURL() (string, error) {
}
func pkgURL(repoURL, pkgPath string) string {
return path.Join(repoURL, filepath.Base(pkgPath))
u, _ := url.Parse(repoURL)
newPath := path.Join(u.Path, filepath.Base(pkgPath))
u.Path = newPath
return u.String()
}
func repoURL(server string) (string, error) {

15
cmd/mdmctl/apply_app_test.go Normal file
View File

@@ -0,0 +1,15 @@
package main
import (
"testing"
)
func TestPkgURL(t *testing.T) {
baseURL := "https://mdm.acme.co/repo"
pkgPath := "/Users/user/Desktop/dep_pkg-foo_1.1.pkg"
u := pkgURL(baseURL, pkgPath)
if have, want := u, "https://mdm.acme.co/repo/dep_pkg-foo_1.1.pkg"; have != want {
t.Errorf("have %s, want %s", have, want)
}
}