Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add posible to set custom path to certificate #63

Merged
merged 1 commit into from
Jul 8, 2021
Merged

Add posible to set custom path to certificate #63

merged 1 commit into from
Jul 8, 2021

Conversation

stepanLav
Copy link

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

@stepanLav stepanLav force-pushed the feature/tls_parameter_extension branch from 1d23939 to 5061a48 Compare November 19, 2020 16:45
@lgtm-com
Copy link

lgtm-com bot commented Nov 19, 2020

This pull request introduces 1 alert when merging 4e39100 into 70e0e96 - view on LGTM.com

new alerts:

  • 1 for Wrong name for an argument in a class instantiation

@lgtm-com
Copy link

lgtm-com bot commented Nov 19, 2020

This pull request introduces 1 alert when merging 64a9013 into 70e0e96 - view on LGTM.com

new alerts:

  • 1 for Wrong name for an argument in a class instantiation

@stepanLav stepanLav force-pushed the feature/tls_parameter_extension branch 3 times, most recently from 3e7a5b5 to d5319b6 Compare November 19, 2020 20:39
@lebdron lebdron requested a review from ravenolf December 7, 2020 17:51
@lebdron
Copy link

lebdron commented Dec 7, 2020

@ravenolf Could you check if this works in your setup?

ravenolf
ravenolf approved these changes Dec 8, 2020
View reviewed changes
Copy link

@ravenolf ravenolf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

examples/tls-example.py Outdated Show resolved Hide resolved
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,
Copy link

@ravenolf ravenolf Dec 8, 2020 •
edited
Loading

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

baziorek
baziorek reviewed Jul 2, 2021
View reviewed changes
examples/tls-example.py Outdated Show resolved Hide resolved
baziorek
baziorek approved these changes Jul 2, 2021
View reviewed changes
Copy link

@baziorek baziorek left a 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:)

@kuvaldini
Copy link

@baziorek If it looks good and have permissions to approve please approve

@baziorek
Copy link

baziorek commented Jul 3, 2021 •
edited
Loading

@baziorek If it looks good and have permissions to approve please approve

I've approved:
obraz
Probably my suggestion must be resolved then my approve would automatically be visible as green.

EDIT: There is conflict, so it must be corrected before merging - then everything would be green to merge:)

@stepanLav stepanLav force-pushed the feature/tls_parameter_extension branch 2 times, most recently from 7ec2960 to 65e0376 Compare July 6, 2021 17:16
@stepanLav stepanLav closed this Jul 6, 2021
@stepanLav stepanLav force-pushed the feature/tls_parameter_extension branch from 727fbb0 to c0a53ef Compare July 6, 2021 18:30
@baziorek
Copy link

baziorek commented Jul 6, 2021

@stepanLav Was it closed by accident, or on purpose? Shouldn't it be merged after corrections?

@stepanLav
Copy link
Author

@baziorek Sorry it was closed by accident, I will recreate it

@stepanLav stepanLav reopened this Jul 7, 2021
@stepanLav
Add possible to provide custom tls cert
8aa6797 
Signed-off-by: Stepan Lavrentev <lawrentievsv@gmail.com>
@stepanLav stepanLav force-pushed the feature/tls_parameter_extension branch from 55e0f45 to 8aa6797 Compare July 7, 2021 19:36
@stepanLav
Copy link
Author

I returned all the changes back.
Sorry, I'm not a master of git commands 😅

baziorek
baziorek approved these changes Jul 7, 2021
View reviewed changes
Copy link

@baziorek baziorek left a 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.

