fix(backoffice): retain admin as control plane login

This commit is contained in:
devmrko
2026-07-22 13:18:26 +09:00
parent b5d3913de3
commit 56b9b511c1
2 changed files with 21 additions and 44 deletions

View File

@@ -1,6 +1,5 @@
package com.cloudhandson.vpdbackoffice.config;
import org.springframework.beans.factory.ObjectProvider;
import java.util.ArrayList;
import java.util.List;
import org.springframework.context.annotation.Bean;
@@ -10,12 +9,10 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.jdbc.core.JdbcTemplate;
@Configuration
public class SecurityConfig {
@@ -78,48 +75,28 @@ public class SecurityConfig {
@Bean
UserDetailsService userDetailsService(
ObjectProvider<JdbcTemplate> jdbcTemplateProvider,
BackofficeProperties properties,
PasswordEncoder passwordEncoder
) {
JdbcTemplate jdbcTemplate = jdbcTemplateProvider.getIfAvailable();
if (jdbcTemplate == null) {
String encodedPassword = properties.security().adminPasswordHash() == null
|| properties.security().adminPasswordHash().isBlank()
? passwordEncoder.encode(properties.security().adminPassword())
: properties.security().adminPasswordHash();
List<UserDetails> users = new ArrayList<>();
users.add(User.withUsername(properties.security().adminUser())
.password(encodedPassword)
.roles("ADMIN")
.build());
if (properties.security().guestConfigured()) {
String encodedGuestPassword = properties.security().guestPasswordHash() == null
|| properties.security().guestPasswordHash().isBlank()
? passwordEncoder.encode(properties.security().guestPassword())
: properties.security().guestPasswordHash();
users.add(User.withUsername(properties.security().guestUser())
.password(encodedGuestPassword)
.roles("VIEWER")
.build());
}
return new InMemoryUserDetailsManager(users);
var security = properties.security();
String encodedPassword = security.adminPasswordHash() == null || security.adminPasswordHash().isBlank()
? passwordEncoder.encode(security.adminPassword())
: security.adminPasswordHash();
List<UserDetails> users = new ArrayList<>();
users.add(User.withUsername(security.adminUser())
.password(encodedPassword)
.roles("ADMIN")
.build());
if (security.guestConfigured()) {
String encodedGuestPassword = security.guestPasswordHash() == null || security.guestPasswordHash().isBlank()
? passwordEncoder.encode(security.guestPassword())
: security.guestPasswordHash();
users.add(User.withUsername(security.guestUser())
.password(encodedGuestPassword)
.roles("VIEWER")
.build());
}
return username -> jdbcTemplate.query(
"""
select user_id, password_hash, role_code
from sg_tool_user
where user_id = ?
and enabled_yn = 'Y'
""",
(resultSet, rowNum) -> User.withUsername(resultSet.getString("user_id"))
.password(resultSet.getString("password_hash"))
.roles("TEAM_LEAD".equals(resultSet.getString("role_code")) ? "ADMIN" : "VIEWER")
.build(),
username
).stream().findFirst().orElseThrow(
() -> new UsernameNotFoundException("Unknown or disabled tool user")
);
return new InMemoryUserDetailsManager(users);
}
@Bean