Update CRT submodules

We haven't done this since starting the project, and there's been a few
important fixes since then, most notably awslabs/aws-c-s3#226 for
detecting concurrent mutations during GETs.

On our bindings side not much has changed. The Uri code moved from
aws-c-io to aws-c-common, and there was also a change to how missing
path fragments are parsed in URIs (awslabs/aws-c-common#986).

Signed-off-by: James Bornholt <[email protected]>

aws-crt-s3/src/common.rs

@@ -12,6 +12,7 @@ pub mod logging;
 pub mod ref_count;
 pub mod rust_log_adapter;
 pub mod task_scheduler;
+pub mod uri;
 
 static COMMON_LIBRARY_INIT: Once = Once::new();
 

aws-crt-s3/src/io/uri.rs → aws-crt-s3/src/common/uri.rs

@@ -64,8 +64,7 @@ impl Uri {
         }
     }
 
-    /// Return the path portion of the URI, including the leading "/". If no path was present,
-    /// returns "/".
+    /// Return the path portion of the URI, including any leading "/".
     pub fn path(&self) -> &OsStr {
         // SAFETY: `inner` is a valid `aws_uri` since it's owned by this struct, and the lifetime of
         // the returned slice will be tied to &self.

aws-crt-s3/src/io.rs

@@ -12,7 +12,6 @@ pub mod futures;
 pub mod host_resolver;
 pub mod retry_strategy;
 pub mod stream;
-pub mod uri;
 
 static IO_LIBRARY_INIT: Once = Once::new();
 

aws-crt-s3/src/io/host_resolver.rs

@@ -30,15 +30,16 @@ impl HostResolver {
     pub fn new_default(allocator: &Allocator, options: &HostResolverDefaultOptions) -> Result<Self, Error> {
         io_library_init(allocator);
 
-        let mut inner_options = aws_host_resolver_default_options {
+        let inner_options = aws_host_resolver_default_options {
             el_group: options.event_loop_group.inner.as_ptr(),
             max_entries: options.max_entries,
             ..Default::default()
         };
 
         let inner =
-            // SAFETY: aws_host_resolver_new_default makes acquires a reference to the inner event loop group.
-            unsafe { aws_host_resolver_new_default(allocator.inner.as_ptr(), &mut inner_options).ok_or_last_error()? };
+            // SAFETY: aws_host_resolver_new_default acquires a reference to the inner event loop
+            // group, and copies what it needs out of `inner_options`.
+            unsafe { aws_host_resolver_new_default(allocator.inner.as_ptr(), &inner_options).ok_or_last_error()? };
 
         Ok(Self { inner })
     }

aws-crt-s3/src/s3/client.rs

@@ -4,10 +4,10 @@ use crate::auth::credentials::CredentialsProvider;
 use crate::auth::signing_config::{SigningConfig, SigningConfigInner};
 use crate::common::allocator::Allocator;
 use crate::common::error::Error;
+use crate::common::uri::Uri;
 use crate::http::request_response::{Headers, Message};
 use crate::io::channel_bootstrap::ClientBootstrap;
 use crate::io::retry_strategy::RetryStrategy;
-use crate::io::uri::Uri;
 use crate::s3::s3_library_init;
 use crate::{aws_byte_cursor_as_slice, CrtError, ResultExt, StringExt};
 use aws_crt_s3_sys::*;

s3-client/src/endpoint.rs

@@ -2,7 +2,7 @@ use std::ffi::OsStr;
 use std::os::unix::prelude::OsStrExt;
 
 use aws_crt_s3::common::allocator::Allocator;
-use aws_crt_s3::io::uri::Uri;
+use aws_crt_s3::common::uri::Uri;
 use lazy_static::lazy_static;
 use regex::Regex;
 use thiserror::Error;
@@ -86,7 +86,8 @@ fn is_valid_dns_name(bucket: &str) -> bool {
 }
 
 fn insert_virtual_host(bucket: &str, uri: &Uri) -> Result<Uri, InvalidUriError> {
-    if uri.path() != OsStr::from_bytes("/".as_bytes()) || !uri.query_string().is_empty() {
+    let empty_path = uri.path().is_empty() || uri.path() == OsStr::from_bytes("/".as_bytes());
+    if !empty_path || !uri.query_string().is_empty() {
         return Err(InvalidUriError::CannotContainPathOrQueryString);
     }
 

s3-client/src/s3_crt_client.rs

@@ -10,13 +10,13 @@ use std::time::{Duration, Instant};
 
 use aws_crt_s3::auth::credentials::{CredentialsProvider, CredentialsProviderChainDefaultOptions};
 use aws_crt_s3::common::allocator::Allocator;
+use aws_crt_s3::common::uri::Uri;
 use aws_crt_s3::http::request_response::{Header, Headers, Message};
 use aws_crt_s3::io::channel_bootstrap::{ClientBootstrap, ClientBootstrapOptions};
 use aws_crt_s3::io::event_loop::EventLoopGroup;
 use aws_crt_s3::io::host_resolver::{HostResolver, HostResolverDefaultOptions};
 use aws_crt_s3::io::retry_strategy::{ExponentialBackoffJitterMode, RetryStrategy, StandardRetryOptions};
 use aws_crt_s3::io::stream::InputStream;
-use aws_crt_s3::io::uri::Uri;
 use aws_crt_s3::s3::client::{
     init_default_signing_config, Client, ClientConfig, MetaRequestOptions, MetaRequestResult, MetaRequestType,
 };