Add support for mounting folders from iOS #543

NoahPeeters · 2019-10-26T14:02:07Z

Adds a button to the bar to mount any folder from a FileProvider into ish as described in #230.

Not all FileProvider support giving read/write access to a folder. Those aren't available.

Working FileProviders:

On My iPad/iPhone
iCloud Drive
Working Copy
SMB servers

FileProviders which do not work

GoogleDrive
ish itself
OneDrive

tbodt · 2019-10-26T15:58:54Z

Thanks! There are a few things missing, such as file coordination.

tbodt · 2019-10-26T16:03:27Z

app/ExternalFolder.m

+    return fs;
+}
+
+const struct fs_ops *externalfs = nil;


Can you create this statically to avoid having to call something to create it?

tbodt · 2019-10-26T16:04:35Z

app/ExternalFolder.m

+    NSURL *url = urlForMount(mount);
+    if ([url startAccessingSecurityScopedResource] == NO) {
+        CFBridgingRelease(mount->data);
+        return errno_map();


startAccessingSecurityScopedResource doesn't set errno so this will return garbage

tbodt · 2019-10-26T16:06:02Z

fs/mount.c

@@ -37,15 +37,15 @@ void mount_release(struct mount *mount) {
    unlock(&mounts_lock);
 }

-int do_mount(const struct fs_ops *fs, const char *source, const char *point, int flags) {
+int do_mount_with_data(const struct fs_ops *fs, const char *source, const char *point, int flags, void *data) {


You're supposed to set mount->data after calling this, there shouldn't need to be a new function

My problem was (and still is) that do_mount calls fs->mount and at that point startAccessingSecurityScopedResource must be called. For that, I need the NSURL object.

tbodt · 2019-10-26T16:06:23Z

app/TerminalViewController.m

+    [self presentViewController:picker animated:true completion:nil];
+}
+
+-(void)displayMountError {


Should include some information on what the error is

tbodt · 2019-10-26T16:38:00Z

Also I think a better idea for the UI is to open the UIDocumentPickerViewController code in the mount function. That way you type something like mount -t ios website /mnt/website and it pops up a file picker.

NoahPeeters · 2019-10-27T23:38:14Z

I've updated the pull request. Now, new directories can be mounted with the mount -t ... command.
I also included the NSFileCoordinator but it is currently not used for opening files as I ran into some problems. One simple example is creating a fifo with mkfifo. If one now tries to read it with cat and then pipe data into the fifo with echo, the echo command blocks because it requires write access and cat still has read access to the file.

tbodt · 2019-11-03T01:10:24Z

app/iOSFS.m

+}
+
+static int iosfs_mount_data(char source[MAX_PATH], char point[MAX_PATH], dword_t *flags, void **data) {
+    pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;


Can this be moved into iosfs_mount? I think that would eliminate the need for a new do_mount_with_data.

tbodt · 2019-11-03T02:21:08Z

File coordination was clearly not designed for fifos. I think it's reasonable to check what type the file is, and don't use file coordination on files where read/write can block.

videoMonkey · 2019-12-12T08:03:22Z

Would love to see this happen, is any progress being made? I wish my programming chops were at the level to be able to help.

NoahPeeters · 2019-12-12T09:28:38Z

I had to do a lot for university lately. I will definitely continue working on this. Probably between Christmas and New Year or so. I already looked into it and it is not that hard to implement it.

videoMonkey · 2019-12-12T11:50:44Z

Hey! Thanks! —Jamie

…

On Dec 12, 2019, at 10:28, Noah Peeters ***@***.***> wrote: I had to do a lot for university lately. I will definitely continue working on this. Probably between Christmas and New Year or so. I already looked into it and it is not that hard to implement it. — You are receiving this because you commented. Reply to this email directly, view it on GitHub, or unsubscribe.

NoahPeeters · 2019-12-14T16:38:12Z

I continued working on this. I added file coordination for regular files and removed the iosfs_mount_data function by calling the ui functions in iosfs_mount.

I did a lot of testing with git in a mounted folder from Working Copy. I noticed that git status can be quit slow even with mid-size repositories because git will check every file in the repository and each of the coordinator calls slows down the process. That's why I added a second filesystem: ios-unsafe. That one will simply make sure that the correct permissions for the security scope are requested but the filecoordinators are not used at all. In case of Working Copy, this works very well but there are probably apps which can have a problem with that (that's why I called in ios-UNSAFE).

Therefore, this pull request now adds the following two commands:

mount -t ios website /mnt/website
mount -t ios-unsafe website /mnt/website

Finally, someone with more experience in async programming in objective-c should have a look at the usage of mutexes in iosfs_open. It does work but I do not know if there is a better/more elegant way of doing this.

tbodt · 2019-12-16T02:53:16Z

Nice! Will do a detailed review in a bit.

I'm torn on whether ios-unsafe is a good idea. For the specific case of Working Copy, it makes more sense to just do git operations directly in the Working Copy app.

tbodt · 2019-12-16T03:52:32Z

iSH.xcodeproj/project.pbxproj

@@ -548,6 +555,7 @@
 				650B335A22E9E46A00B4C03E /* mem.c */,
 				650B335B22E9E46A00B4C03E /* mem.h */,
 				BB101B512364EAF0000A93BC /* mount.c */,
+				40616E3B236642B5008CDF19 /* mount.c */,


Seems to be a duplicate

tbodt · 2019-12-16T03:52:39Z

iSH.xcodeproj/project.pbxproj

@@ -431,6 +436,8 @@
 				BBCC9D952365430800424C83 /* SceneDelegate.m */,
 				BB792B561F96D90D00FFB7A4 /* TerminalViewController.h */,
 				BB792B571F96D90D00FFB7A4 /* TerminalViewController.m */,
+				408A263B23644102008A4E81 /* iOSFS.h */,
+				408A2639236440F8008A4E81 /* iOSFS.m */,


Could you put these under Devices?

tbodt · 2019-12-16T03:53:24Z

kernel/fs.h

@@ -174,6 +175,25 @@ const char *fix_path(const char *path); // TODO reconsider
 // real fs
 extern const struct fd_ops realfs_fdops;

+struct fd *realfs_open_with_fdops(struct mount *mount, const char *path, int flags, int mode, const struct fd_ops *fdops);


At this point there should be a separate fs/real.h header.

tbodt · 2019-12-16T03:53:34Z

kernel/fs.h

@@ -108,6 +108,7 @@ void mount_release(struct mount *mount);

 // must hold mounts_lock while calling these, or traversing mounts
 int do_mount(const struct fs_ops *fs, const char *source, const char *point, int flags);
+int do_mount_with_data(const struct fs_ops *fs, const char *source, const char *point, int flags, void *data);


Unused, please remove

tbodt · 2019-12-16T03:54:34Z

fs/real.c

@@ -73,17 +73,21 @@ static int open_flags_fake_from_real(int flags) {
    return fake_flags;
 }

-static struct fd *realfs_open(struct mount *mount, const char *path, int flags, int mode) {
+struct fd *realfs_open_with_fdops(struct mount *mount, const char *path, int flags, int mode, const struct fd_ops *fdops) {


Instead of a new function here, how about setting fd->ops after calling realfs_open?

tbodt · 2019-12-16T03:57:06Z

app/iOSFS.m

+}
+
+const struct fs_ops iosfs = {
+    .name = "ios", .magic = 0x7265616d,


Can you choose more meaningful magic values? 0x7265616c is used for realfs because it's "real" in ascii hex, so this means "ream". :)

tbodt · 2019-12-16T03:58:28Z

kernel/fs.h

@@ -196,4 +225,8 @@ extern const struct fs_ops procfs;
 extern const struct fs_ops fakefs;
 extern const struct fs_ops devptsfs;

+extern const struct fs_ops *filesystems[];


I think a function filesystem_register that appends a filesystem to the array makes more sense than static filesystem ids.

tbodt · 2019-12-16T04:01:17Z

app/SceneDelegate.h


 NS_ASSUME_NONNULL_BEGIN

+extern TerminalViewController *currentTerminalViewController;


I don't really like this way of getting the view controller. My other ideas are way more annoying to implement though.

tbodt · 2019-12-16T04:09:03Z

app/iOSFS.m

+@interface DirectoryPickerDelegate : NSObject <UIDocumentPickerDelegate>
+
+@property NSURL *url;
+@property pthread_mutex_t *mutex;


Locks aren't really intended for waiting for something to happen. Should use a condition variable. cond_t from util/sync.h is preferred because it allows the process to be interrupted by a signal, with e.g. ctrl-c.

tbodt · 2019-12-16T04:12:15Z

app/iOSFS.m

+    return combine_error(error, err);
+}
+
+static int iosfs_symlink(struct mount *mount, const char *target, const char *link) {


There's a lot of repeated code in these functions. How much can be factored out into a new function that takes a block?

tbodt · 2020-01-01T21:54:26Z

@NoahPeeters Do you plan to work on this soon? If not, I'm willing to pick it up and get it merged.

tbodt · 2020-02-10T02:46:11Z

@NoahPeeters Ping

MrAlexWeber · 2020-03-27T16:54:52Z

+1 for this feature, replying to bump and watch

tbodt · 2020-04-12T18:57:49Z

Gonna take this over

tbodt · 2020-04-12T22:41:06Z

Merged in dbd4100.

tbodt reviewed Oct 26, 2019

View reviewed changes

NoahPeeters force-pushed the mount_file_provider branch 2 times, most recently from 41e96e5 to 547e507 Compare October 27, 2019 23:25

tbodt mentioned this pull request Oct 29, 2019

USB Support #546

Closed

tbodt reviewed Nov 3, 2019

View reviewed changes

NoahPeeters force-pushed the mount_file_provider branch 2 times, most recently from 8b178b3 to 52f30f8 Compare December 14, 2019 13:38

Add support for mounting folders from iOS

1c2d78f

NoahPeeters force-pushed the mount_file_provider branch from 52f30f8 to 1c2d78f Compare December 14, 2019 14:02

tbodt reviewed Dec 16, 2019

View reviewed changes

tbodt force-pushed the master branch from 57b0de6 to 8579c95 Compare December 23, 2019 03:22

tbodt added a commit that referenced this pull request Apr 12, 2020

Merge pull request #543 from NoahPeeters/mount_file_provider

dbd4100

tbodt closed this Apr 12, 2020

GregoryShields mentioned this pull request Apr 3, 2023

Add Mount/Umount holzschu/a-shell#344

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for mounting folders from iOS #543

Add support for mounting folders from iOS #543

NoahPeeters commented Oct 26, 2019

tbodt commented Oct 26, 2019

tbodt Oct 26, 2019

tbodt Oct 26, 2019

tbodt Oct 26, 2019

NoahPeeters Oct 27, 2019

tbodt Oct 26, 2019

tbodt commented Oct 26, 2019

NoahPeeters commented Oct 27, 2019

tbodt Nov 3, 2019

tbodt commented Nov 3, 2019 •

edited

Loading

videoMonkey commented Dec 12, 2019

NoahPeeters commented Dec 12, 2019

videoMonkey commented Dec 12, 2019 via email

NoahPeeters commented Dec 14, 2019

tbodt commented Dec 16, 2019

tbodt Dec 16, 2019

tbodt Dec 16, 2019

tbodt Dec 16, 2019

tbodt Dec 16, 2019

tbodt Dec 16, 2019

tbodt Dec 16, 2019

tbodt Dec 16, 2019

tbodt Dec 16, 2019

tbodt Dec 16, 2019

tbodt Dec 16, 2019

tbodt commented Jan 1, 2020

tbodt commented Feb 10, 2020

MrAlexWeber commented Mar 27, 2020

tbodt commented Apr 12, 2020

tbodt commented Apr 12, 2020


		NS_ASSUME_NONNULL_BEGIN

		extern TerminalViewController *currentTerminalViewController;

Add support for mounting folders from iOS #543

Add support for mounting folders from iOS #543

Conversation

NoahPeeters commented Oct 26, 2019

tbodt commented Oct 26, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tbodt commented Oct 26, 2019

NoahPeeters commented Oct 27, 2019

Choose a reason for hiding this comment

tbodt commented Nov 3, 2019 • edited Loading

videoMonkey commented Dec 12, 2019

NoahPeeters commented Dec 12, 2019

videoMonkey commented Dec 12, 2019 via email

NoahPeeters commented Dec 14, 2019

tbodt commented Dec 16, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tbodt commented Jan 1, 2020

tbodt commented Feb 10, 2020

MrAlexWeber commented Mar 27, 2020

tbodt commented Apr 12, 2020

tbodt commented Apr 12, 2020

tbodt commented Nov 3, 2019 •

edited

Loading