mirror of https://github.com/apache/jclouds.git
Regex-quote the image description and version in TemplateBuilder.fromImage() to prevent problems with image descriptions containing + and other regex special characters
This commit is contained in:
parent
29e7e7e85e
commit
034e9d47f2
|
@ -33,6 +33,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.getSpace;
|
|||
import java.util.List;
|
||||
import java.util.NoSuchElementException;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.inject.Inject;
|
||||
|
@ -499,13 +500,13 @@ public class TemplateBuilderImpl implements TemplateBuilder {
|
|||
if (image.getName() != null)
|
||||
this.imageName = image.getName();
|
||||
if (image.getDescription() != null)
|
||||
this.imageDescription = String.format("^%s$", image.getDescription());
|
||||
this.imageDescription = String.format("^%s$", Pattern.quote(image.getDescription()));
|
||||
if (image.getOperatingSystem().getName() != null)
|
||||
this.osName = image.getOperatingSystem().getName();
|
||||
if (image.getOperatingSystem().getDescription() != null)
|
||||
this.osDescription = image.getOperatingSystem().getDescription();
|
||||
if (image.getVersion() != null)
|
||||
this.imageVersion = String.format("^%s$", image.getVersion());
|
||||
this.imageVersion = String.format("^%s$", Pattern.quote(image.getVersion()));
|
||||
if (image.getOperatingSystem().getVersion() != null)
|
||||
this.osVersion = image.getOperatingSystem().getVersion();
|
||||
this.os64Bit = image.getOperatingSystem().is64Bit();
|
||||
|
|
Loading…
Reference in New Issue