Add container name validation

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
nextflow-io · Feb 24, 2023 · c3b6d9a · c3b6d9a
1 parent 44f8cc0
commit c3b6d9a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/plugins/nf-wave/src/main/io/seqera/wave/plugin/resolver/WaveContainerResolver.groovy b/plugins/nf-wave/src/main/io/seqera/wave/plugin/resolver/WaveContainerResolver.groovy
@@ -30,6 +30,8 @@ import nextflow.container.resolver.ContainerResolver
 import nextflow.container.resolver.DefaultContainerResolver
 import nextflow.plugin.Priority
 import nextflow.processor.TaskRun
+import nextflow.util.StringUtils
+
 /**
  * Implement Wave container resolve logic
  *
@@ -101,6 +103,7 @@ class WaveContainerResolver implements ContainerResolver {
      *      when the task does not request any container or dockerfile to build
      */
     protected ContainerInfo waveContainer(TaskRun task, String container) {
+        validateContainerRepo(container)
         final assets = client().resolveAssets(task, container)
         if( assets ) {
             return client().fetchContainerImage(assets)
@@ -110,4 +113,10 @@ class WaveContainerResolver implements ContainerResolver {
         return null
     }
 
+    static protected void validateContainerRepo(String name) {
+        final scheme = StringUtils.getUrlProtocol(name)
+        if( scheme )
+            throw new IllegalArgumentException("Container repository should not start with URL like prefix - offending value: $name")
+    }
+
 }
diff --git a/plugins/nf-wave/src/test/io/seqera/wave/plugin/resolver/WaveContainerResolverTest.groovy b/plugins/nf-wave/src/test/io/seqera/wave/plugin/resolver/WaveContainerResolverTest.groovy
@@ -68,4 +68,26 @@ class WaveContainerResolverTest extends Specification {
         and:
         result == SINGULARITY_CONTAINER
     }
+
+    def 'should validate container name' () {
+        when:
+        WaveContainerResolver.validateContainerRepo('ubuntu')
+        then:
+        noExceptionThrown()
+
+        when:
+        WaveContainerResolver.validateContainerRepo('ubuntu:latest')
+        then:
+        noExceptionThrown()
+
+        when:
+        WaveContainerResolver.validateContainerRepo('quay.io/wtsicgp/nanoseq:3.3.0')
+        then:
+        noExceptionThrown()
+
+        when:
+        WaveContainerResolver.validateContainerRepo('docker://quay.io/wtsicgp/nanoseq:3.3.0')
+        then:
+        thrown(IllegalArgumentException)
+    }
 }