mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 21:17:32 +00:00
feat: permission check on OIDC and SAML service session API (#9304)
# Which Problems Are Solved Through configuration on projects, there can be additional permission checks enabled through an OIDC or SAML flow, which were not included in the OIDC and SAML services. # How the Problems Are Solved Add permission check through the query-side of Zitadel in a singular SQL query, when an OIDC or SAML flow should be linked to a SSO session. That way it is eventual consistent, but will not impact the performance on the eventstore. The permission check is defined in the API, which provides the necessary function to the command side. # Additional Changes Added integration tests for the permission check on OIDC and SAML service for every combination. Corrected session list integration test, to content checks without ordering. Corrected get auth and saml request integration tests, to check for timestamp of creation, not start of test. # Additional Context Closes #9265 --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
@@ -3,6 +3,7 @@ package query
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
_ "embed"
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
@@ -368,6 +369,77 @@ func (q *Queries) ProjectByClientID(ctx context.Context, appID string) (project
|
||||
return project, err
|
||||
}
|
||||
|
||||
//go:embed app_oidc_project_permission.sql
|
||||
var appOIDCProjectPermissionQuery string
|
||||
|
||||
func (q *Queries) CheckProjectPermissionByClientID(ctx context.Context, clientID, userID string) (_ *projectPermission, err error) {
|
||||
ctx, span := tracing.NewSpan(ctx)
|
||||
defer func() { span.EndWithError(err) }()
|
||||
|
||||
var p *projectPermission
|
||||
err = q.client.QueryRowContext(ctx, func(row *sql.Row) error {
|
||||
p, err = scanProjectPermissionByClientID(row)
|
||||
return err
|
||||
}, appOIDCProjectPermissionQuery,
|
||||
authz.GetInstance(ctx).InstanceID(),
|
||||
clientID,
|
||||
domain.AppStateActive,
|
||||
domain.ProjectStateActive,
|
||||
userID,
|
||||
domain.UserStateActive,
|
||||
domain.ProjectGrantStateActive,
|
||||
domain.UserGrantStateActive,
|
||||
)
|
||||
return p, err
|
||||
}
|
||||
|
||||
//go:embed app_saml_project_permission.sql
|
||||
var appSAMLProjectPermissionQuery string
|
||||
|
||||
func (q *Queries) CheckProjectPermissionByEntityID(ctx context.Context, entityID, userID string) (_ *projectPermission, err error) {
|
||||
ctx, span := tracing.NewSpan(ctx)
|
||||
defer func() { span.EndWithError(err) }()
|
||||
|
||||
var p *projectPermission
|
||||
err = q.client.QueryRowContext(ctx, func(row *sql.Row) error {
|
||||
p, err = scanProjectPermissionByClientID(row)
|
||||
return err
|
||||
}, appSAMLProjectPermissionQuery,
|
||||
authz.GetInstance(ctx).InstanceID(),
|
||||
entityID,
|
||||
domain.AppStateActive,
|
||||
domain.ProjectStateActive,
|
||||
userID,
|
||||
domain.UserStateActive,
|
||||
domain.ProjectGrantStateActive,
|
||||
domain.UserGrantStateActive,
|
||||
)
|
||||
return p, err
|
||||
}
|
||||
|
||||
type projectPermission struct {
|
||||
HasProjectChecked bool
|
||||
ProjectRoleChecked bool
|
||||
}
|
||||
|
||||
func scanProjectPermissionByClientID(row *sql.Row) (*projectPermission, error) {
|
||||
var hasProjectChecked, projectRoleChecked sql.NullBool
|
||||
err := row.Scan(
|
||||
&hasProjectChecked,
|
||||
&projectRoleChecked,
|
||||
)
|
||||
if err != nil || !hasProjectChecked.Valid || !projectRoleChecked.Valid {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, zerrors.ThrowNotFound(err, "QUERY-4tq8wCTCgf", "Errors.App.NotFound")
|
||||
}
|
||||
return nil, zerrors.ThrowInternal(err, "QUERY-NwH4lAqlZC", "Errors.Internal")
|
||||
}
|
||||
return &projectPermission{
|
||||
HasProjectChecked: hasProjectChecked.Bool,
|
||||
ProjectRoleChecked: projectRoleChecked.Bool,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (q *Queries) ProjectIDFromClientID(ctx context.Context, appID string) (id string, err error) {
|
||||
ctx, span := tracing.NewSpan(ctx)
|
||||
defer func() { span.EndWithError(err) }()
|
||||
|
Reference in New Issue
Block a user