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

RSDK-5993 - fallback to non-mdns uri when auth fails #109

Merged
merged 2 commits into from
Apr 18, 2024
Merged

RSDK-5993 - fallback to non-mdns uri when auth fails #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bfbc58
fallback to non-mdns uri when auth fails
stuqdog Apr 11, 2024
435bb29
clarify comment
stuqdog Apr 11, 2024
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: 1 addition & 1 deletion examples/Cargo.lock
View file
Open in desktop

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

39 changes: 21 additions & 18 deletions src/ffi/dial_ffi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,37 +196,40 @@ pub unsafe extern "C" fn dial(
false => match CStr::from_ptr(c_entity).to_str() {
Ok(ent) => Some(ent.to_string()),
Err(e) => {
log::error!("Error unexpectedly received an invalid entity string {:?}", e);
log::error!(
"Error unexpectedly received an invalid entity string {:?}",
e
);
return ptr::null_mut();
}
}
},
}
};
let timeout_duration = Duration::from_secs_f32(c_timeout);

let (server, channel) = match runtime.block_on(async move {
let channel = match (r#type, payload) {
(Some(t), Some(p)) => {
let res = timeout(
timeout_duration,
timeout(
timeout_duration,
dial_with_cred(
uri_str,
entity_opt,
t.to_str()?,
p.to_str()?,
allow_insec,
disable_webrtc,
)?
.connect()
uri_str,
entity_opt,
t.to_str()?,
p.to_str()?,
allow_insec,
disable_webrtc,
)?
.connect(),
)
.await?;
res
.await?
}
(None, None) => {
let res = timeout(
timeout_duration,
dial_without_cred(uri_str, allow_insec, disable_webrtc)?.connect()).await?;
res
timeout(
timeout_duration,
dial_without_cred(uri_str, allow_insec, disable_webrtc)?.connect(),
)
.await?
}
(None, Some(_)) => Err(anyhow::anyhow!("Error missing credential: type")),
(Some(_), None) => Err(anyhow::anyhow!("Error missing credential: payload")),
Expand Down
52 changes: 33 additions & 19 deletions src/rpc/dial.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ impl DialBuilder<WithCredentials> {

let original_uri = Uri::from_parts(original_uri_parts)?;

let domain = original_uri.authority().clone().unwrap().to_string();
let domain = original_uri.authority().unwrap().to_string();
let uri_for_auth = infer_remote_uri_from_authority(original_uri.clone());

let mdns_uri = mdns_uri.and_then(|p| Uri::from_parts(p).ok());
Expand All @@ -621,7 +621,7 @@ impl DialBuilder<WithCredentials> {
// created with the default uri
None => Err(anyhow::anyhow!("")),
};
let real_channel = match channel {
let mut real_channel = match channel {
Ok(c) => {
log::debug!("Connected via mDNS");
c
Expand All @@ -632,26 +632,40 @@ impl DialBuilder<WithCredentials> {
"Unable to connect via mDNS; falling back to robot URI. Error: {e}"
);
}
Self::create_channel(allow_downgrade, &domain, uri_for_auth, false).await?
Self::create_channel(allow_downgrade, &domain, uri_for_auth.clone(), false).await?
}
};

log::debug!("{}", log_prefixes::ACQUIRING_AUTH_TOKEN);
let token = get_auth_token(
&mut real_channel.clone(),
self.config
.credentials
.as_ref()
.unwrap()
.credentials
.clone(),
self.config
.credentials
.unwrap()
.entity
.unwrap_or_else(|| domain.clone()),
)
.await?;
let creds = self
.config
.credentials
.as_ref()
.unwrap()
.credentials
.clone();
let entity = self
.config
.credentials
.unwrap()
.entity
.unwrap_or_else(|| domain.clone());
let token = match get_auth_token(&mut real_channel.clone(), creds.clone(), entity.clone())
.await
{
Ok(t) => t,
Err(e) => {
if !attempting_mdns {
return Err(e);
}
log::debug!(
"Error getting auth token: [{e}]. This may be the result of attempting to connect via mDNS with an incorrectly scoped API key. Attempting again without mDNS uri."
);
real_channel =
Self::create_channel(allow_downgrade, &domain, uri_for_auth, false).await?;
get_auth_token(&mut real_channel.clone(), creds, entity).await?
}
};
log::debug!("{}", log_prefixes::ACQUIRED_AUTH_TOKEN);

let channel = ServiceBuilder::new()
Expand All @@ -660,7 +674,7 @@ impl DialBuilder<WithCredentials> {
HeaderName::from_static("rpc-host"),
HeaderValue::from_str(domain.as_str())?,
))
.service(real_channel.clone());
.service(real_channel);

if disable_webrtc {
log::debug!("Connected via gRPC");
Expand Down
Loading