Skip to content
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

feat: SES lockdown v1.0.0 (Android Hermes) #8161

Closed
wants to merge 6 commits into from
Closed

feat: SES lockdown v1.0.0 (Android Hermes) #8161

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d8c6ce4
Refactor loadWithoutErrorAnnotation from async await to Promises
leotm Dec 19, 2023
f7f6b45
Refactor memoizedLoadWithErrorAnnotation from async await to Promises
leotm Dec 19, 2023
4c92631
Remove minimal async parts
leotm Dec 19, 2023
046a62f
Remove further async parts
leotm Dec 19, 2023
d54ac80
Remove further async parts
leotm Dec 19, 2023
4fc93a5
WIP
leotm Dec 20, 2023
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
226 changes: 95 additions & 131 deletions ses.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7663,7 +7663,7 @@ function tameErrorConstructor(
})()
,
// === functors[38] ===
({ imports: $h‍_imports, liveVar: $h‍_live, onceVar: $h‍_once, importMeta: $h‍____meta, }) => (function () { let ReferenceError,TypeError,Map,Set,arrayJoin,arrayMap,arrayPush,create,freeze,mapGet,mapHas,mapSet,setAdd,promiseCatch,promiseThen,values,weakmapGet,assert;$h‍_imports([["./commons.js", [["ReferenceError", [$h‍_a => (ReferenceError = $h‍_a)]],["TypeError", [$h‍_a => (TypeError = $h‍_a)]],["Map", [$h‍_a => (Map = $h‍_a)]],["Set", [$h‍_a => (Set = $h‍_a)]],["arrayJoin", [$h‍_a => (arrayJoin = $h‍_a)]],["arrayMap", [$h‍_a => (arrayMap = $h‍_a)]],["arrayPush", [$h‍_a => (arrayPush = $h‍_a)]],["create", [$h‍_a => (create = $h‍_a)]],["freeze", [$h‍_a => (freeze = $h‍_a)]],["mapGet", [$h‍_a => (mapGet = $h‍_a)]],["mapHas", [$h‍_a => (mapHas = $h‍_a)]],["mapSet", [$h‍_a => (mapSet = $h‍_a)]],["setAdd", [$h‍_a => (setAdd = $h‍_a)]],["promiseCatch", [$h‍_a => (promiseCatch = $h‍_a)]],["promiseThen", [$h‍_a => (promiseThen = $h‍_a)]],["values", [$h‍_a => (values = $h‍_a)]],["weakmapGet", [$h‍_a => (weakmapGet = $h‍_a)]]]],["./error/assert.js", [["assert", [$h‍_a => (assert = $h‍_a)]]]]]);
({ imports: $h‍_imports, liveVar: $h‍_live, onceVar: $h‍_once, importMeta: $h‍____meta, }) => (function () { let ReferenceError,TypeError,Map,Set,arrayJoin,arrayMap,arrayPush,create,freeze,mapGet,mapHas,mapSet,setAdd,promiseThen,values,weakmapGet,assert;$h‍_imports([["./commons.js", [["ReferenceError", [$h‍_a => (ReferenceError = $h‍_a)]],["TypeError", [$h‍_a => (TypeError = $h‍_a)]],["Map", [$h‍_a => (Map = $h‍_a)]],["Set", [$h‍_a => (Set = $h‍_a)]],["arrayJoin", [$h‍_a => (arrayJoin = $h‍_a)]],["arrayMap", [$h‍_a => (arrayMap = $h‍_a)]],["arrayPush", [$h‍_a => (arrayPush = $h‍_a)]],["create", [$h‍_a => (create = $h‍_a)]],["freeze", [$h‍_a => (freeze = $h‍_a)]],["mapGet", [$h‍_a => (mapGet = $h‍_a)]],["mapHas", [$h‍_a => (mapHas = $h‍_a)]],["mapSet", [$h‍_a => (mapSet = $h‍_a)]],["setAdd", [$h‍_a => (setAdd = $h‍_a)]],["promiseThen", [$h‍_a => (promiseThen = $h‍_a)]],["values", [$h‍_a => (values = $h‍_a)]],["weakmapGet", [$h‍_a => (weakmapGet = $h‍_a)]]]],["./error/assert.js", [["assert", [$h‍_a => (assert = $h‍_a)]]]]]);

Copy link
Member Author

@leotm leotm Dec 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only promiseCatch removed in refactor



Expand Down Expand Up @@ -7775,7 +7775,7 @@ const loadRecord= (
return moduleRecord;
};

const loadWithoutErrorAnnotation= async(
const loadWithoutErrorAnnotation= (
compartmentPrivateFields,
moduleAliases,
compartment,
Expand Down Expand Up @@ -7815,102 +7815,104 @@ const loadWithoutErrorAnnotation= async(
}
// Behold: recursion.
// eslint-disable-next-line no-use-before-define
const aliasRecord= await memoizedLoadWithErrorAnnotation(
return memoizedLoadWithErrorAnnotation(
compartmentPrivateFields,
moduleAliases,
alias.compartment,
alias.specifier,
pendingJobs,
moduleLoads,
errors);

mapSet(moduleRecords, moduleSpecifier, aliasRecord);
return aliasRecord;
errors).
then((aliasRecord)=>{
mapSet(moduleRecords, moduleSpecifier, aliasRecord);
return aliasRecord;
});
}

if( mapHas(moduleRecords, moduleSpecifier)) {
return mapGet(moduleRecords, moduleSpecifier);
return Promise.resolve(mapGet(moduleRecords, moduleSpecifier));
}

const staticModuleRecord= await importHook(moduleSpecifier);

if( staticModuleRecord=== null|| typeof staticModuleRecord!== 'object') {
Fail `importHook must return a promise for an object, for module ${q(
moduleSpecifier)
} in compartment ${q(compartment.name)}`;
}
return importHook(moduleSpecifier).then((staticModuleRecord)=>{
if( staticModuleRecord=== null|| typeof staticModuleRecord!== 'object') {
Fail `importHook must return a promise for an object, for module ${q(
moduleSpecifier)
} in compartment ${q(compartment.name)}`;
}

// check if record is a RedirectStaticModuleInterface
if( staticModuleRecord.specifier!== undefined) {
// check if this redirect with an explicit record
if( staticModuleRecord.record!== undefined) {
// ensure expected record shape
if( staticModuleRecord.compartment!== undefined) {
throw TypeError(
'Cannot redirect to an explicit record with a specified compartment');
// check if record is a RedirectStaticModuleInterface
if( staticModuleRecord.specifier!== undefined) {
// check if this redirect with an explicit record
if( staticModuleRecord.record!== undefined) {
// ensure expected record shape
if( staticModuleRecord.compartment!== undefined) {
throw TypeError(
'Cannot redirect to an explicit record with a specified compartment');

}
const {
compartment: aliasCompartment= compartment,
specifier: aliasSpecifier= moduleSpecifier,
record: aliasModuleRecord,
importMeta}=
staticModuleRecord;

const aliasRecord= loadRecord(
compartmentPrivateFields,
moduleAliases,
aliasCompartment,
aliasSpecifier,
aliasModuleRecord,
pendingJobs,
moduleLoads,
errors,
importMeta);

mapSet(moduleRecords, moduleSpecifier, aliasRecord);
return aliasRecord;
}
const {
compartment: aliasCompartment= compartment,
specifier: aliasSpecifier= moduleSpecifier,
record: aliasModuleRecord,
importMeta}=
staticModuleRecord;

const aliasRecord= loadRecord(
compartmentPrivateFields,
moduleAliases,
aliasCompartment,
aliasSpecifier,
aliasModuleRecord,
pendingJobs,
moduleLoads,
errors,
importMeta);

mapSet(moduleRecords, moduleSpecifier, aliasRecord);
return aliasRecord;
}

// check if this redirect with an explicit compartment
if( staticModuleRecord.compartment!== undefined) {
// ensure expected record shape
if( staticModuleRecord.importMeta!== undefined) {
throw TypeError(
'Cannot redirect to an implicit record with a specified importMeta');
// check if this redirect with an explicit compartment
if( staticModuleRecord.compartment!== undefined) {
// ensure expected record shape
if( staticModuleRecord.importMeta!== undefined) {
throw TypeError(
'Cannot redirect to an implicit record with a specified importMeta');

}
// Behold: recursion.
// eslint-disable-next-line no-use-before-define
return memoizedLoadWithErrorAnnotation(
compartmentPrivateFields,
moduleAliases,
staticModuleRecord.compartment,
staticModuleRecord.specifier,
pendingJobs,
moduleLoads,
errors).
then((aliasRecord)=>{
mapSet(moduleRecords, moduleSpecifier, aliasRecord);
return aliasRecord;
});
}
// Behold: recursion.
// eslint-disable-next-line no-use-before-define
const aliasRecord= await memoizedLoadWithErrorAnnotation(
compartmentPrivateFields,
moduleAliases,
staticModuleRecord.compartment,
staticModuleRecord.specifier,
pendingJobs,
moduleLoads,
errors);

mapSet(moduleRecords, moduleSpecifier, aliasRecord);
return aliasRecord;
throw TypeError('Unnexpected RedirectStaticModuleInterface record shape');
}

throw TypeError('Unnexpected RedirectStaticModuleInterface record shape');
}

return loadRecord(
compartmentPrivateFields,
moduleAliases,
compartment,
moduleSpecifier,
staticModuleRecord,
pendingJobs,
moduleLoads,
errors);
return loadRecord(
compartmentPrivateFields,
moduleAliases,
compartment,
moduleSpecifier,
staticModuleRecord,
pendingJobs,
moduleLoads,
errors);

});
};

const memoizedLoadWithErrorAnnotation= async(
const memoizedLoadWithErrorAnnotation= (
compartmentPrivateFields,
moduleAliases,
compartment,
Expand All @@ -7932,30 +7934,28 @@ const memoizedLoadWithErrorAnnotation= async(
}
let moduleLoading= mapGet(compartmentLoading, moduleSpecifier);
if( moduleLoading!== undefined) {
return moduleLoading;
return Promise.resolve(moduleLoading);
}

moduleLoading= promiseCatch(
loadWithoutErrorAnnotation(
compartmentPrivateFields,
moduleAliases,
compartment,
moduleSpecifier,
pendingJobs,
moduleLoads,
errors),

(error)=>{
// eslint-disable-next-line @endo/no-polymorphic-call
assert.note(
error,
d `${error.message}, loading ${q(moduleSpecifier)} in compartment ${q(
compartmentName)
}`);
moduleLoading= loadWithoutErrorAnnotation(
compartmentPrivateFields,
moduleAliases,
compartment,
moduleSpecifier,
pendingJobs,
moduleLoads,
errors).

throw error;
});
catch((error)=>{
// eslint-disable-next-line @endo/no-polymorphic-call
assert.note(
error,
d `${error.message}, loading ${q(moduleSpecifier)} in compartment ${q(
compartmentName)
}`);

throw error;
});

mapSet(compartmentLoading, moduleSpecifier, moduleLoading);

Expand Down Expand Up @@ -9361,34 +9361,9 @@ const getAnonymousIntrinsics= ()=> {

const Generator= GeneratorFunction.prototype;

// 25.3.1 The AsyncGeneratorFunction Constructor

// eslint-disable-next-line no-empty-function
async function* AsyncGeneratorFunctionInstance() { }
const AsyncGeneratorFunction= getConstructorOf(
AsyncGeneratorFunctionInstance);


// 25.3.2.2 AsyncGeneratorFunction.prototype
const AsyncGenerator= AsyncGeneratorFunction.prototype;
// 25.5.1 Properties of the AsyncGenerator Prototype Object
const AsyncGeneratorPrototype= AsyncGenerator.prototype;
const AsyncIteratorPrototype= getPrototypeOf(AsyncGeneratorPrototype);

// 25.7.1 The AsyncFunction Constructor

// eslint-disable-next-line no-empty-function
async function AsyncFunctionInstance() { }
const AsyncFunction= getConstructorOf(AsyncFunctionInstance);

const intrinsics= {
'%InertFunction%': InertFunction,
'%ArrayIteratorPrototype%': ArrayIteratorPrototype,
'%InertAsyncFunction%': AsyncFunction,
'%AsyncGenerator%': AsyncGenerator,
'%InertAsyncGeneratorFunction%': AsyncGeneratorFunction,
'%AsyncGeneratorPrototype%': AsyncGeneratorPrototype,
'%AsyncIteratorPrototype%': AsyncIteratorPrototype,
'%Generator%': Generator,
'%InertGeneratorFunction%': GeneratorFunction,
'%IteratorPrototype%': IteratorPrototype,
Expand All @@ -9412,17 +9387,6 @@ const getAnonymousIntrinsics= ()=> {

}

if( globalThis.AsyncIterator) {
intrinsics['%AsyncIteratorHelperPrototype%']= getPrototypeOf(
// eslint-disable-next-line @endo/no-polymorphic-call
globalThis.AsyncIterator.from([]).take(0));

intrinsics['%WrapForValidAsyncIteratorPrototype%']= getPrototypeOf(
// eslint-disable-next-line @endo/no-polymorphic-call
globalThis.AsyncIterator.from({ next() { }}));

}

return intrinsics;
};$h‍_once.getAnonymousIntrinsics(getAnonymousIntrinsics);
})()
Expand Down
Loading