-
Notifications
You must be signed in to change notification settings - Fork 80
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
Add posible to set custom path to certificate #63
Add posible to set custom path to certificate #63
Conversation
1d23939
to
5061a48
Compare
This pull request introduces 1 alert when merging 4e39100 into 70e0e96 - view on LGTM.com new alerts:
|
This pull request introduces 1 alert when merging 64a9013 into 70e0e96 - view on LGTM.com new alerts:
|
3e7a5b5
to
d5319b6
Compare
@ravenolf Could you check if this works in your setup? |
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.
LGTM 👍
iroha/iroha.py
Outdated
""" | ||
Create Iroha gRPC client | ||
:param address: Iroha Torii address with port, example "127.0.0.1:50051" | ||
:param timeout: timeout for network I/O operations in seconds | ||
:param secure: enable grpc ssl channel | ||
:param root_certificates: The PEM-encoded root certificates as a byte string, |
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.
You can specify that without those params, grpc will use the default CAs link
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.
I don't know if I should approve, but I've checked the changes and they looks good:)
@baziorek If it looks good and have permissions to approve please approve |
I've approved: EDIT: There is conflict, so it must be corrected before merging - then everything would be green to merge:) |
7ec2960
to
65e0376
Compare
727fbb0
to
c0a53ef
Compare
@stepanLav Was it closed by accident, or on purpose? Shouldn't it be merged after corrections? |
@baziorek Sorry it was closed by accident, I will recreate it |
Signed-off-by: Stepan Lavrentev <[email protected]>
55e0f45
to
8aa6797
Compare
I returned all the changes back. |
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.
I returned all the changes back.
Sorry, I'm not a master of git commands sweat_smile
I'm also not the master:).
Fortunately now it should be enough to just click "Merge" somewhere.
commit 92d8177 Author: Stepan Lavrentev <[email protected]> Date: Thu Jul 8 08:31:43 2021 +0300 Add ability to provide custom TLS cert (hyperledger-iroha#63) Signed-off-by: Stepan Lavrentev <[email protected]> commit 4d10eb0 Author: Grzegorz Bazior <[email protected]> Date: Fri Apr 23 18:02:10 2021 +0200 Add possibility of checking transaction status by hash Signed-off-by: Grzegorz Bazior <[email protected]> commit c0a53ef Author: Sara <[email protected]> Date: Tue Mar 30 01:38:39 2021 +0300 added comments for iroha docs (hyperledger-iroha#68) Signed-off-by: Sara <[email protected]> commit 3968c39 Author: Grzegorz Bazior <[email protected]> Date: Thu Mar 11 23:18:44 2021 +0100 Add optional argument to configure GRPC max message length Signed-off-by: Grzegorz Bazior <[email protected]> commit 293d682 Author: Ry Jones <[email protected]> Date: Thu Mar 25 12:25:13 2021 -0700 Update repolinter.yml Signed-off-by: Ry Jones <[email protected]> commit 7955e40 Author: Ry Jones <[email protected]> Date: Mon Mar 22 17:40:11 2021 -0700 Catch repolinter errors Signed-off-by: Ry Jones <[email protected]> commit ed38676 Author: Ry Jones <[email protected]> Date: Mon Mar 22 12:56:01 2021 -0700 Create repolinter.yml Signed-off-by: Ry Jones <[email protected]> commit c0c7797 Merge: 70e0e96 9470329 Author: Andrei Lebedev <[email protected]> Date: Mon Dec 7 18:49:25 2020 +0100 Merge pull request hyperledger-iroha#64 from vadimreutskiy/master Fix dependencies for the package setup commit 9470329 Author: Vadim Reutskiy <[email protected]> Date: Tue Dec 1 21:27:19 2020 +0900 Fix dependencies for the package setup Signed-off-by: Vadim Reutskiy <[email protected]>
Signed-off-by: Stepan Lavrentev <[email protected]>
Signed-off-by: Stepan Lavrentev <[email protected]> Signed-off-by: G.Bazior <[email protected]>
* Extending TxPaginationMeta in queries (#77) * quries extended * example added * docs comment added * schema changed * formatting fixed * ordering added * edge case fix, now 0 passed as height or timestamp is passing * PaginationMeta in GetPendingTransactions * examples/query_transactions.py Signed-off-by: Piotr Pawlowski <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Update proto files and generated python files to support Iroha 1.4 (#96) * Update proto files with script `download-schema.py` Signed-off-by: Grzegorz Bazior <[email protected]> * Generated python files from protobuf files with script `compile-proto.py` Signed-off-by: G.Bazior <[email protected]> Co-authored-by: Grzegorz Bazior <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Corrected merge - rerun scripts: download-schema.py and compile-proto.py Signed-off-by: G.Bazior <[email protected]> * Tab -> spaces Signed-off-by: G.Bazior <[email protected]> * Add ability to provide custom TLS cert (#63) Signed-off-by: Stepan Lavrentev <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Add ordering sequence to params in query (#73) * Add ordering sequence to params Makes possible to add ordering sequence to Query. Fixes #72 Signed-off-by: Rafik Naccache <[email protected]> * Add :param ordering_sequence: Signed-off-by: Rafik Naccache <[email protected]> * Fix wrong example for :param ordering_sequence: Signed-off-by: Rafik Naccache <[email protected]> * fix wrong ordering message construction in query After more documentation I got to the way to construct to ordering object Signed-off-by: Rafik Naccache <[email protected]> * remove redundant OR clause to manage ordering_sequence Signed-off-by: Rafik Naccache <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Extending TxPaginationMeta in queries (#77) * quries extended * example added * docs comment added * schema changed * formatting fixed * ordering added * edge case fix, now 0 passed as height or timestamp is passing * PaginationMeta in GetPendingTransactions * examples/query_transactions.py Signed-off-by: Piotr Pawlowski <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Added missing changes from Pawlak00@b6d7f42 corrected in #77 Signed-off-by: G.Bazior <[email protected]> Co-authored-by: Piotr Pawłowski <[email protected]> Co-authored-by: Grzegorz Bazior <[email protected]> Co-authored-by: Stepan Lavrentev <[email protected]> Co-authored-by: Rafik NACCACHE <[email protected]>
* Extending TxPaginationMeta in queries (#77) * quries extended * example added * docs comment added * schema changed * formatting fixed * ordering added * edge case fix, now 0 passed as height or timestamp is passing * PaginationMeta in GetPendingTransactions * examples/query_transactions.py Signed-off-by: Piotr Pawlowski <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Update proto files and generated python files to support Iroha 1.4 (#96) * Update proto files with script `download-schema.py` Signed-off-by: Grzegorz Bazior <[email protected]> * Generated python files from protobuf files with script `compile-proto.py` Signed-off-by: G.Bazior <[email protected]> Co-authored-by: Grzegorz Bazior <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Corrected merge - rerun scripts: download-schema.py and compile-proto.py Signed-off-by: G.Bazior <[email protected]> * Tab -> spaces Signed-off-by: G.Bazior <[email protected]> * Add ability to provide custom TLS cert (#63) Signed-off-by: Stepan Lavrentev <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Add ordering sequence to params in query (#73) * Add ordering sequence to params Makes possible to add ordering sequence to Query. Fixes #72 Signed-off-by: Rafik Naccache <[email protected]> * Add :param ordering_sequence: Signed-off-by: Rafik Naccache <[email protected]> * Fix wrong example for :param ordering_sequence: Signed-off-by: Rafik Naccache <[email protected]> * fix wrong ordering message construction in query After more documentation I got to the way to construct to ordering object Signed-off-by: Rafik Naccache <[email protected]> * remove redundant OR clause to manage ordering_sequence Signed-off-by: Rafik Naccache <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Extending TxPaginationMeta in queries (#77) * quries extended * example added * docs comment added * schema changed * formatting fixed * ordering added * edge case fix, now 0 passed as height or timestamp is passing * PaginationMeta in GetPendingTransactions * examples/query_transactions.py Signed-off-by: Piotr Pawlowski <[email protected]> Signed-off-by: G.Bazior <[email protected]> * Added missing changes from Pawlak00@b6d7f42 corrected in #77 Signed-off-by: G.Bazior <[email protected]> * Examples refactor + added example of MST developed by Leo (#103) * Refactoring of example tx-example.py Signed-off-by: G.Bazior <[email protected]> * Added sample of MST transactions. The code was originally developed by Leo: https://github.com/iptelephony/jubilant-engine but he agreed to add his code to examples Signed-off-by: G.Bazior <[email protected]> * Generated protobuf files with protobuf 3.12.4 on Ubuntu 21.04 (#104) Signed-off-by: G.Bazior <[email protected]> * Serious refactoring + improvements + adding new examples for Iroha 1 (#107) * Update README * Refactoring in tls-example.py * A little refactoring of batch-example.py * Small refactoring of blocks-query.py * Small refactoring of infinite-blocks-stream.py * Added sample how to use ordering of result transactions * Refacroting in query_transactions.py * Renamed file with convention used in other files * Added examples in comments * Some refactoring in examples + added docstring in each file * chmod +x * Updated iroha version from 1.4 -> 1.5 Signed-off-by: G.Bazior <[email protected]> * Add autorestart to iroha Signed-off-by: Alexey Rodionov <[email protected]> * Cherry-pick fix Signed-off-by: G.Bazior <[email protected]> * Generated python files from protobuf on Ubuntu:20.04 Signed-off-by: G.Bazior <[email protected]> * Dependencies fix Signed-off-by: G.Bazior <[email protected]> * Added space in logging after review Signed-off-by: G.Bazior <[email protected]> * Made import in code more readable after review Signed-off-by: G.Bazior <[email protected]> Signed-off-by: Piotr Pawlowski <[email protected]> Signed-off-by: G.Bazior <[email protected]> Signed-off-by: Stepan Lavrentev <[email protected]> Signed-off-by: Rafik Naccache <[email protected]> Signed-off-by: Alexey Rodionov <[email protected]> Co-authored-by: Piotr Pawłowski <[email protected]> Co-authored-by: Grzegorz Bazior <[email protected]> Co-authored-by: Stepan Lavrentev <[email protected]> Co-authored-by: Rafik NACCACHE <[email protected]> Co-authored-by: Alexey Rodionov <[email protected]>
Overview
This PR adds an option to set custom path for certificates with grpc TLS connection.
Changes
Add option to use set custom path for certificates
Add example with ssl connection using