Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion e
Submodule e updated from 3c8b74 to 51e051
10 changes: 0 additions & 10 deletions lib/authz/permissions.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,6 @@ type Context struct {
// Inherited from the authorizer that creates the context.
disableDeviceRoleMode bool

// AdminActionVerified is whether this auth request is verified for admin actions. This
// either means that the request was MFA verified through the context or Hardware Key support,
// or the identity does not require admin MFA (built in roles, bot impersonated user, etc).
// TODO(Joerger): Deprecated in favor of AdminActionAuthState, remove once e is no longer dependent.
AdminActionAuthorized bool

// AdminActionAuthState is the state of admin action authorization for this auth context.
AdminActionAuthState AdminActionAuthState
}
Expand Down Expand Up @@ -1406,10 +1400,6 @@ func AuthorizeContextWithVerbs(ctx context.Context, log logrus.FieldLogger, auth

// AuthorizeAdminAction will ensure that the user is authorized to perform admin actions.
func AuthorizeAdminAction(ctx context.Context, authCtx *Context) error {
// TODO(Joerger): AdminActionAuthorized is deprecated in favor of AdminActionAuthState, remove once e is no longer dependent.
if authCtx.AdminActionAuthorized {
return nil
}
switch authCtx.AdminActionAuthState {
case AdminActionAuthMFAVerified, AdminActionAuthNotRequired:
return nil
Expand Down