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

serialize callback body and use it in signature payload #711

Merged
merged 1 commit into from
Oct 12, 2023
Merged

serialize callback body and use it in signature payload #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions polaris/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,11 @@ def test_make_on_change_callback_success(mock_serializer, mock_post):
mock_serializer.assert_called_once_with(mock_transaction)
mock_post.assert_called_once_with(
url=mock_transaction.on_change_callback,
json={"transaction": mock_serializer(mock_transaction).data},
data=json.dumps({}).encode(),
timeout=settings.CALLBACK_REQUEST_TIMEOUT,
headers={
"Signature": "test"
"Signature": "test",
"Content-Type": "application/json"
}
)

Expand All @@ -144,10 +145,11 @@ def test_make_on_change_callback_success_with_timeout(mock_serializer, mock_post
mock_serializer.assert_called_once_with(mock_transaction)
mock_post.assert_called_once_with(
url=mock_transaction.on_change_callback,
json={"transaction": mock_serializer(mock_transaction).data},
data=json.dumps({}).encode(),
timeout=5,
headers={
"Signature": "test"
"Signature": "test",
"Content-Type": "application/json"
}
)

Expand Down
18 changes: 12 additions & 6 deletions polaris/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,16 +301,19 @@ def make_on_change_callback(
raise ValueError("invalid or missing on_change_callback")
if not timeout:
timeout = settings.CALLBACK_REQUEST_TIMEOUT
callback_body = {"transaction": TransactionSerializer(transaction).data}
callback_body = json.dumps({"transaction": TransactionSerializer(transaction).data})
try:
signature_header_value = compute_callback_signature(transaction.on_change_callback, callback_body)
except ValueError: #
logger.error(f"unable to parse host of transaction.on_change_callback for transaction {transaction.id}")
return None
headers = {"Signature": signature_header_value}
headers = {
"Signature": signature_header_value,
"Content-Type": "application/json"
}
return post(
url=transaction.on_change_callback,
json=callback_body,
data=callback_body.encode(),
timeout=timeout,
headers=headers
)
Expand Down Expand Up @@ -345,17 +348,20 @@ async def make_on_change_callback_async(
if not timeout:
timeout = settings.CALLBACK_REQUEST_TIMEOUT
timeout_obj = aiohttp.ClientTimeout(total=timeout)
callback_body = {"transaction": TransactionSerializer(transaction).data}
callback_body = json.dumps({"transaction": TransactionSerializer(transaction).data})
try:
signature_header_value = compute_callback_signature(transaction.on_change_callback, callback_body)
except ValueError: #
logger.error(f"unable to parse host of transaction.on_change_callback for transaction {transaction.id}")
return None
headers = {"Signature": signature_header_value}
headers = {
"Signature": signature_header_value,
"Content-Type": "application/json"
}
async with aiohttp.ClientSession(timeout=timeout_obj) as session:
return await session.post(
url=transaction.on_change_callback,
json=callback_body,
data=callback_body.encode(),
timeout=timeout,
headers=headers
)
Expand Down