From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-offline-mirror 3/4] mirror: support acquiring indices by hash
Date: Thu, 15 Sep 2022 15:09:16 +0200 [thread overview]
Message-ID: <20220915130918.727902-6-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20220915130918.727902-1-f.gruenbichler@proxmox.com>
requires proxmox-apt > 0.9.1, since earlier versions misdetect by-hash
support in the release file.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/mirror.rs | 47 ++++++++++++++++++++++++++++++++++++++---------
1 file changed, 38 insertions(+), 9 deletions(-)
diff --git a/src/mirror.rs b/src/mirror.rs
index f910e6a..6cbd680 100644
--- a/src/mirror.rs
+++ b/src/mirror.rs
@@ -233,6 +233,7 @@ fn fetch_index_file(
prefix: &Path,
reference: &FileReference,
uncompressed: &FileReference,
+ by_hash: bool,
) -> Result<FetchResult, Error> {
let url = get_dist_url(&config.repository, &reference.path);
let path = get_dist_path(&config.repository, prefix, &reference.path);
@@ -252,14 +253,36 @@ fn fetch_index_file(
return Ok(FetchResult { data, fetched: 0 });
}
- let res = fetch_plain_file(
- config,
- &url,
- &path,
- reference.size,
- &reference.checksums,
- true,
- )?;
+ let urls = if by_hash {
+ let mut urls = Vec::new();
+ if let Some((base_url, _file_name)) = url.rsplit_once('/') {
+ if let Some(sha512) = reference.checksums.sha512 {
+ urls.push(format!("{base_url}/by-hash/SHA512/{}", hex::encode(sha512)));
+ }
+ if let Some(sha256) = reference.checksums.sha256 {
+ urls.push(format!("{base_url}/by-hash/SHA256/{}", hex::encode(sha256)));
+ }
+ }
+ urls.push(url);
+ urls
+ } else {
+ vec![url]
+ };
+
+ let res = urls
+ .iter()
+ .fold(None, |res, url| match res {
+ Some(Ok(res)) => Some(Ok(res)),
+ _ => Some(fetch_plain_file(
+ config,
+ &url,
+ &path,
+ reference.size,
+ &reference.checksums,
+ true,
+ )),
+ })
+ .ok_or_else(|| format_err!("Failed to retrieve {}", reference.path))??;
let mut buf = Vec::new();
let raw = res.data_ref();
@@ -556,7 +579,13 @@ pub fn create_snapshot(
}
// this will ensure the uncompressed file will be written locally
- let res = match fetch_index_file(&config, prefix, reference, uncompressed_ref) {
+ let res = match fetch_index_file(
+ &config,
+ prefix,
+ reference,
+ uncompressed_ref,
+ release.aquire_by_hash,
+ ) {
Ok(res) => res,
Err(err) if !reference.file_type.is_package_index() => {
eprintln!(
--
2.30.2
next prev parent reply other threads:[~2022-09-15 13:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 13:09 [pve-devel] [PATCH proxmox-apt/proxmox-offline-mirror 0/7] misc improvements Fabian Grünbichler
2022-09-15 13:09 ` [pve-devel] [PATCH proxmox-offline-mirror 1/4] mirror: use xz multi decoder Fabian Grünbichler
2022-09-15 13:09 ` [pve-devel] [PATCH proxmox-apt 1/3] release: add Commands file reference type Fabian Grünbichler
2022-09-15 13:09 ` [pve-devel] [PATCH proxmox-offline-mirror 2/4] mirror: skip failed, non Packages references Fabian Grünbichler
2022-09-15 13:09 ` [pve-devel] [PATCH proxmox-apt 2/3] release: add 'architecture' helper Fabian Grünbichler
2022-09-15 13:09 ` Fabian Grünbichler [this message]
2022-09-15 14:34 ` [pve-devel] [PATCH FIXUP proxmox-offline-mirror] clippy fix Fabian Grünbichler
2022-09-15 13:09 ` [pve-devel] [PATCH proxmox-apt 3/3] release: fix typo in 'Acquire-By-Hash' Fabian Grünbichler
2022-09-15 13:09 ` [pve-devel] [PATCH proxmox-offline-mirror 4/4] mirror: use new architecture helper Fabian Grünbichler
2022-09-15 14:36 ` [pve-devel] [PATCH follow-up proxmox-offline-mirror 8/7] mirror: handle indices which are only available compressed Fabian Grünbichler
2022-09-16 12:31 ` [pve-devel] applied-series: [PATCH proxmox-apt/proxmox-offline-mirror 0/7] misc improvements Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220915130918.727902-6-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox