Skip to content

Conversation

@Andrewmatilde
Copy link
Member

@Andrewmatilde Andrewmatilde commented May 4, 2022

related issue :
#42

  • Backend
  • Frontend
  • Test
  • Feature Issue
  • Description

Signed-off-by: andrewmatilde [email protected]

Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
@Andrewmatilde Andrewmatilde changed the title [WIP] Add TLS support for http Add TLS support for http May 5, 2022
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
Copy link
Member

@Hexilee Hexilee left a comment

Choose a reason for hiding this comment

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

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	chaos-tproxy-controller/Cargo.toml
#	chaos-tproxy-proxy/Cargo.toml
#	chaos-tproxy-proxy/src/proxy/http/server.rs
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
derivative = "2.2.0"
rustls-pemfile = "1.0.0"
webpki-roots = "0.22"
hyper-rustls = { git = "https://github.com/Andrewmatilde/hyper-rustls.git", features = ["http2"] }
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we can use dependency override to replace hyper globally instead of modifying it in each dependency.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think this is not the common use case of dependency override

Copy link
Member Author

Choose a reason for hiding this comment

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

Lucky, something we need just merged rust-lang/cargo#10497

Copy link
Member Author

Choose a reason for hiding this comment

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

I know what's the problem , I will fix it.

Copy link
Member Author

Choose a reason for hiding this comment

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

It seems dependency override not fix the problem.

tracing::debug!(target : "Accept streaming", "remote={:?}, local={:?}",
addr_remote, addr_local);
let service = HttpService::new(addr_remote,
addr_local,
Copy link
Member

Choose a reason for hiding this comment

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

Please format the code, there should be some idents.

Copy link
Member Author

Choose a reason for hiding this comment

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

That didn't auto fmt becuase the code are inside the macro.

Copy link
Member Author

Choose a reason for hiding this comment

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

I will fix it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

}
}

loop {
Copy link
Member

Choose a reason for hiding this comment

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

Why not merge the two loops by a bit of abstraction?

Copy link
Member Author

Choose a reason for hiding this comment

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

It seems there are only three lines code are same , so I think we do not need give an abstrction here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

Err(e) => {
return if e.is_parse() {
tracing::debug!("{}:Turn into tcp transfer.", log_key);
debug!("{}:Turn into tcp transfer.", log_key);
Copy link
Member

Choose a reason for hiding this comment

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

Please use the span instead of log_key.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

*request.uri_mut() = Uri::from_parts(parts)?;

let client = Client::builder().build(HttpConnector::new(self.remote));
let mut response = if let Some(tls_client_config) = &self.tls_client_config {
Copy link
Member

Choose a reason for hiding this comment

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

There is duplicated code in two cases of if-else, please reuse them.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
Signed-off-by: andrewmatilde <[email protected]>
@Andrewmatilde
Copy link
Member Author

PTAL @Hexilee

Copy link
Member

@Hexilee Hexilee left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants