Skip to content

VM storage options and fixes for input, networking, and setup #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesstringer90 merged 10 commits into from
Sep 10, 2026
Merged

VM storage options and fixes for input, networking, and setup #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
978f52b
Fix VM setup, storage, snapshots, and viewer behavior
jamesstringer90 Sep 7, 2026
4e2493d
Fix international keyboard input and Linux clipboard copying
jamesstringer90 Sep 7, 2026
c737c29
Use DHCP for Windows-host NAT networking
jamesstringer90 Sep 7, 2026
d8b9be0
Fix HCN schema for DHCP network creation
jamesstringer90 Sep 7, 2026
fcdef62
Configure NAT DHCP subnets and remove Windows agent IP setup
jamesstringer90 Sep 7, 2026
a68665d
Restore static NAT networking and preserve saved VM IPs
jamesstringer90 Sep 8, 2026
92c7a35
Remove redundant source comments
jamesstringer90 Sep 8, 2026
046a7c0
Use updated Windows ARM64 payload for Mac VM creation
jamesstringer90 Sep 8, 2026
26e0e96
Fix Mac builds and sandbox creation validation
jamesstringer90 Sep 8, 2026
9d6342f
Fix viewer mouse capture and keyboard handling
jamesstringer90 Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions AppSandbox.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
6033000000000000000000DD /* firstboot.sh in Embed agent_mac */ = {isa = PBXBuildFile; fileRef = 1033000000000000000000DD /* firstboot.sh */; };
/* Framework target — Frameworks */
4011000000000000000000BB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3001000000000000000000AA /* Cocoa.framework */; };
4016000000000000000000BB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3016000000000000000000BB /* Carbon.framework */; };
4012000000000000000000BB /* Virtualization.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3003000000000000000000AA /* Virtualization.framework */; };
4013000000000000000000BB /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3004000000000000000000AA /* Metal.framework */; };
4014000000000000000000BB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3005000000000000000000AA /* Security.framework */; };
Expand Down Expand Up @@ -197,8 +198,10 @@
1040000000000000000000EE /* appsandbox-clipboard.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "appsandbox-clipboard.m"; sourceTree = "<group>"; };
C040000000000000000000EE /* appsandbox-clipboard */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "appsandbox-clipboard"; sourceTree = BUILT_PRODUCTS_DIR; };
1018000000000000000000AA /* asb_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = asb_types.h; sourceTree = "<group>"; };
1070000000000000000000AA /* protocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = protocol.h; sourceTree = "<group>"; };
1020000000000000000000BB /* AppSandboxCore-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "AppSandboxCore-Info.plist"; sourceTree = "<group>"; };
3001000000000000000000AA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
3016000000000000000000BB /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
3002000000000000000000AA /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
3003000000000000000000AA /* Virtualization.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Virtualization.framework; path = System/Library/Frameworks/Virtualization.framework; sourceTree = SDKROOT; };
3004000000000000000000AA /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -254,6 +257,7 @@
buildActionMask = 2147483647;
files = (
4011000000000000000000BB /* Cocoa.framework in Frameworks */,
4016000000000000000000BB /* Carbon.framework in Frameworks */,
4012000000000000000000BB /* Virtualization.framework in Frameworks */,
4013000000000000000000BB /* Metal.framework in Frameworks */,
4014000000000000000000BB /* Security.framework in Frameworks */,
Expand Down Expand Up @@ -393,6 +397,7 @@
isa = PBXGroup;
children = (
1018000000000000000000AA /* asb_types.h */,
1070000000000000000000AA /* protocol.h */,
);
name = core;
path = src/core;
Expand Down Expand Up @@ -436,6 +441,7 @@
isa = PBXGroup;
children = (
3001000000000000000000AA /* Cocoa.framework */,
3016000000000000000000BB /* Carbon.framework */,
3002000000000000000000AA /* WebKit.framework */,
3003000000000000000000AA /* Virtualization.framework */,
3004000000000000000000AA /* Metal.framework */,
Expand Down
1 change: 1 addition & 0 deletions AppSandboxCore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\core\asb_types.h" />
<ClInclude Include="src\core\protocol.h" />
<ClInclude Include="src\backend_win\asb_core.h" />
<ClInclude Include="src\backend_win\asb_display.h" />
<ClInclude Include="src\ui.h" />
Expand Down
81 changes: 49 additions & 32 deletions src/app_mac/headless.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ Otherwise an orphaned child (e.g. a QEMU VM left running after the app quits) ke
static gid_t g_user_gid = 0;
static dispatch_queue_t g_chown_q;
static int g_chown_pending = 0; /* touched only on g_chown_q */
static NSArray<NSString *> *g_chown_disk_paths; /* snapshot, owned by g_chown_q */

/* Resolve the invoking user's uid/gid from the SAME source vm_dir.m uses to
* resolve the tree location -- getpwnam(SUDO_USER) -- so the chown target and
Expand All @@ -148,7 +149,20 @@ static void chown_to_user(NSString *path) {
chown(path.fileSystemRepresentation, g_user_uid, g_user_gid);
}

static void fix_tree_ownership_now(void) {
/* Read the registry on the main queue; only VM disk paths may change owner. */
static NSArray<NSString *> *vm_disk_ownership_paths(void) {
NSMutableArray<NSString *> *paths = [NSMutableArray array];
for (int i = 0; i < asb_mac_vm_count(); i++) {
AsbVmMac *vm = asb_mac_vm_get(i);
if (!vm || !vm->disk_directory[0]) continue;
NSString *name = @(vm->name);
[paths addObject:[VmDir diskDirectoryForVm:name].path];
[paths addObject:[VmDir diskImageURLFor:name].path];
}
return paths;
}

static void fix_tree_ownership_now(NSArray<NSString *> *disk_paths) {
if (!g_user_uid) return;
NSTask *t = [[NSTask alloc] init];
t.launchPath = @"/usr/sbin/chown";
Expand All @@ -157,20 +171,25 @@ static void fix_tree_ownership_now(void) {
(unsigned)g_user_uid, (unsigned)g_user_gid],
support_dir()];
if ([t launchAndReturnError:nil]) [t waitUntilExit];
for (NSString *path in disk_paths) {
lchown(path.fileSystemRepresentation, g_user_uid, g_user_gid);
}
}

