[GitHub] [cloudstack] shwstppr edited a comment on pull request #5826: Allow templates & ISOs from IPv6 host address.

[GitBox <gi...@apache.org>]

shwstppr edited a comment on pull request #5826:
URL: https://github.com/apache/cloudstack/pull/5826#issuecomment-1020929718


   @GabrielBrascher doing something like following works,
   ```
   diff --git a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
   index 00dfee244c..1cf058d565 100644
   --- a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
   +++ b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
   @@ -216,7 +216,7 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
        public TemplateProfile prepare(RegisterTemplateCmd cmd) throws ResourceAllocationException {
            TemplateProfile profile = super.prepare(cmd);
            String url = profile.getUrl();
   -        UriUtils.validateUrl(cmd.getFormat(), url);
   +        UriUtils.validateUrl(cmd.getFormat(), url, cmd.isDirectDownload());
            if (cmd.isDirectDownload()) {
                DigestHelper.validateChecksumString(cmd.getChecksum());
                Long templateSize = performDirectDownloadUrlValidation(cmd.getFormat(), url, cmd.getZoneIds());
   diff --git a/utils/src/main/java/com/cloud/utils/UriUtils.java b/utils/src/main/java/com/cloud/utils/UriUtils.java
   index 6b222289b6..eb84d4555f 100644
   --- a/utils/src/main/java/com/cloud/utils/UriUtils.java
   +++ b/utils/src/main/java/com/cloud/utils/UriUtils.java
   @@ -262,7 +262,7 @@ public class UriUtils {
            return validateUrl(null, url);
        }
    
   -    public static Pair<String, Integer> validateUrl(String format, String url) throws IllegalArgumentException {
   +    public static Pair<String, Integer> validateUrl(String format, String url, boolean skipIpv6Check) throws IllegalArgumentException {
            try {
                URI uri = new URI(url);
                if ((uri.getScheme() == null) ||
   @@ -283,7 +283,7 @@ public class UriUtils {
                    if (hostAddr.isAnyLocalAddress() || hostAddr.isLinkLocalAddress() || hostAddr.isLoopbackAddress() || hostAddr.isMulticastAddress()) {
                        throw new IllegalArgumentException("Illegal host specified in url");
                    }
   -                if (hostAddr instanceof Inet6Address) {
   +                if (!skipIpv6Check && hostAddr instanceof Inet6Address) {
                        throw new IllegalArgumentException("IPV6 addresses not supported (" + hostAddr.getHostAddress() + ")");
                    }
                } catch (UnknownHostException uhe) {
   @@ -301,6 +301,10 @@ public class UriUtils {
            }
        }
    
   +    public static Pair<String, Integer> validateUrl(String format, String url) throws IllegalArgumentException {
   +        return validateUrl(format, url, false);
   +    }
   +
        /**
         * Add element to priority list examining node attributes: priority (for urls) and type (for checksums)
         */
   ```
   Normal template:
   ![Screenshot from 2022-01-25 14-51-54](https://user-images.githubusercontent.com/153340/150948754-711b801c-b98b-4b64-87c0-aa698bb9626e.png)
   
   Direct download:
   ![Screenshot from 2022-01-25 13-59-16](https://user-images.githubusercontent.com/153340/150940443-26d2274d-6059-4e9e-81b4-e6908fcabe4c.png)
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org