fix ipv6 handling for remotes/sync jobs

* add square brackets to ipv6 adresses in BackupRepository if they not
already have some (we save them without in the remote config)

* in get_pull_parameters, we now create a BackupRepository first and use
  those values (which does the [] mapping), this also has the advantage
  that we have one place less were we hardcode 8007 as port

* in the ui, add square brackets for ipv6 adresses for remotes

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-09-30 13:23:39 +02:00 committed by Dietmar Maurer
parent 7b8aa893fa
commit 38d4675921
3 changed files with 12 additions and 2 deletions

View File

@ -55,12 +55,13 @@ pub async fn get_pull_parameters(
.password(Some(remote.password.clone())) .password(Some(remote.password.clone()))
.fingerprint(remote.fingerprint.clone()); .fingerprint(remote.fingerprint.clone());
let client = HttpClient::new(&remote.host, remote.port.unwrap_or(8007), &remote.userid, options)?; let src_repo = BackupRepository::new(Some(remote.userid.clone()), Some(remote.host.clone()), remote.port, remote_store.to_string());
let client = HttpClient::new(&src_repo.host(), src_repo.port(), &src_repo.user(), options)?;
let _auth_info = client.login() // make sure we can auth let _auth_info = client.login() // make sure we can auth
.await .await
.map_err(|err| format_err!("remote connection to '{}' failed - {}", remote.host, err))?; .map_err(|err| format_err!("remote connection to '{}' failed - {}", remote.host, err))?;
let src_repo = BackupRepository::new(Some(remote.userid), Some(remote.host), remote.port, remote_store.to_string());
Ok((client, src_repo, tgt_store)) Ok((client, src_repo, tgt_store))
} }

View File

@ -28,6 +28,12 @@ pub struct BackupRepository {
impl BackupRepository { impl BackupRepository {
pub fn new(user: Option<Userid>, host: Option<String>, port: Option<u16>, store: String) -> Self { pub fn new(user: Option<Userid>, host: Option<String>, port: Option<u16>, store: String) -> Self {
let host = match host {
Some(host) if (IP_V6_REGEX.regex_obj)().is_match(&host) => {
Some(format!("[{}]", host))
},
other => other,
};
Self { user, host, port, store } Self { user, host, port, store }
} }

View File

@ -6,6 +6,9 @@ Ext.define('pmx-remotes', {
calculate: function(data) { calculate: function(data) {
let host = data.host || "localhost"; let host = data.host || "localhost";
let port = data.port || "8007"; let port = data.port || "8007";
if (Proxmox.Utils.IP64_match.test(host)) {
host = `[${host}]`;
}
return `${host}:${port}`; return `${host}:${port}`;
} }
} }