feat: add support for relative URLs

rust/agama-cli/Cargo.toml

@@ -25,6 +25,7 @@ chrono = "0.4.38"
 regex = "1.11.1"
 home = "0.5.11"
 serde = { version = "1.0.219", features = ["derive"] }
+fluent-uri = "0.3.2"
 
 [[bin]]
 name = "agama"

rust/agama-cli/src/commands.rs

@@ -99,13 +99,14 @@ pub enum Commands {
 
     /// Download file from given URL
     ///
-    /// The purpose of this command is to download files using AutoYaST supported schemas (e.g. device:// or relurl://).
+    /// The purpose of this command is to download files using AutoYaST supported schemas (e.g. device://).
     /// It can be used to download additional scripts, configuration files and so on.
     /// You can use it for downloading Agama autoinstallation profiles. However, unless you need additional processing,
     /// the "agama profile import" is recommended.
     /// If you want to convert an AutoYaST profile, use "agama profile autoyast".
     Download {
-        /// URL pointing to file for download
+        /// URL reference pointing to file for download. If a relative URL is
+        /// provided, it will be resolved against the current working directory.
         url: String,
         /// File name
         destination: PathBuf,

rust/agama-cli/src/config.rs

@@ -26,7 +26,8 @@ use std::{
 
 use crate::show_progress;
 use agama_lib::{
-    base_http_client::BaseHTTPClient, install_settings::InstallSettings, Store as SettingsStore,
+    base_http_client::BaseHTTPClient, context::InstallationContext,
+    install_settings::InstallSettings, Store as SettingsStore,
 };
 use anyhow::anyhow;
 use clap::Subcommand;
@@ -75,7 +76,7 @@ pub async fn run(http_client: BaseHTTPClient, subcommand: ConfigCommands) -> any
             let mut stdin = io::stdin();
             let mut contents = String::new();
             stdin.read_to_string(&mut contents)?;
-            let result: InstallSettings = serde_json::from_str(&contents)?;
+            let result = InstallSettings::from_json(&contents, &InstallationContext::from_env()?)?;
             tokio::spawn(async move {
                 show_progress().await.unwrap();
             });
@@ -112,7 +113,10 @@ fn edit(model: &InstallSettings, editor: &str) -> anyhow::Result<InstallSettings
     let mut command = editor_command(editor);
     let status = command.arg(path.as_os_str()).status()?;
     if status.success() {
-        return Ok(InstallSettings::from_file(path)?);
+        return Ok(InstallSettings::from_file(
+            path,
+            &InstallationContext::from_env()?,
+        )?);
     }
 
     Err(anyhow!(

rust/agama-cli/src/lib.rs

@@ -19,10 +19,12 @@
 // find current contact information at www.suse.com.
 
 use agama_lib::auth::AuthToken;
+use agama_lib::context::InstallationContext;
 use agama_lib::manager::FinishMethod;
 use anyhow::Context;
 use auth_tokens_file::AuthTokensFile;
 use clap::{Args, Parser};
+use fluent_uri::UriRef;
 
 mod auth;
 mod auth_tokens_file;
@@ -185,15 +187,24 @@ async fn build_manager<'a>() -> anyhow::Result<ManagerClient<'a>> {
     Ok(ManagerClient::new(conn).await?)
 }
 
-pub fn download_file(url: &str, path: &PathBuf) -> Result<(), ServiceError> {
+pub fn download_file(url: &str, path: &PathBuf) -> anyhow::Result<()> {
     let mut file = fs::OpenOptions::new()
         .create(true)
         .write(true)
-        .mode(0o400)
+        .truncate(true)
+        .mode(0o600)
         .open(path)
         .context(format!("Cannot write the file '{}'", path.display()))?;
 
-    match Transfer::get(url, &mut file) {
+    let context = InstallationContext::from_env().unwrap();
+    let uri = UriRef::parse(url).context("Invalid URL")?;
+    let absolute_url = if uri.has_scheme() {
+        uri.to_string()
+    } else {
+        uri.resolve_against(&context.source)?.to_string()
+    };
+
+    match Transfer::get(&absolute_url, &mut file) {
         Ok(()) => println!("File saved to {}", path.display()),
         Err(e) => eprintln!("Could not retrieve the file: {e}"),
     }

rust/agama-cli/src/profile.rs

@@ -20,12 +20,17 @@
 
 use crate::show_progress;
 use agama_lib::{
-    base_http_client::BaseHTTPClient, install_settings::InstallSettings,
-    profile::ValidationOutcome, utils::FileFormat, utils::Transfer, Store as SettingsStore,
+    base_http_client::BaseHTTPClient,
+    context::InstallationContext,
+    install_settings::InstallSettings,
+    profile::ValidationOutcome,
+    utils::{FileFormat, Transfer},
+    Store as SettingsStore,
 };
 use anyhow::Context;
 use clap::Subcommand;
 use console::style;
+use fluent_uri::Uri;
 use std::{
     io,
     io::Read,
@@ -228,11 +233,11 @@ async fn import(client: BaseHTTPClient, url_string: String) -> anyhow::Result<()
         }
     });
 
-    let url = Url::parse(&url_string)?;
-    let path = url.path();
+    let url = Uri::parse(url_string.as_str())?;
+    let path = url.path().to_string();
     let profile_json = if path.ends_with(".xml") || path.ends_with(".erb") || path.ends_with('/') {
         // AutoYaST specific download and convert to JSON
-        let config_string = autoyast_client(&client, &url).await?;
+        let config_string = autoyast_client(&client, &url.to_owned()).await?;
         Some(config_string)
     } else {
         pre_process_profile(&client, &url_string).await?
@@ -241,7 +246,10 @@ async fn import(client: BaseHTTPClient, url_string: String) -> anyhow::Result<()
     // None means the profile is a script and it has been executed
     if let Some(profile_json) = profile_json {
         validate(&client, CliInput::Full(profile_json.clone())).await?;
-        store_settings(client, &profile_json).await?;
+        let context = InstallationContext {
+            source: url.to_owned(),
+        };
+        store_settings(client, &profile_json, &context).await?;
     }
     Ok(())
 }
@@ -280,9 +288,13 @@ async fn pre_process_profile(
     }
 }
 
-async fn store_settings(client: BaseHTTPClient, profile_json: &str) -> anyhow::Result<()> {
+async fn store_settings(
+    client: BaseHTTPClient,
+    profile_json: &str,
+    context: &InstallationContext,
+) -> anyhow::Result<()> {
     let store = SettingsStore::new(client).await?;
-    let settings: InstallSettings = serde_json::from_str(profile_json)?;
+    let settings = InstallSettings::from_json(profile_json, context)?;
     store.store(&settings).await?;
     Ok(())
 }
@@ -291,7 +303,7 @@ async fn store_settings(client: BaseHTTPClient, profile_json: &str) -> anyhow::R
 /// Note that this client does not act on this *url*, it passes it as a parameter
 /// to our web backend.
 /// Return well-formed Agama JSON on success.
-async fn autoyast_client(client: &BaseHTTPClient, url: &Url) -> anyhow::Result<String> {
+async fn autoyast_client(client: &BaseHTTPClient, url: &Uri<String>) -> anyhow::Result<String> {
     // FIXME: how to escape it?
     let api_url = format!("/profile/autoyast?url={}", url);
     let output: Box<serde_json::value::RawValue> = client.post(&api_url, &()).await?;
@@ -300,8 +312,8 @@ async fn autoyast_client(client: &BaseHTTPClient, url: &Url) -> anyhow::Result<S
 }
 
 async fn autoyast(client: BaseHTTPClient, url_string: String) -> anyhow::Result<()> {
-    let url = Url::parse(&url_string)?;
-    let output = autoyast_client(&client, &url).await?;
+    let url = Uri::parse(url_string.as_str())?;
+    let output = autoyast_client(&client, &url.to_owned()).await?;
     println!("{}", output);
     Ok(())
 }

rust/agama-lib/Cargo.toml

@@ -20,8 +20,8 @@ tempfile = "3.13.0"
 thiserror = "1.0.64"
 tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
 tokio-stream = "0.1.16"
-url = "2.5.2"
-utoipa = "5.2.0"
+url = { version = "2.5.2", features = ["serde"] }
+utoipa = { version = "5.2.0", features = ["url"] }
 zbus = { version = "5", default-features = false, features = ["tokio"] }
 # Needed to define curl error in profile errors
 curl = { version = "0.4.47", features = ["protocol-ftp"] }
@@ -37,6 +37,7 @@ strum = { version = "0.27.1", features = ["derive"] }
 fs_extra = "1.3.0"
 serde_with = "3.12.0"
 regex = "1.11.1"
+fluent-uri = { version = "0.3.2", features = ["serde"] }
 
 [dev-dependencies]
 httpmock = "0.7.0"

rust/agama-lib/share/profile.schema.json

@@ -600,8 +600,8 @@
           "type": "string"
         },
         "url": {
-          "title": "Script URL",
-          "description": "URL to fetch the script from"
+          "title": "Script URL reference",
+          "description": "Absolute or relative URL to fetch the script from"
         }
       },
       "required": ["name"],
@@ -628,8 +628,8 @@
           "type": "string"
         },
         "url": {
-          "title": "Script URL",
-          "description": "URL to fetch the script from"
+          "title": "Script URL reference",
+          "description": "Absolute or relative URL to fetch the script from."
         }
       },
       "required": ["name"],
@@ -656,8 +656,8 @@
           "type": "string"
         },
         "url": {
-          "title": "Script URL",
-          "description": "URL to fetch the script from"
+          "title": "Script URL reference",
+          "description": "Absolute or relative URL to fetch the script from."
         },
         "chroot": {
           "title": "Whether it should run in the installed system using a chroot environment",
@@ -689,8 +689,8 @@
           "type": "string"
         },
         "url": {
-          "title": "Script URL",
-          "description": "URL to fetch the script from"
+          "title": "Script URL reference",
+          "description": "Absolute or relative URL to fetch the script from."
         }
       },
       "required": ["name"],
@@ -711,8 +711,8 @@
           "type": "string"
         },
         "url": {
-          "title": "File URL",
-          "description": "URL to fetch the file from"
+          "title": "File URL reference",
+          "description": "Absolute or relative URL to fetch the file from."
         },
         "permissions": {
           "title": "File permissions",

rust/agama-lib/src/context.rs

@@ -0,0 +1,46 @@
+// Copyright (c) [2025] SUSE LLC
+//
+// All Rights Reserved.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, contact SUSE LLC.
+//
+// To contact SUSE LLC about this file by physical or electronic mail, you may
+// find current contact information at www.suse.com.
+
+use fluent_uri::Uri;
+
+#[derive(Debug, thiserror::Error)]
+#[error("Could not determine the installation context")]
+pub struct InstallationContextError(String);
+
+/// It contains context information for the store.
+#[derive(Debug)]
+pub struct InstallationContext {
+    /// Where the installation settings are from.
+    /// Used for resolving relative URL references.
+    pub source: Uri<String>,
+}
+
+impl InstallationContext {
+    /// Sets _source_ to the current directory.
+    pub fn from_env() -> Result<Self, InstallationContextError> {
+        let current_path =
+            std::env::current_dir().map_err(|e| InstallationContextError(e.to_string()))?;
+        let url = format!("file://{}", current_path.as_path().display());
+        let url = Uri::parse(url.as_str()).map_err(|e| InstallationContextError(e.to_string()))?;
+        Ok(Self {
+            source: url.to_owned(),
+        })
+    }
+}

rust/agama-lib/src/error.rs

@@ -59,7 +59,7 @@ pub enum ServiceError {
     // FIXME reroute the error to a better place
     #[error("Profile error: {0}")]
     Profile(#[from] ProfileError),
-    #[error("Unsupported SSL Fingeprint algorithm '#{0}'.")]
+    #[error("Unsupported SSL Fingerprint algorithm '#{0}'.")]
     UnsupportedSSLFingerprintAlgorithm(String),
 }