fix(dast): ccp, sshconfig missing #3705

raynatopedrajeta · 2024-12-18T05:58:29Z

Primary Changes

Fix the issue on plugin-ledger-connector-fabric that
throws an error when there is no sshConfig available.

Fixes #3671

Pull Request Requirements

Rebased onto upstream/main branch and squashed into single commit to help maintainers review it more efficient and to avoid spaghetti git commit graphs that obfuscate which commit did exactly what change, when and, why.
Have git sign off at the end of commit message to avoid being marked red. You can add -s flag when using git commit command. You may refer to this link for more information.
Follow the Commit Linting specification. You may refer to this link for more information.

Character Limit

Pull Request Title and Commit Subject must not exceed 72 characters (including spaces and special characters).
Commit Message per line must not exceed 80 characters (including spaces and special characters).

A Must Read for Beginners
For rebasing and squashing, here's a must read guide for beginners.

jagpreetsinghsasan · 2024-12-18T06:05:39Z

.github/workflows/.dast-nuclei-cmd-api-server.yaml

@@ -85,7 +84,7 @@ jobs:
        run: jq '.plugins += [{ "packageName":"@hyperledger/cactus-plugin-keychain-memory","type":"org.hyperledger.cactus.plugin_import_type.LOCAL","action":"org.hyperledger.cactus.plugin_import_action.INSTALL","options":{"packageSrc":"/home/runner/work/cacti/cacti/packages/cactus-plugin-keychain-memory/","instanceId":"0daacd05-d1cd-4eab-9332-4ad1aff4b909","keychainId":"d29d728e-eaa0-4e2d-b187-d132242b0d9a"}}]' .config.json > .config2.json && mv .config2.json .config.json

      - name: Install Fabric connector into the API server
-        run: jq '.plugins += [{ "packageName":"@hyperledger/cactus-plugin-ledger-connector-fabric", "type":"org.hyperledger.cactus.plugin_import_type.LOCAL", "action":"org.hyperledger.cactus.plugin_import_action.INSTALL",  "options":{ "packageSrc":"/home/runner/work/cacti/cacti/packages/cactus-plugin-ledger-connector-fabric/", "instanceId":"some-unique-fabric-connector-instance-id", "peerBinary":"/fabric-samples/bin/peer", "connectionProfile":"{}", "dockerBinary":"usr/local/bin/docker","cliContainerEnv":{"CORE_PEER_LOCALMSPID":"Org1MSP","CORE_PEER_ADDRESS":"peer0.org1.example.com:7051","CORE_PEER_MSPCONFIGPATH":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/[email protected]/msp","CORE_PEER_TLS_ROOTCERT_FILE":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt","ORDERER_TLS_ROOTCERT_FILE":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem"},"discoveryOptions":{"enabled":true,"asLocalhost":true}}}] ' .config.json > .config2.json && mv .config2.json .config.json
+        run: jq '.plugins += [{ "packageName":"@hyperledger/cactus-plugin-ledger-connector-fabric", "type":"org.hyperledger.cactus.plugin_import_type.LOCAL", "action":"org.hyperledger.cactus.plugin_import_action.INSTALL",  "options":{ "packageSrc":"/home/runner/work/cacti/cacti/packages/cactus-plugin-ledger-connector-fabric/", "instanceId":"some-unique-fabric-connector-instance-id", "peerBinary":"/fabric-samples/bin/peer", "connectionProfile":"{}", "connectionProfile":"{}", "dockerBinary":"usr/local/bin/docker","cliContainerEnv":{"CORE_PEER_LOCALMSPID":"Org1MSP","CORE_PEER_ADDRESS":"peer0.org1.example.com:7051","CORE_PEER_MSPCONFIGPATH":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/[email protected]/msp","CORE_PEER_TLS_ROOTCERT_FILE":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt","ORDERER_TLS_ROOTCERT_FILE":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem"},"discoveryOptions":{"enabled":true,"asLocalhost":true}}}] ' .config.json > .config2.json && mv .config2.json .config.json


Again, there should be NO changes to this piece of code (That is the objective of the task)

jagpreetsinghsasan · 2025-01-13T04:00:46Z

.github/workflows/.dast-nuclei-cmd-api-server.yaml

+          echo "Private Key:"
+          cat private_key.pem
+
+      - run: jq '.expressJwtOptions.secret = "-----BEGIN PUBLIC KEY-----\n$(cat public_key.pem)\n-----END PUBLIC KEY-----" |


The public key is generated with those tags by default, please double check

jagpreetsinghsasan · 2025-01-13T04:04:20Z

.../cactus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts

