octoleo
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make admin support hostinfo

This commit is contained in:
BlockListed 2023-09-09 14:01:37 +02:00
parent 968ed8a453
commit 42e1018ad7
No known key found for this signature in database
GPG Key ID: 2D204777C477B588
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/admin.rs
View File

@ -12,7 +12,7 @@ use rocket::{
Catcher, Route,
};
use crate::auth::BaseURL;
use crate::auth::HostInfo;
use crate::{
api::{
core::{log_event, two_factor},
@ -669,7 +669,7 @@ async fn get_ntp_time(has_http_access: bool) -> String {
}
#[get("/diagnostics")]
async fn diagnostics(_token: AdminToken, ip_header: IpHeader, mut conn: DbConn, base_url: BaseURL) -> ApiResult<Html<String>> {
async fn diagnostics(_token: AdminToken, ip_header: IpHeader, host_info: HostInfo, mut conn: DbConn) -> ApiResult<Html<String>> {
use chrono::prelude::*;
use std::net::ToSocketAddrs;
@ -725,7 +725,7 @@ async fn diagnostics(_token: AdminToken, ip_header: IpHeader, mut conn: DbConn,
"uses_proxy": uses_proxy,
"db_type": *DB_TYPE,
"db_version": get_sql_server_version(&mut conn).await,
"admin_url": format!("{}/diagnostics", admin_url(&base_url.base_url)),
"admin_url": format!("{}/diagnostics", admin_url(&host_info.base_url)),
"overrides": &CONFIG.get_overrides().join(", "),
"host_arch": std::env::consts::ARCH,
"host_os": std::env::consts::OS,