proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-08-08 08:52:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

proxy: redirect HTTP requests to HTTPS

Browse Source 
Signed-off-by: Max Carrara <m.carrara@proxmox.com>
This commit is contained in:
Max Carrara 2023-11-21 11:08:46 +01:00 committed by Wolfgang Bumiller
parent e90f3402b6
commit 532e7d9522
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/bin/proxmox-backup-proxy.rs
View File

@ -1,7 +1,7 @@
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Context, Error};
use futures::*; use futures::*;
use http::request::Parts; use http::request::Parts;
use http::Response; use http::Response;
@ -23,8 +23,8 @@ use proxmox_sys::{task_log, task_warn};
use pbs_datastore::DataStore; use pbs_datastore::DataStore;
use proxmox_rest_server::{ use proxmox_rest_server::{
cleanup_old_tasks, cookie_from_header, rotate_task_log_archive, ApiConfig, RestEnvironment, cleanup_old_tasks, cookie_from_header, rotate_task_log_archive, ApiConfig, Redirector,
RestServer, WorkerTask, RestEnvironment, RestServer, WorkerTask,
}; };
use proxmox_backup::rrd_cache::{ use proxmox_backup::rrd_cache::{
@ -253,6 +253,7 @@ async fn run() -> Result<(), Error> {
)?; )?;
let rest_server = RestServer::new(config); let rest_server = RestServer::new(config);
let redirector = Redirector::new();
proxmox_rest_server::init_worker_tasks( proxmox_rest_server::init_worker_tasks(
pbs_buildcfg::PROXMOX_BACKUP_LOG_DIR_M!().into(), pbs_buildcfg::PROXMOX_BACKUP_LOG_DIR_M!().into(),
file_opts.clone(), file_opts.clone(),
@ -288,23 +289,47 @@ async fn run() -> Result<(), Error> {
Ok(Value::Null) Ok(Value::Null)
})?; })?;
let connections = proxmox_rest_server::connection::AcceptBuilder::with_acceptor(acceptor) let connections = proxmox_rest_server::connection::AcceptBuilder::new()
.debug(debug) .debug(debug)
.rate_limiter_lookup(Arc::new(lookup_rate_limiter)) .rate_limiter_lookup(Arc::new(lookup_rate_limiter))
.tcp_keepalive_time(PROXMOX_BACKUP_TCP_KEEPALIVE_TIME); .tcp_keepalive_time(PROXMOX_BACKUP_TCP_KEEPALIVE_TIME);
let server = daemon::create_daemon( let server = daemon::create_daemon(
([0, 0, 0, 0, 0, 0, 0, 0], 8007).into(), ([0, 0, 0, 0, 0, 0, 0, 0], 8007).into(),
move |listener| { move |listener| {
let connections = connections.accept(listener); let (secure_connections, insecure_connections) =
connections.accept_tls_optional(listener, acceptor);
Ok(async { Ok(async {
daemon::systemd_notify(daemon::SystemdNotify::Ready)?; daemon::systemd_notify(daemon::SystemdNotify::Ready)?;
hyper::Server::builder(connections) let secure_server = hyper::Server::builder(secure_connections)
.serve(rest_server) .serve(rest_server)
.with_graceful_shutdown(proxmox_rest_server::shutdown_future()) .with_graceful_shutdown(proxmox_rest_server::shutdown_future())
.map_err(Error::from) .map_err(Error::from);
.await
let insecure_server = hyper::Server::builder(insecure_connections)
.serve(redirector)
.with_graceful_shutdown(proxmox_rest_server::shutdown_future())
.map_err(Error::from);
let (secure_res, insecure_res) =
try_join!(tokio::spawn(secure_server), tokio::spawn(insecure_server))
.context("failed to complete REST server task")?;
let results = [secure_res, insecure_res];
if results.iter().any(Result::is_err) {
let cat_errors = results
.into_iter()
.filter_map(|res| res.err().map(|err| err.to_string()))
.collect::<Vec<_>>()
.join("\n");
bail!(cat_errors);
}
Ok(())
}) })
}, },
Some(pbs_buildcfg::PROXMOX_BACKUP_PROXY_PID_FN), Some(pbs_buildcfg::PROXMOX_BACKUP_PROXY_PID_FN),