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

Jump to bottom

Ensure that directory permissions are properly set on MySQL and MariaDB #5401

Closed
wants to merge 1 commit into from
Closed

Ensure that directory permissions are properly set on MySQL and MariaDB #5401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.testcontainers.containers.traits.LinkableContainer;
import org.testcontainers.delegate.DatabaseDelegate;
import org.testcontainers.ext.ScriptUtils;
import org.testcontainers.images.builder.Transferable;
import org.testcontainers.jdbc.JdbcDatabaseDelegate;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
Expand Down Expand Up @@ -285,15 +287,25 @@ protected String constructUrlParameters(String startCharacter, String delimiter,
return urlParameters;
}

@Deprecated
protected void optionallyMapResourceParameterAsVolume(
@NotNull String paramName,
@NotNull String pathNameInContainer,
@NotNull String defaultResource
) {
optionallyMapResourceParameterAsVolume(paramName, pathNameInContainer, defaultResource, null);
}

protected void optionallyMapResourceParameterAsVolume(
@NotNull String paramName,
@NotNull String pathNameInContainer,
@NotNull String defaultResource,
@Nullable Integer fileMode
) {
String resourceName = parameters.getOrDefault(paramName, defaultResource);

if (resourceName != null) {
final MountableFile mountableFile = MountableFile.forClasspathResource(resourceName);
final MountableFile mountableFile = MountableFile.forClasspathResource(resourceName, fileMode);
withCopyFileToContainer(mountableFile, pathNameInContainer);
}
}
Expand Down
4 changes: 3 additions & 1 deletion modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.testcontainers.containers;

import com.google.common.collect.Sets;
import org.testcontainers.images.builder.Transferable;
import org.testcontainers.utility.DockerImageName;

import java.util.Set;
Expand Down Expand Up @@ -67,7 +68,8 @@ protected void configure() {
optionallyMapResourceParameterAsVolume(
MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
"/etc/mysql/conf.d",
"mariadb-default-conf"
"mariadb-default-conf",
Transferable.DEFAULT_FILE_MODE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be Transferable.DEFAULT_DIR_MODE, right?

);

addEnv("MYSQL_DATABASE", databaseName);
Expand Down
4 changes: 3 additions & 1 deletion modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.testcontainers.containers;

import org.jetbrains.annotations.NotNull;
import org.testcontainers.images.builder.Transferable;
import org.testcontainers.utility.DockerImageName;

import java.util.HashSet;
Expand Down Expand Up @@ -67,7 +68,8 @@ protected void configure() {
optionallyMapResourceParameterAsVolume(
MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
"/etc/mysql/conf.d",
"mysql-default-conf"
"mysql-default-conf",
Transferable.DEFAULT_DIR_MODE
);

addEnv("MYSQL_DATABASE", databaseName);
Expand Down
73 changes: 71 additions & 2 deletions modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.testcontainers.junit.mysql;

import org.apache.commons.lang3.SystemUtils;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -10,6 +11,11 @@
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.db.AbstractContainerDatabaseTest;

import java.io.File;
import java.net.URL;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.attribute.PosixFilePermission;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
Expand All @@ -18,9 +24,14 @@
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;

import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.Assume.assumeFalse;
import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
Expand Down Expand Up @@ -209,8 +220,8 @@ public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
Statement statement = connection.createStatement();
String multiQuery =
"DROP TABLE IF EXISTS bar; " +
"CREATE TABLE bar (foo VARCHAR(20)); " +
"INSERT INTO bar (foo) VALUES ('hello world');";
"CREATE TABLE bar (foo VARCHAR(20)); " +
"INSERT INTO bar (foo) VALUES ('hello world');";
statement.execute(multiQuery);
statement.execute("SELECT foo FROM bar;");
try (ResultSet resultSet = statement.getResultSet()) {
Expand Down Expand Up @@ -241,4 +252,62 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
mysql.stop();
}
}

@Test
public void startFailsWithWrongPermissions() throws Exception {
try (
MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
.withConfigurationOverride("somepath/mysql_conf_override")
.withLogConsumer(new Slf4jLogConsumer(logger))
) {
URL resource = this.getClass().getClassLoader().getResource("somepath/mysql_conf_override");

File file = new File(resource.toURI());
Assert.assertTrue(file.isDirectory());

boolean posix = FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
if (posix) {
Set<PosixFilePermission> permissions = new HashSet<>(Arrays.asList(PosixFilePermission.OWNER_READ,
PosixFilePermission.OWNER_WRITE,
PosixFilePermission.OWNER_EXECUTE));

Files.setPosixFilePermissions(file.toPath(), permissions);
}

assertThrows(ContainerLaunchException.class, mysql::start);
}
}

@Test
public void startFailsSucceedsWithProperPermissions() throws Exception {
try (
MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
.withConfigurationOverride("somepath/mysql_conf_override")
.withLogConsumer(new Slf4jLogConsumer(logger))
) {
URL resource = this.getClass().getClassLoader().getResource("somepath/mysql_conf_override");

File file = new File(resource.toURI());
Assert.assertTrue(file.isDirectory());

boolean posix = FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
if (posix) {
Set<PosixFilePermission> permissions = new HashSet<>(Arrays.asList(
PosixFilePermission.OWNER_READ,
PosixFilePermission.OWNER_WRITE,
PosixFilePermission.OWNER_EXECUTE,
PosixFilePermission.GROUP_READ,
PosixFilePermission.GROUP_WRITE,
PosixFilePermission.GROUP_EXECUTE,
PosixFilePermission.OTHERS_READ,
PosixFilePermission.OTHERS_WRITE,
PosixFilePermission.OTHERS_EXECUTE
));

Files.setPosixFilePermissions(file.toPath(), permissions);
}

assertThrows(ContainerLaunchException.class, mysql::start);
}
}
}