-    }
-    if (this.sshDebugOn) {
-      this.sshConfig = this.enableSshDebugLogs(this.sshConfig);
+      // throw new Error("Cannot instantiate Fabric connector without SSH config");


Before this comment please add this

TODO: Temporarily commenting this code so that we do not have breaking changes, will be fixed by ISSUE_NUM

I think you straightaway copy pasted my line even though we discussed in the meeting to create a new task to fix this and then replace it with ISSUE_NUM.

+1 raynatopedrajeta The comment is almost spot on, just please make sure to open an issue and put the number of that issue there in place of ISSUE_NUM

jagpreetsinghsasan · 2025-01-13T04:04:30Z

.../cactus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts

-      this.sshConfig = this.enableSshDebugLogs(this.sshConfig);
+      // throw new Error("Cannot instantiate Fabric connector without SSH config");
+      this.sshConfig = {};
+      console.log("The check for sshConfig has been temporarily removed");


Please remove this

jagpreetsinghsasan · 2025-01-13T04:09:15Z

.github/workflows/.dast-nuclei-cmd-api-server.yaml

 on:
  push:
    branches: [main, dev]
-
+ 


Please remove these new lines

Hello @jagpreetsinghsasan ,

I've compared this per line and no changes on my end. Not sure why these empty lines are tagged as changes.

Any suggestions for this?

Thank you!

Rayn

When you add the changed files (before commit), you can revert these changes there itself, the change here is, earlier it was newline and now it is newline,space

Primary Changes ---------------- 1. Fix the issue on plugin-ledger-connector-fabric that throws an error when there is no sshConfig available. Fixes hyperledger-cacti#3671 Signed-off-by: raynato.c.pedrajeta <[email protected]>

jagpreetsinghsasan · 2025-01-28T09:53:39Z

.github/workflows/.dast-nuclei-cmd-api-server.yaml

 on:
  push:
    branches: [main, dev]
-
+ 


When you add the changed files (before commit), you can revert these changes there itself, the change here is, earlier it was newline and now it is newline,space

jagpreetsinghsasan · 2025-01-28T09:55:34Z

.../cactus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts

-    }
-    if (this.sshDebugOn) {
-      this.sshConfig = this.enableSshDebugLogs(this.sshConfig);
+      // throw new Error("Cannot instantiate Fabric connector without SSH config");


I think you straightaway copy pasted my line even though we discussed in the meeting to create a new task to fix this and then replace it with ISSUE_NUM.

petermetz · 2025-02-06T04:20:20Z

.../cactus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts

-    }
-    if (this.sshDebugOn) {
-      this.sshConfig = this.enableSshDebugLogs(this.sshConfig);
+      // throw new Error("Cannot instantiate Fabric connector without SSH config");


+1 raynatopedrajeta The comment is almost spot on, just please make sure to open an issue and put the number of that issue there in place of ISSUE_NUM

jagpreetsinghsasan reviewed Dec 18, 2024

View reviewed changes

raynatopedrajeta force-pushed the raynatopedrajeta/issue3671 branch 3 times, most recently from 85013e4 to 4048f3e Compare December 26, 2024 09:14

raynatopedrajeta force-pushed the raynatopedrajeta/issue3671 branch 26 times, most recently from 3bee9e8 to 9de9c66 Compare January 10, 2025 02:39

raynatopedrajeta force-pushed the raynatopedrajeta/issue3671 branch 8 times, most recently from 956d7f7 to 5ba0d22 Compare January 10, 2025 03:47

raynatopedrajeta marked this pull request as ready for review January 10, 2025 06:31

raynatopedrajeta requested review from petermetz, takeutak, izuru0, VRamakrishna, sandeepnRES and outSH as code owners January 10, 2025 06:31

raynatopedrajeta requested a review from jagpreetsinghsasan January 10, 2025 06:31

jagpreetsinghsasan requested changes Jan 13, 2025

View reviewed changes

fix(dast): ccp, sshconfig missing

612559d

Primary Changes ---------------- 1. Fix the issue on plugin-ledger-connector-fabric that throws an error when there is no sshConfig available. Fixes hyperledger-cacti#3671 Signed-off-by: raynato.c.pedrajeta <[email protected]>

raynatopedrajeta force-pushed the raynatopedrajeta/issue3671 branch from 5ba0d22 to 612559d Compare January 13, 2025 06:47

raynatopedrajeta requested a review from jagpreetsinghsasan January 14, 2025 03:32

jagpreetsinghsasan requested changes Jan 28, 2025

View reviewed changes

petermetz requested changes Feb 6, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(dast): ccp, sshconfig missing #3705

fix(dast): ccp, sshconfig missing #3705

raynatopedrajeta commented Dec 18, 2024 •

edited

Loading

jagpreetsinghsasan Dec 18, 2024

jagpreetsinghsasan Jan 13, 2025

jagpreetsinghsasan Jan 13, 2025

jagpreetsinghsasan Jan 28, 2025

petermetz Feb 6, 2025

jagpreetsinghsasan Jan 13, 2025

jagpreetsinghsasan Jan 13, 2025

raynatopedrajeta Jan 16, 2025

jagpreetsinghsasan Jan 28, 2025

jagpreetsinghsasan Jan 28, 2025

jagpreetsinghsasan Jan 28, 2025

petermetz Feb 6, 2025

fix(dast): ccp, sshconfig missing #3705

Are you sure you want to change the base?

fix(dast): ccp, sshconfig missing #3705

Conversation

raynatopedrajeta commented Dec 18, 2024 • edited Loading

Primary Changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

raynatopedrajeta commented Dec 18, 2024 •

edited

Loading