Skip to content

Commit f099a78

Browse files
fix(mobile): restore permission registry concurrency protection
1 parent ccad9f6 commit f099a78

5 files changed

Lines changed: 168 additions & 4 deletions

File tree

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
@interface TestPermissionRequester : NSObject <EXPermissionsRequester>
2+
@end
3+
4+
@implementation TestPermissionRequester
5+
+ (NSString *)permissionType { return NSStringFromClass(self); }
6+
- (NSDictionary *)getPermissions { return @{ @"status": @(EXPermissionStatusGranted) }; }
7+
- (void)requestPermissionsWithResolver:(EXPromiseResolveBlock)resolve rejecter:(EXPromiseRejectBlock)reject {
8+
resolve([self getPermissions]);
9+
}
10+
@end
11+
12+
typedef struct {
13+
__unsafe_unretained EXPermissionsService *service;
14+
__unsafe_unretained NSArray *requesters;
15+
size_t offset;
16+
} Worker;
17+
18+
static void *exerciseRegistry(void *context) {
19+
Worker *worker = context;
20+
for (size_t index = 0; index < 250; index++) {
21+
@autoreleasepool {
22+
id<EXPermissionsRequester> requester = worker->requesters[(index + worker->offset) % worker->requesters.count];
23+
[worker->service registerRequesters:@[requester]];
24+
id resolved = [worker->service getPermissionRequesterForType:[[requester class] permissionType]];
25+
assert(resolved == requester);
26+
NSDictionary *permissions = [worker->service getPermissionUsingRequesterClass:[requester class]];
27+
assert([permissions[@"status"] isEqualToString:@"granted"]);
28+
}
29+
}
30+
return NULL;
31+
}
32+
33+
int main(void) {
34+
@autoreleasepool {
35+
EXPermissionsService *service = [EXPermissionsService new];
36+
NSMutableArray *requesters = [NSMutableArray new];
37+
for (int i = 0; i < 32; i++) {
38+
NSString *name = [NSString stringWithFormat:@"TestPermission%d", i];
39+
Class cls = objc_allocateClassPair([TestPermissionRequester class], name.UTF8String, 0);
40+
objc_registerClassPair(cls);
41+
[requesters addObject:[cls new]];
42+
}
43+
Worker workers[8];
44+
pthread_t threads[8];
45+
for (size_t index = 0; index < 8; index++) {
46+
workers[index] = (Worker){ service, requesters, index };
47+
assert(pthread_create(&threads[index], NULL, exerciseRegistry, &workers[index]) == 0);
48+
}
49+
for (size_t index = 0; index < 8; index++) {
50+
assert(pthread_join(threads[index], NULL) == 0);
51+
}
52+
puts("passed");
53+
}
54+
return 0;
55+
}
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
// @effect-diagnostics nodeBuiltinImport:off - Compiles the native dependency regression directly.
2+
import * as NodeChildProcess from "node:child_process";
3+
import * as NodeFS from "node:fs";
4+
import * as NodeModule from "node:module";
5+
import * as NodeOS from "node:os";
6+
import * as NodePath from "node:path";
7+
import { expect, it } from "vite-plus/test";
8+
9+
// oxlint-disable-next-line t3code/no-global-process-runtime -- This test compiles against the host Foundation framework.
10+
it.skipIf(NodeOS.platform() !== "darwin")(
11+
"registers and reads native permissions concurrently without corrupting the registry",
12+
() => {
13+
const directory = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-permissions-test-"));
14+
try {
15+
const require = NodeModule.createRequire(import.meta.url);
16+
const core = NodePath.dirname(
17+
NodeModule.createRequire(require.resolve("expo/package.json")).resolve(
18+
"expo-modules-core/package.json",
19+
),
20+
);
21+
const read = (relativePath: string) =>
22+
NodeFS.readFileSync(NodePath.join(core, relativePath), "utf8").replace(
23+
/^#import .*$/gm,
24+
"",
25+
);
26+
const source = NodePath.join(directory, "regression.m");
27+
NodeFS.writeFileSync(
28+
source,
29+
[
30+
"#import <Foundation/Foundation.h>",
31+
"#import <objc/runtime.h>",
32+
"#include <assert.h>",
33+
"#include <pthread.h>",
34+
"typedef void (^EXPromiseResolveBlock)(id result);",
35+
"typedef void (^EXPromiseRejectBlock)(NSString *, NSString *, NSError *);",
36+
"#define RCTLogWarn(...)",
37+
read("ios/Interfaces/Permissions/EXPermissionsInterface.h"),
38+
read("ios/Legacy/Services/Permissions/EXPermissionsService.h"),
39+
read("ios/Legacy/Services/Permissions/EXPermissionsService.m"),
40+
NodeFS.readFileSync(
41+
new URL("./fixtures/PermissionsServiceRegression.m", import.meta.url),
42+
"utf8",
43+
),
44+
].join("\n"),
45+
);
46+
const executable = NodePath.join(directory, "regression");
47+
NodeChildProcess.execFileSync(
48+
"clang",
49+
[
50+
"-fobjc-arc",
51+
"-fblocks",
52+
"-fsanitize=thread",
53+
"-framework",
54+
"Foundation",
55+
source,
56+
"-o",
57+
executable,
58+
],
59+
{ encoding: "utf8", timeout: 30_000 },
60+
);
61+
expect(
62+
NodeChildProcess.execFileSync(executable, { encoding: "utf8", timeout: 15_000 }).trim(),
63+
).toBe("passed");
64+
} finally {
65+
NodeFS.rmSync(directory, { recursive: true, force: true });
66+
}
67+
},
68+
);

