-
Notifications
You must be signed in to change notification settings - Fork 283
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.
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
fix(security): address CVE-2021-23358 #1816
fix(security): address CVE-2021-23358 #1816
Conversation
c719b34
to
ba20b67
Compare
review-requested: @petermetz |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zondervancalvez There's no diff though. Did a rebase or merge gone wrong or was this fixed by somebody else concurrently in the meantime and that got merged first with the exact same diff?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zondervancalvez There's no diff though. Did a rebase or merge gone wrong or was this fixed by somebody else concurrently in the meantime and that got merged first with the exact same diff?
+1
fec71ff
to
48b0647
Compare
This is 2 part changes:
|
48b0647
to
b073e29
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zondervancalvez Question: Where did you get the index.d.ts file from?
b073e29
to
f249887
Compare
Here: |
e408284
to
9acbc64
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zondervancalvez Please make the tests pass, right now the CI is failing with this:
Error: Cannot find module 'web3-eea'
Require stack:
- /home/runner/work/cactus/cactus/packages/cactus-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-ledger-connector-besu/deploy-contract/private-deploy-contract-from-json-cactus.test.ts
at Function.Module._resolveFilename (internal/modules/cjs/loader.js:889:15)
at Function.Module._load (internal/modules/cjs/loader.js:745:27)
at Module.require (internal/modules/cjs/loader.js:961:19)
at require (internal/modules/cjs/helpers.js:92:18)
at Object.<anonymous> (/home/runner/work/cactus/cactus/packages/cactus-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-ledger-connector-besu/deploy-contract/private-deploy-contract-from-json-cactus.test.ts:2:966)
at Module._compile (internal/modules/cjs/loader.js:1072:14)
at Module.replacementCompile (/home/runner/work/cactus/cactus/node_modules/append-transform/index.js:60:13)
at Module.m._compile (/home/runner/work/cactus/cactus/node_modules/ts-node/src/index.ts:1311:23)
at module.exports (/home/runner/work/cactus/cactus/node_modules/default-require-extensions/js.js:7:9)
at /home/runner/work/cactus/cactus/node_modules/append-transform/index.js:64:4
at require.extensions.<computed> (/home/runner/work/cactus/cactus/node_modules/ts-node/src/index.ts:1314:12)
at Object.<anonymous> (/home/runner/work/cactus/cactus/node_modules/append-transform/index.js:64:4)
at Module.load (internal/modules/cjs/loader.js:937:32)
at Function.Module._load (internal/modules/cjs/loader.js:778:12)
at Function.executeUserEntryPoint [as runMain] (internal/modules/run_main.js:76:12)
at internal/main/run_main_module.js:17:47 {
code: 'MODULE_NOT_FOUND',
requireStack: [
'/home/runner/work/cactus/cactus/packages/cactus-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-ledger-connector-besu/deploy-contract/private-deploy-contract-from-json-cactus.test.ts'
]
}
# Subtest: ./packages/cactus-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-ledger-connector-besu/deploy-contract/private-deploy-contract-from-json-cactus.test.ts
1..0 # no tests found
not ok 54 - ./packages/cactus-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-ledger-connector-besu/deploy-contract/private-deploy-contract-from-json-cactus.test.ts # time=11406.73ms
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zondervancalvez Please also resolve the merge conflicts!
d2bf19b
to
75f27ed
Compare
611a2b1
to
0453a57
Compare
0453a57
to
f756509
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zondervancalvez LGTM, thank you!
fixes: hyperledger-cacti#1775 Signed-off-by: zondervancalvez <[email protected]>
f756509
to
75849db
Compare
@zondervancalvez Unless you made some updates to the diff/code that should be explicitly re-checked by the reviewers (because it's different from what was approved), there's usually no need to re-request review from those who already approved (in this case Takuma) |
fixes: #1775