feat: added --mount-point|-m flag to ipsw mount cmd to let you pick the mount location + docs update

Author: blacktop

api/server/routes/ipsw/ipsw.go

@@ -57,6 +57,11 @@ func getFsFiles(pemDB string) gin.HandlerFunc {
 				pemDbPath = filepath.Clean(pemDB)
 			}
 		}
+		
+		mountPointParam, _ := c.GetQuery("mount_point")
+		if mountPointParam != "" {
+			mountPointParam = filepath.Clean(mountPointParam)
+		}
 
 		i, err := info.Parse(ipswPath)
 		if err != nil {
@@ -99,7 +104,7 @@ func getFsFiles(pemDB string) gin.HandlerFunc {
 
 		// mount filesystem DMG
 		utils.Indent(log.Info, 2)(fmt.Sprintf("Mounting %s", dmgPath))
-		mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
+		mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath, mountPointParam)
 		if err != nil {
 			if !errors.Is(err, utils.ErrMountResourceBusy) {
 				c.AbortWithStatusJSON(http.StatusInternalServerError, types.GenericError{Error: fmt.Sprintf("failed to mount DMG: %v", err)})

api/server/routes/mount/mount.go

@@ -50,6 +50,11 @@ func AddRoutes(rg *gin.RouterGroup, pemDB string) {
 	//         description: path to AEA pem DB JSON file
 	//         required: false
 	//         type: string
+	//       + name: mount_point
+	//         in: query
+	//         description: custom mount point path
+	//         required: false
+	//         type: string
 	//     Responses:
 	//       500: genericError
 	//       200: mountReponse
@@ -69,12 +74,18 @@ func AddRoutes(rg *gin.RouterGroup, pemDB string) {
 				pemDbPath = filepath.Clean(pemDB)
 			}
 		}
+		
+		mountPointParam, _ := c.GetQuery("mount_point")
+		if mountPointParam != "" {
+			mountPointParam = filepath.Clean(mountPointParam)
+		}
+		
 		dmgType := c.Param("type")
 		if !slices.Contains([]string{"app", "sys", "fs"}, dmgType) {
 			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "invalid dmg type: must be app, sys, or fs"})
 			return
 		}
-		ctx, err := mount.DmgInIPSW(ipswPath, dmgType, pemDbPath, nil)
+		ctx, err := mount.DmgInIPSW(ipswPath, dmgType, pemDbPath, nil, mountPointParam)
 		if err != nil {
 			if errors.Unwrap(err) == info.ErrorCryptexNotFound {
 				c.AbortWithError(http.StatusNotFound, err)

cmd/ipsw/cmd/ia.go

@@ -70,7 +70,7 @@ var iaCmd = &cobra.Command{
 		dmgPath := filepath.Join(outDir, "SharedSupport.dmg")
 
 		log.Debugf("Mounting %s", dmgPath)
-		mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
+		mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath, "")
 		if err != nil {
 			return fmt.Errorf("failed to mount DMG: %v", err)
 		}

cmd/ipsw/cmd/mdevs.go

@@ -118,7 +118,7 @@ var mdevsCmd = &cobra.Command{
 		}
 		// mount filesystem DMG
 		log.Debugf("Mounting %s", dmgPath)
-		mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
+		mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath, "")
 		if err != nil {
 			return fmt.Errorf("failed to mount DMG: %v", err)
 		}

cmd/ipsw/cmd/mount.go

@@ -45,9 +45,11 @@ func init() {
 	mountCmd.Flags().StringP("key", "k", "", "DMG key")
 	mountCmd.Flags().Bool("lookup", false, "Lookup DMG keys on theapplewiki.com")
 	mountCmd.Flags().String("pem-db", "", "AEA pem DB JSON file")
+	mountCmd.Flags().StringP("mount-point", "m", "", "Custom mount point (default: /tmp/<dmg>.mount)")
 	viper.BindPFlag("mount.key", mountCmd.Flags().Lookup("key"))
 	viper.BindPFlag("mount.lookup", mountCmd.Flags().Lookup("lookup"))
 	viper.BindPFlag("mount.pem-db", mountCmd.Flags().Lookup("pem-db"))
+	viper.BindPFlag("mount.mount-point", mountCmd.Flags().Lookup("mount-point"))
 }
 
 // mountCmd represents the mount command
@@ -69,6 +71,9 @@ var mountCmd = &cobra.Command{
 
 		# Mount dyld shared cache (exc) DMG with AEA pem DB
 		$ ipsw mount exc iPhone.ipsw --pem-db /path/to/pem.json
+
+		# Mount to a custom mount point
+		$ ipsw mount fs iPhone.ipsw --mount-point /mnt/ios-filesystem
 	`),
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 0 {
@@ -86,6 +91,7 @@ var mountCmd = &cobra.Command{
 		key := viper.GetString("mount.key")
 		lookupKeys := viper.GetBool("mount.lookup")
 		pemDB := viper.GetString("mount.pem-db")
+		mountPoint := viper.GetString("mount.mount-point")
 		// validate flags
 		if len(key) > 0 && lookupKeys {
 			return fmt.Errorf("cannot use --key AND --lookup flags together")
@@ -129,7 +135,7 @@ var mountCmd = &cobra.Command{
 			keys = key
 		}
 
-		mctx, err := mount.DmgInIPSW(args[1], args[0], pemDB, keys)
+		mctx, err := mount.DmgInIPSW(args[1], args[0], pemDB, keys, mountPoint)
 		if err != nil {
 			return fmt.Errorf("failed to mount %s DMG: %v", args[0], err)
 		}

cmd/ipsw/cmd/sb/sb_diff.go

@@ -126,7 +126,7 @@ var sbDiffCmd = &cobra.Command{
 				}
 
 				utils.Indent(log.Debug, 2)(fmt.Sprintf("Mounting FS %s", dmgPath))
-				mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
+				mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath, "")
 				if err != nil {
 					return fmt.Errorf("failed to mount DMG: %v", err)
 				}

cmd/ipsw/cmd/wp.go

@@ -59,7 +59,7 @@ var wpCmd = &cobra.Command{
 		pemDB := viper.GetString("wp.pem-db")
 		// output := viper.GetString("wp.output")
 
-		ctx, err := mount.DmgInIPSW(filepath.Clean(args[0]), "fs", pemDB, nil)
+		ctx, err := mount.DmgInIPSW(filepath.Clean(args[0]), "fs", pemDB, nil, "")
 		if err != nil {
 			return fmt.Errorf("failed to mount %s DMG: %v", args[0], err)
 		}

internal/commands/device/mount.go

@@ -182,7 +182,7 @@ func GetDDIInfo(c *DDIConfig) (info *DDIInfo, err error) {
 	if info.ManifestPath == "" {
 		// At this point we have a DMG path that needs to be mounted to find the BuildManifest.plist
 		utils.Indent(log.Info, 2)(fmt.Sprintf("Mounting %s", c.DDIDmgPath))
-		mountPoint, alreadyMounted, err := utils.MountDMG(c.DDIDmgPath)
+		mountPoint, alreadyMounted, err := utils.MountDMG(c.DDIDmgPath, "")
 		if err != nil {
 			return nil, fmt.Errorf("failed to mount %s: %w", c.DDIDmgPath, err)
 		}

internal/commands/dsc/dsc.go

@@ -765,7 +765,7 @@ func GetUserAgent(f *dyld.File, sysVer *plist.SystemVersion) (string, error) {
 }
 
 func OpenFromIPSW(ipswPath, pemDB string, driverKit, all bool) (*mount.Context, []*dyld.File, error) {
-	ctx, err := mount.DmgInIPSW(ipswPath, "sys", pemDB, nil)
+	ctx, err := mount.DmgInIPSW(ipswPath, "sys", pemDB, nil, "")
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to mount IPSW: %v", err)
 	}

internal/commands/ent/ent.go

@@ -284,7 +284,7 @@ func scanEnts(ipswPath, dmgPath, dmgType, pemDbPath string) (map[string]string,
 	}
 
 	utils.Indent(log.Debug, 2)(fmt.Sprintf("Mounting %s %s", dmgType, dmgPath))
-	mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
+	mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath, "")
 	if err != nil {
 		return nil, fmt.Errorf("failed to mount DMG: %v", err)
 	}