1369c32351
* Remove Request::build * All mutations on Request follow builder pattern The previous `build()` on request was necessary because mutating functions did not follow a proper builder pattern (taking `&mut self` instead of `mut self`). With a proper builder pattern, the need for `.build()` goes away. * All Request body and call methods consume self Anything which "executes" the request will now consume the `Request` to produce a `Result<Response>`. * Move all config from request to agent builder Timeouts, redirect config, proxy settings and TLS config are now on `AgentBuilder`. * Rename max_pool_connections -> max_idle_connections * Rename max_pool_connections_per_host -> max_idle_connections_per_host Consistent internal and external naming. * Introduce new AgentConfig for static config created by builder. `Agent` can be seen as having two parts. Static config and a mutable shared state between all states. The static config goes into `AgentConfig` and the mutable shared state into `AgentState`. * Replace all use of `Default` for `new`. Deriving or implementing `Default` makes for a secondary instantiation API. It is useful in some cases, but gets very confusing when there is both `new` _and_ a `Default`. It's especially devious for derived values where a reasonable default is not `0`, `false` or `None`. * Remove feature native_tls, we want only native rustls. This feature made for very clunky handling throughout the code. From a security point of view, it's better to stick with one single TLS API. Rustls recently got an official audit (very positive). https://github.com/ctz/rustls/tree/master/audit Rustls deliberately omits support for older, insecure TLS such as TLS 1.1 or RC4. This might be a problem for a user of ureq, but on balance not considered important enough to keep native_tls. * Remove auth and support for basic auth. The API just wasn't enough. A future reintroduction should at least also provide a `Bearer` mechanism and possibly more. * Rename jar -> cookie_store * Rename jar -> cookie_tin Just make some field names sync up with the type. * Drop "cookies" as default feature The need for handling cookies is probably rare, let's not enable it by default. * Change all feature checks for "cookie" to "cookies" The outward facing feature is "cookies" and I think it's better form that the code uses the official feature name instead of the optional library "cookies". * Keep `set` on Agent level as well as AgentBuilder. The idea is that an auth exchange might result in a header that need to be set _after_ the agent has been built.
75 lines
2.6 KiB
Rust
75 lines
2.6 KiB
Rust
use crate::response::Response;
|
|
use std::fmt;
|
|
use std::io::{self, ErrorKind};
|
|
|
|
#[derive(Debug)]
|
|
pub enum Error {
|
|
/// The url could not be understood.
|
|
BadUrl(String),
|
|
/// The url scheme could not be understood.
|
|
UnknownScheme(String),
|
|
/// DNS lookup failed.
|
|
DnsFailed(String),
|
|
/// Connection to server failed.
|
|
ConnectionFailed(String),
|
|
/// Too many redirects.
|
|
TooManyRedirects,
|
|
/// A status line we don't understand `HTTP/1.1 200 OK`.
|
|
BadStatus,
|
|
/// A header line that couldn't be parsed.
|
|
BadHeader,
|
|
/// Some unspecified `std::io::Error`.
|
|
Io(io::Error),
|
|
/// Proxy information was not properly formatted
|
|
BadProxy,
|
|
/// Proxy credentials were not properly formatted
|
|
BadProxyCreds,
|
|
/// Proxy could not connect
|
|
ProxyConnect,
|
|
/// Incorrect credentials for proxy
|
|
InvalidProxyCreds,
|
|
/// HTTP status code indicating an error (e.g. 4xx, 5xx)
|
|
/// Read the inner response body for details and to return
|
|
/// the connection to the pool.
|
|
HTTP(Box<Response>),
|
|
}
|
|
|
|
impl Error {
|
|
// Return true iff the error was due to a connection closing.
|
|
pub(crate) fn connection_closed(&self) -> bool {
|
|
match self {
|
|
Error::Io(e) if e.kind() == ErrorKind::ConnectionAborted => true,
|
|
Error::Io(e) if e.kind() == ErrorKind::ConnectionReset => true,
|
|
_ => false,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<io::Error> for Error {
|
|
fn from(err: io::Error) -> Error {
|
|
Error::Io(err)
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for Error {
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
match self {
|
|
Error::BadUrl(url) => write!(f, "Bad URL: {}", url),
|
|
Error::UnknownScheme(scheme) => write!(f, "Unknown Scheme: {}", scheme),
|
|
Error::DnsFailed(err) => write!(f, "Dns Failed: {}", err),
|
|
Error::ConnectionFailed(err) => write!(f, "Connection Failed: {}", err),
|
|
Error::TooManyRedirects => write!(f, "Too Many Redirects"),
|
|
Error::BadStatus => write!(f, "Bad Status"),
|
|
Error::BadHeader => write!(f, "Bad Header"),
|
|
Error::Io(ioe) => write!(f, "Network Error: {}", ioe),
|
|
Error::BadProxy => write!(f, "Malformed proxy"),
|
|
Error::BadProxyCreds => write!(f, "Failed to parse proxy credentials"),
|
|
Error::ProxyConnect => write!(f, "Proxy failed to connect"),
|
|
Error::InvalidProxyCreds => write!(f, "Provided proxy credentials are incorrect"),
|
|
Error::HTTP(response) => write!(f, "HTTP status {}", response.status()),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl std::error::Error for Error {}
|