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

[feature/#323] 총무 일부 권한 상승 #324

Merged
merged 3 commits into from
Jun 26, 2024
Merged

[feature/#323] 총무 일부 권한 상승 #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bf0693
[feature/#323] 허용 권한 정의 가능 개수를 1개에서 List로 변경
whitem4rk Jun 26, 2024
82f1582
[feature/#323] 권한 체크 로직 변경
whitem4rk Jun 26, 2024
fae27df
[feature/#323] spotlessJavaApply
whitem4rk Jun 26, 2024
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
27 changes: 17 additions & 10 deletions resource-server/src/main/java/com/inhabas/api/domain/board/usecase/BoardSecurityChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@

import static com.inhabas.api.auth.domain.oauth2.member.domain.valueObject.Role.ANONYMOUS;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

import javax.persistence.EntityNotFoundException;

Expand Down Expand Up @@ -79,29 +83,32 @@ public boolean checkMenuAccess(Integer menuId, String action) {
}

Menu menu = menuRepository.findById(menuId).orElseThrow(NotFoundException::new);
Role required = null;
List<Role> requiredRoles = new ArrayList<>();
switch (action) {
case READ_BOARD_LIST:
required = menu.getType().getReadBoardListRole();
requiredRoles = menu.getType().getReadBoardListRole();
break;
case CREATE_BOARD:
required = menu.getType().getCreateBoardRole();
requiredRoles = menu.getType().getCreateBoardRole();
break;
case READ_BOARD:
required = menu.getType().getReadBoardRole();
requiredRoles = menu.getType().getReadBoardRole();
break;
case CREATE_COMMENT:
required = menu.getType().getCreateCommentRole();
requiredRoles = menu.getType().getCreateCommentRole();
break;
case READ_COMMENT:
required = menu.getType().getReadCommentRole();
requiredRoles = menu.getType().getReadCommentRole();
break;
}

String finalRequired = ROLE_PREFIX + required;
if (required == null
|| authorities.stream()
.noneMatch(grantedAuthority -> grantedAuthority.getAuthority().equals(finalRequired))) {
Set<String> prefixedRoles =
requiredRoles.stream().map(role -> ROLE_PREFIX + role).collect(Collectors.toSet());

boolean hasAuthority =
authorities.stream().map(GrantedAuthority::getAuthority).anyMatch(prefixedRoles::contains);

if (!hasAuthority) {
throw new InvalidAuthorityException();
}

Expand Down
164 changes: 130 additions & 34 deletions resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package com.inhabas.api.domain.menu.domain.valueObject;

import static com.inhabas.api.auth.domain.oauth2.member.domain.valueObject.Role.*;
import static java.util.Arrays.*;

import java.util.List;

import lombok.Getter;

Expand All @@ -11,67 +14,160 @@ public enum MenuType {
// 관리자에 의해 추가, 삭제 불가능한 메뉴,(메뉴 순서와 이름만 변경가능하다.)

// 동아리 소개
INTRODUCE(ANONYMOUS, EXECUTIVES, ANONYMOUS, ADMIN, ADMIN),
INTRODUCE(
List.of(ANONYMOUS), List.of(EXECUTIVES), List.of(ANONYMOUS), List.of(ADMIN), List.of(ADMIN)),
// 동아리 활동
ALBUM(ANONYMOUS, EXECUTIVES, ANONYMOUS, DEACTIVATED, ANONYMOUS),
ALBUM(
List.of(ANONYMOUS),
List.of(EXECUTIVES),
List.of(ANONYMOUS),
List.of(DEACTIVATED),
List.of(ANONYMOUS)),
// 명예의 전당
HALL_OF_FAME(ANONYMOUS, ADMIN, ANONYMOUS, ADMIN, ADMIN),
HALL_OF_FAME(
List.of(ANONYMOUS), List.of(ADMIN), List.of(ANONYMOUS), List.of(ADMIN), List.of(ADMIN)),
// 공지사항
NOTICE(DEACTIVATED, EXECUTIVES, DEACTIVATED, DEACTIVATED, DEACTIVATED),
NOTICE(
List.of(DEACTIVATED),
List.of(EXECUTIVES),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED)),
// 자유게시판
FREE(DEACTIVATED, DEACTIVATED, DEACTIVATED, DEACTIVATED, DEACTIVATED),
FREE(
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED)),
// 질문게시판
QUESTION(DEACTIVATED, DEACTIVATED, DEACTIVATED, DEACTIVATED, DEACTIVATED),
QUESTION(
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED)),
// 건의 사항
SUGGEST(DEACTIVATED, DEACTIVATED, DEACTIVATED, DEACTIVATED, DEACTIVATED),
SUGGEST(
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED)),
// 공개 자료실
STORAGE(ANONYMOUS, BASIC, ANONYMOUS, DEACTIVATED, ANONYMOUS),
STORAGE(
List.of(ANONYMOUS),
List.of(BASIC),
List.of(ANONYMOUS),
List.of(DEACTIVATED),
List.of(ANONYMOUS)),
// 회장단 게시판
EXECUTIVE(SECRETARY, SECRETARY, SECRETARY, SECRETARY, SECRETARY),
EXECUTIVE(
asList(SECRETARY, EXECUTIVES),
asList(SECRETARY, EXECUTIVES),
asList(SECRETARY, EXECUTIVES),
asList(SECRETARY, EXECUTIVES),
asList(SECRETARY, EXECUTIVES)),
// 강의
LECTURE(BASIC, BASIC, BASIC, BASIC, BASIC),
LECTURE(List.of(BASIC), List.of(BASIC), List.of(BASIC), List.of(BASIC), List.of(BASIC)),
// 스터디
STUDY(BASIC, BASIC, BASIC, BASIC, BASIC),
STUDY(List.of(BASIC), List.of(BASIC), List.of(BASIC), List.of(BASIC), List.of(BASIC)),
// 취미활동
HOBBY(BASIC, BASIC, BASIC, BASIC, BASIC),
HOBBY(List.of(BASIC), List.of(BASIC), List.of(BASIC), List.of(BASIC), List.of(BASIC)),
// 대기중인 강의 관리
LECTURE_PENDING(EXECUTIVES, ADMIN, EXECUTIVES, ADMIN, ADMIN),
LECTURE_PENDING(
List.of(EXECUTIVES), List.of(ADMIN), List.of(EXECUTIVES), List.of(ADMIN), List.of(ADMIN)),
// 지원금 신청
BUDGET_SUPPORT(DEACTIVATED, DEACTIVATED, DEACTIVATED, ADMIN, ADMIN),
BUDGET_SUPPORT(
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(ADMIN),
List.of(ADMIN)),
// 회계 내역
BUDGET_ACCOUNT(DEACTIVATED, SECRETARY, DEACTIVATED, ADMIN, ADMIN),
BUDGET_ACCOUNT(
List.of(DEACTIVATED),
List.of(SECRETARY),
List.of(DEACTIVATED),
List.of(ADMIN),
List.of(ADMIN)),
// 알파테스터
ALPHA(DEACTIVATED, BASIC, DEACTIVATED, DEACTIVATED, DEACTIVATED),
ALPHA(
List.of(DEACTIVATED),
List.of(BASIC),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED)),
// 베타테스터
BETA(DEACTIVATED, BASIC, DEACTIVATED, DEACTIVATED, DEACTIVATED),
BETA(
List.of(DEACTIVATED),
List.of(BASIC),
List.of(DEACTIVATED),
List.of(DEACTIVATED),
List.of(DEACTIVATED)),
// 공모전
CONTEST(ANONYMOUS, BASIC, ANONYMOUS, DEACTIVATED, ANONYMOUS),
CONTEST(
List.of(ANONYMOUS),
List.of(BASIC),
List.of(ANONYMOUS),
List.of(DEACTIVATED),
List.of(ANONYMOUS)),
// 대외활동
ACTIVITY(ANONYMOUS, BASIC, ANONYMOUS, DEACTIVATED, ANONYMOUS),
ACTIVITY(
List.of(ANONYMOUS),
List.of(BASIC),
List.of(ANONYMOUS),
List.of(DEACTIVATED),
List.of(ANONYMOUS)),
// 장학회
SCHOLARSHIP(ANONYMOUS, SECRETARY, ANONYMOUS, ADMIN, ADMIN),
SCHOLARSHIP(
List.of(ANONYMOUS),
asList(SECRETARY, EXECUTIVES),
List.of(ANONYMOUS),
List.of(ADMIN),
List.of(ADMIN)),
// 후원 내용
SPONSOR(ANONYMOUS, SECRETARY, ANONYMOUS, BASIC, ANONYMOUS),
SPONSOR(
List.of(ANONYMOUS),
asList(SECRETARY, EXECUTIVES),
List.of(ANONYMOUS),
List.of(BASIC),
List.of(ANONYMOUS)),
// 사용 내역
USAGE(ANONYMOUS, SECRETARY, ANONYMOUS, BASIC, ANONYMOUS),
USAGE(
List.of(ANONYMOUS),
asList(SECRETARY, EXECUTIVES),
List.of(ANONYMOUS),
List.of(BASIC),
List.of(ANONYMOUS)),

// 관리자가 추가, 삭제 가능한 메뉴.(NormalBoard 연관)
LIST(ANONYMOUS, ANONYMOUS, ANONYMOUS, ANONYMOUS, ANONYMOUS), // 리스트형 게시판 메뉴
CARD(ANONYMOUS, ANONYMOUS, ANONYMOUS, ANONYMOUS, ANONYMOUS), // 카드형 게시판 메뉴
LIST(
List.of(ANONYMOUS),
List.of(ANONYMOUS),
List.of(ANONYMOUS),
List.of(ANONYMOUS),
List.of(ANONYMOUS)), // 리스트형 게시판 메뉴
CARD(
List.of(ANONYMOUS),
List.of(ANONYMOUS),
List.of(ANONYMOUS),
List.of(ANONYMOUS),
List.of(ANONYMOUS)), // 카드형 게시판 메뉴
;

private final Role readBoardListRole;
private final Role createBoardRole;
private final Role readBoardRole;
private final Role createCommentRole;
private final Role readCommentRole;
private final List<Role> readBoardListRole;
private final List<Role> createBoardRole;
private final List<Role> readBoardRole;
private final List<Role> createCommentRole;
private final List<Role> readCommentRole;

MenuType(
Role readBoardListRole,
Role createBoardRole,
Role readBoardRole,
Role createCommentRole,
Role readCommentRole) {
List<Role> readBoardListRole,
List<Role> createBoardRole,
List<Role> readBoardRole,
List<Role> createCommentRole,
List<Role> readCommentRole) {
this.readBoardListRole = readBoardListRole;
this.createBoardRole = createBoardRole;
this.readBoardRole = readBoardRole;
Expand Down
Loading