Signed-off-by: Fabian Ebner <f.eb...@proxmox.com> --- Changes from v4: * use common_digest function now living in the library * use 'infos' in the return value description to match the actual return value key
src/api2/node/apt.rs | 68 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index 0fcdce9c..deb481a7 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -7,7 +7,7 @@ use proxmox::api::{api, RpcEnvironment, RpcEnvironmentType, Permission}; use proxmox::api::router::{Router, SubdirMap}; use proxmox::tools::fs::{replace_file, CreateOptions}; -use proxmox_apt::types::{APTRepositoryFile, APTRepositoryFileError}; +use proxmox_apt::types::{APTRepositoryFile, APTRepositoryFileError, APTRepositoryInfo}; use proxmox_http::ProxyConfig; use crate::config::node; @@ -390,6 +390,71 @@ pub fn get_versions() -> Result<Vec<APTUpdateInfo>, Error> { Ok(packages) } +#[api( + input: { + properties: { + node: { + schema: NODE_SCHEMA, + }, + digest: { + schema: PROXMOX_CONFIG_DIGEST_SCHEMA, + optional: true, + }, + }, + }, + returns: { + type: Object, + description: "Additional sanity checks for the configured APT repositories.", + properties: { + infos: { + description: "Additional information/warnings for APT repositories.", + type: Array, + items: { + type: APTRepositoryInfo, + }, + }, + enterprise: { + description: "Whether the enterprise repository is enabled or not.", + type: Boolean, + }, + nosubscription: { + description: "Whether the no-subscription repository is enabled or not.", + type: Boolean, + }, + }, + }, + access: { + permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false), + }, +)] +/// Additional sanity checks for the configured APT repositories. +pub fn check_repositories(digest: Option<String>) -> Result<Value, Error> { + let (files, _) = proxmox_apt::repositories::repositories()?; + + if files.len() == 0 { + bail!("no APT repository files could be parsed!"); + } + + if let Some(digest) = digest { + let expected_digest = proxmox::tools::hex_to_digest(&digest)?; + let current_digest = proxmox_apt::repositories::common_digest(&files); + crate::tools::detect_modified_configuration_file(¤t_digest, &expected_digest)?; + } + + let infos = proxmox_apt::repositories::check_repositories(&files); + + let enterprise_enabled = + proxmox_apt::repositories::enterprise_repository_enabled(&files, "pbs"); + let no_subscription_enabled = + proxmox_apt::repositories::no_subscription_repository_enabled(&files, "pbs"); + + Ok(json!({ + "infos": infos, + "enterprise": enterprise_enabled, + "nosubscription": no_subscription_enabled + })) +} + #[api( input: { properties: { @@ -446,6 +511,7 @@ pub fn get_repositories() -> Result<Value, Error> { const SUBDIRS: SubdirMap = &[ ("changelog", &Router::new().get(&API_METHOD_APT_GET_CHANGELOG)), + ("checkrepositories", &Router::new().get(&API_METHOD_CHECK_REPOSITORIES)), ("repositories", &Router::new().get(&API_METHOD_GET_REPOSITORIES)), ("update", &Router::new() .get(&API_METHOD_APT_UPDATE_AVAILABLE) -- 2.20.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel