[browser] improve CSP#86158

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

[browser] improve CSP #86158

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
1 change: 1 addition & 0 deletions src/mono/sample/wasm/browser-advanced/index.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
<title>Wasm Browser Advanced Sample</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval';" />
<script type='module' src="./main.js"></script>
<script type='module' src="./dotnet.js"></script>
<link rel="preload" href="./mono-config.json" as="fetch" crossorigin="anonymous">
Expand Down
31 changes: 15 additions & 16 deletions src/mono/sample/wasm/browser-advanced/main.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,25 @@ let testAbort = true;
let testError = true;

try {
const originalFetch = globalThis.fetch;
globalThis.fetch = (url, fetchArgs) => {
console.log("fetching " + url);
// we are testing that we can retry loading of the assembly
if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
testAbort = false;
return originalFetch(url + "?testAbort=true", fetchArgs);
}
if (testError && url.indexOf('System.Console') != -1) {
testError = false;
return originalFetch(url + "?testError=true", fetchArgs);
}
return originalFetch(url, fetchArgs);
};
const { runtimeBuildInfo, setModuleImports, getAssemblyExports, runMain, getConfig, Module } = await dotnet
.withElementOnExit()
// 'withModuleConfig' is internal lower level API
// here we show how emscripten could be further configured
// It is prefered to use specific 'with***' methods instead in all other cases.
// It is preferred to use specific 'with***' methods instead in all other cases.
.withModuleConfig({
configSrc: "./mono-config.json",
onConfigLoaded: (config) => {
Expand All@@ -25,21 +39,6 @@ try {
config.environmentVariables["MONO_LOG_LEVEL"] = "debug";
config.browserProfilerOptions = {};
},
imports: {
fetch: (url, fetchArgs) => {
console.log("fetching " + url);
// we are testing that we can retry loading of the assembly
if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
testAbort = false;
return fetch(url + "?testAbort=true", fetchArgs);
}
if (testError && url.indexOf('System.Console') != -1) {
testError = false;
return fetch(url + "?testError=true", fetchArgs);
}
return fetch(url, fetchArgs);
}
},
preInit: () => { console.log('user code Module.preInit'); },
preRun: () => { console.log('user code Module.preRun'); },
onRuntimeInitialized: () => {
Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/runtime/jiterpreter-trace-generator.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ import {
sizeOfDataItem, sizeOfV128, sizeOfStackval,

disabledOpcodes, countCallTargets,
callTargetCounts, trapTraceErrors,
callTargetCounts,
trace, traceOnError, traceOnRuntimeError,
emitPadding, traceBranchDisplacements,
traceEip, nullCheckValidation,
Expand DownExpand Up@@ -1262,7 +1262,7 @@ export function generateWasmBody(
(opcode <= MintOpcode.MINT_RET_I8_IMM)
)
) {
if (isConditionallyExecuted || trapTraceErrors || builder.options.countBailouts) {
if (isConditionallyExecuted || builder.options.countBailouts) {
// Not an exit, because returns are normal and we don't want to make them more expensive.
// FIXME: Or do we want to record them? Early conditional returns might reduce the value of a trace,
// but the main problem is more likely to be calls early in traces. Worth testing later.
Expand Down
79 changes: 17 additions & 62 deletions src/mono/wasm/runtime/jiterpreter.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,6 @@ export const
traceTooSmall = false,
// For instrumented methods, trace their exact IP during execution
traceEip = false,
// Wraps traces in a JS function that will trap errors and log the trace responsible.
// Very expensive!!!!
trapTraceErrors = false,
// When eliminating a null check, replace it with a runtime 'not null' assertion
// that will print a diagnostic message if the value is actually null or if
// the value does not match the value on the native interpreter stack in memory
Expand DownExpand Up@@ -183,8 +180,6 @@ struct InterpMethod {
export let traceBuilder: WasmBuilder;
export let traceImports: Array<[string, string, Function]> | undefined;

export let _wrap_trace_function: Function;

const mathOps1d =
[
"asin",
Expand DownExpand Up@@ -319,45 +314,6 @@ function getTraceImports() {
return traceImports;
}

function wrap_trace_function(
f: Function, name: string, traceBuf: any,
base: MintOpcodePtr, instrumentedTraceId: number
) {
const tup = instrumentedTraces[instrumentedTraceId];
if (instrumentedTraceId)
console.log(`instrumented ${tup.name}`);

if (!_wrap_trace_function) {
// If we used a regular closure, the js console would print the entirety of
// dotnet.native.js when printing an error stack trace, which is... not helpful
const js = `return function trace_enter (locals) {
let threw = true;
try {
let result = trace(locals);
threw = false;
return result;
} finally {
if (threw) {
let msg = "Unhandled error in trace '" + name + "'";
if (tup) {
msg += " at offset " + (tup.eip + base).toString(16);
msg += " with most recent operands " + tup.operand1.toString(16) + ", " + tup.operand2.toString(16);
}
console.error(msg);
if (traceBuf) {
for (let i = 0, l = traceBuf.length; i < l; i++)
console.log(traceBuf[i]);
}
}
}
};`;
_wrap_trace_function = new Function("trace", "name", "traceBuf", "tup", "base", js);
}
return _wrap_trace_function(
f, name, traceBuf, instrumentedTraces[instrumentedTraceId], base
);
}

function initialize_builder(builder: WasmBuilder) {
// Function type for compiled traces
builder.defineType(
Expand All@@ -379,7 +335,8 @@ function initialize_builder(builder: WasmBuilder) {
WasmValtype.i32, true
);
builder.defineType(
"copy_ptr", {
"copy_ptr",
{
"dest": WasmValtype.i32,
"src": WasmValtype.i32
},
Expand DownExpand Up@@ -696,25 +653,31 @@ function initialize_builder(builder: WasmBuilder) {
WasmValtype.i32, true
);
builder.defineType(
"simd_p_p", {
"simd_p_p",
{
"arg0": WasmValtype.i32,
"arg1": WasmValtype.i32,
}, WasmValtype.void, true
},
WasmValtype.void, true
);
builder.defineType(
"simd_p_pp", {
"simd_p_pp",
{
"arg0": WasmValtype.i32,
"arg1": WasmValtype.i32,
"arg2": WasmValtype.i32,
}, WasmValtype.void, true
},
WasmValtype.void, true
);
builder.defineType(
"simd_p_ppp", {
"simd_p_ppp",
{
"arg0": WasmValtype.i32,
"arg1": WasmValtype.i32,
"arg2": WasmValtype.i32,
"arg3": WasmValtype.i32,
}, WasmValtype.void, true
},
WasmValtype.void, true
);

const traceImports = getTraceImports();
Expand DownExpand Up@@ -887,15 +850,7 @@ function generate_wasm(
rejected = false;
mono_assert(!runtimeHelpers.storeMemorySnapshotPending, "Attempting to set function into table during creation of memory snapshot");

const idx =
trapTraceErrors
? Module.addFunction(
wrap_trace_function(
<any>fn, methodFullName || methodName, traceOnRuntimeError ? builder.traceBuf : undefined,
builder.base, instrumentedTraceId
), "iii"
)
: addWasmFunctionPointer(<any>fn);
const idx = addWasmFunctionPointer(<any>fn);
if (!idx)
throw new Error("add_function_pointer returned a 0 index");
else if (trace >= 2)
Expand DownExpand Up@@ -1021,7 +976,7 @@ export function mono_interp_tier_prepare_jiterpreter(

counters.traceCandidates++;
let methodFullName: string | undefined;
if (trapTraceErrors || mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
if (mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
const pMethodName = cwraps.mono_wasm_method_get_full_name(method);
methodFullName = Module.UTF8ToString(pMethodName);
Module._free(<any>pMethodName);
Expand DownExpand Up@@ -1218,7 +1173,7 @@ export function jiterpreter_dump_stats(b?: boolean, concise?: boolean) {
for (const k in counters.simdFallback)
console.log(`// simd ${k}: ${counters.simdFallback[k]} fallback insn(s)`);

if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
setTimeout(
() => jiterpreter_dump_stats(b),
15000
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[browser] improve CSP#86158

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

lewing
merged 1 commit into

from

May 12, 2023
 Merged


[browser] improve CSP
#86158
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


1 change: 1 addition & 0 deletions
src/mono/sample/wasm/browser-advanced/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
 <title>Wasm Browser Advanced Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval';" />
 <script type='module' src="./main.js"></script>
 <script type='module' src="./dotnet.js"></script>
 <link rel="preload" href="./mono-config.json" as="fetch" crossorigin="anonymous">
Expand Down

31 changes: 15 additions & 16 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,25 @@ let testAbort = true;
let testError = true;

try {
 const originalFetch = globalThis.fetch;
 globalThis.fetch = (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return originalFetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return originalFetch(url + "?testError=true", fetchArgs);
 }
 return originalFetch(url, fetchArgs);
 };
 const { runtimeBuildInfo, setModuleImports, getAssemblyExports, runMain, getConfig, Module } = await dotnet
 .withElementOnExit()
 // 'withModuleConfig' is internal lower level API 
 // here we show how emscripten could be further configured
 // It is prefered to use specific 'with***' methods instead in all other cases.
 // It is preferred to use specific 'with***' methods instead in all other cases.
 .withModuleConfig({
 configSrc: "./mono-config.json",
 onConfigLoaded: (config) => {
Expand All@@ -25,21 +39,6 @@ try {
 config.environmentVariables["MONO_LOG_LEVEL"] = "debug";
 config.browserProfilerOptions = {};
 },
 imports: {
 fetch: (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return fetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return fetch(url + "?testError=true", fetchArgs);
 }
 return fetch(url, fetchArgs);
 }
 },
 preInit: () => { console.log('user code Module.preInit'); },
 preRun: () => { console.log('user code Module.preRun'); },
 onRuntimeInitialized: () => {
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/runtime/jiterpreter-trace-generator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ import {
 sizeOfDataItem, sizeOfV128, sizeOfStackval,

 disabledOpcodes, countCallTargets,
 callTargetCounts, trapTraceErrors,
 callTargetCounts,
 trace, traceOnError, traceOnRuntimeError,
 emitPadding, traceBranchDisplacements,
 traceEip, nullCheckValidation,
Expand DownExpand Up@@ -1262,7 +1262,7 @@ export function generateWasmBody(
 (opcode <= MintOpcode.MINT_RET_I8_IMM)
 )
 ) {
 if (isConditionallyExecuted || trapTraceErrors || builder.options.countBailouts) {
 if (isConditionallyExecuted || builder.options.countBailouts) {
 // Not an exit, because returns are normal and we don't want to make them more expensive.
 // FIXME: Or do we want to record them? Early conditional returns might reduce the value of a trace,
 // but the main problem is more likely to be calls early in traces. Worth testing later.
Expand Down

79 changes: 17 additions & 62 deletions
src/mono/wasm/runtime/jiterpreter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,6 @@ export const
 traceTooSmall = false,
 // For instrumented methods, trace their exact IP during execution
 traceEip = false,
 // Wraps traces in a JS function that will trap errors and log the trace responsible.
 // Very expensive!!!!
 trapTraceErrors = false,
 // When eliminating a null check, replace it with a runtime 'not null' assertion
 // that will print a diagnostic message if the value is actually null or if
 // the value does not match the value on the native interpreter stack in memory
Expand DownExpand Up@@ -183,8 +180,6 @@ struct InterpMethod {
export let traceBuilder: WasmBuilder;
export let traceImports: Array<[string, string, Function]> | undefined;

export let _wrap_trace_function: Function;

const mathOps1d =
 [
 "asin",
Expand DownExpand Up@@ -319,45 +314,6 @@ function getTraceImports() {
 return traceImports;
}

function wrap_trace_function(
 f: Function, name: string, traceBuf: any,
 base: MintOpcodePtr, instrumentedTraceId: number
) {
 const tup = instrumentedTraces[instrumentedTraceId];
 if (instrumentedTraceId)
 console.log(`instrumented ${tup.name}`);

 if (!_wrap_trace_function) {
 // If we used a regular closure, the js console would print the entirety of
 // dotnet.native.js when printing an error stack trace, which is... not helpful
 const js = `return function trace_enter (locals) {
 let threw = true;
 try {
 let result = trace(locals);
 threw = false;
 return result;
 } finally {
 if (threw) {
 let msg = "Unhandled error in trace '" + name + "'";
 if (tup) {
 msg += " at offset " + (tup.eip + base).toString(16);
 msg += " with most recent operands " + tup.operand1.toString(16) + ", " + tup.operand2.toString(16);
 }
 console.error(msg);
 if (traceBuf) {
 for (let i = 0, l = traceBuf.length; i < l; i++)
 console.log(traceBuf[i]);
 }
 }
 }
 };`;
 _wrap_trace_function = new Function("trace", "name", "traceBuf", "tup", "base", js);
 }
 return _wrap_trace_function(
 f, name, traceBuf, instrumentedTraces[instrumentedTraceId], base
 );
}

function initialize_builder(builder: WasmBuilder) {
 // Function type for compiled traces
 builder.defineType(
Expand All@@ -379,7 +335,8 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "copy_ptr", {
 "copy_ptr",
 {
 "dest": WasmValtype.i32,
 "src": WasmValtype.i32
 },
Expand DownExpand Up@@ -696,25 +653,31 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "simd_p_p", {
 "simd_p_p",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_pp", {
 "simd_p_pp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_ppp", {
 "simd_p_ppp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 "arg3": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );

 const traceImports = getTraceImports();
Expand DownExpand Up@@ -887,15 +850,7 @@ function generate_wasm(
 rejected = false;
 mono_assert(!runtimeHelpers.storeMemorySnapshotPending, "Attempting to set function into table during creation of memory snapshot");

 const idx =
 trapTraceErrors
 ? Module.addFunction(
 wrap_trace_function(
 <any>fn, methodFullName || methodName, traceOnRuntimeError ? builder.traceBuf : undefined,
 builder.base, instrumentedTraceId
 ), "iii"
 )
 : addWasmFunctionPointer(<any>fn);
 const idx = addWasmFunctionPointer(<any>fn);
 if (!idx)
 throw new Error("add_function_pointer returned a 0 index");
 else if (trace >= 2)
Expand DownExpand Up@@ -1021,7 +976,7 @@ export function mono_interp_tier_prepare_jiterpreter(

 counters.traceCandidates++;
 let methodFullName: string | undefined;
 if (trapTraceErrors || mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 if (mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 const pMethodName = cwraps.mono_wasm_method_get_full_name(method);
 methodFullName = Module.UTF8ToString(pMethodName);
 Module._free(<any>pMethodName);
Expand DownExpand Up@@ -1218,7 +1173,7 @@ export function jiterpreter_dump_stats(b?: boolean, concise?: boolean) {
 for (const k in counters.simdFallback)
 console.log(`// simd ${k}: ${counters.simdFallback[k]} fallback insn(s)`);

 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 setTimeout(
 () => jiterpreter_dump_stats(b),
 15000
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[browser] improve CSP#86158

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

lewing
merged 1 commit into

from

May 12, 2023
 Merged


[browser] improve CSP
#86158
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


1 change: 1 addition & 0 deletions
src/mono/sample/wasm/browser-advanced/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
 <title>Wasm Browser Advanced Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval';" />
 <script type='module' src="./main.js"></script>
 <script type='module' src="./dotnet.js"></script>
 <link rel="preload" href="./mono-config.json" as="fetch" crossorigin="anonymous">
Expand Down

31 changes: 15 additions & 16 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,25 @@ let testAbort = true;
let testError = true;

try {
 const originalFetch = globalThis.fetch;
 globalThis.fetch = (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return originalFetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return originalFetch(url + "?testError=true", fetchArgs);
 }
 return originalFetch(url, fetchArgs);
 };
 const { runtimeBuildInfo, setModuleImports, getAssemblyExports, runMain, getConfig, Module } = await dotnet
 .withElementOnExit()
 // 'withModuleConfig' is internal lower level API 
 // here we show how emscripten could be further configured
 // It is prefered to use specific 'with***' methods instead in all other cases.
 // It is preferred to use specific 'with***' methods instead in all other cases.
 .withModuleConfig({
 configSrc: "./mono-config.json",
 onConfigLoaded: (config) => {
Expand All@@ -25,21 +39,6 @@ try {
 config.environmentVariables["MONO_LOG_LEVEL"] = "debug";
 config.browserProfilerOptions = {};
 },
 imports: {
 fetch: (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return fetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return fetch(url + "?testError=true", fetchArgs);
 }
 return fetch(url, fetchArgs);
 }
 },
 preInit: () => { console.log('user code Module.preInit'); },
 preRun: () => { console.log('user code Module.preRun'); },
 onRuntimeInitialized: () => {
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/runtime/jiterpreter-trace-generator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ import {
 sizeOfDataItem, sizeOfV128, sizeOfStackval,

 disabledOpcodes, countCallTargets,
 callTargetCounts, trapTraceErrors,
 callTargetCounts,
 trace, traceOnError, traceOnRuntimeError,
 emitPadding, traceBranchDisplacements,
 traceEip, nullCheckValidation,
Expand DownExpand Up@@ -1262,7 +1262,7 @@ export function generateWasmBody(
 (opcode <= MintOpcode.MINT_RET_I8_IMM)
 )
 ) {
 if (isConditionallyExecuted || trapTraceErrors || builder.options.countBailouts) {
 if (isConditionallyExecuted || builder.options.countBailouts) {
 // Not an exit, because returns are normal and we don't want to make them more expensive.
 // FIXME: Or do we want to record them? Early conditional returns might reduce the value of a trace,
 // but the main problem is more likely to be calls early in traces. Worth testing later.
Expand Down

79 changes: 17 additions & 62 deletions
src/mono/wasm/runtime/jiterpreter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,6 @@ export const
 traceTooSmall = false,
 // For instrumented methods, trace their exact IP during execution
 traceEip = false,
 // Wraps traces in a JS function that will trap errors and log the trace responsible.
 // Very expensive!!!!
 trapTraceErrors = false,
 // When eliminating a null check, replace it with a runtime 'not null' assertion
 // that will print a diagnostic message if the value is actually null or if
 // the value does not match the value on the native interpreter stack in memory
Expand DownExpand Up@@ -183,8 +180,6 @@ struct InterpMethod {
export let traceBuilder: WasmBuilder;
export let traceImports: Array<[string, string, Function]> | undefined;

export let _wrap_trace_function: Function;

const mathOps1d =
 [
 "asin",
Expand DownExpand Up@@ -319,45 +314,6 @@ function getTraceImports() {
 return traceImports;
}

function wrap_trace_function(
 f: Function, name: string, traceBuf: any,
 base: MintOpcodePtr, instrumentedTraceId: number
) {
 const tup = instrumentedTraces[instrumentedTraceId];
 if (instrumentedTraceId)
 console.log(`instrumented ${tup.name}`);

 if (!_wrap_trace_function) {
 // If we used a regular closure, the js console would print the entirety of
 // dotnet.native.js when printing an error stack trace, which is... not helpful
 const js = `return function trace_enter (locals) {
 let threw = true;
 try {
 let result = trace(locals);
 threw = false;
 return result;
 } finally {
 if (threw) {
 let msg = "Unhandled error in trace '" + name + "'";
 if (tup) {
 msg += " at offset " + (tup.eip + base).toString(16);
 msg += " with most recent operands " + tup.operand1.toString(16) + ", " + tup.operand2.toString(16);
 }
 console.error(msg);
 if (traceBuf) {
 for (let i = 0, l = traceBuf.length; i < l; i++)
 console.log(traceBuf[i]);
 }
 }
 }
 };`;
 _wrap_trace_function = new Function("trace", "name", "traceBuf", "tup", "base", js);
 }
 return _wrap_trace_function(
 f, name, traceBuf, instrumentedTraces[instrumentedTraceId], base
 );
}

function initialize_builder(builder: WasmBuilder) {
 // Function type for compiled traces
 builder.defineType(
Expand All@@ -379,7 +335,8 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "copy_ptr", {
 "copy_ptr",
 {
 "dest": WasmValtype.i32,
 "src": WasmValtype.i32
 },
Expand DownExpand Up@@ -696,25 +653,31 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "simd_p_p", {
 "simd_p_p",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_pp", {
 "simd_p_pp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_ppp", {
 "simd_p_ppp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 "arg3": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );

 const traceImports = getTraceImports();
Expand DownExpand Up@@ -887,15 +850,7 @@ function generate_wasm(
 rejected = false;
 mono_assert(!runtimeHelpers.storeMemorySnapshotPending, "Attempting to set function into table during creation of memory snapshot");

 const idx =
 trapTraceErrors
 ? Module.addFunction(
 wrap_trace_function(
 <any>fn, methodFullName || methodName, traceOnRuntimeError ? builder.traceBuf : undefined,
 builder.base, instrumentedTraceId
 ), "iii"
 )
 : addWasmFunctionPointer(<any>fn);
 const idx = addWasmFunctionPointer(<any>fn);
 if (!idx)
 throw new Error("add_function_pointer returned a 0 index");
 else if (trace >= 2)
Expand DownExpand Up@@ -1021,7 +976,7 @@ export function mono_interp_tier_prepare_jiterpreter(

 counters.traceCandidates++;
 let methodFullName: string | undefined;
 if (trapTraceErrors || mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 if (mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 const pMethodName = cwraps.mono_wasm_method_get_full_name(method);
 methodFullName = Module.UTF8ToString(pMethodName);
 Module._free(<any>pMethodName);
Expand DownExpand Up@@ -1218,7 +1173,7 @@ export function jiterpreter_dump_stats(b?: boolean, concise?: boolean) {
 for (const k in counters.simdFallback)
 console.log(`// simd ${k}: ${counters.simdFallback[k]} fallback insn(s)`);

 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 setTimeout(
 () => jiterpreter_dump_stats(b),
 15000
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[browser] improve CSP#86158

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

lewing
merged 1 commit into

from

May 12, 2023
 Merged


[browser] improve CSP
#86158
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


1 change: 1 addition & 0 deletions
src/mono/sample/wasm/browser-advanced/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
 <title>Wasm Browser Advanced Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval';" />
 <script type='module' src="./main.js"></script>
 <script type='module' src="./dotnet.js"></script>
 <link rel="preload" href="./mono-config.json" as="fetch" crossorigin="anonymous">
Expand Down

31 changes: 15 additions & 16 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,25 @@ let testAbort = true;
let testError = true;

try {
 const originalFetch = globalThis.fetch;
 globalThis.fetch = (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return originalFetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return originalFetch(url + "?testError=true", fetchArgs);
 }
 return originalFetch(url, fetchArgs);
 };
 const { runtimeBuildInfo, setModuleImports, getAssemblyExports, runMain, getConfig, Module } = await dotnet
 .withElementOnExit()
 // 'withModuleConfig' is internal lower level API 
 // here we show how emscripten could be further configured
 // It is prefered to use specific 'with***' methods instead in all other cases.
 // It is preferred to use specific 'with***' methods instead in all other cases.
 .withModuleConfig({
 configSrc: "./mono-config.json",
 onConfigLoaded: (config) => {
Expand All@@ -25,21 +39,6 @@ try {
 config.environmentVariables["MONO_LOG_LEVEL"] = "debug";
 config.browserProfilerOptions = {};
 },
 imports: {
 fetch: (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return fetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return fetch(url + "?testError=true", fetchArgs);
 }
 return fetch(url, fetchArgs);
 }
 },
 preInit: () => { console.log('user code Module.preInit'); },
 preRun: () => { console.log('user code Module.preRun'); },
 onRuntimeInitialized: () => {
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/runtime/jiterpreter-trace-generator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ import {
 sizeOfDataItem, sizeOfV128, sizeOfStackval,

 disabledOpcodes, countCallTargets,
 callTargetCounts, trapTraceErrors,
 callTargetCounts,
 trace, traceOnError, traceOnRuntimeError,
 emitPadding, traceBranchDisplacements,
 traceEip, nullCheckValidation,
Expand DownExpand Up@@ -1262,7 +1262,7 @@ export function generateWasmBody(
 (opcode <= MintOpcode.MINT_RET_I8_IMM)
 )
 ) {
 if (isConditionallyExecuted || trapTraceErrors || builder.options.countBailouts) {
 if (isConditionallyExecuted || builder.options.countBailouts) {
 // Not an exit, because returns are normal and we don't want to make them more expensive.
 // FIXME: Or do we want to record them? Early conditional returns might reduce the value of a trace,
 // but the main problem is more likely to be calls early in traces. Worth testing later.
Expand Down

79 changes: 17 additions & 62 deletions
src/mono/wasm/runtime/jiterpreter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,6 @@ export const
 traceTooSmall = false,
 // For instrumented methods, trace their exact IP during execution
 traceEip = false,
 // Wraps traces in a JS function that will trap errors and log the trace responsible.
 // Very expensive!!!!
 trapTraceErrors = false,
 // When eliminating a null check, replace it with a runtime 'not null' assertion
 // that will print a diagnostic message if the value is actually null or if
 // the value does not match the value on the native interpreter stack in memory
Expand DownExpand Up@@ -183,8 +180,6 @@ struct InterpMethod {
export let traceBuilder: WasmBuilder;
export let traceImports: Array<[string, string, Function]> | undefined;

export let _wrap_trace_function: Function;

const mathOps1d =
 [
 "asin",
Expand DownExpand Up@@ -319,45 +314,6 @@ function getTraceImports() {
 return traceImports;
}

function wrap_trace_function(
 f: Function, name: string, traceBuf: any,
 base: MintOpcodePtr, instrumentedTraceId: number
) {
 const tup = instrumentedTraces[instrumentedTraceId];
 if (instrumentedTraceId)
 console.log(`instrumented ${tup.name}`);

 if (!_wrap_trace_function) {
 // If we used a regular closure, the js console would print the entirety of
 // dotnet.native.js when printing an error stack trace, which is... not helpful
 const js = `return function trace_enter (locals) {
 let threw = true;
 try {
 let result = trace(locals);
 threw = false;
 return result;
 } finally {
 if (threw) {
 let msg = "Unhandled error in trace '" + name + "'";
 if (tup) {
 msg += " at offset " + (tup.eip + base).toString(16);
 msg += " with most recent operands " + tup.operand1.toString(16) + ", " + tup.operand2.toString(16);
 }
 console.error(msg);
 if (traceBuf) {
 for (let i = 0, l = traceBuf.length; i < l; i++)
 console.log(traceBuf[i]);
 }
 }
 }
 };`;
 _wrap_trace_function = new Function("trace", "name", "traceBuf", "tup", "base", js);
 }
 return _wrap_trace_function(
 f, name, traceBuf, instrumentedTraces[instrumentedTraceId], base
 );
}

function initialize_builder(builder: WasmBuilder) {
 // Function type for compiled traces
 builder.defineType(
Expand All@@ -379,7 +335,8 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "copy_ptr", {
 "copy_ptr",
 {
 "dest": WasmValtype.i32,
 "src": WasmValtype.i32
 },
Expand DownExpand Up@@ -696,25 +653,31 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "simd_p_p", {
 "simd_p_p",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_pp", {
 "simd_p_pp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_ppp", {
 "simd_p_ppp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 "arg3": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );

 const traceImports = getTraceImports();
Expand DownExpand Up@@ -887,15 +850,7 @@ function generate_wasm(
 rejected = false;
 mono_assert(!runtimeHelpers.storeMemorySnapshotPending, "Attempting to set function into table during creation of memory snapshot");

 const idx =
 trapTraceErrors
 ? Module.addFunction(
 wrap_trace_function(
 <any>fn, methodFullName || methodName, traceOnRuntimeError ? builder.traceBuf : undefined,
 builder.base, instrumentedTraceId
 ), "iii"
 )
 : addWasmFunctionPointer(<any>fn);
 const idx = addWasmFunctionPointer(<any>fn);
 if (!idx)
 throw new Error("add_function_pointer returned a 0 index");
 else if (trace >= 2)
Expand DownExpand Up@@ -1021,7 +976,7 @@ export function mono_interp_tier_prepare_jiterpreter(

 counters.traceCandidates++;
 let methodFullName: string | undefined;
 if (trapTraceErrors || mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 if (mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 const pMethodName = cwraps.mono_wasm_method_get_full_name(method);
 methodFullName = Module.UTF8ToString(pMethodName);
 Module._free(<any>pMethodName);
Expand DownExpand Up@@ -1218,7 +1173,7 @@ export function jiterpreter_dump_stats(b?: boolean, concise?: boolean) {
 for (const k in counters.simdFallback)
 console.log(`// simd ${k}: ${counters.simdFallback[k]} fallback insn(s)`);

 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 setTimeout(
 () => jiterpreter_dump_stats(b),
 15000
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[browser] improve CSP#86158

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

lewing
merged 1 commit into

from

May 12, 2023
 Merged


[browser] improve CSP
#86158
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


1 change: 1 addition & 0 deletions
src/mono/sample/wasm/browser-advanced/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
 <title>Wasm Browser Advanced Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval';" />
 <script type='module' src="./main.js"></script>
 <script type='module' src="./dotnet.js"></script>
 <link rel="preload" href="./mono-config.json" as="fetch" crossorigin="anonymous">
Expand Down

31 changes: 15 additions & 16 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,25 @@ let testAbort = true;
let testError = true;

try {
 const originalFetch = globalThis.fetch;
 globalThis.fetch = (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return originalFetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return originalFetch(url + "?testError=true", fetchArgs);
 }
 return originalFetch(url, fetchArgs);
 };
 const { runtimeBuildInfo, setModuleImports, getAssemblyExports, runMain, getConfig, Module } = await dotnet
 .withElementOnExit()
 // 'withModuleConfig' is internal lower level API 
 // here we show how emscripten could be further configured
 // It is prefered to use specific 'with***' methods instead in all other cases.
 // It is preferred to use specific 'with***' methods instead in all other cases.
 .withModuleConfig({
 configSrc: "./mono-config.json",
 onConfigLoaded: (config) => {
Expand All@@ -25,21 +39,6 @@ try {
 config.environmentVariables["MONO_LOG_LEVEL"] = "debug";
 config.browserProfilerOptions = {};
 },
 imports: {
 fetch: (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return fetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return fetch(url + "?testError=true", fetchArgs);
 }
 return fetch(url, fetchArgs);
 }
 },
 preInit: () => { console.log('user code Module.preInit'); },
 preRun: () => { console.log('user code Module.preRun'); },
 onRuntimeInitialized: () => {
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/runtime/jiterpreter-trace-generator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ import {
 sizeOfDataItem, sizeOfV128, sizeOfStackval,

 disabledOpcodes, countCallTargets,
 callTargetCounts, trapTraceErrors,
 callTargetCounts,
 trace, traceOnError, traceOnRuntimeError,
 emitPadding, traceBranchDisplacements,
 traceEip, nullCheckValidation,
Expand DownExpand Up@@ -1262,7 +1262,7 @@ export function generateWasmBody(
 (opcode <= MintOpcode.MINT_RET_I8_IMM)
 )
 ) {
 if (isConditionallyExecuted || trapTraceErrors || builder.options.countBailouts) {
 if (isConditionallyExecuted || builder.options.countBailouts) {
 // Not an exit, because returns are normal and we don't want to make them more expensive.
 // FIXME: Or do we want to record them? Early conditional returns might reduce the value of a trace,
 // but the main problem is more likely to be calls early in traces. Worth testing later.
Expand Down

79 changes: 17 additions & 62 deletions
src/mono/wasm/runtime/jiterpreter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,6 @@ export const
 traceTooSmall = false,
 // For instrumented methods, trace their exact IP during execution
 traceEip = false,
 // Wraps traces in a JS function that will trap errors and log the trace responsible.
 // Very expensive!!!!
 trapTraceErrors = false,
 // When eliminating a null check, replace it with a runtime 'not null' assertion
 // that will print a diagnostic message if the value is actually null or if
 // the value does not match the value on the native interpreter stack in memory
Expand DownExpand Up@@ -183,8 +180,6 @@ struct InterpMethod {
export let traceBuilder: WasmBuilder;
export let traceImports: Array<[string, string, Function]> | undefined;

export let _wrap_trace_function: Function;

const mathOps1d =
 [
 "asin",
Expand DownExpand Up@@ -319,45 +314,6 @@ function getTraceImports() {
 return traceImports;
}

function wrap_trace_function(
 f: Function, name: string, traceBuf: any,
 base: MintOpcodePtr, instrumentedTraceId: number
) {
 const tup = instrumentedTraces[instrumentedTraceId];
 if (instrumentedTraceId)
 console.log(`instrumented ${tup.name}`);

 if (!_wrap_trace_function) {
 // If we used a regular closure, the js console would print the entirety of
 // dotnet.native.js when printing an error stack trace, which is... not helpful
 const js = `return function trace_enter (locals) {
 let threw = true;
 try {
 let result = trace(locals);
 threw = false;
 return result;
 } finally {
 if (threw) {
 let msg = "Unhandled error in trace '" + name + "'";
 if (tup) {
 msg += " at offset " + (tup.eip + base).toString(16);
 msg += " with most recent operands " + tup.operand1.toString(16) + ", " + tup.operand2.toString(16);
 }
 console.error(msg);
 if (traceBuf) {
 for (let i = 0, l = traceBuf.length; i < l; i++)
 console.log(traceBuf[i]);
 }
 }
 }
 };`;
 _wrap_trace_function = new Function("trace", "name", "traceBuf", "tup", "base", js);
 }
 return _wrap_trace_function(
 f, name, traceBuf, instrumentedTraces[instrumentedTraceId], base
 );
}

function initialize_builder(builder: WasmBuilder) {
 // Function type for compiled traces
 builder.defineType(
Expand All@@ -379,7 +335,8 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "copy_ptr", {
 "copy_ptr",
 {
 "dest": WasmValtype.i32,
 "src": WasmValtype.i32
 },
Expand DownExpand Up@@ -696,25 +653,31 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "simd_p_p", {
 "simd_p_p",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_pp", {
 "simd_p_pp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_ppp", {
 "simd_p_ppp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 "arg3": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );

 const traceImports = getTraceImports();
Expand DownExpand Up@@ -887,15 +850,7 @@ function generate_wasm(
 rejected = false;
 mono_assert(!runtimeHelpers.storeMemorySnapshotPending, "Attempting to set function into table during creation of memory snapshot");

 const idx =
 trapTraceErrors
 ? Module.addFunction(
 wrap_trace_function(
 <any>fn, methodFullName || methodName, traceOnRuntimeError ? builder.traceBuf : undefined,
 builder.base, instrumentedTraceId
 ), "iii"
 )
 : addWasmFunctionPointer(<any>fn);
 const idx = addWasmFunctionPointer(<any>fn);
 if (!idx)
 throw new Error("add_function_pointer returned a 0 index");
 else if (trace >= 2)
Expand DownExpand Up@@ -1021,7 +976,7 @@ export function mono_interp_tier_prepare_jiterpreter(

 counters.traceCandidates++;
 let methodFullName: string | undefined;
 if (trapTraceErrors || mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 if (mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 const pMethodName = cwraps.mono_wasm_method_get_full_name(method);
 methodFullName = Module.UTF8ToString(pMethodName);
 Module._free(<any>pMethodName);
Expand DownExpand Up@@ -1218,7 +1173,7 @@ export function jiterpreter_dump_stats(b?: boolean, concise?: boolean) {
 for (const k in counters.simdFallback)
 console.log(`// simd ${k}: ${counters.simdFallback[k]} fallback insn(s)`);

 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 setTimeout(
 () => jiterpreter_dump_stats(b),
 15000
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[browser] improve CSP#86158

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

lewing
merged 1 commit into

from

May 12, 2023
 Merged


[browser] improve CSP
#86158
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


1 change: 1 addition & 0 deletions
src/mono/sample/wasm/browser-advanced/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
 <title>Wasm Browser Advanced Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval';" />
 <script type='module' src="./main.js"></script>
 <script type='module' src="./dotnet.js"></script>
 <link rel="preload" href="./mono-config.json" as="fetch" crossorigin="anonymous">
Expand Down

31 changes: 15 additions & 16 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,25 @@ let testAbort = true;
let testError = true;

try {
 const originalFetch = globalThis.fetch;
 globalThis.fetch = (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return originalFetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return originalFetch(url + "?testError=true", fetchArgs);
 }
 return originalFetch(url, fetchArgs);
 };
 const { runtimeBuildInfo, setModuleImports, getAssemblyExports, runMain, getConfig, Module } = await dotnet
 .withElementOnExit()
 // 'withModuleConfig' is internal lower level API 
 // here we show how emscripten could be further configured
 // It is prefered to use specific 'with***' methods instead in all other cases.
 // It is preferred to use specific 'with***' methods instead in all other cases.
 .withModuleConfig({
 configSrc: "./mono-config.json",
 onConfigLoaded: (config) => {
Expand All@@ -25,21 +39,6 @@ try {
 config.environmentVariables["MONO_LOG_LEVEL"] = "debug";
 config.browserProfilerOptions = {};
 },
 imports: {
 fetch: (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return fetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return fetch(url + "?testError=true", fetchArgs);
 }
 return fetch(url, fetchArgs);
 }
 },
 preInit: () => { console.log('user code Module.preInit'); },
 preRun: () => { console.log('user code Module.preRun'); },
 onRuntimeInitialized: () => {
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/runtime/jiterpreter-trace-generator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ import {
 sizeOfDataItem, sizeOfV128, sizeOfStackval,

 disabledOpcodes, countCallTargets,
 callTargetCounts, trapTraceErrors,
 callTargetCounts,
 trace, traceOnError, traceOnRuntimeError,
 emitPadding, traceBranchDisplacements,
 traceEip, nullCheckValidation,
Expand DownExpand Up@@ -1262,7 +1262,7 @@ export function generateWasmBody(
 (opcode <= MintOpcode.MINT_RET_I8_IMM)
 )
 ) {
 if (isConditionallyExecuted || trapTraceErrors || builder.options.countBailouts) {
 if (isConditionallyExecuted || builder.options.countBailouts) {
 // Not an exit, because returns are normal and we don't want to make them more expensive.
 // FIXME: Or do we want to record them? Early conditional returns might reduce the value of a trace,
 // but the main problem is more likely to be calls early in traces. Worth testing later.
Expand Down

79 changes: 17 additions & 62 deletions
src/mono/wasm/runtime/jiterpreter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,6 @@ export const
 traceTooSmall = false,
 // For instrumented methods, trace their exact IP during execution
 traceEip = false,
 // Wraps traces in a JS function that will trap errors and log the trace responsible.
 // Very expensive!!!!
 trapTraceErrors = false,
 // When eliminating a null check, replace it with a runtime 'not null' assertion
 // that will print a diagnostic message if the value is actually null or if
 // the value does not match the value on the native interpreter stack in memory
Expand DownExpand Up@@ -183,8 +180,6 @@ struct InterpMethod {
export let traceBuilder: WasmBuilder;
export let traceImports: Array<[string, string, Function]> | undefined;

export let _wrap_trace_function: Function;

const mathOps1d =
 [
 "asin",
Expand DownExpand Up@@ -319,45 +314,6 @@ function getTraceImports() {
 return traceImports;
}

function wrap_trace_function(
 f: Function, name: string, traceBuf: any,
 base: MintOpcodePtr, instrumentedTraceId: number
) {
 const tup = instrumentedTraces[instrumentedTraceId];
 if (instrumentedTraceId)
 console.log(`instrumented ${tup.name}`);

 if (!_wrap_trace_function) {
 // If we used a regular closure, the js console would print the entirety of
 // dotnet.native.js when printing an error stack trace, which is... not helpful
 const js = `return function trace_enter (locals) {
 let threw = true;
 try {
 let result = trace(locals);
 threw = false;
 return result;
 } finally {
 if (threw) {
 let msg = "Unhandled error in trace '" + name + "'";
 if (tup) {
 msg += " at offset " + (tup.eip + base).toString(16);
 msg += " with most recent operands " + tup.operand1.toString(16) + ", " + tup.operand2.toString(16);
 }
 console.error(msg);
 if (traceBuf) {
 for (let i = 0, l = traceBuf.length; i < l; i++)
 console.log(traceBuf[i]);
 }
 }
 }
 };`;
 _wrap_trace_function = new Function("trace", "name", "traceBuf", "tup", "base", js);
 }
 return _wrap_trace_function(
 f, name, traceBuf, instrumentedTraces[instrumentedTraceId], base
 );
}

function initialize_builder(builder: WasmBuilder) {
 // Function type for compiled traces
 builder.defineType(
Expand All@@ -379,7 +335,8 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "copy_ptr", {
 "copy_ptr",
 {
 "dest": WasmValtype.i32,
 "src": WasmValtype.i32
 },
Expand DownExpand Up@@ -696,25 +653,31 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "simd_p_p", {
 "simd_p_p",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_pp", {
 "simd_p_pp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_ppp", {
 "simd_p_ppp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 "arg3": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );

 const traceImports = getTraceImports();
Expand DownExpand Up@@ -887,15 +850,7 @@ function generate_wasm(
 rejected = false;
 mono_assert(!runtimeHelpers.storeMemorySnapshotPending, "Attempting to set function into table during creation of memory snapshot");

 const idx =
 trapTraceErrors
 ? Module.addFunction(
 wrap_trace_function(
 <any>fn, methodFullName || methodName, traceOnRuntimeError ? builder.traceBuf : undefined,
 builder.base, instrumentedTraceId
 ), "iii"
 )
 : addWasmFunctionPointer(<any>fn);
 const idx = addWasmFunctionPointer(<any>fn);
 if (!idx)
 throw new Error("add_function_pointer returned a 0 index");
 else if (trace >= 2)
Expand DownExpand Up@@ -1021,7 +976,7 @@ export function mono_interp_tier_prepare_jiterpreter(

 counters.traceCandidates++;
 let methodFullName: string | undefined;
 if (trapTraceErrors || mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 if (mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 const pMethodName = cwraps.mono_wasm_method_get_full_name(method);
 methodFullName = Module.UTF8ToString(pMethodName);
 Module._free(<any>pMethodName);
Expand DownExpand Up@@ -1218,7 +1173,7 @@ export function jiterpreter_dump_stats(b?: boolean, concise?: boolean) {
 for (const k in counters.simdFallback)
 console.log(`// simd ${k}: ${counters.simdFallback[k]} fallback insn(s)`);

 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 setTimeout(
 () => jiterpreter_dump_stats(b),
 15000
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[browser] improve CSP#86158

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

lewing
merged 1 commit into

from

May 12, 2023
 Merged


[browser] improve CSP
#86158
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


1 change: 1 addition & 0 deletions
src/mono/sample/wasm/browser-advanced/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
 <title>Wasm Browser Advanced Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval';" />
 <script type='module' src="./main.js"></script>
 <script type='module' src="./dotnet.js"></script>
 <link rel="preload" href="./mono-config.json" as="fetch" crossorigin="anonymous">
Expand Down

31 changes: 15 additions & 16 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,25 @@ let testAbort = true;
let testError = true;

try {
 const originalFetch = globalThis.fetch;
 globalThis.fetch = (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return originalFetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return originalFetch(url + "?testError=true", fetchArgs);
 }
 return originalFetch(url, fetchArgs);
 };
 const { runtimeBuildInfo, setModuleImports, getAssemblyExports, runMain, getConfig, Module } = await dotnet
 .withElementOnExit()
 // 'withModuleConfig' is internal lower level API 
 // here we show how emscripten could be further configured
 // It is prefered to use specific 'with***' methods instead in all other cases.
 // It is preferred to use specific 'with***' methods instead in all other cases.
 .withModuleConfig({
 configSrc: "./mono-config.json",
 onConfigLoaded: (config) => {
Expand All@@ -25,21 +39,6 @@ try {
 config.environmentVariables["MONO_LOG_LEVEL"] = "debug";
 config.browserProfilerOptions = {};
 },
 imports: {
 fetch: (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return fetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return fetch(url + "?testError=true", fetchArgs);
 }
 return fetch(url, fetchArgs);
 }
 },
 preInit: () => { console.log('user code Module.preInit'); },
 preRun: () => { console.log('user code Module.preRun'); },
 onRuntimeInitialized: () => {
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/runtime/jiterpreter-trace-generator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ import {
 sizeOfDataItem, sizeOfV128, sizeOfStackval,

 disabledOpcodes, countCallTargets,
 callTargetCounts, trapTraceErrors,
 callTargetCounts,
 trace, traceOnError, traceOnRuntimeError,
 emitPadding, traceBranchDisplacements,
 traceEip, nullCheckValidation,
Expand DownExpand Up@@ -1262,7 +1262,7 @@ export function generateWasmBody(
 (opcode <= MintOpcode.MINT_RET_I8_IMM)
 )
 ) {
 if (isConditionallyExecuted || trapTraceErrors || builder.options.countBailouts) {
 if (isConditionallyExecuted || builder.options.countBailouts) {
 // Not an exit, because returns are normal and we don't want to make them more expensive.
 // FIXME: Or do we want to record them? Early conditional returns might reduce the value of a trace,
 // but the main problem is more likely to be calls early in traces. Worth testing later.
Expand Down

79 changes: 17 additions & 62 deletions
src/mono/wasm/runtime/jiterpreter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,6 @@ export const
 traceTooSmall = false,
 // For instrumented methods, trace their exact IP during execution
 traceEip = false,
 // Wraps traces in a JS function that will trap errors and log the trace responsible.
 // Very expensive!!!!
 trapTraceErrors = false,
 // When eliminating a null check, replace it with a runtime 'not null' assertion
 // that will print a diagnostic message if the value is actually null or if
 // the value does not match the value on the native interpreter stack in memory
Expand DownExpand Up@@ -183,8 +180,6 @@ struct InterpMethod {
export let traceBuilder: WasmBuilder;
export let traceImports: Array<[string, string, Function]> | undefined;

export let _wrap_trace_function: Function;

const mathOps1d =
 [
 "asin",
Expand DownExpand Up@@ -319,45 +314,6 @@ function getTraceImports() {
 return traceImports;
}

function wrap_trace_function(
 f: Function, name: string, traceBuf: any,
 base: MintOpcodePtr, instrumentedTraceId: number
) {
 const tup = instrumentedTraces[instrumentedTraceId];
 if (instrumentedTraceId)
 console.log(`instrumented ${tup.name}`);

 if (!_wrap_trace_function) {
 // If we used a regular closure, the js console would print the entirety of
 // dotnet.native.js when printing an error stack trace, which is... not helpful
 const js = `return function trace_enter (locals) {
 let threw = true;
 try {
 let result = trace(locals);
 threw = false;
 return result;
 } finally {
 if (threw) {
 let msg = "Unhandled error in trace '" + name + "'";
 if (tup) {
 msg += " at offset " + (tup.eip + base).toString(16);
 msg += " with most recent operands " + tup.operand1.toString(16) + ", " + tup.operand2.toString(16);
 }
 console.error(msg);
 if (traceBuf) {
 for (let i = 0, l = traceBuf.length; i < l; i++)
 console.log(traceBuf[i]);
 }
 }
 }
 };`;
 _wrap_trace_function = new Function("trace", "name", "traceBuf", "tup", "base", js);
 }
 return _wrap_trace_function(
 f, name, traceBuf, instrumentedTraces[instrumentedTraceId], base
 );
}

function initialize_builder(builder: WasmBuilder) {
 // Function type for compiled traces
 builder.defineType(
Expand All@@ -379,7 +335,8 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "copy_ptr", {
 "copy_ptr",
 {
 "dest": WasmValtype.i32,
 "src": WasmValtype.i32
 },
Expand DownExpand Up@@ -696,25 +653,31 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "simd_p_p", {
 "simd_p_p",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_pp", {
 "simd_p_pp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_ppp", {
 "simd_p_ppp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 "arg3": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );

 const traceImports = getTraceImports();
Expand DownExpand Up@@ -887,15 +850,7 @@ function generate_wasm(
 rejected = false;
 mono_assert(!runtimeHelpers.storeMemorySnapshotPending, "Attempting to set function into table during creation of memory snapshot");

 const idx =
 trapTraceErrors
 ? Module.addFunction(
 wrap_trace_function(
 <any>fn, methodFullName || methodName, traceOnRuntimeError ? builder.traceBuf : undefined,
 builder.base, instrumentedTraceId
 ), "iii"
 )
 : addWasmFunctionPointer(<any>fn);
 const idx = addWasmFunctionPointer(<any>fn);
 if (!idx)
 throw new Error("add_function_pointer returned a 0 index");
 else if (trace >= 2)
Expand DownExpand Up@@ -1021,7 +976,7 @@ export function mono_interp_tier_prepare_jiterpreter(

 counters.traceCandidates++;
 let methodFullName: string | undefined;
 if (trapTraceErrors || mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 if (mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 const pMethodName = cwraps.mono_wasm_method_get_full_name(method);
 methodFullName = Module.UTF8ToString(pMethodName);
 Module._free(<any>pMethodName);
Expand DownExpand Up@@ -1218,7 +1173,7 @@ export function jiterpreter_dump_stats(b?: boolean, concise?: boolean) {
 for (const k in counters.simdFallback)
 console.log(`// simd ${k}: ${counters.simdFallback[k]} fallback insn(s)`);

 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 setTimeout(
 () => jiterpreter_dump_stats(b),
 15000
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[browser] improve CSP#86158

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

lewing
merged 1 commit into

from

May 12, 2023
 Merged


[browser] improve CSP
#86158
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


1 change: 1 addition & 0 deletions
src/mono/sample/wasm/browser-advanced/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
 <title>Wasm Browser Advanced Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval';" />
 <script type='module' src="./main.js"></script>
 <script type='module' src="./dotnet.js"></script>
 <link rel="preload" href="./mono-config.json" as="fetch" crossorigin="anonymous">
Expand Down

31 changes: 15 additions & 16 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,25 @@ let testAbort = true;
let testError = true;

try {
 const originalFetch = globalThis.fetch;
 globalThis.fetch = (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return originalFetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return originalFetch(url + "?testError=true", fetchArgs);
 }
 return originalFetch(url, fetchArgs);
 };
 const { runtimeBuildInfo, setModuleImports, getAssemblyExports, runMain, getConfig, Module } = await dotnet
 .withElementOnExit()
 // 'withModuleConfig' is internal lower level API 
 // here we show how emscripten could be further configured
 // It is prefered to use specific 'with***' methods instead in all other cases.
 // It is preferred to use specific 'with***' methods instead in all other cases.
 .withModuleConfig({
 configSrc: "./mono-config.json",
 onConfigLoaded: (config) => {
Expand All@@ -25,21 +39,6 @@ try {
 config.environmentVariables["MONO_LOG_LEVEL"] = "debug";
 config.browserProfilerOptions = {};
 },
 imports: {
 fetch: (url, fetchArgs) => {
 console.log("fetching " + url);
 // we are testing that we can retry loading of the assembly
 if (testAbort && url.indexOf('System.Private.CoreLib') != -1) {
 testAbort = false;
 return fetch(url + "?testAbort=true", fetchArgs);
 }
 if (testError && url.indexOf('System.Console') != -1) {
 testError = false;
 return fetch(url + "?testError=true", fetchArgs);
 }
 return fetch(url, fetchArgs);
 }
 },
 preInit: () => { console.log('user code Module.preInit'); },
 preRun: () => { console.log('user code Module.preRun'); },
 onRuntimeInitialized: () => {
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/runtime/jiterpreter-trace-generator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ import {
 sizeOfDataItem, sizeOfV128, sizeOfStackval,

 disabledOpcodes, countCallTargets,
 callTargetCounts, trapTraceErrors,
 callTargetCounts,
 trace, traceOnError, traceOnRuntimeError,
 emitPadding, traceBranchDisplacements,
 traceEip, nullCheckValidation,
Expand DownExpand Up@@ -1262,7 +1262,7 @@ export function generateWasmBody(
 (opcode <= MintOpcode.MINT_RET_I8_IMM)
 )
 ) {
 if (isConditionallyExecuted || trapTraceErrors || builder.options.countBailouts) {
 if (isConditionallyExecuted || builder.options.countBailouts) {
 // Not an exit, because returns are normal and we don't want to make them more expensive.
 // FIXME: Or do we want to record them? Early conditional returns might reduce the value of a trace,
 // but the main problem is more likely to be calls early in traces. Worth testing later.
Expand Down

79 changes: 17 additions & 62 deletions
src/mono/wasm/runtime/jiterpreter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,6 @@ export const
 traceTooSmall = false,
 // For instrumented methods, trace their exact IP during execution
 traceEip = false,
 // Wraps traces in a JS function that will trap errors and log the trace responsible.
 // Very expensive!!!!
 trapTraceErrors = false,
 // When eliminating a null check, replace it with a runtime 'not null' assertion
 // that will print a diagnostic message if the value is actually null or if
 // the value does not match the value on the native interpreter stack in memory
Expand DownExpand Up@@ -183,8 +180,6 @@ struct InterpMethod {
export let traceBuilder: WasmBuilder;
export let traceImports: Array<[string, string, Function]> | undefined;

export let _wrap_trace_function: Function;

const mathOps1d =
 [
 "asin",
Expand DownExpand Up@@ -319,45 +314,6 @@ function getTraceImports() {
 return traceImports;
}

function wrap_trace_function(
 f: Function, name: string, traceBuf: any,
 base: MintOpcodePtr, instrumentedTraceId: number
) {
 const tup = instrumentedTraces[instrumentedTraceId];
 if (instrumentedTraceId)
 console.log(`instrumented ${tup.name}`);

 if (!_wrap_trace_function) {
 // If we used a regular closure, the js console would print the entirety of
 // dotnet.native.js when printing an error stack trace, which is... not helpful
 const js = `return function trace_enter (locals) {
 let threw = true;
 try {
 let result = trace(locals);
 threw = false;
 return result;
 } finally {
 if (threw) {
 let msg = "Unhandled error in trace '" + name + "'";
 if (tup) {
 msg += " at offset " + (tup.eip + base).toString(16);
 msg += " with most recent operands " + tup.operand1.toString(16) + ", " + tup.operand2.toString(16);
 }
 console.error(msg);
 if (traceBuf) {
 for (let i = 0, l = traceBuf.length; i < l; i++)
 console.log(traceBuf[i]);
 }
 }
 }
 };`;
 _wrap_trace_function = new Function("trace", "name", "traceBuf", "tup", "base", js);
 }
 return _wrap_trace_function(
 f, name, traceBuf, instrumentedTraces[instrumentedTraceId], base
 );
}

function initialize_builder(builder: WasmBuilder) {
 // Function type for compiled traces
 builder.defineType(
Expand All@@ -379,7 +335,8 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "copy_ptr", {
 "copy_ptr",
 {
 "dest": WasmValtype.i32,
 "src": WasmValtype.i32
 },
Expand DownExpand Up@@ -696,25 +653,31 @@ function initialize_builder(builder: WasmBuilder) {
 WasmValtype.i32, true
 );
 builder.defineType(
 "simd_p_p", {
 "simd_p_p",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_pp", {
 "simd_p_pp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );
 builder.defineType(
 "simd_p_ppp", {
 "simd_p_ppp",
 {
 "arg0": WasmValtype.i32,
 "arg1": WasmValtype.i32,
 "arg2": WasmValtype.i32,
 "arg3": WasmValtype.i32,
 }, WasmValtype.void, true
 },
 WasmValtype.void, true
 );

 const traceImports = getTraceImports();
Expand DownExpand Up@@ -887,15 +850,7 @@ function generate_wasm(
 rejected = false;
 mono_assert(!runtimeHelpers.storeMemorySnapshotPending, "Attempting to set function into table during creation of memory snapshot");

 const idx =
 trapTraceErrors
 ? Module.addFunction(
 wrap_trace_function(
 <any>fn, methodFullName || methodName, traceOnRuntimeError ? builder.traceBuf : undefined,
 builder.base, instrumentedTraceId
 ), "iii"
 )
 : addWasmFunctionPointer(<any>fn);
 const idx = addWasmFunctionPointer(<any>fn);
 if (!idx)
 throw new Error("add_function_pointer returned a 0 index");
 else if (trace >= 2)
Expand DownExpand Up@@ -1021,7 +976,7 @@ export function mono_interp_tier_prepare_jiterpreter(

 counters.traceCandidates++;
 let methodFullName: string | undefined;
 if (trapTraceErrors || mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 if (mostRecentOptions.estimateHeat || (instrumentedMethodNames.length > 0) || useFullNames) {
 const pMethodName = cwraps.mono_wasm_method_get_full_name(method);
 methodFullName = Module.UTF8ToString(pMethodName);
 Module._free(<any>pMethodName);
Expand DownExpand Up@@ -1218,7 +1173,7 @@ export function jiterpreter_dump_stats(b?: boolean, concise?: boolean) {
 for (const k in counters.simdFallback)
 console.log(`// simd ${k}: ${counters.simdFallback[k]} fallback insn(s)`);

 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 if ((typeof(globalThis.setTimeout) === "function") && (b !== undefined))
 setTimeout(
 () => jiterpreter_dump_stats(b),
 15000
Expand Down