zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

debug minimal docker setup

Browse source
This commit is contained in:
anhefti 2024-02-28 14:58:59 +01:00
parent 4d55104a0b
commit a753971808
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java
View file

@ -12,10 +12,12 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -44,15 +46,18 @@ class AdminUserInitializer {
private final boolean initializeAdmin; private final boolean initializeAdmin;
private final String adminName; private final String adminName;
private final String orgName; private final String orgName;
private final Environment environment;
public AdminUserInitializer( public AdminUserInitializer(
final UserDAO userDAO, final UserDAO userDAO,
final InstitutionDAO institutionDAO, final InstitutionDAO institutionDAO,
final Environment environment,
@Qualifier(WebSecurityConfig.USER_PASSWORD_ENCODER_BEAN_NAME) final PasswordEncoder passwordEncoder, @Qualifier(WebSecurityConfig.USER_PASSWORD_ENCODER_BEAN_NAME) final PasswordEncoder passwordEncoder,
@Value("${sebserver.init.adminaccount.gen-on-init:false}") final boolean initializeAdmin, @Value("${sebserver.init.adminaccount.gen-on-init:false}") final boolean initializeAdmin,
@Value("${sebserver.init.adminaccount.username:seb-server-admin}") final String adminName, @Value("${sebserver.init.adminaccount.username:seb-server-admin}") final String adminName,
@Value("${sebserver.init.organisation.name:[SET_ORGANIZATION_NAME]}") final String orgName) { @Value("${sebserver.init.organisation.name:[SET_ORGANIZATION_NAME]}") final String orgName) {
this.environment = environment;
this.userDAO = userDAO; this.userDAO = userDAO;
this.institutionDAO = institutionDAO; this.institutionDAO = institutionDAO;
this.passwordEncoder = passwordEncoder; this.passwordEncoder = passwordEncoder;
@ -89,7 +94,11 @@ class AdminUserInitializer {
} }
} }
} else { } else {
final CharSequence generateAdminPassword = this.generateAdminPassword(); final String initPWD = environment.getProperty("sebserver.init.adminaccount.init.pwd", "");
final CharSequence generateAdminPassword = StringUtils.isNotBlank(initPWD)
? initPWD :
this.generateAdminPassword();
Long institutionId = this.institutionDAO.allMatching(new FilterMap()) Long institutionId = this.institutionDAO.allMatching(new FilterMap())
.getOrElse(Collections::emptyList) .getOrElse(Collections::emptyList)
.stream() .stream()

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/WebserviceInfoDAOImpl.java
View file

@ -57,7 +57,7 @@ public class WebserviceInfoDAOImpl implements WebserviceInfoDAO {
.execute(); .execute();
return true; return true;
} catch (final Exception e) { } catch (final Exception e) {
log.warn("DB Context not initialized: ", e); log.warn("DB Context not initialized yet: {}", e.getMessage());
return false; return false;
} }
} }