Validate docker image name before launching container.
This commit is contained in:
parent
3d2afb209c
commit
603a0a316c
|
@ -57,6 +57,7 @@ import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import static org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.runtime.LinuxContainerRuntimeConstants.*;
|
import static org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.runtime.LinuxContainerRuntimeConstants.*;
|
||||||
|
|
||||||
|
@ -128,6 +129,12 @@ public class DockerLinuxContainerRuntime implements LinuxContainerRuntime {
|
||||||
private static final Log LOG = LogFactory.getLog(
|
private static final Log LOG = LogFactory.getLog(
|
||||||
DockerLinuxContainerRuntime.class);
|
DockerLinuxContainerRuntime.class);
|
||||||
|
|
||||||
|
// This validates that the image is a proper docker image
|
||||||
|
public static final String DOCKER_IMAGE_PATTERN =
|
||||||
|
"^(([a-zA-Z0-9.-]+)(:\\d+)?/)?([a-z0-9_./-]+)(:[\\w.-]+)?$";
|
||||||
|
private static final Pattern dockerImagePattern =
|
||||||
|
Pattern.compile(DOCKER_IMAGE_PATTERN);
|
||||||
|
|
||||||
@InterfaceAudience.Private
|
@InterfaceAudience.Private
|
||||||
public static final String ENV_DOCKER_CONTAINER_IMAGE =
|
public static final String ENV_DOCKER_CONTAINER_IMAGE =
|
||||||
"YARN_CONTAINER_RUNTIME_DOCKER_IMAGE";
|
"YARN_CONTAINER_RUNTIME_DOCKER_IMAGE";
|
||||||
|
@ -413,10 +420,7 @@ public class DockerLinuxContainerRuntime implements LinuxContainerRuntime {
|
||||||
|
|
||||||
validateContainerNetworkType(network);
|
validateContainerNetworkType(network);
|
||||||
|
|
||||||
if (imageName == null) {
|
validateImageName(imageName);
|
||||||
throw new ContainerExecutionException(ENV_DOCKER_CONTAINER_IMAGE
|
|
||||||
+ " not set!");
|
|
||||||
}
|
|
||||||
|
|
||||||
String containerIdStr = container.getContainerId().toString();
|
String containerIdStr = container.getContainerId().toString();
|
||||||
String runAsUser = ctx.getExecutionAttribute(RUN_AS_USER);
|
String runAsUser = ctx.getExecutionAttribute(RUN_AS_USER);
|
||||||
|
@ -635,4 +639,16 @@ public class DockerLinuxContainerRuntime implements LinuxContainerRuntime {
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void validateImageName(String imageName)
|
||||||
|
throws ContainerExecutionException {
|
||||||
|
if (imageName == null || imageName.isEmpty()) {
|
||||||
|
throw new ContainerExecutionException(
|
||||||
|
ENV_DOCKER_CONTAINER_IMAGE + " not set!");
|
||||||
|
}
|
||||||
|
if (!dockerImagePattern.matcher(imageName).matches()) {
|
||||||
|
throw new ContainerExecutionException("Image name '" + imageName
|
||||||
|
+ "' doesn't match docker image name pattern");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -898,4 +898,33 @@ public class TestDockerContainerRuntime {
|
||||||
return conf;
|
return conf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDockerImageNamePattern() throws Exception {
|
||||||
|
String[] validNames =
|
||||||
|
{ "ubuntu", "fedora/httpd:version1.0",
|
||||||
|
"fedora/httpd:version1.0.test",
|
||||||
|
"fedora/httpd:version1.0.TEST",
|
||||||
|
"myregistryhost:5000/ubuntu",
|
||||||
|
"myregistryhost:5000/fedora/httpd:version1.0",
|
||||||
|
"myregistryhost:5000/fedora/httpd:version1.0.test",
|
||||||
|
"myregistryhost:5000/fedora/httpd:version1.0.TEST"};
|
||||||
|
|
||||||
|
String[] invalidNames = { "Ubuntu", "ubuntu || fedora", "ubuntu#",
|
||||||
|
"myregistryhost:50AB0/ubuntu", "myregistry#host:50AB0/ubuntu",
|
||||||
|
":8080/ubuntu"
|
||||||
|
};
|
||||||
|
|
||||||
|
for (String name : validNames) {
|
||||||
|
DockerLinuxContainerRuntime.validateImageName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (String name : invalidNames) {
|
||||||
|
try {
|
||||||
|
DockerLinuxContainerRuntime.validateImageName(name);
|
||||||
|
Assert.fail(name + " is an invalid name and should fail the regex");
|
||||||
|
} catch (ContainerExecutionException ce) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue