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

Update python examples #529

Merged
merged 3 commits into from
Apr 28, 2022
Merged

Update python examples #529

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d625f93
zhars/update_python_examples
Zhaars Apr 18, 2022
34a13da
zhars/update_python_examples
Zhaars Apr 19, 2022
740cc80
Merge branch 'master' into zhars/update_python_examples
Zhaars Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion examples/python/encryptor_config_with_zone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,15 @@ schemas:
- id
- email
encrypted:
- column: email
- column: email

- table: test_example_with_zone
columns:
- id
- data
- raw_data
encrypted:
- column: data
data_type: bytes
# base64 bytes value
Copy link
Collaborator

Choose a reason for hiding this comment

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

mention decoded value of base64 string to understand what we should expect: "test-data"

default_data_value: dGVzdC1kYXRhCg==
13 changes: 12 additions & 1 deletion examples/python/encryptor_config_without_zone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,15 @@ schemas:
- id
- email
encrypted:
- column: email
- column: email

- table: test_example_without_zone
columns:
- id
- data
- raw_data
encrypted:
- column: data
data_type: bytes
# base64 bytes value
default_data_value: ZGVmYXVsdAo=
14 changes: 5 additions & 9 deletions examples/python/example_with_zone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# coding: utf-8
import argparse
import ssl
from sqlalchemy import (Table, Column, Integer, MetaData, select, LargeBinary, Text, cast)
from sqlalchemy import (Table, Column, Integer, MetaData, select, LargeBinary, Text, literal_column)
from sqlalchemy.dialects.postgresql import BYTEA
from acrawriter import create_acrastruct
from common import get_engine, get_default, get_zone, register_common_cli_params
Expand All @@ -25,16 +25,16 @@ def print_data(zone_id, connection):
console"""
result = connection.execute(
# explicitly pass zone id before related data
select([cast(zone_id.encode('utf-8'), BYTEA), test_table]))
select([literal_column("'{}'".format(zone_id)), test_table]))
Copy link
Collaborator

Choose a reason for hiding this comment

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

what about to avoid manual escaping values, use sqlalchemy's engine and specify type_ value for literal_column? I think that we can specify String type to apply escape rules for string values (according to TypeEngine documentation)?
if it will works, I prefer to use such approach. Because it will automatically work for mysql and all other DBs if we will add them.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good, let me check it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I used sqlalchemy's literal, it performs escaping values inside. What do you think @Lagovas ?

result = result.fetchall()
ZONE_ID_INDEX = 0
print("use zone_id: ", zone_id)
print("{:<3} - {} - {} - {}".format("id", 'zone', "data", "raw_data"))
for row in result:
print(
"{:<3} - {} - {} - {}\n".format(
row['id'], row[ZONE_ID_INDEX].decode('utf-8'),
row['data'].decode('utf-8', errors='ignore'), row['raw_data']))
row['id'], row[ZONE_ID_INDEX],
row['data'].decode('utf-8', errors='ignore').rstrip(), row['raw_data']))


def write_data(data, connection, sslcontext=None):
Expand All @@ -45,10 +45,7 @@ def write_data(data, connection, sslcontext=None):
encrypted_data = create_acrastruct(
data.encode('utf-8'), key, zone_id.encode('utf-8'))

connection.execute(
test_table.insert(), data=encrypted_data,
zone_id=zone_id.encode('utf-8'),
raw_data=data)
connection.execute(test_table.insert(), data=encrypted_data, raw_data=data)


if __name__ == '__main__':
Expand All @@ -67,7 +64,6 @@ def write_data(data, connection, sslcontext=None):
test_table = Table(
'test_example_with_zone', metadata,
Column('id', Integer, primary_key=True, nullable=False),
Column('zone_id', LargeBinary, nullable=True),
Column('data', LargeBinary, nullable=False),
Column('raw_data', Text, nullable=False),
)
Expand Down