/* Debounced (5s) so chatty events coalesce; chown -R is metadata-only and the
* tree is a few hundred files, so each pass is cheap. The pending flag is read
* and written only on g_chown_q (serial), so no cross-thread race. */
static void fix_tree_ownership_soon(void) {
if (!g_user_uid) return;
NSArray<NSString *> *diskPaths = vm_disk_ownership_paths();
dispatch_async(g_chown_q, ^{
g_chown_disk_paths = diskPaths;
if (g_chown_pending) return; /* a pass is already scheduled */
g_chown_pending = 1;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC),
g_chown_q, ^{
g_chown_pending = 0;
fix_tree_ownership_now();
fix_tree_ownership_now(g_chown_disk_paths);
});
});
}
Expand Down Expand Up @@ -300,6 +319,7 @@ static BOOL vm_installing(const AsbVmMac *v) {
return @{
@"name": @(v->name),
@"osType": @(v->os_type),
@"diskDirectory": [VmDir diskDirectoryForVm:@(v->name)].URLByDeletingLastPathComponent.path,
@"state": @(derive_state(v)),
@"running": v->running ? @YES : @NO,
@"agentOnline": v->agent_online ? @YES : @NO,
Expand Down Expand Up @@ -327,19 +347,23 @@ static BOOL vm_installing(const AsbVmMac *v) {
* templates), plus the numeric rules the Windows daemon enforces, so the API
* rejects exactly what the UI would. Returns an English error (nil = valid). */
static NSString *validate_create_mac(NSString *name, NSString *os,
NSString *user, BOOL is_template,
id user, id password, BOOL is_template,
int ram_mb, int hdd_gb, int cpu_cores,
int gpu_mode, int net_mode) {
int gpu_mode, int net_mode,
NSString *disk_directory) {
BOOL is_mac = [os.lowercaseString isEqualToString:@"macos"];
BOOL is_win = [os.lowercaseString isEqualToString:@"windows"];
if (!is_mac && !is_win)
return @"Only macOS and Windows guests are supported on a macOS host.";
if (is_template)
return @"Templates are not yet supported for Windows-on-Mac (use a direct ISO install).";

/* name / hostname (macOS LocalHostName rules, app.js validateVmName) */
if (!name.length) return @"VM name is required.";
if (name.length > 63) return @"VM name cannot exceed 63 characters (macOS LocalHostName limit).";
if (is_win) {
if (name.length > 15) return @"VM name cannot exceed 15 characters (NetBIOS limit).";
} else if (name.length > 63) {
return @"VM name cannot exceed 63 characters (macOS LocalHostName limit).";
}
BOOL all_digits = YES;
for (NSUInteger i = 0; i < name.length; i++) {
unichar ch = [name characterAtIndex:i];
Expand All @@ -354,24 +378,11 @@ static BOOL vm_installing(const AsbVmMac *v) {
if (asb_mac_vm_find(name.UTF8String))
return @"A VM with this name already exists.";

/* username -- app.js applies the Windows-account ruleset on macOS */
if (!user.length) return @"Username is required.";
if (user.length > 20) return @"Username cannot exceed 20 characters.";
BOOL only_dots_ws = YES;
for (NSUInteger i = 0; i < user.length; i++) {
unichar ch = [user characterAtIndex:i];
if ([@"\"\\/[]:;|=,+*?<>" rangeOfString:
[NSString stringWithCharacters:&ch length:1]].location != NSNotFound)
return @"Username contains invalid characters.";
if (!(ch == '.' || ch == ' ' || ch == '\t')) only_dots_ws = NO;
}
if (only_dots_ws) return @"Username cannot be only dots or spaces.";
if ([user hasSuffix:@"."]) return @"Username cannot end with a period.";
NSArray *reserved = @[@"CON",@"PRN",@"AUX",@"NUL",
@"COM1",@"COM2",@"COM3",@"COM4",@"COM5",@"COM6",@"COM7",@"COM8",@"COM9",
@"LPT1",@"LPT2",@"LPT3",@"LPT4",@"LPT5",@"LPT6",@"LPT7",@"LPT8",@"LPT9"];
if ([reserved containsObject:user.uppercaseString])
return @"Username is a reserved name.";
NSString *usernameError = asb_mac_validate_username(os, user, name);
if (usernameError) return usernameError;

NSString *passwordError = asb_mac_validate_password(os, password);
if (passwordError) return passwordError;

/* numeric ranges (0 = unset -> the core fills a default). The even-RAM
rule is kept for interface parity with the GUI/Windows daemon. */
Expand All @@ -384,7 +395,7 @@ static BOOL vm_installing(const AsbVmMac *v) {
if (gpu_mode < 0 || gpu_mode > 2) return @"gpuMode must be 0 (None), 1 (Default), or 2 (Try all).";
if (net_mode < 0 || net_mode > 3) return @"networkMode must be 0 (None), 1 (NAT), 2 (External), or 3 (Internal).";

return nil;
return [VmDir validationErrorForDiskDirectory:disk_directory vmName:name];
}

/* ---- Minimal HTTP plumbing (loopback only, Connection: close) ---- */
Expand Down Expand Up @@ -608,10 +619,11 @@ static void cleanup_and_exit(int code) {
if (g_listen_fd >= 0) close(g_listen_fd);
/* Orderly teardown of agent/proxy/clipboard threads; the VZ VMs themselves
are in-process and terminate with us -- the daemon owns its VMs. */
NSArray<NSString *> *diskPaths = vm_disk_ownership_paths();
asb_mac_cleanup();
/* Final synchronous hand-back: everything root touched in the user's
AppSandbox tree is the user's again before we exit. */
fix_tree_ownership_now();
fix_tree_ownership_now(diskPaths);
hlog(@"cleaned up. exit %d.", code);
if (g_log) { fclose(g_log); g_log = NULL; }
if (g_lock_fd >= 0) close(g_lock_fd);
Expand Down Expand Up @@ -665,6 +677,7 @@ static int handle_request(int fd, HttpReq *r) {
info = @{ @"hostCores": @([HostInfo hostCores]),
@"hostRamMb": @([HostInfo hostRamMb]),
@"freeGb": @([HostInfo freeGb]),
@"defaultDiskDirectory": [VmDir vmsRootDirectory].path,
@"vmCores": @(vmCores), @"vmRamMb": @(vmRamMb),
@"vmHddGb": @(vmHddGb) };
});
Expand Down Expand Up @@ -699,10 +712,13 @@ static int handle_request(int fd, HttpReq *r) {
if (!b[@"name"]) name = @"";
NSString *os = b[@"osType"] ? [b[@"osType"] description] : @"macOS";
NSString *img = b[@"imagePath"] ? [b[@"imagePath"] description] : @"";
NSString *user = b[@"adminUser"] ? [[b[@"adminUser"] description]
stringByTrimmingCharactersInSet:
[NSCharacterSet whitespaceAndNewlineCharacterSet]] : @"";
NSString *pass = b[@"adminPass"] ? [b[@"adminPass"] description] : @"";
if (b[@"diskDirectory"] && ![b[@"diskDirectory"] isKindOfClass:[NSString class]]) {
send_err(fd, 400, "Bad Request", @"invalid_arg", @"diskDirectory must be a string.");
return 0;
}
NSString *diskDirectory = b[@"diskDirectory"] ?: @"";
NSString *user = b[@"adminUser"];
NSString *pass = b[@"adminPass"];
int ram = [b[@"ramMb"] intValue], hdd = [b[@"hddGb"] intValue];
int cpu = [b[@"cpuCores"] intValue], gpu = [b[@"gpuMode"] intValue];
int net = [b[@"networkMode"] intValue];
Expand All @@ -718,8 +734,8 @@ static int handle_request(int fd, HttpReq *r) {
}
__block NSString *verr;
on_main(^{
verr = validate_create_mac(name, os, user, isTemplate,
ram, hdd, cpu, gpu, net);
verr = validate_create_mac(name, os, user, pass, isTemplate,
ram, hdd, cpu, gpu, net, diskDirectory);
});
if (verr) {
send_err(fd, 400, "Bad Request", @"invalid_arg", verr);
Expand All @@ -742,6 +758,7 @@ static int handle_request(int fd, HttpReq *r) {
int rc = asb_mac_vm_create(name.UTF8String, os.UTF8String,
ram, hdd, cpu, gpu, net,
img.length ? img.UTF8String : NULL,
diskDirectory.UTF8String,
user.UTF8String, pass.UTF8String,
sshEnabled, sshDeploy, testMode);
if (rc != BACKEND_OK)
Expand Down
Loading