Skip to content

feat: update to agent-rs which calls read_state for response authentication #1171

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

Merged
19 commits merged into from
Nov 18, 2020
Merged

feat: update to agent-rs which calls read_state for response authentication #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8fa3a43
Update ic-ref and agent-rs
Nov 9, 2020
2c746b1
status not found in certificate indicates status unknown
Nov 10, 2020
d9c372f
format
Nov 10, 2020
d450fd0
update agent / new HashTree type
Nov 11, 2020
a2b45bb
Merge remote-tracking branch 'origin/master' into es-1139-resp-auth-u…
Nov 11, 2020
5dd6c81
Merge remote-tracking branch 'origin/master' into es-1139-resp-auth-u…
Nov 11, 2020
cd54559
Update ic-ref for improved DER detection
Nov 11, 2020
edfda6e
update agent-rs
Nov 12, 2020
8c52578
Merge remote-tracking branch 'origin/master' into es-1139-resp-auth-u…
Nov 12, 2020
2bb5755
Update rust agent; it now formats http payload
Nov 12, 2020
0f32c42
format
Nov 12, 2020
1356a0e
update agent
Nov 12, 2020
d11b30c
Merge remote-tracking branch 'origin/master' into es-1139-resp-auth-u…
Nov 12, 2020
2c5c2b4
cargo update
Nov 12, 2020
3ac4538
Merge remote-tracking branch 'origin/master' into es-1139-resp-auth-u…
Nov 18, 2020
d19a3af
Update agent-rs, and ic-ref to release-0.13 (0.13.2)
Nov 18, 2020
601bfff
reset to agent-rs next branch
Nov 18, 2020
9972a05
revert Cargo.lock
Nov 18, 2020
b8edda1
Update cargo.lock;
Nov 18, 2020
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
83 changes: 42 additions & 41 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ members = [
version = "0.1.0"
git = "https://github.com/dfinity/agent-rs.git"
branch = "next"
rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84"
rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"

[patch.crates-io.ic-types]
version = "0.1.2"
git = "https://github.com/dfinity/agent-rs.git"
branch = "next"
rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84"
rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"

[patch.crates-io.ic-utils]
version = "0.1.0"
git = "https://github.com/dfinity/agent-rs.git"
branch = "next"
rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84"
rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
4 changes: 2 additions & 2 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"type": "git"
},
"ic-ref": {
"branch": "release-0.11",
"branch": "release-0.13",
"repo": "ssh://git@github.com/dfinity-lab/ic-ref",
"rev": "9edd0fdda006519118ed40515b84c74f69c59bc1",
"rev": "d08472d437c95534ee3d09e635a370522ea0fd37",
"type": "git"
},
"motoko": {
Expand Down
6 changes: 3 additions & 3 deletions src/dfx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ wasmparser = "0.45.0"
version = "0.1.0"
git = "https://github.com/dfinity/agent-rs.git"
branch = "next"
rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84"
rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"

[dependencies.ic-types]
version = "0.1.2"
git = "https://github.com/dfinity/agent-rs.git"
branch = "next"
rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84"
rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"

[dependencies.ic-utils]
version = "0.1.0"
git = "https://github.com/dfinity/agent-rs.git"
branch = "next"
rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84"
rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"

[dev-dependencies]
env_logger = "0.6"
Expand Down
24 changes: 2 additions & 22 deletions src/dfx/src/lib/error/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,19 +194,8 @@ impl Display for DfxError {
reject_code, reject_message
))?;
}
DfxError::AgentError(AgentError::HttpError {
status,
content_type,
content,
}) if is_plain_text_utf8(content_type) => {
f.write_fmt(format_args!(
"Replica error (HTTP status {}): {}",
status,
String::from_utf8(content.to_vec()).unwrap_or_else(|from_utf8_err| format!(
"(unable to decode content: {:#?})",
from_utf8_err
))
))?;
DfxError::AgentError(AgentError::HttpError(http_error_payload)) => {
f.write_fmt(format_args!("Replica error: {}", http_error_payload))?;
Copy link
Contributor

@hansl hansl Nov 18, 2020

Choose a reason for hiding this comment

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

nice.

}
DfxError::Unknown(err) => {
f.write_fmt(format_args!("Unknown error: {}", err))?;
Expand Down Expand Up @@ -341,12 +330,3 @@ impl From<delay::WaiterError> for DfxError {
DfxError::WaiterError(err)
}
}

fn is_plain_text_utf8(content_type: &Option<String>) -> bool {
// text/plain is also sometimes returned by the replica (or ic-ref),
// depending on where in the stack the error happens.
matches!(
content_type.as_ref().and_then(|s|s.parse::<mime::Mime>().ok()),
Some(mt) if mt == mime::TEXT_PLAIN || mt == mime::TEXT_PLAIN_UTF_8
)
}