refactor(cmd-socketio-server): remove code duplication #2047

outSH · 2022-05-26T10:56:55Z

Moved verifyValidatorJwt to cactus-common to keep encrypt/decrypt logic
of socketio-based validators in one, common location.
Move config-reading and signMessageJwt helper functions from validators to cmd-socketio-server
to remove code duplication.
Refactor validators to use these common instead of own implementation.
Remove ValidatorAuthentication.ts that is not used anymore
(not part of public interface, it was copied by validators during before couple commits ago).
Create jwt-message-authentication.test.ts from old, similar one in cactus-api-client.
Updated readme with instructions of how to start asset-trade and electricity-trade samples
without docker-compose (to be used during development).
Added helper script for patching the config.

Signed-off-by: Michal Bajer michal.bajer@fujitsu.com

This PR is for the last commit only - refactor(cmd-socketio-server): remove code duplication. Please ignore previous one (dependencies) which will be removed before the merge.

Depends on #2033
Depends on #2129

gitguardian · 2022-05-26T10:57:31Z

️✅ There are no secrets present in this pull request anymore.

If these secrets were true positive and are still valid, we highly recommend you to revoke them.
Once a secret has been leaked into a git repository, you should consider it compromised, even if it was deleted immediately.
Find here more information about risks.

^{_{🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!}}

jagpreetsinghsasan · 2022-05-27T08:24:54Z

Thanks @outSH for your contribution.
It will take a while for me to review this, hope this ain't blocking anything super urgently.

outSH · 2022-05-27T08:46:13Z

Thanks @outSH for your contribution. It will take a while for me to review this, hope this ain't blocking anything super urgently.

@jagpreetsinghsasan Sure, there are bunch of depndencies awaiting to be merged first, no hurry ;) Just remember to look only at the last commit.

outSH · 2022-05-27T13:18:15Z

Note to myself: Fix sample apps dockerfiles to use only npm packages

- Add functional test of all functions from go-ethereum-socketio validator. - Refactor go-ethereum validator to allow importing as a module, to simplify the functional test. - Fix sendRawTransaction to work with Verifier protocol. It couldn't be reached by any client library until now, so I consider this as "private" interface. - Add common web3 client object in openethereum test ledger helper class. - Add few new functions to ethereum test ledger helper class: newEthPersonalAccount, transferAssetFromCoinbase, deployContract. Depends on hyperledger-cacti#2051 Depends on hyperledger-cacti#2047 Closes: hyperledger-cacti#2052 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

izuru0

LGTM

takeutak · 2022-06-23T00:30:30Z

@petermetz @jagpreetsinghsasan (cc: @izuru0)
Could you review this PR?

jagpreetsinghsasan

This looks all good to me.

packages/cactus-common/package.json

packages/cactus-common/src/main/typescript/verifier/jwt-message-authentication.ts

- Add functional test of all functions from sawtooth-socketio validator. - Refactor sawtooth validator to allow importing as a module, to simplify the functional test. - Add stopMonitor to terminate tests easily. - Allow multiple clients to monitor for blocks. - Fix parsing of URL from config so that it doesn't depend on trailing slash anymore. Closes: hyperledger-cacti#2107 Depends on: hyperledger-cacti#2109 Depends on: hyperledger-cacti#2110 Depends on: hyperledger-cacti#2047 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

outSH · 2022-07-22T12:56:10Z

@petermetz Can you also publish cmd-sockio package from this branch to npm after #2129 is merged? It is needed by the connectors in this PR.

// Note to myself: Test the dockerized sample apps manually after cmd-socketio package is published

petermetz

@outSH LGTM, thank you!

github-actions · 2022-08-26T02:38:30Z

This PR/issue depends on:

~~feat(secret): remove Validator/Verifier secret keys from repository #2033~~
~~chore(cmd-socketio-server): rename package to match directory name #2129~~
By Dependent Issues (🤖). Happy coding!

petermetz

@outSH Please resolve the conflict and then pass it back for review!

outSH · 2022-11-16T13:45:08Z

@petermetz I've rebased to the current main branch status, went through example apps startup (both docker and dockerless scenarios), fixed all errors and connector dockerfiles. Additionally, I've removed the dependency on Indy-SDK for main cactus build since it was tricky to install and sometimes their repo was not available. Updated the ci.sh and readme files.

For better understanding of changes I've done since review, you can check this commit: outSH@de5dfef
(it was squashed in this PR).

