mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-27 15:37:02 +00:00
fix policy_db_get
This commit is contained in:
+7
-1
@@ -606,11 +606,17 @@ where
|
|||||||
|
|
||||||
if !policy_present {
|
if !policy_present {
|
||||||
let mut m = HashMap::new();
|
let mut m = HashMap::new();
|
||||||
self.api.load_mapped_policy(name, UserType::Reg, true, &mut m).await?;
|
if let Err(err) = self.api.load_mapped_policy(name, UserType::Reg, true, &mut m).await {
|
||||||
|
if !is_err_no_such_policy(&err) {
|
||||||
|
return Err(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
if let Some(p) = m.get(name) {
|
if let Some(p) = m.get(name) {
|
||||||
Cache::add_or_update(&self.cache.group_policies, name, p, OffsetDateTime::now_utc());
|
Cache::add_or_update(&self.cache.group_policies, name, p, OffsetDateTime::now_utc());
|
||||||
return Ok((p.to_slice(), p.update_at));
|
return Ok((p.to_slice(), p.update_at));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return Ok((Vec::new(), OffsetDateTime::now_utc()));
|
||||||
}
|
}
|
||||||
|
|
||||||
return Ok((Vec::new(), OffsetDateTime::now_utc()));
|
return Ok((Vec::new(), OffsetDateTime::now_utc()));
|
||||||
|
|||||||
+4
-3
@@ -2,14 +2,15 @@ use serde::Deserialize;
|
|||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use time::OffsetDateTime;
|
use time::OffsetDateTime;
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
#[serde(rename_all = "lowercase")]
|
#[serde(rename_all = "lowercase")]
|
||||||
pub enum GroupStatus {
|
pub enum GroupStatus {
|
||||||
|
#[default]
|
||||||
Enabled,
|
Enabled,
|
||||||
Disabled,
|
Disabled,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
pub struct GroupAddRemove {
|
pub struct GroupAddRemove {
|
||||||
pub group: String,
|
pub group: String,
|
||||||
pub members: Vec<String>,
|
pub members: Vec<String>,
|
||||||
@@ -19,7 +20,7 @@ pub struct GroupAddRemove {
|
|||||||
pub is_remove: bool,
|
pub is_remove: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
pub struct GroupDesc {
|
pub struct GroupDesc {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub status: String,
|
pub status: String,
|
||||||
|
|||||||
Reference in New Issue
Block a user