mirror of
https://github.com/morluto/rea.git
synced 2026-11-20 13:45:30 +00:00
fix(managed): refuse empty field definition identities (#12467)
This commit is contained in:
1 parent
5a62623cd1
commit
82fa175d2f
11 files changed
+217
-94
No files matched your search
@@ -291,6 +291,7 @@ const callEdgesByCaller = (
|
||||
|
||||
const fieldAccessesByCaller = (
|
||||
result: ManagedMemberInspection,
|
||||
emptyFieldTokens: ReadonlySet<string>,
|
||||
): ReadonlyMap<
|
||||
string,
|
||||
readonly ManagedMemberInspection["field_accesses"][number][]
|
||||
@@ -300,10 +301,15 @@ const fieldAccessesByCaller = (
|
||||
ManagedMemberInspection["field_accesses"][number][]
|
||||
>();
|
||||
for (const access of result.field_accesses) {
|
||||
const observed =
|
||||
emptyFieldTokens.has(access.field_token) &&
|
||||
access.target_identity_sha256 !== null
|
||||
? { ...access, target_identity_sha256: null }
|
||||
: access;
|
||||
const callerAccesses = accesses.get(access.method_token);
|
||||
if (callerAccesses === undefined)
|
||||
accesses.set(access.method_token, [access]);
|
||||
else callerAccesses.push(access);
|
||||
accesses.set(access.method_token, [observed]);
|
||||
else callerAccesses.push(observed);
|
||||
}
|
||||
return accesses;
|
||||
};
|
||||
@@ -330,8 +336,14 @@ export const compareManagedMembers = (
|
||||
rightAssembly: right.result.assembly,
|
||||
leftCallEdgesByCaller: callEdgesByCaller(left.result),
|
||||
rightCallEdgesByCaller: callEdgesByCaller(right.result),
|
||||
leftFieldAccessesByCaller: fieldAccessesByCaller(left.result),
|
||||
rightFieldAccessesByCaller: fieldAccessesByCaller(right.result),
|
||||
leftFieldAccessesByCaller: fieldAccessesByCaller(
|
||||
left.result,
|
||||
scope.left.emptyFieldTokens,
|
||||
),
|
||||
rightFieldAccessesByCaller: fieldAccessesByCaller(
|
||||
right.result,
|
||||
scope.right.emptyFieldTokens,
|
||||
),
|
||||
};
|
||||
const methodItems = buildMethodItems(methodMatches, itemContext);
|
||||
const fieldItems = buildFieldItems(fieldMatches, itemContext);
|
||||
|
||||
@@ -85,8 +85,8 @@ const unavailableTypeNames = (
|
||||
return unavailable;
|
||||
};
|
||||
|
||||
/** One side's build-local TypeDef lookup and observed nominal selection. */
|
||||
const declaringTypeScope = (result: ManagedMemberInspection) => {
|
||||
/** One side's nominal name availability and observed declaring-type selection. */
|
||||
const comparisonSideScope = (result: ManagedMemberInspection) => {
|
||||
const unavailable = unavailableTypeNames(result.types);
|
||||
const names = new Map(
|
||||
result.types.map((type) => [
|
||||
@@ -96,15 +96,27 @@ const declaringTypeScope = (result: ManagedMemberInspection) => {
|
||||
);
|
||||
// Historical Evidence may record invalid names with complete coverage.
|
||||
const hasEmptyTypeName = unavailable.size > 0;
|
||||
const emptyMethodNames = new Set(
|
||||
result.methods.filter(({ name }) => name === ""),
|
||||
const emptyMemberNames = new Set<DeclaredMember>();
|
||||
for (const definitions of [result.methods, result.fields])
|
||||
for (const member of definitions)
|
||||
if (member.name === "") emptyMemberNames.add(member);
|
||||
const emptyFieldTokens = new Set(
|
||||
result.fields
|
||||
.filter((field) => emptyMemberNames.has(field))
|
||||
.map(({ token }) => token),
|
||||
);
|
||||
const hasEmptyDefinitionName = hasEmptyTypeName || emptyMethodNames.size > 0;
|
||||
// A selected method can reference a Field row outside the retained inventory.
|
||||
for (const access of result.field_accesses)
|
||||
if (access.field_name === "" && access.field_token.startsWith("0x04"))
|
||||
emptyFieldTokens.add(access.field_token);
|
||||
const hasEmptyDefinitionName =
|
||||
hasEmptyTypeName || emptyMemberNames.size > 0 || emptyFieldTokens.size > 0;
|
||||
const metadataComplete =
|
||||
result.metadata.status === "complete" && !hasEmptyDefinitionName;
|
||||
return {
|
||||
names,
|
||||
emptyMethodNames,
|
||||
emptyMemberNames,
|
||||
emptyFieldTokens,
|
||||
hasEmptyDefinitionName,
|
||||
metadataComplete,
|
||||
selected:
|
||||
@@ -119,15 +131,15 @@ const declaringTypeScope = (result: ManagedMemberInspection) => {
|
||||
};
|
||||
};
|
||||
|
||||
type DeclaringTypeScope = ReturnType<typeof declaringTypeScope>;
|
||||
type ComparisonSideScope = ReturnType<typeof comparisonSideScope>;
|
||||
type DeclaredMember =
|
||||
| ManagedMemberInspection["methods"][number]
|
||||
| ManagedMemberInspection["fields"][number];
|
||||
|
||||
/** Resolve tokens only in their own source, then test opposite nominal scope. */
|
||||
const observedBy = (
|
||||
own: DeclaringTypeScope,
|
||||
opposite: DeclaringTypeScope,
|
||||
own: ComparisonSideScope,
|
||||
opposite: ComparisonSideScope,
|
||||
member: DeclaredMember,
|
||||
): boolean => {
|
||||
if (opposite.selected === null) return true;
|
||||
@@ -137,8 +149,8 @@ const observedBy = (
|
||||
|
||||
/** Compare the nominal types the owner retained, independently of request spelling. */
|
||||
const compareSelectedTypes = (
|
||||
left: DeclaringTypeScope,
|
||||
right: DeclaringTypeScope,
|
||||
left: ComparisonSideScope,
|
||||
right: ComparisonSideScope,
|
||||
): SelectionAgreement => {
|
||||
const leftNames = left.selected;
|
||||
const rightNames = right.selected;
|
||||
@@ -156,8 +168,8 @@ export const managedComparisonScope = (
|
||||
left: ManagedMemberInspection,
|
||||
right: ManagedMemberInspection,
|
||||
) => {
|
||||
const a = declaringTypeScope(left);
|
||||
const b = declaringTypeScope(right);
|
||||
const a = comparisonSideScope(left);
|
||||
const b = comparisonSideScope(right);
|
||||
return {
|
||||
left: a,
|
||||
right: b,
|
||||
@@ -298,7 +310,7 @@ export const comparisonLimitations = (
|
||||
limitations.push("At least one managed member observation is partial.");
|
||||
if (scope.left.hasEmptyDefinitionName || scope.right.hasEmptyDefinitionName)
|
||||
limitations.push(
|
||||
"Recorded empty TypeDef or MethodDef names leave nominal identities unresolved. The comparison has partial name coverage even if a source reported complete metadata.",
|
||||
"Recorded empty definition names leave nominal identities unresolved. The comparison has partial name coverage even if a source reported complete metadata.",
|
||||
);
|
||||
limitations.push(...capacityLimitations(left, right));
|
||||
if (scope.agreement === "different")
|
||||
|
||||
@@ -484,7 +484,7 @@ const methodOnlyItem = (
|
||||
),
|
||||
unpaired: undecoded,
|
||||
ownIdentityUnavailable: identityUnavailable,
|
||||
ownNameUnavailable: context.scope.left.emptyMethodNames.has(member.left),
|
||||
ownNameUnavailable: context.scope.left.emptyMemberNames.has(member.left),
|
||||
opposite: "right",
|
||||
inventory: "method",
|
||||
});
|
||||
@@ -508,7 +508,7 @@ const methodOnlyItem = (
|
||||
),
|
||||
unpaired: undecoded,
|
||||
ownIdentityUnavailable: identityUnavailable,
|
||||
ownNameUnavailable: context.scope.right.emptyMethodNames.has(member.right),
|
||||
ownNameUnavailable: context.scope.right.emptyMemberNames.has(member.right),
|
||||
opposite: "left",
|
||||
inventory: "method",
|
||||
});
|
||||
@@ -540,7 +540,7 @@ const absenceLimitations = (
|
||||
opposite: {
|
||||
readonly oppositeComplete: boolean;
|
||||
readonly ownIdentityUnavailable: boolean;
|
||||
readonly ownNameUnavailable?: boolean;
|
||||
readonly ownNameUnavailable: boolean;
|
||||
readonly unpaired: UndecodedOneSidedNames;
|
||||
readonly opposite: "left" | "right";
|
||||
readonly inventory: "method" | "field";
|
||||
@@ -550,7 +550,7 @@ const absenceLimitations = (
|
||||
? [
|
||||
limitation(
|
||||
"unknown-within-incomplete-metadata",
|
||||
"The recorded MethodDef name is empty, so its nominal identity is unavailable.",
|
||||
`The recorded ${opposite.inventory === "method" ? "MethodDef" : "Field"} name is empty, so its nominal identity is unavailable.`,
|
||||
),
|
||||
]
|
||||
: opposite.ownIdentityUnavailable
|
||||
@@ -724,6 +724,7 @@ const fieldOnlyItem = (
|
||||
),
|
||||
unpaired: undecoded,
|
||||
ownIdentityUnavailable: identityUnavailable,
|
||||
ownNameUnavailable: context.scope.left.emptyMemberNames.has(member.left),
|
||||
opposite: "right",
|
||||
inventory: "field",
|
||||
});
|
||||
@@ -746,6 +747,7 @@ const fieldOnlyItem = (
|
||||
),
|
||||
unpaired: undecoded,
|
||||
ownIdentityUnavailable: identityUnavailable,
|
||||
ownNameUnavailable: context.scope.right.emptyMemberNames.has(member.right),
|
||||
opposite: "left",
|
||||
inventory: "field",
|
||||
});
|
||||
|
||||
@@ -510,26 +510,28 @@ export const keyMembers = (
|
||||
} => {
|
||||
const declared = (
|
||||
inspection: ManagedMemberInspection,
|
||||
names: ReadonlyMap<string, string | null>,
|
||||
side: ManagedComparisonScope["left"],
|
||||
): ((item: Method | Field) => DeclaredName) => {
|
||||
return (item) => {
|
||||
if (!inspection.nesting_read) return null;
|
||||
const digest = names.get(item.declaring_type_token ?? "");
|
||||
if (!inspection.nesting_read || side.emptyMemberNames.has(item))
|
||||
return null;
|
||||
const digest = side.names.get(item.declaring_type_token ?? "");
|
||||
return digest == null ? null : ["nominal-name-sha256", digest];
|
||||
};
|
||||
};
|
||||
const declaredLeft = declared(left.result, scope.left.names);
|
||||
const declaredRight = declared(right.result, scope.right.names);
|
||||
const declaredLeft = declared(left.result, scope.left);
|
||||
const declaredRight = declared(right.result, scope.right);
|
||||
const matchable = {
|
||||
inLeft: (item: Method | Field) =>
|
||||
!scope.right.emptyMemberNames.has(item) && scope.inLeft(item),
|
||||
inRight: (item: Method | Field) =>
|
||||
!scope.left.emptyMemberNames.has(item) && scope.inRight(item),
|
||||
};
|
||||
return {
|
||||
methodMatches: matchObserved(
|
||||
left.result.methods,
|
||||
right.result.methods,
|
||||
{
|
||||
inLeft: (item) =>
|
||||
!scope.right.emptyMethodNames.has(item) && scope.inLeft(item),
|
||||
inRight: (item) =>
|
||||
!scope.left.emptyMethodNames.has(item) && scope.inRight(item),
|
||||
},
|
||||
matchable,
|
||||
(a, b) =>
|
||||
matchMethods(
|
||||
a,
|
||||
@@ -539,21 +541,13 @@ export const keyMembers = (
|
||||
hasCompleteMethodRows(left.result) &&
|
||||
hasCompleteMethodRows(right.result),
|
||||
),
|
||||
(item) =>
|
||||
keyMethod(
|
||||
item,
|
||||
scope.left.emptyMethodNames.has(item) ? null : declaredLeft(item),
|
||||
),
|
||||
(item) =>
|
||||
keyMethod(
|
||||
item,
|
||||
scope.right.emptyMethodNames.has(item) ? null : declaredRight(item),
|
||||
),
|
||||
(item) => keyMethod(item, declaredLeft(item)),
|
||||
(item) => keyMethod(item, declaredRight(item)),
|
||||
),
|
||||
fieldMatches: matchObserved(
|
||||
left.result.fields,
|
||||
right.result.fields,
|
||||
scope,
|
||||
matchable,
|
||||
(a, b) =>
|
||||
matchFields(
|
||||
a,
|
||||
|
||||
@@ -197,7 +197,7 @@ export const readMetadataString = (
|
||||
export const readRequiredMetadataName = (
|
||||
bytes: Buffer,
|
||||
layout: ManagedMetadataLayout,
|
||||
table: "TypeDef" | "MethodDef",
|
||||
table: "TypeDef" | "Field" | "MethodDef",
|
||||
token: string,
|
||||
{
|
||||
nameIndex,
|
||||
|
||||
@@ -2,6 +2,7 @@ import type { ManagedMetadataLayout } from "../domain/managed/managedMetadataLay
|
||||
import {
|
||||
metadataRowCursor,
|
||||
metadataToken,
|
||||
readRequiredMetadataName,
|
||||
} from "../domain/managed/managedMetadataHeaps.js";
|
||||
|
||||
/** Scalar Field facts; consumers own heap admission and field selection. */
|
||||
@@ -14,6 +15,7 @@ export const readFieldDefinitionRow = (
|
||||
readonly rowOffset: number;
|
||||
readonly flags: number;
|
||||
readonly nameIndex: number;
|
||||
readonly nameOffset: number;
|
||||
readonly signatureIndex: number;
|
||||
} => {
|
||||
// Layout admission bounds the complete row independently of its heap values.
|
||||
@@ -22,7 +24,24 @@ export const readFieldDefinitionRow = (
|
||||
token: metadataToken(4, row),
|
||||
rowOffset: cursor.start,
|
||||
flags: cursor.u16(),
|
||||
nameOffset: cursor.offset,
|
||||
nameIndex: cursor.readIndex(layout.stringIndexSize),
|
||||
signatureIndex: cursor.readIndex(layout.blobIndexSize),
|
||||
};
|
||||
};
|
||||
|
||||
export const readFieldDefinitionName = (
|
||||
bytes: Buffer,
|
||||
layout: ManagedMetadataLayout,
|
||||
definition: Pick<
|
||||
ReturnType<typeof readFieldDefinitionRow>,
|
||||
"token" | "nameIndex" | "nameOffset"
|
||||
>,
|
||||
): string =>
|
||||
readRequiredMetadataName(
|
||||
bytes,
|
||||
layout,
|
||||
"Field",
|
||||
definition.token,
|
||||
definition,
|
||||
);
|
||||
@@ -1,4 +1,7 @@
|
||||
import { readFieldDefinitionRow } from "./ManagedFieldDefinitionRows.js";
|
||||
import {
|
||||
readFieldDefinitionName,
|
||||
readFieldDefinitionRow,
|
||||
} from "./ManagedFieldDefinitionRows.js";
|
||||
import { createManagedFieldConstantReader } from "./ManagedFieldConstants.js";
|
||||
import { readMemberReferenceRowFacts } from "../domain/managed/managedMemberReferenceRows.js";
|
||||
import {
|
||||
@@ -111,9 +114,9 @@ export const parseFields = (
|
||||
)
|
||||
continue;
|
||||
readManagedValue(() => {
|
||||
const { token, rowOffset, flags, nameIndex, signatureIndex } =
|
||||
readFieldDefinitionRow(bytes, layout, row);
|
||||
const name = readMetadataString(bytes, layout, nameIndex);
|
||||
const definition = readFieldDefinitionRow(bytes, layout, row);
|
||||
const { token, rowOffset, flags, signatureIndex } = definition;
|
||||
const name = readFieldDefinitionName(bytes, layout, definition);
|
||||
const owned = owner ?? 0;
|
||||
core.set(token, {
|
||||
token,
|
||||
@@ -507,10 +510,10 @@ export const readReferencedMemberCores = (
|
||||
const declared = ranges[ownerOf(table, row) - 1];
|
||||
const name =
|
||||
table === 4
|
||||
? readMetadataString(
|
||||
? readFieldDefinitionName(
|
||||
bytes,
|
||||
layout,
|
||||
readFieldDefinitionRow(bytes, layout, row).nameIndex,
|
||||
readFieldDefinitionRow(bytes, layout, row),
|
||||
)
|
||||
: readMethodDefinitionName(
|
||||
bytes,
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
import { readFieldDefinitionRow } from "./ManagedFieldDefinitionRows.js";
|
||||
import {
|
||||
readFieldDefinitionName,
|
||||
readFieldDefinitionRow,
|
||||
} from "./ManagedFieldDefinitionRows.js";
|
||||
import {
|
||||
readMethodDefinitionName,
|
||||
readMethodDefinitionRow,
|
||||
@@ -94,12 +97,9 @@ export const parseFields = (
|
||||
const table = layout.table(4);
|
||||
for (let row = 1; row <= (table?.rowCount ?? 0); row += 1) {
|
||||
readManagedValue(() => {
|
||||
const { token, rowOffset, flags, nameIndex } = readFieldDefinitionRow(
|
||||
bytes,
|
||||
layout,
|
||||
row,
|
||||
);
|
||||
const name = readMetadataString(bytes, layout, nameIndex);
|
||||
const definition = readFieldDefinitionRow(bytes, layout, row);
|
||||
const { token, rowOffset, flags } = definition;
|
||||
const name = readFieldDefinitionName(bytes, layout, definition);
|
||||
fields.set(token, {
|
||||
token,
|
||||
rowOffset,
|
||||
|
||||
@@ -210,25 +210,36 @@ it.each([0, 2])(
|
||||
},
|
||||
);
|
||||
|
||||
it("reports field imports as declarations without inventing method implementations", () => {
|
||||
const bytes = buildManagedPeFixture({ pinvoke: { memberForwardedRaw: 2 } });
|
||||
const result = inspectManagedNativeBoundariesBytes(
|
||||
bytes,
|
||||
managedPeFixtureTarget(bytes),
|
||||
);
|
||||
expect(result.pinvoke_imports).toMatchObject([
|
||||
{
|
||||
member_kind: "field",
|
||||
member_token: "0x04000001",
|
||||
member_name: "counter",
|
||||
},
|
||||
]);
|
||||
expect(
|
||||
result.native_implementations.every((item) =>
|
||||
item.token.startsWith("0x06"),
|
||||
),
|
||||
).toBe(true);
|
||||
});
|
||||
it.each([
|
||||
{ fieldName: "counter", memberName: "counter", status: "complete" },
|
||||
{ fieldName: "", memberName: null, status: "partial" },
|
||||
])(
|
||||
"preserves a field import declaration with a $status FieldDef name observation",
|
||||
({ fieldName, memberName, status }) => {
|
||||
const bytes = buildManagedPeFixture({
|
||||
fieldName,
|
||||
pinvoke: { memberForwardedRaw: 2 },
|
||||
});
|
||||
const result = inspectManagedNativeBoundariesBytes(
|
||||
bytes,
|
||||
managedPeFixtureTarget(bytes),
|
||||
);
|
||||
expect(result.pinvoke_imports).toMatchObject([
|
||||
{
|
||||
member_kind: "field",
|
||||
member_token: "0x04000001",
|
||||
member_name: memberName,
|
||||
import_name: "MessageBoxW",
|
||||
},
|
||||
]);
|
||||
expect(result.metadata.status).toBe(status);
|
||||
expect(
|
||||
result.native_implementations.every((item) =>
|
||||
item.token.startsWith("0x06"),
|
||||
),
|
||||
).toBe(true);
|
||||
},
|
||||
);
|
||||
|
||||
describe("managed native boundary inspection", () => {
|
||||
it("reports absent or malformed member metadata", () => {
|
||||
|
||||
Reference in new issue
Block a user