vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-22 14:07:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check if environment variables are not empty strings as well as not null (#623)

Browse Source
This commit is contained in:
Ben Grabham 2022-02-20 09:48:37 -05:00 committed by GitHub
parent d8dc63fc98
commit 0b7c42e814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs-core/src/main/java/com/sismics/docs/core/dao/UserDao.java
View File

@ -1,6 +1,7 @@
package com.sismics.docs.core.dao; package com.sismics.docs.core.dao;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import at.favre.lib.crypto.bcrypt.BCrypt; import at.favre.lib.crypto.bcrypt.BCrypt;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -289,7 +290,7 @@ public class UserDao {
private String hashPassword(String password) { private String hashPassword(String password) {
int bcryptWork = Constants.DEFAULT_BCRYPT_WORK; int bcryptWork = Constants.DEFAULT_BCRYPT_WORK;
String envBcryptWork = System.getenv(Constants.BCRYPT_WORK_ENV); String envBcryptWork = System.getenv(Constants.BCRYPT_WORK_ENV);
if (envBcryptWork != null) { if (!Strings.isNullOrEmpty(envBcryptWork)) {
try { try {
int envBcryptWorkInt = Integer.parseInt(envBcryptWork); int envBcryptWorkInt = Integer.parseInt(envBcryptWork);
if (envBcryptWorkInt >= 4 && envBcryptWorkInt <= 31) { if (envBcryptWorkInt >= 4 && envBcryptWorkInt <= 31) {

5
docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java
View File

@ -1,5 +1,6 @@
package com.sismics.docs.core.model.context; package com.sismics.docs.core.model.context;
import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.eventbus.AsyncEventBus; import com.google.common.eventbus.AsyncEventBus;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
@ -106,7 +107,7 @@ public class AppContext {
// Change the admin password if needed // Change the admin password if needed
String envAdminPassword = System.getenv(Constants.ADMIN_PASSWORD_INIT_ENV); String envAdminPassword = System.getenv(Constants.ADMIN_PASSWORD_INIT_ENV);
if (envAdminPassword != null) { if (!Strings.isNullOrEmpty(envAdminPassword)) {
UserDao userDao = new UserDao(); UserDao userDao = new UserDao();
User adminUser = userDao.getById("admin"); User adminUser = userDao.getById("admin");
if (Constants.DEFAULT_ADMIN_PASSWORD.equals(adminUser.getPassword())) { if (Constants.DEFAULT_ADMIN_PASSWORD.equals(adminUser.getPassword())) {
@ -117,7 +118,7 @@ public class AppContext {
// Change the admin email if needed // Change the admin email if needed
String envAdminEmail = System.getenv(Constants.ADMIN_EMAIL_INIT_ENV); String envAdminEmail = System.getenv(Constants.ADMIN_EMAIL_INIT_ENV);
if (envAdminEmail != null) { if (!Strings.isNullOrEmpty(envAdminEmail)) {
UserDao userDao = new UserDao(); UserDao userDao = new UserDao();
User adminUser = userDao.getById("admin"); User adminUser = userDao.getById("admin");
if (Constants.DEFAULT_ADMIN_EMAIL.equals(adminUser.getEmail())) { if (Constants.DEFAULT_ADMIN_EMAIL.equals(adminUser.getEmail())) {

6
docs-core/src/main/java/com/sismics/util/EmailUtil.java
View File

@ -92,7 +92,7 @@ public class EmailUtil {
// Hostname // Hostname
String envHostname = System.getenv(Constants.SMTP_HOSTNAME_ENV); String envHostname = System.getenv(Constants.SMTP_HOSTNAME_ENV);
if (envHostname == null) { if (Strings.isNullOrEmpty(envHostname)) {
email.setHostName(ConfigUtil.getConfigStringValue(ConfigType.SMTP_HOSTNAME)); email.setHostName(ConfigUtil.getConfigStringValue(ConfigType.SMTP_HOSTNAME));
} else { } else {
email.setHostName(envHostname); email.setHostName(envHostname);
@ -101,7 +101,7 @@ public class EmailUtil {
// Port // Port
int port = ConfigUtil.getConfigIntegerValue(ConfigType.SMTP_PORT); int port = ConfigUtil.getConfigIntegerValue(ConfigType.SMTP_PORT);
String envPort = System.getenv(Constants.SMTP_PORT_ENV); String envPort = System.getenv(Constants.SMTP_PORT_ENV);
if (envPort != null) { if (!Strings.isNullOrEmpty(envPort)) {
port = Integer.valueOf(envPort); port = Integer.valueOf(envPort);
} }
email.setSmtpPort(port); email.setSmtpPort(port);
@ -114,7 +114,7 @@ public class EmailUtil {
// Username and password // Username and password
String envUsername = System.getenv(Constants.SMTP_USERNAME_ENV); String envUsername = System.getenv(Constants.SMTP_USERNAME_ENV);
String envPassword = System.getenv(Constants.SMTP_PASSWORD_ENV); String envPassword = System.getenv(Constants.SMTP_PASSWORD_ENV);
if (envUsername == null || envPassword == null) { if (Strings.isNullOrEmpty(envUsername) || Strings.isNullOrEmpty(envPassword)) {
Config usernameConfig = configDao.getById(ConfigType.SMTP_USERNAME); Config usernameConfig = configDao.getById(ConfigType.SMTP_USERNAME);
Config passwordConfig = configDao.getById(ConfigType.SMTP_PASSWORD); Config passwordConfig = configDao.getById(ConfigType.SMTP_PASSWORD);
if (usernameConfig != null && passwordConfig != null) { if (usernameConfig != null && passwordConfig != null) {

3
docs-core/src/main/java/com/sismics/util/jpa/EMF.java
View File

@ -1,5 +1,6 @@
package com.sismics.util.jpa; package com.sismics.util.jpa;
import com.google.common.base.Strings;
import com.sismics.docs.core.util.DirectoryUtil; import com.sismics.docs.core.util.DirectoryUtil;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.internal.util.config.ConfigurationHelper;
@ -83,7 +84,7 @@ public final class EMF {
Map<Object, Object> props = new HashMap<>(); Map<Object, Object> props = new HashMap<>();
Path dbDirectory = DirectoryUtil.getDbDirectory(); Path dbDirectory = DirectoryUtil.getDbDirectory();
String dbFile = dbDirectory.resolve("docs").toAbsolutePath().toString(); String dbFile = dbDirectory.resolve("docs").toAbsolutePath().toString();
if (databaseUrl == null) { if (Strings.isNullOrEmpty(databaseUrl)) {
props.put("hibernate.connection.driver_class", "org.h2.Driver"); props.put("hibernate.connection.driver_class", "org.h2.Driver");
props.put("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); props.put("hibernate.dialect", "org.hibernate.dialect.HSQLDialect");
props.put("hibernate.connection.url", "jdbc:h2:file:" + dbFile + ";CACHE_SIZE=65536;LOCK_TIMEOUT=10000"); props.put("hibernate.connection.url", "jdbc:h2:file:" + dbFile + ";CACHE_SIZE=65536;LOCK_TIMEOUT=10000");

3
docs-web-common/src/test/java/com/sismics/docs/rest/BaseJerseyTest.java
View File

@ -26,6 +26,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* Base class of integration tests with Jersey. * Base class of integration tests with Jersey.
@ -56,7 +57,7 @@ public abstract class BaseJerseyTest extends JerseyTest {
@Override @Override
protected Application configure() { protected Application configure() {
String travisEnv = System.getenv("TRAVIS"); String travisEnv = System.getenv("TRAVIS");
if (travisEnv == null || !travisEnv.equals("true")) { if (!Objects.equals(travisEnv, "true")) {
// Travis doesn't like big logs // Travis doesn't like big logs
enable(TestProperties.LOG_TRAFFIC); enable(TestProperties.LOG_TRAFFIC);
enable(TestProperties.DUMP_ENTITY); enable(TestProperties.DUMP_ENTITY);

8
docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java
View File

@ -205,28 +205,28 @@ public class AppResource extends BaseResource {
Config passwordConfig = configDao.getById(ConfigType.SMTP_PASSWORD); Config passwordConfig = configDao.getById(ConfigType.SMTP_PASSWORD);
Config fromConfig = configDao.getById(ConfigType.SMTP_FROM); Config fromConfig = configDao.getById(ConfigType.SMTP_FROM);
JsonObjectBuilder response = Json.createObjectBuilder(); JsonObjectBuilder response = Json.createObjectBuilder();
if (System.getenv(Constants.SMTP_HOSTNAME_ENV) == null) { if (Strings.isNullOrEmpty(System.getenv(Constants.SMTP_HOSTNAME_ENV))) {
if (hostnameConfig == null) { if (hostnameConfig == null) {
response.addNull("hostname"); response.addNull("hostname");
} else { } else {
response.add("hostname", hostnameConfig.getValue()); response.add("hostname", hostnameConfig.getValue());
} }
} }
if (System.getenv(Constants.SMTP_PORT_ENV) == null) { if (Strings.isNullOrEmpty(System.getenv(Constants.SMTP_PORT_ENV))) {
if (portConfig == null) { if (portConfig == null) {
response.addNull("port"); response.addNull("port");
} else { } else {
response.add("port", Integer.valueOf(portConfig.getValue())); response.add("port", Integer.valueOf(portConfig.getValue()));
} }
} }
if (System.getenv(Constants.SMTP_USERNAME_ENV) == null) { if (Strings.isNullOrEmpty(System.getenv(Constants.SMTP_USERNAME_ENV))) {
if (usernameConfig == null) { if (usernameConfig == null) {
response.addNull("username"); response.addNull("username");
} else { } else {
response.add("username", usernameConfig.getValue()); response.add("username", usernameConfig.getValue());
} }
} }
if (System.getenv(Constants.SMTP_PASSWORD_ENV) == null) { if (Strings.isNullOrEmpty(System.getenv(Constants.SMTP_PASSWORD_ENV))) {
if (passwordConfig == null) { if (passwordConfig == null) {
response.addNull("password"); response.addNull("password");
} else { } else {