‎patches/[email protected]‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
diff --git a/ios/Legacy/Services/Permissions/EXPermissionsService.m b/ios/Legacy/Services/Permissions/EXPermissionsService.m
2+
--- a/ios/Legacy/Services/Permissions/EXPermissionsService.m
3+
+++ b/ios/Legacy/Services/Permissions/EXPermissionsService.m
4+
@@ -32,8 +32,11 @@
5+
6+
- (void)registerRequesters:(NSArray<id<EXPermissionsRequester>> *)newRequesters {
7+
for (id<EXPermissionsRequester> requester in newRequesters) {
8+
- [_requesters setObject:requester forKey:[[requester class] permissionType]];
9+
- [_requestersByClass setObject:requester forKey:[requester class]];
10+
+ NSString *permissionType = [[requester class] permissionType];
11+
+ @synchronized (self) {
12+
+ [_requesters setObject:requester forKey:permissionType];
13+
+ [_requestersByClass setObject:requester forKey:[requester class]];
14+
+ }
15+
}
16+
}
17+
18+
@@ -162,12 +165,16 @@
19+
20+
- (id<EXPermissionsRequester>)getPermissionRequesterForType:(NSString *)type
21+
{
22+
- return _requesters[type];
23+
+ @synchronized (self) {
24+
+ return _requesters[type];
25+
+ }
26+
}
27+
28+
- (id<EXPermissionsRequester>)getPermissionRequesterForClass:(Class)requesterClass
29+
{
30+
- return [_requestersByClass objectForKey:requesterClass];
31+
+ @synchronized (self) {
32+
+ return [_requestersByClass objectForKey:requesterClass];
33+
+ }
34+
}
35+
36+
@end

‎pnpm-lock.yaml‎

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pnpm-workspace.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ overrides:
143143
"@expo/dom-webview": 57.0.1
144144
"@expo/metro-config": 57.0.12
145145
expo-constants: 57.0.16
146+
# Keep fresh resolution on the version carrying the permissions registry fix.
147+
expo-modules-core: 57.0.14
146148
"@pierre/diffs>@shikijs/transformers": ^4.2.0
147149
# Keep one copy of these native-binary packages. lightningcss ships 11 platform binaries per
148150
# version, and the workspaces' tailwindcss ^4 ranges drift into two 4.3.x copies of the family.
@@ -187,6 +189,7 @@ patchedDependencies:
187189
188190
189191
192+
190193
191194
192195

0 commit comments

Comments
 (0)