Skip to content

Remove use of legacy interop preventing CSP compliance in Blazor WebAssembly #48182

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
merged 1 commit into from
May 12, 2023
Merged

Remove use of legacy interop preventing CSP compliance in Blazor WebAssembly #48182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.server.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.webview.js
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 5 additions & 20 deletions src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { WebAssemblyResourceLoader, LoadingResource } from '../WebAssemblyResour
import { Platform, System_Array, Pointer, System_Object, System_String, HeapLock, PlatformApi } from '../Platform';
import { WebAssemblyBootResourceType, WebAssemblyStartOptions } from '../WebAssemblyStartOptions';
import { Blazor } from '../../GlobalExports';
import { DotnetModuleConfig, EmscriptenModule, MonoConfig, ModuleAPI, BootJsonData, ICUDataMode } from 'dotnet';
import { DotnetModuleConfig, EmscriptenModule, MonoConfig, ModuleAPI, BootJsonData, ICUDataMode, RuntimeAPI } from 'dotnet';
import { BINDINGType, MONOType } from 'dotnet/dotnet-legacy';
import { WebAssemblyComponentDescriptor, discoverComponents, discoverPersistedState } from '../../Services/ComponentDescriptorDiscovery';
import { attachRootComponentToElement, attachRootComponentToLogicalElement } from '../../Rendering/Renderer';
Expand All @@ -24,6 +24,7 @@ export let BINDING: BINDINGType = undefined as any;
export let MONO: MONOType = undefined as any;
export let Module: DotnetModuleConfig & EmscriptenModule = undefined as any;
let MONO_INTERNAL: any = undefined as any;
let runtime: RuntimeAPI = undefined as any;

const uint64HighOrderShift = Math.pow(2, 32);
const maxSafeNumberHighPart = Math.pow(2, 21) - 1; // The high-order int32 from Number.MAX_SAFE_INTEGER
Expand Down Expand Up @@ -62,10 +63,8 @@ export const monoPlatform: Platform = {
},

callEntryPoint: async function callEntryPoint(assemblyName: string): Promise<any> {
const emptyArray = [[]];

try {
await BINDING.call_assembly_entry_point(assemblyName, emptyArray, 'm');
await runtime.runMain(assemblyName, []);
} catch (error) {
console.error(error);
showErrorNotification();
Expand Down Expand Up @@ -131,18 +130,7 @@ export const monoPlatform: Platform = {
return unboxedValue;
}

let decodedString: string | null | undefined;
if (currentHeapLock) {
decodedString = currentHeapLock.stringCache.get(fieldValue);
if (decodedString === undefined) {
decodedString = BINDING.conv_string(fieldValue as any as System_String);
currentHeapLock.stringCache.set(fieldValue, decodedString);
}
} else {
decodedString = BINDING.conv_string(fieldValue as any as System_String);
}

return decodedString;
return BINDING.conv_string(fieldValue as any as System_String);
},

readStructField: function readStructField<T extends Pointer>(baseAddress: Pointer, fieldOffset?: number): T {
Expand Down Expand Up @@ -321,7 +309,7 @@ async function createRuntimeInstance(options: Partial<WebAssemblyStartOptions>):

anyDotnet.withStartupOptions(options).withModuleConfig(moduleConfig);

const runtime = await dotnet.create();
runtime = await dotnet.create();
const { MONO: mono, BINDING: binding, Module: module, setModuleImports, INTERNAL: mono_internal } = runtime;
Module = module;
BINDING = binding;
Expand Down Expand Up @@ -472,9 +460,6 @@ function assertHeapIsNotLocked() {
}

class MonoHeapLock implements HeapLock {
// Within a given heap lock, it's safe to cache decoded strings since the memory can't change
stringCache = new Map<number, string | null>();

// eslint-disable-next-line @typescript-eslint/ban-types
private postReleaseActions?: Function[];

Expand Down