@kuvaldini kuvaldini merged commit 92d8177 into hyperledger-iroha:master Jul 8, 2021
@stepanLav stepanLav deleted the feature/tls_parameter_extension branch July 8, 2021 05:36
stepanLav added a commit to stepanLav/iroha-python that referenced this pull request Jul 9, 2021
@stepanLav
Squashed commit of the following:
8055f55 
commit 92d8177
Author: Stepan Lavrentev <40560660+stepanLav@users.noreply.github.com>
Date:   Thu Jul 8 08:31:43 2021 +0300

    Add ability to provide custom TLS cert (hyperledger-iroha#63)

    Signed-off-by: Stepan Lavrentev <lawrentievsv@gmail.com>

commit 4d10eb0
Author: Grzegorz Bazior <g.bazior@yodiss.pl>
Date:   Fri Apr 23 18:02:10 2021 +0200

    Add possibility of checking transaction status by hash

    Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>

commit c0a53ef
Author: Sara <lira.lemur@gmail.com>
Date:   Tue Mar 30 01:38:39 2021 +0300

    added comments for iroha docs (hyperledger-iroha#68)

    Signed-off-by: Sara <lira.lemur@gmail.com>

commit 3968c39
Author: Grzegorz Bazior <g.bazior@yodiss.pl>
Date:   Thu Mar 11 23:18:44 2021 +0100

    Add optional argument to configure GRPC max message length

    Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>

commit 293d682
Author: Ry Jones <ry@linux.com>
Date:   Thu Mar 25 12:25:13 2021 -0700

    Update repolinter.yml

    Signed-off-by: Ry Jones <ry@linux.com>

commit 7955e40
Author: Ry Jones <ry@linux.com>
Date:   Mon Mar 22 17:40:11 2021 -0700

    Catch repolinter errors

    Signed-off-by: Ry Jones <ry@linux.com>

commit ed38676
Author: Ry Jones <ry@linux.com>
Date:   Mon Mar 22 12:56:01 2021 -0700

    Create repolinter.yml

    Signed-off-by: Ry Jones <ry@linux.com>

commit c0c7797
Merge: 70e0e96 9470329
Author: Andrei Lebedev <lebdron@gmail.com>
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 <reutskiy.vadim@gmail.com>
Date:   Tue Dec 1 21:27:19 2020 +0900

    Fix dependencies for the package setup

    Signed-off-by: Vadim Reutskiy <reutskiy.vadim@gmail.com>
baziorek pushed a commit to baziorek/iroha-python that referenced this pull request Feb 28, 2022
@stepanLav @baziorek
Add ability to provide custom TLS cert (hyperledger-iroha#63)
b92fc1a 
Signed-off-by: Stepan Lavrentev <lawrentievsv@gmail.com>
baziorek pushed a commit to baziorek/iroha-python that referenced this pull request Feb 28, 2022
@stepanLav @baziorek
Add ability to provide custom TLS cert (hyperledger-iroha#63)
57bad92 
Signed-off-by: Stepan Lavrentev <lawrentievsv@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
baziorek added a commit that referenced this pull request Mar 23, 2022
@baziorek @Pawlak00
@stepanLav @turbopape
cherry-pick new features from develop -> main (#97)
e0a4f9b 
* 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 <ppiotru@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* 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 <g.bazior@yodiss.pl>

* Generated python files from protobuf files with script `compile-proto.py`

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

Co-authored-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Corrected merge - rerun scripts: download-schema.py and compile-proto.py

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Tab -> spaces

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Add ability to provide custom TLS cert (#63)

Signed-off-by: Stepan Lavrentev <lawrentievsv@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* 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 <rafik@fekr.tech>

* Add :param ordering_sequence:

Signed-off-by: Rafik Naccache <rafik@fekr.tech>

* Fix wrong example for :param ordering_sequence:

Signed-off-by: Rafik Naccache <rafik@fekr.tech>

* 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 <rafik@fekr.tech>

* remove redundant OR clause to manage ordering_sequence

Signed-off-by: Rafik Naccache <rafik@fekr.tech>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* 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 <ppiotru@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Added missing changes from Pawlak00@b6d7f42 corrected in #77

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

Co-authored-by: Piotr Pawłowski <68233055+Pawlak00@users.noreply.github.com>
Co-authored-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Co-authored-by: Stepan Lavrentev <40560660+stepanLav@users.noreply.github.com>
Co-authored-by: Rafik NACCACHE <rafik@fekr.tech>
baziorek added a commit that referenced this pull request Aug 22, 2022
@baziorek @Pawlak00
@stepanLav @turbopape @Stayer
Cherry-pick changes from develop -> main (#122)
0b2d615 
* 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 <ppiotru@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* 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 <g.bazior@yodiss.pl>

* Generated python files from protobuf files with script `compile-proto.py`

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

Co-authored-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Corrected merge - rerun scripts: download-schema.py and compile-proto.py

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Tab -> spaces

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Add ability to provide custom TLS cert (#63)

Signed-off-by: Stepan Lavrentev <lawrentievsv@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* 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 <rafik@fekr.tech>

* Add :param ordering_sequence:

Signed-off-by: Rafik Naccache <rafik@fekr.tech>

* Fix wrong example for :param ordering_sequence:

Signed-off-by: Rafik Naccache <rafik@fekr.tech>

* 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 <rafik@fekr.tech>

* remove redundant OR clause to manage ordering_sequence

Signed-off-by: Rafik Naccache <rafik@fekr.tech>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* 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 <ppiotru@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Added missing changes from Pawlak00@b6d7f42 corrected in #77

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Examples refactor + added example of MST developed by Leo (#103)

* Refactoring of example tx-example.py

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* 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 <bazior@agh.edu.pl>

* Generated protobuf files with protobuf 3.12.4 on Ubuntu 21.04 (#104)

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* 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 <bazior@agh.edu.pl>

* Add autorestart to iroha

Signed-off-by: Alexey Rodionov <rodionov12@gmail.com>

* Cherry-pick fix

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Generated python files from protobuf on Ubuntu:20.04

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Dependencies fix

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Added space in logging after review

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Made import in code more readable after review

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
Signed-off-by: Stepan Lavrentev <lawrentievsv@gmail.com>
Signed-off-by: Rafik Naccache <rafik@fekr.tech>
Signed-off-by: Alexey Rodionov <rodionov12@gmail.com>
Co-authored-by: Piotr Pawłowski <68233055+Pawlak00@users.noreply.github.com>
Co-authored-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Co-authored-by: Stepan Lavrentev <40560660+stepanLav@users.noreply.github.com>
Co-authored-by: Rafik NACCACHE <rafik@fekr.tech>
Co-authored-by: Alexey Rodionov <rodionov12@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kuvaldini kuvaldini kuvaldini approved these changes

@ravenolf ravenolf ravenolf approved these changes

@baziorek baziorek baziorek approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@stepanLav @lebdron @kuvaldini @baziorek @ravenolf