Per collection/folder auth

This commit is contained in:
Torbjörn Molin committed 2026-10-19 12:38:38 +02:00
1 parent d5e7b484fc
commit 47ee07d9ff
16 files changed
+1569 -58

No files matched your search

+10 -4
View File
@@ -10,6 +10,7 @@ use anyhow::{bail, Context, Result};
use clap::{Parser, Subcommand};
use reqlite_core::cookies::CookieJar;
use reqlite_core::env::{find_env_dir, Environments};
use reqlite_core::folder::{inherited_auth_on_disk, with_inherited_auth, InheritedAuth};
use reqlite_core::http::{HttpClient, RequestOptions};
use reqlite_core::httpfile::{render_request, HttpFile};
use reqlite_core::resolve::resolve_request;
@@ -99,6 +100,8 @@ struct Loaded {
file: HttpFile,
base_dir: PathBuf,
envs: Environments,
/// Folder auth for requests without an Authorization header.
auth: Option<InheritedAuth>,
indices: Vec<usize>,
}
@@ -114,7 +117,9 @@ fn load(file: &Path, name: Option<&str>, env: Option<&str>) -> Result<Loaded> {
} else {
base_dir
};
let envs = match find_env_dir(&std::fs::canonicalize(&base_dir)?) {
let abs_dir = std::fs::canonicalize(&base_dir)?;
let auth = inherited_auth_on_disk(&abs_dir)?;
let envs = match find_env_dir(&abs_dir) {
Some(d) => Environments::load(&d)?,
None => Environments::default(),
};
@@ -136,6 +141,7 @@ fn load(file: &Path, name: Option<&str>, env: Option<&str>) -> Result<Loaded> {
file: parsed,
base_dir,
envs,
auth,
indices,
})
}
@@ -165,12 +171,12 @@ async fn run(cli: Cli) -> Result<ExitCode> {
let multiple = l.indices.len() > 1;
let mut out = std::io::stdout().lock();
for i in l.indices {
let req = l.file.request(i).unwrap();
let req = with_inherited_auth(l.file.request(i).unwrap(), l.auth.as_ref());
let label = req
.display_name()
.map(str::to_string)
.unwrap_or_else(|| format!("#{}", i + 1));
let mut resolved = resolve_request(req, &resolver, &l.base_dir, &defaults)
let mut resolved = resolve_request(&req, &resolver, &l.base_dir, &defaults)
.with_context(|| format!("request {label}"))?;
if !req.directives.no_cookie_jar {
if let Some(c) = jar.header_for(&resolved.url, SystemTime::now()) {
@@ -230,7 +236,7 @@ async fn run(cli: Cli) -> Result<ExitCode> {
let resolver = l.envs.resolver(env.as_deref(), &l.file.variables());
for i in l.indices {
let r = resolve_request(
l.file.request(i).unwrap(),
&with_inherited_auth(l.file.request(i).unwrap(), l.auth.as_ref()),
&resolver,
&l.base_dir,
&RequestOptions::default(),