Skip to content

Type fga errors properly #16736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
leovalais wants to merge 8 commits into
base: dev
Choose a base branch
from
Draft

Type fga errors properly #16736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
475ea67
editoast: authz: define `authz::v2::group` for organization
leovalais May 12, 2026
1001051
editoast: authz: define `authz::v2::roles` for organization
leovalais May 12, 2026
4a1c401
editoast: authz: define `authz::v2::infra` for organization
leovalais May 12, 2026
a205abd
editoast: authz: move `trait TestClientExt` in its own module
leovalais May 12, 2026
27df41d
editoast: cargo fmt
leovalais May 13, 2026
12828ac
editoast: fga: properly type OpenFGA errors
leovalais May 13, 2026
3cceb4f
editoast: fga: test exceeding limits for tuple write and deletion
leovalais May 13, 2026
0088727
adapt the rest of editoast
leovalais May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions editoast/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion editoast/authz/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub enum Error<StorageError: std::error::Error> {
#[error("unknown user {identity}")]
UnknownUser { identity: String },
#[error(transparent)]
OpenFga(#[from] fga::client::RequestFailure),
OpenFga(#[from] fga::client::Error),
#[error(transparent)]
Storage(StorageError),
}
Expand Down
8 changes: 2 additions & 6 deletions editoast/authz/src/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,18 +214,14 @@ impl Role {
openfga: &fga::Client,
relation: R,
object: &R::Object,
) -> Result<Vec<Self>, fga::client::RequestFailure>
) -> Result<Vec<Self>, fga::client::Error>
where
O: fga::model::Object,
R: fga::model::Relation<User = Self, Object = O>,
{
use fga::client::Request as _;

let roles = relation
.query_users(object)
.fetch(openfga)
.await
.map_err(fga::client::QueryError::parsing_ok)?;
let roles = relation.query_users(object).fetch(openfga).await?;
debug_assert!(
roles.public_access.is_none(),
"we don't write public accesses for roles"
Expand Down
19 changes: 6 additions & 13 deletions editoast/authz/src/regulator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::collections::HashSet;
use std::future::Future;

use fga::client::QueryError;
use fga::client::UserList;
use fga::model::Relation;
use tracing::Level;
Expand Down Expand Up @@ -126,8 +125,7 @@ impl<S: StorageDriver> Regulator<S> {
let groups = self
.openfga
.list_users(User::group().query_users(user))
.await
.map_err(QueryError::parsing_ok)?;
.await?;
Ok(groups.users.into_iter().collect())
}

Expand All @@ -140,8 +138,7 @@ impl<S: StorageDriver> Regulator<S> {
let members = self
.openfga
.list_users(Group::member().query_users(group))
.await
.map_err(QueryError::parsing_ok)?;
.await?;

debug_assert!(
members.public_access.is_none(),
Expand Down Expand Up @@ -269,8 +266,7 @@ impl<S: StorageDriver> Regulator<S> {
self.openfga.list_users(Infra::reader().query_users(infra)),
self.openfga
.list_usersets(Infra::reader().query_usersets(Group::member(), infra))
)
.map_err(QueryError::parsing_ok)?;
)?;

Ok(users
.into_iter()
Expand All @@ -295,8 +291,7 @@ impl<S: StorageDriver> Regulator<S> {
self.openfga.list_users(Infra::writer().query_users(infra)),
self.openfga
.list_usersets(Infra::writer().query_usersets(Group::member(), infra))
)
.map_err(QueryError::parsing_ok)?;
)?;

Ok(users
.into_iter()
Expand All @@ -321,8 +316,7 @@ impl<S: StorageDriver> Regulator<S> {
self.openfga.list_users(Infra::owner().query_users(infra)),
self.openfga
.list_usersets(Infra::owner().query_usersets(Group::member(), infra))
)
.map_err(QueryError::parsing_ok)?;
)?;

Ok(users
.into_iter()
Expand All @@ -344,8 +338,7 @@ impl<S: StorageDriver> Regulator<S> {
let infra_list = self
.openfga
.list_objects(Infra::can_read().query_objects(user))
.await
.map_err(QueryError::parsing_ok)?;
.await?;

Ok(Authorization::Granted(infra_list))
}
Expand Down
Loading
Loading