Merge pull request #430 from berty/dev/moul/dmg

berty · Feb 4, 2022 · 0cfd767 · 0cfd767
2 parents 0e47e35 + 7a73e5f
commit 0cfd767
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/go/pkg/yolosvc/api_download.go b/go/pkg/yolosvc/api_download.go
@@ -75,6 +75,21 @@ func (svc *service) ArtifactDownloader(w http.ResponseWriter, r *http.Request) {
 		if err != nil {
 			httpError(w, err, codes.Internal)
 		}
+	case ".unsigned-dmg", ".dummy-signed-dmg":
+		// TODO: implement à-la-zsign (re)signature
+		// TODO: patch the .dmg to append some additional context
+		var (
+			cacheKey = artifact.ID
+			filename = strings.TrimSuffix(path.Base(artifact.LocalPath), ext) + ".dmg"
+			mimetype = artifact.MimeType
+			filesize = artifact.FileSize
+		)
+		err := svc.sendFileMayCache(filename, cacheKey, mimetype, filesize, w, func(w io.Writer) error {
+			return svc.artifactDownloadFromProvider(artifact, w)
+		})
+		if err != nil {
+			httpError(w, err, codes.Internal)
+		}
 	default:
 		var (
 			cacheKey = artifact.ID

diff --git a/go/pkg/yolosvc/util.go b/go/pkg/yolosvc/util.go
@@ -18,7 +18,7 @@ func artifactKindByPath(path string) yolopb.Artifact_Kind {
 	switch filepath.Ext(path) {
 	case ".ipa", ".unsigned-ipa", ".dummy-signed-ipa":
 		return yolopb.Artifact_IPA
-	case ".dmg":
+	case ".dmg", ".unsigned-dmg" , ".dummy-signed-dmg":
 		return yolopb.Artifact_DMG
 	case ".apk":
 		return yolopb.Artifact_APK
@@ -32,7 +32,7 @@ func mimetypeByPath(path string) string {
 		return "application/octet-stream"
 	case ".apk":
 		return "application/vnd.android.package-archive"
-	case ".dmg":
+	case ".dmg", ".unsigned-dmg", ".dummy-signed-dmg":
 		return "application/x-apple-diskimage"
 	case ".jar":
 		return "application/java-archive"