gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-09-06 20:19:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

wrap secrets in new type

Browse Source
This commit is contained in:
trinity-1686a
2026-09-05 16:25:49 +02:00
parent c85597fd18
commit 33d50666b5
10 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin/admin_token.rs
+2 -2
View File
@@ -191,7 +191,7 @@ impl RequestHandler for GetCurrentAdminTokenInfoRequest {
.admin
.metrics_token
.as_ref()
.is_some_and(|s| s == &self.admin_token)
.is_some_and(|s| s.eq_ct(&self.admin_token))
{
return Ok(GetCurrentAdminTokenInfoResponse(
GetAdminTokenInfoResponse {
@@ -210,7 +210,7 @@ impl RequestHandler for GetCurrentAdminTokenInfoRequest {
.admin
.admin_token
.as_ref()
.is_some_and(|s| s == &self.admin_token)
.is_some_and(|s| s.eq_ct(&self.admin_token))
{
return Ok(GetCurrentAdminTokenInfoResponse(
GetAdminTokenInfoResponse {
src/api/admin/api_server.rs
+8 -2
View File
@@ -117,8 +117,14 @@ impl AdminApiServer {
#[cfg(feature = "metrics")] exporter: PrometheusExporter,
) -> Arc<Self> {
let cfg = &garage.config.admin;
let metrics_token = cfg.metrics_token.as_deref().map(hash_bearer_token);
let admin_token = cfg.admin_token.as_deref().map(hash_bearer_token);
let metrics_token = cfg
.metrics_token
.as_ref()
.map(|token| hash_bearer_token(token.extract_secret()));
let admin_token = cfg
.admin_token
.as_ref()
.map(|token| hash_bearer_token(token.extract_secret()));
let metrics_require_token = cfg.metrics_require_token;
let endpoint = garage.system.netapp.endpoint(ADMIN_RPC_PATH.into());