diff --git a/e b/e index 3c8b742b88760..51e0518602ffd 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit 3c8b742b887607148d64fde6b963eda48e4ec772 +Subproject commit 51e0518602ffd962305230144b88c42674ae6873 diff --git a/lib/authz/permissions.go b/lib/authz/permissions.go index 2722d88f30e59..9062688a4d790 100644 --- a/lib/authz/permissions.go +++ b/lib/authz/permissions.go @@ -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 } @@ -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