proxmox-mirrors/proxmox-offline-mirror
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-offline-mirror synced 2025-04-28 17:06:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #4445: mirror: subscription: add proxy support

Browse Source 
This commit adds support for HTTP proxies, configurable via the
ALL_PROXY environment variable.

For example:
  $ ALL_PROXY="localhost:3128" proxmox-offline-mirror mirror <...>

Note: `ureq` seems to use HTTP CONNECT for *all* connections, including
HTTP on port 80. Proxies need to be configured to allow that - Squid by
default allows CONNECT only for HTTPS on port 443.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
This commit is contained in:
Lukas Wagner 2023-01-19 11:40:40 +01:00 committed by Fabian Grünbichler
parent 26e97f4513
commit 7fdd1a3dee
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mirror.rs
View File

@ -9,7 +9,7 @@ use anyhow::{bail, format_err, Error};
use flate2::bufread::GzDecoder;
use globset::{Glob, GlobSet, GlobSetBuilder};
use nix::libc;
use proxmox_http::{client::sync::Client, HttpClient, HttpOptions};
use proxmox_http::{client::sync::Client, HttpClient, HttpOptions, ProxyConfig};
use proxmox_sys::fs::file_get_contents;
use crate::{
@ -64,6 +64,7 @@ impl TryInto<ParsedMirrorConfig> for MirrorConfig {
let options = HttpOptions {
user_agent: Some("proxmox-offline-mirror 0.1".to_string()),
proxy_config: ProxyConfig::from_proxy_env()?,
..Default::default()
}; // TODO actually read version ;)

13
src/subscription.rs
View File

@ -1,7 +1,7 @@
use anyhow::{bail, format_err, Error};
use proxmox_http::client::sync::Client;
use proxmox_http::{HttpClient, HttpOptions};
use proxmox_http::{HttpClient, HttpOptions, ProxyConfig};
use proxmox_subscription::SubscriptionStatus;
use proxmox_subscription::{
sign::{SignRequest, SignedResponse},
@ -15,12 +15,13 @@ const PRODUCT_URL: &str = "-";
// TODO add version?
const USER_AGENT: &str = "proxmox-offline-mirror";
fn client() -> Client {
fn client() -> Result<Client, Error> {
let options = HttpOptions {
user_agent: Some(USER_AGENT.to_string()),
proxy_config: ProxyConfig::from_proxy_env()?,
..Default::default()
};
Client::new(options)
Ok(Client::new(options))
}
pub fn extract_mirror_key(keys: &[SubscriptionKey]) -> Result<SubscriptionKey, Error> {
@ -61,7 +62,7 @@ pub fn refresh_offline_keys(
key.key.clone(),
key.server_id.clone(),
PRODUCT_URL.to_string(),
client(),
client()?,
) {
errors = true;
eprintln!("Failed to refresh subscription key {} - {}", key.key, err);
@ -74,7 +75,7 @@ pub fn refresh_offline_keys(
mirror_key: mirror_key.into(),
blobs: offline_keys.into_iter().map(|k| k.into()).collect(),
};
let res = client().post(
let res = client()?.post(
"https://shop.proxmox.com/proxmox-subscription/sign",
Some(serde_json::to_vec(&request)?.as_slice()),
Some("text/json"),
@ -98,6 +99,6 @@ pub fn refresh_mirror_key(mirror_key: SubscriptionKey) -> Result<SubscriptionInf
mirror_key.key,
mirror_key.server_id,
PRODUCT_URL.to_string(),
client(),
client()?,
)
}