Skip to content

fix: read mounted rclone profiles without canonicalizing #1849

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

Draft
magrathean-uk wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: read mounted rclone profiles without canonicalizing #1849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use std::{
path::PathBuf,
};

use abscissa_core::{FrameworkError, FrameworkErrorKind, config::Config, path::AbsPathBuf};
use abscissa_core::{FrameworkError, FrameworkErrorKind, config::Config};
use anyhow::{Result, anyhow};
use clap::{Parser, ValueHint};
use conflate::Merge;
Expand Down Expand Up @@ -126,7 +126,10 @@ impl RusticConfig {

if let Some(path) = paths.iter().find(|path| path.exists()) {
merge_logs.push((Level::Info, format!("using config {}", path.display())));
let config_content = std::fs::read_to_string(AbsPathBuf::canonicalize(path)?)?;
// Reading a profile does not require resolving its path first. In particular,
// `canonicalize` can fail for otherwise readable files on mounted filesystems
// (such as rclone mounts on Windows).
let config_content = std::fs::read_to_string(path)?;
let config_content = if self.global.profile_substitute_env {
subst::substitute(&config_content, &subst::Env).map_err(|e| {
abscissa_core::error::context::Context::new(
Expand Down