Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump LavaMoat and SES #22590

Merged
merged 3 commits into from
Jan 18, 2024
Merged

Bump LavaMoat and SES #22590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4380858
Bump LavaMoat
FrederikBolding Jan 18, 2024
0e7fc02
Update LavaMoat policies
metamaskbot Jan 18, 2024
253882a
Bump SES
FrederikBolding Jan 18, 2024
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
15 changes: 0 additions & 15 deletions .yarn/patches/@lavamoat-lavapack-npm-3.1.0-34c65d233b.patch
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions .yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch
View file
Open in desktop

This file was deleted.

18 changes: 18 additions & 0 deletions .yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/src/loadPolicy.js b/src/loadPolicy.js
index f0ca3c4991a64f316f4e7199867439dd9ab09354..11296dd253b8dc1afd4cc870a0207c280fb728d9 100644
--- a/src/loadPolicy.js
+++ b/src/loadPolicy.js
@@ -84,10 +84,9 @@ async function loadPolicyAndApplyOverrides({

const finalPolicy = mergePolicy(policy, policyOverride)

- // TODO: Only write if merge results in changes.
- // Would have to make a deep equal check on whole policy, which is a waste of time.
- // mergePolicy() should be able to do it in one pass.
- await fs.writeFile(policyPath, jsonStringify(finalPolicy, { space: 2 }))
+ // Skip policy write step to prevent intermittent build failures
+ // The extension validates the policy in a separate step, we don't need it
+ // to be written to disk here.

return finalPolicy
}
14 changes: 7 additions & 7 deletions lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2940,6 +2940,11 @@
"crypto.getRandomValues": true
}
},
"depcheck>is-core-module>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"dependency-tree>precinct>detective-postcss>postcss>nanoid": {
"globals": {
"crypto.getRandomValues": true
Expand Down Expand Up @@ -4475,20 +4480,15 @@
},
"packages": {
"browserify>has>function-bind": true,
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>es-abstract>has-proto": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>has-symbols": true
}
},
"string.prototype.matchall>get-intrinsic>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"string.prototype.matchall>internal-slot": {
"packages": {
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>get-intrinsic": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>side-channel": true
}
},
Expand Down
14 changes: 7 additions & 7 deletions lavamoat/browserify/desktop/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3197,6 +3197,11 @@
"crypto.getRandomValues": true
}
},
"depcheck>is-core-module>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"dependency-tree>precinct>detective-postcss>postcss>nanoid": {
"globals": {
"crypto.getRandomValues": true
Expand Down Expand Up @@ -4841,20 +4846,15 @@
},
"packages": {
"browserify>has>function-bind": true,
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>es-abstract>has-proto": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>has-symbols": true
}
},
"string.prototype.matchall>get-intrinsic>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"string.prototype.matchall>internal-slot": {
"packages": {
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>get-intrinsic": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>side-channel": true
}
},
Expand Down
14 changes: 7 additions & 7 deletions lavamoat/browserify/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3251,6 +3251,11 @@
"crypto.getRandomValues": true
}
},
"depcheck>is-core-module>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"dependency-tree>precinct>detective-postcss>postcss>nanoid": {
"globals": {
"crypto.getRandomValues": true
Expand Down Expand Up @@ -4895,20 +4900,15 @@
},
"packages": {
"browserify>has>function-bind": true,
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>es-abstract>has-proto": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>has-symbols": true
}
},
"string.prototype.matchall>get-intrinsic>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"string.prototype.matchall>internal-slot": {
"packages": {
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>get-intrinsic": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>side-channel": true
}
},
Expand Down
14 changes: 7 additions & 7 deletions lavamoat/browserify/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3174,6 +3174,11 @@
"crypto.getRandomValues": true
}
},
"depcheck>is-core-module>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"dependency-tree>precinct>detective-postcss>postcss>nanoid": {
"globals": {
"crypto.getRandomValues": true
Expand Down Expand Up @@ -4818,20 +4823,15 @@
},
"packages": {
"browserify>has>function-bind": true,
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>es-abstract>has-proto": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>has-symbols": true
}
},
"string.prototype.matchall>get-intrinsic>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"string.prototype.matchall>internal-slot": {
"packages": {
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>get-intrinsic": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>side-channel": true
}
},
Expand Down
14 changes: 7 additions & 7 deletions lavamoat/browserify/mmi/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3252,6 +3252,11 @@
"crypto.getRandomValues": true
}
},
"depcheck>is-core-module>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"dependency-tree>precinct>detective-postcss>postcss>nanoid": {
"globals": {
"crypto.getRandomValues": true
Expand Down Expand Up @@ -4872,20 +4877,15 @@
},
"packages": {
"browserify>has>function-bind": true,
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>es-abstract>has-proto": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>has-symbols": true
}
},
"string.prototype.matchall>get-intrinsic>hasown": {
"packages": {
"browserify>has>function-bind": true
}
},
"string.prototype.matchall>internal-slot": {
"packages": {
"depcheck>is-core-module>hasown": true,
"string.prototype.matchall>get-intrinsic": true,
"string.prototype.matchall>get-intrinsic>hasown": true,
"string.prototype.matchall>side-channel": true
}
},
Expand Down
Loading
Loading