// EDIT Will fix the tests soon

outSH · 2022-11-17T13:49:49Z

@petermetz OK, the tests are fixed, please merge when possible.

Changes since your last review: outSH@083d91b

petermetz · 2022-11-17T20:08:33Z

@petermetz Can you also publish cmd-sockio package from this branch to npm after #2129 is merged? It is needed by the connectors in this PR.

// Note to myself: Test the dockerized sample apps manually after cmd-socketio package is published

@outSH Yes, sorry for not responding earlier, we now have the packages published to npm for v1.1.0 and v1.1.1 and v1.1.2 as well so you can use them with the new package names!

petermetz · 2022-11-17T20:11:03Z

@petermetz OK, the tests are fixed, please merge when possible.

Changes since your last review: outSH@083d91b

@outSH Thank you that commit link and the squash+rebase helped a lot with the re-review! LGTM

Additionally, I've removed the dependency on Indy-SDK for main cactus build since it was tricky to install and sometimes their repo was not available. Updated the ci.sh and readme files.

Extra thanks for this because it was causing problems for people in ways that I could not reliably reproduce so it's much better that it is not an optional part of the build. Thank you!

- Move config-reading and signMessageJwt helper functions from validators to cmd-socketio-server to remove code duplication. Refactor validators to use these common instead of own implementation. - Remove ValidatorAuthentication.ts that is not used anymore (not part of public interface, it was copied by validators during before couple commits ago). - Updated readme with instructions of how to start asset-trade and electricity-trade samples without docker-compose (to be used during development). Added helper script for patching the config. - Remove dependency on Indy SDK for the main build (it's needed only for running dockerless discounted-cartrade sample now) - Update legacy-socketio-connector Dockerfiles to work after updates. Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Add functional test of all functions from sawtooth-socketio validator. - Refactor sawtooth validator to allow importing as a module, to simplify the functional test. - Add stopMonitor to terminate tests easily. - Allow multiple clients to monitor for blocks. - Fix parsing of URL from config so that it doesn't depend on trailing slash anymore. Closes: hyperledger-cacti#2107 Depends on: hyperledger-cacti#2109 Depends on: hyperledger-cacti#2110 Depends on: hyperledger-cacti#2047 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Add functional test of all functions from go-ethereum-socketio validator. - Refactor go-ethereum validator to allow importing as a module, to simplify the functional test. - Fix sendRawTransaction to work with Verifier protocol. It couldn't be reached by any client library until now, so I consider this as "private" interface. - Add common web3 client object in openethereum test ledger helper class. - Add few new functions to ethereum test ledger helper class: newEthPersonalAccount, transferAssetFromCoinbase, deployContract. Depends on hyperledger-cacti#2051 Depends on hyperledger-cacti#2047 Closes: hyperledger-cacti#2052 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Add functional test of all functions from sawtooth-socketio validator. - Refactor sawtooth validator to allow importing as a module, to simplify the functional test. - Add stopMonitor to terminate tests easily. - Allow multiple clients to monitor for blocks. - Fix parsing of URL from config so that it doesn't depend on trailing slash anymore. Closes: hyperledger-cacti#2107 Depends on: hyperledger-cacti#2109 Depends on: hyperledger-cacti#2110 Depends on: hyperledger-cacti#2047 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Add functional test of all functions from go-ethereum-socketio validator. - Refactor go-ethereum validator to allow importing as a module, to simplify the functional test. - Fix sendRawTransaction to work with Verifier protocol. It couldn't be reached by any client library until now, so I consider this as "private" interface. - Add common web3 client object in openethereum test ledger helper class. - Add few new functions to ethereum test ledger helper class: newEthPersonalAccount, transferAssetFromCoinbase, deployContract. Depends on #2051 Depends on #2047 Closes: #2052 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Add functional test of all functions from sawtooth-socketio validator. - Refactor sawtooth validator to allow importing as a module, to simplify the functional test. - Add stopMonitor to terminate tests easily. - Allow multiple clients to monitor for blocks. - Fix parsing of URL from config so that it doesn't depend on trailing slash anymore. Closes: hyperledger-cacti#2107 Depends on: hyperledger-cacti#2109 Depends on: hyperledger-cacti#2110 Depends on: hyperledger-cacti#2047 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Add functional test of all functions from sawtooth-socketio validator. - Refactor sawtooth validator to allow importing as a module, to simplify the functional test. - Add stopMonitor to terminate tests easily. - Allow multiple clients to monitor for blocks. - Fix parsing of URL from config so that it doesn't depend on trailing slash anymore. Closes: #2107 Depends on: #2109 Depends on: #2110 Depends on: #2047 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

outSH requested review from petermetz, takeutak, izuru0, jagpreetsinghsasan and sandeepnRES as code owners May 26, 2022 10:56

github-actions bot added the dependent label May 26, 2022

outSH mentioned this pull request May 31, 2022

test(connector-go-ethereum-socketio): add functional test, bug fix #2053

Merged

outSH mentioned this pull request Jun 7, 2022

feat(fabric-socketio-connector): sending transactions signed on the client-side #2071

Merged

izuru0 approved these changes Jun 9, 2022

View reviewed changes

jagpreetsinghsasan approved these changes Jun 28, 2022

View reviewed changes

petermetz requested changes Jun 29, 2022

View reviewed changes

outSH mentioned this pull request Jul 1, 2022

test(connector-sawtooth-socketio): add functional test, bug fix #2111

Merged

github-actions bot removed the dependent label Jul 20, 2022

outSH force-pushed the refactor_validator_config_pr branch 2 times, most recently from e14caa0 to 4fb5d7b Compare July 22, 2022 12:34

github-actions bot added the dependent label Jul 22, 2022

outSH requested a review from petermetz July 22, 2022 12:57

petermetz approved these changes Jul 22, 2022

View reviewed changes

github-actions bot removed the dependent label Aug 26, 2022

petermetz requested changes Oct 31, 2022

View reviewed changes

outSH force-pushed the refactor_validator_config_pr branch from 4fb5d7b to 343f6ff Compare November 16, 2022 13:41

outSH force-pushed the refactor_validator_config_pr branch from 343f6ff to 74d336e Compare November 16, 2022 13:50

outSH requested review from petermetz and removed request for sandeepnRES and takeutak November 16, 2022 13:50

outSH force-pushed the refactor_validator_config_pr branch from 74d336e to 3ff0636 Compare November 17, 2022 12:41

petermetz approved these changes Nov 17, 2022

View reviewed changes

petermetz force-pushed the refactor_validator_config_pr branch from 3ff0636 to dc48415 Compare November 17, 2022 20:11

outSH force-pushed the refactor_validator_config_pr branch from dc48415 to c2d9e4c Compare November 18, 2022 08:44

izuru0 merged commit 673f122 into hyperledger-cacti:main Nov 18, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(cmd-socketio-server): remove code duplication #2047

refactor(cmd-socketio-server): remove code duplication #2047

outSH commented May 26, 2022 •

edited

Loading

gitguardian bot commented May 26, 2022 •

edited

Loading

jagpreetsinghsasan commented May 27, 2022

outSH commented May 27, 2022

outSH commented May 27, 2022

izuru0 left a comment

takeutak commented Jun 23, 2022

jagpreetsinghsasan left a comment

outSH commented Jul 22, 2022 •

edited

Loading

petermetz left a comment

github-actions bot commented Aug 26, 2022

petermetz left a comment

outSH commented Nov 16, 2022 •

edited

Loading

outSH commented Nov 17, 2022

petermetz commented Nov 17, 2022

petermetz commented Nov 17, 2022

refactor(cmd-socketio-server): remove code duplication #2047

refactor(cmd-socketio-server): remove code duplication #2047

Conversation

outSH commented May 26, 2022 • edited Loading

gitguardian bot commented May 26, 2022 • edited Loading

️✅ There are no secrets present in this pull request anymore.

jagpreetsinghsasan commented May 27, 2022

outSH commented May 27, 2022

outSH commented May 27, 2022

izuru0 left a comment

Choose a reason for hiding this comment

takeutak commented Jun 23, 2022

jagpreetsinghsasan left a comment

Choose a reason for hiding this comment

outSH commented Jul 22, 2022 • edited Loading

petermetz left a comment

Choose a reason for hiding this comment

github-actions bot commented Aug 26, 2022

petermetz left a comment

Choose a reason for hiding this comment

outSH commented Nov 16, 2022 • edited Loading

outSH commented Nov 17, 2022

petermetz commented Nov 17, 2022

petermetz commented Nov 17, 2022

outSH commented May 26, 2022 •

edited

Loading

gitguardian bot commented May 26, 2022 •

edited

Loading

outSH commented Jul 22, 2022 •

edited

Loading

outSH commented Nov 16, 2022 •

edited

Loading