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

feat(): removed panicking code #293

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+7 −7
Open

feat(): removed panicking code #293

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69d3753
feat(): removed panicking code
Christiantyemele Jan 15, 2025
4117751
feat(): ci formatting
Christiantyemele Jan 15, 2025
f414c29
fix(midlw): handle error in midlw
Christiantyemele Jan 20, 2025
7874311
fix(): remove auto generated files
Christiantyemele Jan 20, 2025
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
2 changes: 2 additions & 0 deletions crates/web-plugins/didcomm-messaging/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ pub(crate) enum Error {
InternalServer,
#[error("unsupported content-type, only accept application/didcomm-encrypted+json")]
NotDidcommEncryptedPayload,
#[error("Could not unpack message")]
UnpackingError,
}

impl Error {
Expand Down
12 changes: 5 additions & 7 deletions crates/web-plugins/didcomm-messaging/src/midlw.rs
View file
Open in desktop
IngridPuppet marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use http_body_util::BodyExt;
use hyper::Request;
use serde_json::Value;
use std::sync::Arc;
use tracing::error;

// use super::{error::MediationError, AppState};
use crate::{
Expand Down Expand Up @@ -80,7 +81,7 @@ pub async fn unpack_didcomm_message(

next.run(request).await
}
Err(response) => response,
Err(response) => response.into_response(),
}
Christiantyemele marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down Expand Up @@ -119,13 +120,10 @@ async fn unpack_payload(
.await;

let (plain_message, metadata) = res.map_err(|err| {
tracing::error!("Failed to unpack message: {err:?}");
let response = (
StatusCode::INTERNAL_SERVER_ERROR,
Error::InternalServer.json(),
);
error!("Failed to unpack message: {}", err.kind());
let response = (StatusCode::BAD_REQUEST, Error::UnpackingError.json());
Copy link
Collaborator

Choose a reason for hiding this comment

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

We should find a better way to handle the kinds of errors that can happen here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

i think its better this way

Copy link
Collaborator

Choose a reason for hiding this comment

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

The error kind doesn’t provide sufficient information about the error. We also need additional context to fully understand the error. That’s why a complete error backtrace is necessary.

I need to investigate further to determine why the code panics at this level, as it doesn’t seem to be normal.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm interested in knowing the result of @Hermann-Core's investigation. Please consider his final approval as mine on this PR.


response.into_response()
return response.into_response();
})?;
Christiantyemele marked this conversation as resolved.
Show resolved Hide resolved

if !metadata.encrypted {
Expand Down
51 changes: 51 additions & 0 deletions storage/did.json
View file
Open in desktop
Christiantyemele marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"@context": [
"https://www.w3.org/ns/did/v1",
"https://w3id.org/security/suites/jws-2020/v1"
],
"id": "did:peer:2.Vz6MkqYBvhbuwQMSW8jUEfN7UHKUJb95im7P8pVcMUg6F7Pk9.Ez6LSsUxZqQ1GNhaJtHoA9pPVUHdYoTnFZFf8DjYHSCHfsG36.SeyJpZCI6IiNkaWRjb21tIiwicyI6eyJhIjpbImRpZGNvbW0vdjIiXSwiciI6W10sInVyaSI6Imh0dHBzOi8vZGlkY29tbS1tZWRpYXRvci5ldWRpLWFkb3JzeXMuY29tIn0sInQiOiJkbSJ9",
"alsoKnownAs": [
"did:peer:3zQmNzFFTCrNTqAaxETT7YyMb6VGuWT5UHvo55T5rXrYMtat"
],
"verificationMethod": [
{
"id": "#key-1",
"type": "JsonWebKey2020",
"controller": "did:peer:2.Vz6MkqYBvhbuwQMSW8jUEfN7UHKUJb95im7P8pVcMUg6F7Pk9.Ez6LSsUxZqQ1GNhaJtHoA9pPVUHdYoTnFZFf8DjYHSCHfsG36.SeyJpZCI6IiNkaWRjb21tIiwicyI6eyJhIjpbImRpZGNvbW0vdjIiXSwiciI6W10sInVyaSI6Imh0dHBzOi8vZGlkY29tbS1tZWRpYXRvci5ldWRpLWFkb3JzeXMuY29tIn0sInQiOiJkbSJ9",
"publicKeyJwk": {
"kty": "OKP",
"crv": "Ed25519",
"x": "pLPNl4HZ2dBIeoUQnbSD9HfT1JMApVftS2B6AKATlA4"
}
},
{
"id": "#key-2",
"type": "JsonWebKey2020",
"controller": "did:peer:2.Vz6MkqYBvhbuwQMSW8jUEfN7UHKUJb95im7P8pVcMUg6F7Pk9.Ez6LSsUxZqQ1GNhaJtHoA9pPVUHdYoTnFZFf8DjYHSCHfsG36.SeyJpZCI6IiNkaWRjb21tIiwicyI6eyJhIjpbImRpZGNvbW0vdjIiXSwiciI6W10sInVyaSI6Imh0dHBzOi8vZGlkY29tbS1tZWRpYXRvci5ldWRpLWFkb3JzeXMuY29tIn0sInQiOiJkbSJ9",
"publicKeyJwk": {
"kty": "OKP",
"crv": "X25519",
"x": "6ttbc-2E-Ul-jYIFhXZ95hwip4SJrjxXYmlEH6mlRQU"
}
}
],
"authentication": [
"#key-1"
],
"keyAgreement": [
"#key-2"
],
"service": [
{
"id": "#didcomm",
"type": "DIDCommMessaging",
"serviceEndpoint": {
"accept": [
"didcomm/v2"
],
"routingKeys": [],
"uri": "https://didcomm-mediator.eudi-adorsys.com"
}
}
]
}
1 change: 1 addition & 0 deletions storage/oob_invitation.txt
View file
Open in desktop
IngridPuppet marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://didcomm-mediator.eudi-adorsys.com:8080?_oob=eyJ0eXBlIjoiaHR0cHM6Ly9kaWRjb21tLm9yZy9vdXQtb2YtYmFuZC8yLjAvaW52aXRhdGlvbiIsImlkIjoiNDY2ZTFjNzEtZjNiYS00YTZiLWE3ZTAtYmYwNDg5ZTczNWM5IiwiZnJvbSI6ImRpZDpwZWVyOjIuVno2TWtxWUJ2aGJ1d1FNU1c4alVFZk43VUhLVUpiOTVpbTdQOHBWY01VZzZGN1BrOS5FejZMU3NVeFpxUTFHTmhhSnRIb0E5cFBWVUhkWW9UbkZaRmY4RGpZSFNDSGZzRzM2LlNleUpwWkNJNklpTmthV1JqYjIxdElpd2ljeUk2ZXlKaElqcGJJbVJwWkdOdmJXMHZkaklpWFN3aWNpSTZXMTBzSW5WeWFTSTZJbWgwZEhCek9pOHZaR2xrWTI5dGJTMXRaV1JwWVhSdmNpNWxkV1JwTFdGa2IzSnplWE11WTI5dEluMHNJblFpT2lKa2JTSjkiLCJib2R5Ijp7ImdvYWxfY29kZSI6InJlcXVlc3QtbWVkaWF0ZSIsImdvYWwiOiJSZXF1ZXN0IE1lZGlhdGUiLCJsYWJlbCI6Ik1lZGlhdG9yIiwiYWNjZXB0IjpbImRpZGNvbW0vdjIiXX19
Loading
Loading