diff --git a/.gitguardian.yaml b/.gitguardian.yaml index 3f2ea65018..21cc554613 100644 --- a/.gitguardian.yaml +++ b/.gitguardian.yaml @@ -7,7 +7,7 @@ exit-zero: false # default: false verbose: false # default: false -instance: https://api.gitguardian.com/ +instance: https://dashboard.gitguardian.com/ # Maximum commits to scan in a hook. max-commits-for-hook: 50 # default: 50 @@ -21,13 +21,13 @@ secret: # Exclude files and paths by globbing ignored-paths: - '**/README.md' - - 'doc/*' + - 'docs/*' - 'LICENSE' - '**/examples/cactus-example-carbon-accounting-backend/example-config.json' - - 'weaver/samples/**/*' - - 'weaver/tests/**/*' - - 'weaver/core/drivers/fabric-driver/wallet-network1/*.id' - - 'weaver/core/drivers/fabric-driver/wallet-network2/*.id' + - 'weaver/core/drivers/fabric-driver/wallet-network1/relay.id' + - 'weaver/core/drivers/fabric-driver/wallet-network2/relay.id' + - 'weaver/samples/*' + - 'weaver/tests/*' # Detectors to ignore. ignored-detectors: # default: [] diff --git a/.github/workflows/gg-shield-action.yaml b/.github/workflows/gg-shield-action.yaml index 40b67f8de8..2ce6d86115 100644 --- a/.github/workflows/gg-shield-action.yaml +++ b/.github/workflows/gg-shield-action.yaml @@ -25,9 +25,9 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: GitGuardian scan - uses: GitGuardian/ggshield-action@v1.14.4 + uses: GitGuardian/ggshield-action@v1.28.0 with: - args: --show-secrets --exit-zero --all-policies --verbose + args: --show-secrets --exit-zero --all-policies --verbose --exclude 'weaver/tests/*' env: GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }} GITHUB_PUSH_BASE_SHA: ${{ github.event.base }} diff --git a/weaver/core/drivers/fabric-driver/wallet-network1/relay.id b/weaver/core/drivers/fabric-driver/wallet-network1/relay.id index 3d050f78f7..b6a3846e3a 100644 --- a/weaver/core/drivers/fabric-driver/wallet-network1/relay.id +++ b/weaver/core/drivers/fabric-driver/wallet-network1/relay.id @@ -1 +1 @@ -{"credentials":{"certificate":"-----BEGIN CERTIFICATE-----\nMIICkTCCAjegAwIBAgIUcabHrj3uzOT/qLYMpw2/kr/qrNowCgYIKoZIzj0EAwIw\ncjELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRowGAYDVQQK\nExFvcmcxLm5ldHdvcmsxLmNvbTEPMA0GA1UECxMGRmFicmljMR0wGwYDVQQDExRj\nYS5vcmcxLm5ldHdvcmsxLmNvbTAeFw0yNDA2MTcwNjIwMDBaFw0zNDA2MTUwNzQz\nMDBaMEIxMDALBgNVBAsTBG9yZzEwDQYDVQQLEwZjbGllbnQwEgYDVQQLEwtkZXBh\ncnRtZW50MTEOMAwGA1UEAxMFcmVsYXkwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC\nAASVptZNTjxeRDtd5WUwKiBXHUczicGVNMTTVAlA48IsQaTTImHGVTsHktZqq/Uw\n/nMpPOf/4wSEb0qfLefN5MSco4HaMIHXMA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMB\nAf8EAjAAMB0GA1UdDgQWBBRHSVRhABZ2cwM0CXOfi42X3Dg9PTAfBgNVHSMEGDAW\ngBSjqW3VHCTFVlj3wk5DlBb7yNs8kzB3BggqAwQFBgcIAQRreyJhdHRycyI6eyJo\nZi5BZmZpbGlhdGlvbiI6Im9yZzEuZGVwYXJ0bWVudDEiLCJoZi5FbnJvbGxtZW50\nSUQiOiJyZWxheSIsImhmLlR5cGUiOiJjbGllbnQiLCJyZWxheSI6InRydWUifX0w\nCgYIKoZIzj0EAwIDSAAwRQIhAN56BY2L7+I0rQYBhXlD8iqzr0ynvF6vjvo14SRU\npJzvAiB+PJnxtkNCRO8/SkapDgD0eyigIKTDPdRiY5Z7mTcE8g==\n-----END CERTIFICATE-----\n","privateKey":"-----BEGIN PRIVATE KEY-----\r\nMIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgTZ+LtXT58KVa3qbI\r\nXo+NMe9zbNMLW6qUxoi/YjTGXbOhRANCAASVptZNTjxeRDtd5WUwKiBXHUczicGV\r\nNMTTVAlA48IsQaTTImHGVTsHktZqq/Uw/nMpPOf/4wSEb0qfLefN5MSc\r\n-----END PRIVATE KEY-----\r\n"},"mspId":"Org1MSP","type":"X.509","version":1} \ No newline at end of file +{"credentials":{"certificate":"-----BEGIN CERTIFICATE-----\nMIICkTCCAjegAwIBAgIUcabHrj3uzOT/qLYMpw2/kr/qrNowCgYIKoZIzj0EAwIw\ncjELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRowGAYDVQQK\nExFvcmcxLm5ldHdvcmsxLmNvbTEPMA0GA1UECxMGRmFicmljMR0wGwYDVQQDExRj\nYS5vcmcxLm5ldHdvcmsxLmNvbTAeFw0yNDA2MTcwNjIwMDBaFw0zNDA2MTUwNzQz\nMDBaMEIxMDALBgNVBAsTBG9yZzEwDQYDVQQLEwZjbGllbnQwEgYDVQQLEwtkZXBh\ncnRtZW50MTEOMAwGA1UEAxMFcmVsYXkwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC\nAASVptZNTjxeRDtd5WUwKiBXHUczicGVNMTTVAlA48IsQaTTImHGVTsHktZqq/Uw\n/nMpPOf/4wSEb0qfLefN5MSco4HaMIHXMA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMB\nAf8EAjAAMB0GA1UdDgQWBBRHSVRhABZ2cwM0CXOfi42X3Dg9PTAfBgNVHSMEGDAW\ngBSjqW3VHCTFVlj3wk5DlBb7yNs8kzB3BggqAwQFBgcIAQRreyJhdHRycyI6eyJo\nZi5BZmZpbGlhdGlvbiI6Im9yZzEuZGVwYXJ0bWVudDEiLCJoZi5FbnJvbGxtZW50\nSUQiOiJyZWxheSIsImhmLlR5cGUiOiJjbGllbnQiLCJyZWxheSI6InRydWUifX0w\nCgYIKoZIzj0EAwIDSAAwRQIhAN56BY2L7+I0rQYBhXlD8iqzr0ynvF6vjvo14SRU\npJzvAiB+PJnxtkNCRO8/SkapDgD0eyigIKTDPdRiY5Z7mTcE8g==\n-----END CERTIFICATE-----\n","privateKey":"-----BEGIN PRIVATE KEY-----\r\nMIGHAgEAMBMGByqGSM49AgEasdasdGCCqGSM49AwEHBG0wawIBAQQgTZ+LtXT58KVa3qbI\r\nXo+NMe9zbNMLW6qUxoi/YjTGXbOhRANCAASVptZNTjxeRDtd5WUwKiBXHUczicGV\r\nNMTTVAlA48IsQaTTImHGVTsHktZqq/Uw/nMpPOf/4wSEb0qfLefN5MSc\r\n-----END PRIVATE KEY-----\r\n"},"mspId":"Org1MSP","type":"X.509","version":1} \ No newline at end of file diff --git a/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/IssuerPublicKey b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/IssuerPublicKey new file mode 100644 index 0000000000..652e74fe24 Binary files /dev/null and b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/IssuerPublicKey differ diff --git a/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/IssuerRevocationPublicKey b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/IssuerRevocationPublicKey new file mode 100644 index 0000000000..247e1804b1 --- /dev/null +++ b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/IssuerRevocationPublicKey @@ -0,0 +1,5 @@ +-----BEGIN PUBLIC KEY----- +MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEO9mphv6rmoTAV/u7pIaMG43UkLgg0F1h +nfiBObsOPHYhY1Xm7UBWEqvYz2lgDPVAQhDZxhaK1iLBxoVbUTCwbGYKrpPGkVTg +4lWsRcdPrO4cG9AOSX4dQdMCS+c5ayZ7 +-----END PUBLIC KEY----- diff --git a/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/ca-cert.pem b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/ca-cert.pem new file mode 100644 index 0000000000..03cd55aca7 --- /dev/null +++ b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/ca-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICKjCCAdGgAwIBAgIUcws+2zc99L2cl7+VRQAIGntaoTQwCgYIKoZIzj0EAwIw +cjELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRowGAYDVQQK +ExFvcmcxLm5ldHdvcmsxLmNvbTEPMA0GA1UECxMGRmFicmljMR0wGwYDVQQDExRj +YS5vcmcxLm5ldHdvcmsxLmNvbTAeFw0yNDA2MTcwNjIwMDBaFw0zOTA2MTQwNjIw +MDBaMHIxCzAJBgNVBAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEaMBgG +A1UEChMRb3JnMS5uZXR3b3JrMS5jb20xDzANBgNVBAsTBkZhYnJpYzEdMBsGA1UE +AxMUY2Eub3JnMS5uZXR3b3JrMS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC +AASRCfXL0J5PiLLUyqluS5Fi4OZ+OSZiZe+KAmXkBwByC7uyc+N9LQSMd3srdc+y +FJtwRKbmi/DJcPL14HrZa3+Ko0UwQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/ +BAgwBgEB/wIBATAdBgNVHQ4EFgQUo6lt1RwkxVZY98JOQ5QW+8jbPJMwCgYIKoZI +zj0EAwIDRwAwRAIgHw4EO3aWTcK8Q07brs35YDEnxPWlQUU60j9HHbHEmwcCIEQR +acHYPAXBEdRuIwMuZuZd8N8dXeM3PE4jKMZQurCP +-----END CERTIFICATE----- diff --git a/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/fabric-ca-server.db b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/fabric-ca-server.db new file mode 100644 index 0000000000..e651e17e00 Binary files /dev/null and b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/fabric-ca-server.db differ diff --git a/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/IssuerRevocationPrivateKey b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/IssuerRevocationPrivateKey new file mode 100644 index 0000000000..ada3da1aa1 --- /dev/null +++ b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/IssuerRevocationPrivateKey @@ -0,0 +1,6 @@ +-----BEGIN PRIVATE KEY----- +MIGkAgEBBDB1DEGMRu2ysQTM0wVq1RFXlHNabS9GjZs4vG7Mz4mSY7pjJGolUwin ++o+X5zxtsZ2gBwYFK4EEACKhZANiAAQ72amG/quahMBX+7ukhowbjdSQuCDQXWGd ++IE5uw48diFjVebtQFYSq9jPaWAM9UBCENnGForWIsHGhVtRMLBsZgquk8aRVODi +VaxFx0+s7hwb0A5Jfh1B0wJL5zlrJns= +-----END PRIVATE KEY----- diff --git a/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/IssuerSecretKey b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/IssuerSecretKey new file mode 100644 index 0000000000..e064f4fcce --- /dev/null +++ b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/IssuerSecretKey @@ -0,0 +1 @@ +6:n"cTH۲bH%{Dn \ No newline at end of file diff --git a/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/a6ca52b519199223f12b72c54944ce32628f34de382e118e6a7cf9737394fb45_sk b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/a6ca52b519199223f12b72c54944ce32628f34de382e118e6a7cf9737394fb45_sk new file mode 100644 index 0000000000..7a515879a9 --- /dev/null +++ b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/a6ca52b519199223f12b72c54944ce32628f34de382e118e6a7cf9737394fb45_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgzw0y/HYqgnHmQQuq +7LHJ5dPMCMIHjbRUpdf4Mwa2JbKhRANCAASRCfXL0J5PiLLUyqluS5Fi4OZ+OSZi +Ze+KAmXkBwByC7uyc+N9LQSMd3srdc+yFJtwRKbmi/DJcPL14HrZa3+K +-----END PRIVATE KEY----- diff --git a/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/a7fa347b343cb9b9d4f13fade85803d6c19a0e83fb628c636530a39c4fbc2585_sk b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/a7fa347b343cb9b9d4f13fade85803d6c19a0e83fb628c636530a39c4fbc2585_sk new file mode 100644 index 0000000000..3cac15a0d0 --- /dev/null +++ b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/msp/keystore/a7fa347b343cb9b9d4f13fade85803d6c19a0e83fb628c636530a39c4fbc2585_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg5iOz5553XGTi6jAF +1pu38oUSkosaghlm0nHIYAe/BI6hRANCAARDGb2RZBGfsZNZDcTF1W1QiGyKm5Og +hMchK6J5qj2fFBE1X0cDkfxfVlZ+ufOjo0Xhxpj3WTYqQAJDzlrfASXF +-----END PRIVATE KEY----- diff --git a/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/tls-cert.pem b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/tls-cert.pem new file mode 100644 index 0000000000..7292ddd70a --- /dev/null +++ b/weaver/tests/network-setups/fabric/network-artifacts/network1/fabric-ca/org3/tls-cert.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICljCCAjygAwIBAgIUCBMPBI8XNPTOc7K6Zvj7v913yzYwCgYIKoZIzj0EAwIw +cjELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRowGAYDVQQK +ExFvcmcxLm5ldHdvcmsxLmNvbTEPMA0GA1UECxMGRmFicmljMR0wGwYDVQQDExRj +YS5vcmcxLm5ldHdvcmsxLmNvbTAeFw0yNDA2MTcwNjIwMDBaFw0zNDA2MTUwNjIw +MDBaMGoxCzAJBgNVBAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEaMBgG +A1UEChMRb3JnMS5uZXR3b3JrMS5jb20xDzANBgNVBAsTBkZhYnJpYzEVMBMGA1UE +AxMMYWRjZTExZjNjOWU3MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQxm9kWQR +n7GTWQ3ExdVtUIhsipuToITHISuieao9nxQRNV9HA5H8X1ZWfrnzo6NF4caY91k2 +KkACQ85a3wElxaOBtzCBtDAOBgNVHQ8BAf8EBAMCA6gwHQYDVR0lBBYwFAYIKwYB +BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFI2k0+YOGqKR +BIcmuBdUh9R1mMSGMB8GA1UdIwQYMBaAFKOpbdUcJMVWWPfCTkOUFvvI2zyTMDUG +A1UdEQQuMCyCDDZiYmQ4OTQzMDE2NoIJbG9jYWxob3N0ghFvcmcxLm5ldHdvcmsx +LmNvbTAKBggqhkjOPQQDAgNIADBFAiEApoFQPRZ+xBKgM+91rPPK5EeQtLAKptVc +3biv40+PPWYCIG7CK+HaCSl8ssij3KLPYiRc8k67eWmRBmbcYyuXEdm7 +-----END CERTIFICATE-----