diff --git a/docker-compose.yml b/docker-compose.yml index 6fdbcfa..984794f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,6 +65,19 @@ services: retries: 5 start_period: 30s + gatewayserver: + build: + context: . + dockerfile: Dockerfile + args: + MODULE: gateway-server + ports: + - "8000:8000" + environment: + <<: *service-env + depends_on: + <<: *service-depends-on + companyservice: build: context: . diff --git a/gateway-server/.gitattributes b/gateway-server/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/gateway-server/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/gateway-server/.gitignore b/gateway-server/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/gateway-server/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/gateway-server/build.gradle b/gateway-server/build.gradle new file mode 100644 index 0000000..eb8562e --- /dev/null +++ b/gateway-server/build.gradle @@ -0,0 +1,49 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.13' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.shipflow' +version = '0.0.1-SNAPSHOT' +description = 'gateway-server' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +ext { + set('springCloudVersion', "2025.0.0") +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation 'org.springframework.cloud:spring-cloud-starter-gateway-server-webflux' + implementation 'org.springframework.cloud:spring-cloud-starter-loadbalancer' + implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' + runtimeOnly 'io.micrometer:micrometer-registry-prometheus' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'io.projectreactor:reactor-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' +} + +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" + } +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gateway-server/gradle/wrapper/gradle-wrapper.jar b/gateway-server/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/gateway-server/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gateway-server/gradle/wrapper/gradle-wrapper.properties b/gateway-server/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..aaaabb3 --- /dev/null +++ b/gateway-server/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gateway-server/gradlew b/gateway-server/gradlew new file mode 100755 index 0000000..23d15a9 --- /dev/null +++ b/gateway-server/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gateway-server/gradlew.bat b/gateway-server/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gateway-server/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/gateway-server/src/main/java/com/shipflow/gatewayserver/GatewayServerApplication.java b/gateway-server/src/main/java/com/shipflow/gatewayserver/GatewayServerApplication.java new file mode 100644 index 0000000..a592a9d --- /dev/null +++ b/gateway-server/src/main/java/com/shipflow/gatewayserver/GatewayServerApplication.java @@ -0,0 +1,13 @@ +package com.shipflow.gatewayserver; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class GatewayServerApplication { + + public static void main(String[] args) { + SpringApplication.run(GatewayServerApplication.class, args); + } + +} diff --git a/gateway-server/src/main/java/com/shipflow/gatewayserver/config/SecurityConfig.java b/gateway-server/src/main/java/com/shipflow/gatewayserver/config/SecurityConfig.java new file mode 100644 index 0000000..d0c46b0 --- /dev/null +++ b/gateway-server/src/main/java/com/shipflow/gatewayserver/config/SecurityConfig.java @@ -0,0 +1,85 @@ +package com.shipflow.gatewayserver.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; +import org.springframework.security.config.web.server.ServerHttpSecurity; +import org.springframework.security.web.server.SecurityWebFilterChain; + +import static org.springframework.http.HttpMethod.*; + +@Configuration +@EnableWebFluxSecurity +public class SecurityConfig { + + private static final String[] WHITELIST = { + "/api/auth/login", + "/eureka/**" + }; + + public static final String USERS = "/api/users/**"; + public static final String SIGNUP = "/api/auth/signup-requests/**"; + public static final String COMPANYS = "/api/companies/**"; + public static final String HUBS = "/api/hubs/**"; + public static final String HUBSROUTES = "/api/hub-routes/**"; + public static final String PRODUCTS = "/api/companies/*/products/**"; + public static final String ORDERS = "/api/orders/**"; + public static final String SHIPMENT = "/api/shipments/**"; + public static final String SHIPMANAGER = "/api/shipment-managers/**"; + public static final String AILOG = "/api/ai/**"; + public static final String SLACK = "/api/slack/**"; + + + @Bean + public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) { + return http + .csrf(ServerHttpSecurity.CsrfSpec::disable) + + .authorizeExchange(ex -> ex + .pathMatchers(WHITELIST).permitAll() + + .pathMatchers(POST, SIGNUP).permitAll() + .pathMatchers(PATCH, SIGNUP).hasAnyRole("MASTER", "HUB_MANAGER") + .pathMatchers(GET, SIGNUP).hasAnyRole("MASTER", "HUB_MANAGER") + + .pathMatchers(POST, COMPANYS).hasAnyRole("MASTER", "HUB_MANAGER") + .pathMatchers(DELETE, COMPANYS).hasAnyRole("MASTER", "HUB_MANAGER") + + .pathMatchers(PATCH, ORDERS).hasAnyRole("MASTER", "HUB_MANAGER") + .pathMatchers(DELETE, ORDERS).hasAnyRole("MASTER", "HUB_MANAGER") + + .pathMatchers(POST, PRODUCTS).hasAnyRole("MASTER", "HUB_MANAGER", "COMPANY_MANAGER") + .pathMatchers(PUT, PRODUCTS).hasAnyRole("MASTER", "HUB_MANAGER", "COMPANY_MANAGER") + .pathMatchers(PATCH, PRODUCTS).hasAnyRole("MASTER", "HUB_MANAGER", "COMPANY_MANAGER") + .pathMatchers(DELETE, PRODUCTS).hasAnyRole("MASTER", "HUB_MANAGER", "COMPANY_MANAGER") + + .pathMatchers(PATCH, SHIPMANAGER).hasAnyRole("MASTER", "HUB_MANAGER") + .pathMatchers(DELETE, SHIPMANAGER).hasAnyRole("MASTER", "HUB_MANAGER") + + .pathMatchers(GET, AILOG).hasRole("MASTER") + + .pathMatchers(GET, SLACK).hasRole("MASTER") + .pathMatchers(PATCH, SLACK).hasRole("MASTER") + .pathMatchers(DELETE, SLACK).hasRole("MASTER") + + .pathMatchers(POST, HUBS).hasRole("MASTER") + .pathMatchers(PATCH, HUBS).hasRole("MASTER") + .pathMatchers(DELETE, HUBS).hasRole("MASTER") + + .pathMatchers(POST, HUBSROUTES).hasRole("MASTER") + .pathMatchers(PATCH, HUBSROUTES).hasRole("MASTER") + .pathMatchers(DELETE, HUBSROUTES).hasRole("MASTER") + + .pathMatchers(DELETE, SHIPMENT).hasRole("MASTER") + + .anyExchange().authenticated() + ) + + .oauth2ResourceServer(oauth -> oauth + .jwt(Customizer.withDefaults()) + ) + + .build(); + } +} \ No newline at end of file diff --git a/gateway-server/src/main/java/com/shipflow/gatewayserver/config/UserHeaderFilter.java b/gateway-server/src/main/java/com/shipflow/gatewayserver/config/UserHeaderFilter.java new file mode 100644 index 0000000..d207643 --- /dev/null +++ b/gateway-server/src/main/java/com/shipflow/gatewayserver/config/UserHeaderFilter.java @@ -0,0 +1,83 @@ +package com.shipflow.gatewayserver.config; + +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.security.core.Authentication; +import org.springframework.security.oauth2.jwt.Jwt; +import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +import java.util.List; +import java.util.Map; + +import com.shipflow.gatewayserver.exception.BusinessException; +import com.shipflow.gatewayserver.exception.GateErrorCode; + +@Component +public class UserHeaderFilter implements GlobalFilter { + + private static final String USER_ID_HEADER = "X-User-Id"; + private static final String USER_ROLE_HEADER = "X-User-Role"; + + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { + + // 모든 요청에서 먼저 헤더 제거 (핵심!) + ServerWebExchange sanitizedExchange = exchange.mutate() + .request(exchange.getRequest().mutate() + .headers(headers -> { + headers.remove(USER_ID_HEADER); + headers.remove(USER_ROLE_HEADER); + }) + .build()) + .build(); + + return sanitizedExchange.getPrincipal() + .ofType(Authentication.class) + .flatMap(auth -> { + + if (auth instanceof JwtAuthenticationToken jwtAuth) { + Jwt jwt = jwtAuth.getToken(); + + String userId = jwt.getSubject(); + String role = extractRole(jwt); + + if (userId == null || userId.isBlank() || role == null || role.isBlank()) { + return Mono.error(new BusinessException(GateErrorCode.MISSING_ROLES)); + } + + // JWT 값으로만 재주입 + ServerHttpRequest mutated = sanitizedExchange.getRequest().mutate() + .headers(headers -> { + headers.add(USER_ID_HEADER, userId); + headers.add(USER_ROLE_HEADER, role); + }) + .build(); + + return chain.filter( + sanitizedExchange.mutate().request(mutated).build() + ); + } + + return chain.filter(sanitizedExchange); + }) + .switchIfEmpty(chain.filter(sanitizedExchange)); + } + + + private String extractRole(Jwt jwt) { //role 추출 + Map realmAccess = jwt.getClaimAsMap("realm_access"); + if (realmAccess == null) { + throw new BusinessException(GateErrorCode.MISSING_REALM_ACCESS); + } + + Object rolesObj = realmAccess.get("roles"); + if (!(rolesObj instanceof List roles) || roles.isEmpty()) { + throw new BusinessException(GateErrorCode.MISSING_ROLES); + } + return roles.get(0).toString(); + } +} \ No newline at end of file diff --git a/gateway-server/src/main/java/com/shipflow/gatewayserver/exception/BusinessException.java b/gateway-server/src/main/java/com/shipflow/gatewayserver/exception/BusinessException.java new file mode 100644 index 0000000..a6fd413 --- /dev/null +++ b/gateway-server/src/main/java/com/shipflow/gatewayserver/exception/BusinessException.java @@ -0,0 +1,29 @@ +package com.shipflow.gatewayserver.exception; + +import lombok.Getter; + +@Getter +public class BusinessException extends RuntimeException { + + private final GateErrorCode errorCode; + + public BusinessException(GateErrorCode errorCode) { + super(errorCode.message()); + this.errorCode = errorCode; + } + + public BusinessException(GateErrorCode errorCode, String message) { + super(message); + this.errorCode = errorCode; + } + + public BusinessException(GateErrorCode errorCode, Throwable cause) { + super(errorCode.message(), cause); + this.errorCode = errorCode; + } + + public BusinessException(GateErrorCode errorCode, String message, Throwable cause) { + super(message, cause); + this.errorCode = errorCode; + } +} \ No newline at end of file diff --git a/gateway-server/src/main/java/com/shipflow/gatewayserver/exception/GateErrorCode.java b/gateway-server/src/main/java/com/shipflow/gatewayserver/exception/GateErrorCode.java new file mode 100644 index 0000000..5bfd25e --- /dev/null +++ b/gateway-server/src/main/java/com/shipflow/gatewayserver/exception/GateErrorCode.java @@ -0,0 +1,31 @@ +package com.shipflow.gatewayserver.exception; + +import org.springframework.http.HttpStatus; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum GateErrorCode{ + + ACCESS_DENIED(HttpStatus.FORBIDDEN, "G001", "해당 작업에 대한 권한이 없습니다."), + MISSING_REALM_ACCESS(HttpStatus.UNAUTHORIZED, "G002", "realm_access claim이 없습니다."), + MISSING_ROLES(HttpStatus.UNAUTHORIZED, "G003", "roles claim이 없거나 비어있습니다."); + + private final HttpStatus status; + private final String code; + private final String message; + + public String code() { + return code; + } + + public HttpStatus status() { + return status; + } + + public String message() { + return message; + } +} diff --git a/gateway-server/src/main/resources/application.yaml b/gateway-server/src/main/resources/application.yaml new file mode 100644 index 0000000..81670a0 --- /dev/null +++ b/gateway-server/src/main/resources/application.yaml @@ -0,0 +1,59 @@ +server: + port: 8000 + +spring: + application: + name: gateway-server + + cloud: + gateway: + server: + webflux: + routes: + - id: user + uri: lb://USERSERVICE + predicates: + - Path=/api/users/**, /api/auth/** + + - id: product + uri: lb://PRODUCTSERVICE + predicates: + - Path=/api/companies/*/products/** + + - id: company + uri: lb://COMPANYSERVICE + predicates: + - Path=/api/companies/** + + - id: order + uri: lb://ORDERSERVICE + predicates: + - Path=/api/orders/** + + - id: shipment + uri: lb://SHIPMENTSERVICE + predicates: + - Path=/api/shipments/**, /api/shipment-managers/** + + - id: notification + uri: lb://NOTIFICATIONSERVICE + predicates: + - Path=/api/ai/**, /api/slack/** + + - id: hub + uri: lb://HUBSERVICE + predicates: + - Path=/api/hubs/**, /api/hub-routes/** + + security: + oauth2: + resourceserver: + jwt: + issuer-uri: http://localhost:9001/realms/shipflow + +eureka: + client: + register-with-eureka: true + fetch-registry: true + service-url: + defaultZone: http://localhost:8761/eureka/ \ No newline at end of file diff --git a/gateway-server/src/test/java/com/shipflow/gatewayserver/GatewayServerApplicationTests.java b/gateway-server/src/test/java/com/shipflow/gatewayserver/GatewayServerApplicationTests.java new file mode 100644 index 0000000..77d9835 --- /dev/null +++ b/gateway-server/src/test/java/com/shipflow/gatewayserver/GatewayServerApplicationTests.java @@ -0,0 +1,13 @@ +package com.shipflow.gatewayserver; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class GatewayServerApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/order-service/build.gradle b/order-service/build.gradle index c93498d..a65d2ef 100644 --- a/order-service/build.gradle +++ b/order-service/build.gradle @@ -29,6 +29,7 @@ dependencies { // 1. Service Discovery 설정 implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' // 2. Persistence & Driver (에러 해결 핵심) implementation 'org.springframework.boot:spring-boot-starter-data-jpa' diff --git a/settings.gradle b/settings.gradle index e588cdf..f1af794 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,3 +9,4 @@ include 'notification-service' include 'hub-service' include 'common' include 'discovery-server' +include 'gateway-server' diff --git a/user-service/build.gradle b/user-service/build.gradle index ecf133b..8e83aa4 100644 --- a/user-service/build.gradle +++ b/user-service/build.gradle @@ -34,6 +34,7 @@ dependencies { implementation 'org.keycloak:keycloak-admin-client:25.0.0' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' + implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' runtimeOnly 'org.postgresql:postgresql' implementation 'org.springframework.cloud:spring-cloud-starter-openfeign' diff --git a/user-service/src/main/java/com/shipflow/userservice/UserserviceApplication.java b/user-service/src/main/java/com/shipflow/userservice/UserserviceApplication.java index b3f4db8..59e8dbd 100644 --- a/user-service/src/main/java/com/shipflow/userservice/UserserviceApplication.java +++ b/user-service/src/main/java/com/shipflow/userservice/UserserviceApplication.java @@ -2,9 +2,11 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication +@EnableDiscoveryClient @EnableFeignClients public class UserserviceApplication { diff --git a/user-service/src/main/java/com/shipflow/userservice/presentation/controller/AuthController.java b/user-service/src/main/java/com/shipflow/userservice/presentation/controller/AuthController.java index b189a96..b4ed089 100644 --- a/user-service/src/main/java/com/shipflow/userservice/presentation/controller/AuthController.java +++ b/user-service/src/main/java/com/shipflow/userservice/presentation/controller/AuthController.java @@ -48,6 +48,7 @@ public ResponseEntity login(@RequestBody LoginReqDto request) { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); + System.out.println("[UserService] login endpoint called"); MultiValueMap form = new LinkedMultiValueMap<>(); form.add("grant_type", "password"); diff --git a/user-service/src/main/resources/application.yaml b/user-service/src/main/resources/application.yaml index ff36b2a..4e87287 100644 --- a/user-service/src/main/resources/application.yaml +++ b/user-service/src/main/resources/application.yaml @@ -6,7 +6,7 @@ spring: driver-class-name: org.postgresql.Driver url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:shipflow}?currentSchema={schema} username: ${DB_USER:shipflow} - password: ${DB_PASSWORD:your_password} + password: ${DB_PASSWORD:1234} jpa: hibernate: @@ -16,14 +16,11 @@ spring: default_schema: users show-sql: true -keycloak: - server-url: http://localhost:9001 - realm: master - user-realm: shipflow - admin-client-id: admin-cli - admin-username: admin - admin-password: admin1234 - login-client-id: shipflow-api + security: + oauth2: + resourceserver: + jwt: + issuer-uri: http://localhost:9001/realms/shipflow cloud: openfeign: @@ -33,8 +30,21 @@ keycloak: connectTimeout: 5000 readTimeout: 5000 -security: - oauth2: - resourceserver: - jwt: - issuer-uri: http://localhost:9001/realms/shipflow \ No newline at end of file +keycloak: + server-url: http://localhost:9001 + realm: master + user-realm: shipflow + admin-client-id: admin-cli + admin-username: ${KEYCLOAK_ADMIN} + admin-password: ${KEYCLOAK_ADMIN_PASSWORD} + login-client-id: shipflow-api + +eureka: + client: + service-url: + defaultZone: http://localhost:8761/eureka/ + registry-fetch-interval-seconds: 5 + instance: + prefer-ip-address: true + lease-renewal-interval-in-seconds: 10 + lease-expiration-duration-in-seconds: 30