Skip to content
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

Jump to bottom

web/admin: show warning when adding user to superuser group #5091

Merged
merged 1 commit into from Mar 27, 2023
Merged

web/admin: show warning when adding user to superuser group #5091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/src/admin/groups/GroupListPage.ts
View file
Open in desktop
Expand Up @@ -81,7 +81,7 @@ export class GroupListPage extends TablePage<Group> {
html`<a href="#/identity/groups/${item.pk}">${item.name}</a>`,
html`${item.parentName || t`-`}`,
html`${Array.from(item.users || []).length}`,
html` <ak-label color=${item.isSuperuser ? PFColor.Green : PFColor.Grey}>
html`<ak-label color=${item.isSuperuser ? PFColor.Green : PFColor.Grey}>
${item.isSuperuser ? t`Yes` : t`No`}
</ak-label>`,
html` <ak-forms-modal>
Expand Down
4 changes: 2 additions & 2 deletions web/src/admin/groups/RelatedGroupList.ts
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ export class RelatedGroupAdd extends Form<{ groups: string[] }> {
return t`Successfully added user to group(s).`;
}

send = async (data: { groups: string[] }): Promise<{ groups: string[] }> => {
async send(data: { groups: string[] }): Promise<unknown> {
await Promise.all(
data.groups.map((group) => {
return new CoreApi(DEFAULT_CONFIG).coreGroupsAddUserCreate({
Expand All @@ -44,7 +44,7 @@ export class RelatedGroupAdd extends Form<{ groups: string[] }> {
}),
);
return data;
};
}

renderForm(): TemplateResult {
return html`<form class="pf-c-form pf-m-horizontal">
Expand Down
16 changes: 15 additions & 1 deletion web/src/admin/users/GroupSelectModal.ts
View file
Open in desktop
Expand Up @@ -8,9 +8,11 @@ import { TableModal } from "@goauthentik/elements/table/TableModal";

import { t } from "@lingui/macro";

import { TemplateResult, html } from "lit";
import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js";

import PFBanner from "@patternfly/patternfly/components/Banner/banner.css";

import { CoreApi, Group } from "@goauthentik/api";

@customElement("ak-user-group-select-table")
Expand All @@ -27,6 +29,10 @@ export class GroupSelectModal extends TableModal<Group> {

order = "name";

static get styles(): CSSResult[] {
return super.styles.concat(PFBanner);
}

async apiEndpoint(page: number): Promise<PaginatedResponse<Group>> {
return new CoreApi(DEFAULT_CONFIG).coreGroupsList({
ordering: this.order,
Expand Down Expand Up @@ -61,11 +67,19 @@ export class GroupSelectModal extends TableModal<Group> {
}

renderModalInner(): TemplateResult {
const willSuperuser = this.selectedElements.filter((g) => g.isSuperuser).length > 0;
return html`<section class="pf-c-modal-box__header pf-c-page__main-section pf-m-light">
<div class="pf-c-content">
<h1 class="pf-c-title pf-m-2xl">${t`Select groups to add user to`}</h1>
</div>
</section>
${willSuperuser
? html`
<div class="pf-c-banner pf-m-warning">
${t`Warning: Adding the user to the selected group(s) will give them superuser permissions.`}
</div>
`
: html``}
<section class="pf-c-modal-box__body pf-m-light">${this.renderTable()}</section>
<footer class="pf-c-modal-box__footer">
<ak-spinner-button
Expand Down
15 changes: 12 additions & 3 deletions web/src/admin/users/RelatedUserList.ts
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@ import { customElement, property, state } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js";

import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";
import PFBanner from "@patternfly/patternfly/components/Banner/banner.css";
import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css";

import { CapabilitiesEnum, CoreApi, Group, ResponseError, User } from "@goauthentik/api";
Expand All @@ -44,7 +45,7 @@ export class RelatedUserAdd extends Form<{ users: number[] }> {
return t`Successfully added user(s).`;
}

send = async (data: { users: number[] }): Promise<{ users: number[] }> => {
async send(data: { users: number[] }): Promise<{ users: number[] }> {
await Promise.all(
data.users.map((user) => {
return new CoreApi(DEFAULT_CONFIG).coreGroupsAddUserCreate({
Expand All @@ -56,10 +57,11 @@ export class RelatedUserAdd extends Form<{ users: number[] }> {
}),
);
return data;
};
}

renderForm(): TemplateResult {
return html`<form class="pf-c-form pf-m-horizontal">
${this.group?.isSuperuser ? html`` : html``}
<ak-form-element-horizontal label=${t`Users to add`} name="users">
<div class="pf-c-input-group">
<ak-group-member-select-table
Expand Down Expand Up @@ -115,7 +117,7 @@ export class RelatedUserList extends Table<User> {
hideServiceAccounts = getURLParam<boolean>("hideServiceAccounts", true);

static get styles(): CSSResult[] {
return super.styles.concat(PFDescriptionList, PFAlert);
return super.styles.concat(PFDescriptionList, PFAlert, PFBanner);
}

async apiEndpoint(page: number): Promise<PaginatedResponse<User>> {
Expand Down Expand Up @@ -334,6 +336,13 @@ export class RelatedUserList extends Table<User> {
? html`<ak-forms-modal>
<span slot="submit"> ${t`Add`} </span>
<span slot="header"> ${t`Add User`} </span>
${this.targetGroup.isSuperuser
? html`
<div class="pf-c-banner pf-m-warning" slot="above-form">
${t`Warning: This group is configured with superuser access. Added users will have superuser access.`}
</div>
`
: html``}
<ak-user-related-add .group=${this.targetGroup} slot="form">
</ak-user-related-add>
<button slot="trigger" class="pf-c-button pf-m-primary">
Expand Down
1 change: 1 addition & 0 deletions web/src/elements/forms/ModalForm.ts
View file
Open in desktop
Expand Up @@ -65,6 +65,7 @@ export class ModalForm extends ModalButton {
</h1>
</div>
</section>
<slot name="above-form"></slot>
<section
class="pf-c-modal-box__body"
@scroll=${() => {
Expand Down