Merge pull request #164 from markslater/allow-insecure-protocol

Allow insecure protocol

Author: deepy

docs/usage.md

@@ -222,6 +222,12 @@ node {
     // Or set to null if you want to add the repository on your own.
     distBaseUrl = "https://nodejs.org/dist"
     
+    // Specifies whether it is acceptable to communicate with the Node.js repository over an insecure HTTP connection.
+    // Only used if download is true
+    // Change it to true if you use a mirror that uses HTTP rather than HTTPS
+    // Or set to null if you want to use Gradle's default behaviour.
+    allowInsecureProtocol = null
+    
     // The npm command executed by the npmInstall task
     // By default it is install but it can be changed to ci
     npmInstallCommand = "install"

src/main/kotlin/com/github/gradle/node/NodeExtension.kt

@@ -59,6 +59,14 @@ open class NodeExtension(project: Project) {
      */
     val distBaseUrl = project.objects.property<String>()
 
+    /**
+     * Specifies whether it is acceptable to communicate with the Node.js repository over an insecure HTTP connection.
+     * Only used if download is true
+     * Change it to true if you use a mirror that uses HTTP rather than HTTPS
+     * Or set to null if you want to use Gradle's default behaviour.
+     */
+    val allowInsecureProtocol = project.objects.property<Boolean>()
+
     val npmCommand = project.objects.property<String>().convention("npm")
     val npxCommand = project.objects.property<String>().convention("npx")
     val yarnCommand = project.objects.property<String>().convention("yarn")

src/main/kotlin/com/github/gradle/node/NodePlugin.kt

@@ -16,6 +16,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.named
 import org.gradle.kotlin.dsl.register
+import org.gradle.util.GradleVersion
 import java.io.File
 
 class NodePlugin : Plugin<Project> {
@@ -30,7 +31,7 @@ class NodePlugin : Plugin<Project> {
         addYarnRule()
         project.afterEvaluate {
             if (nodeExtension.download.get()) {
-                nodeExtension.distBaseUrl.orNull?.let { addRepository(it) }
+                nodeExtension.distBaseUrl.orNull?.let { addRepository(it, nodeExtension.allowInsecureProtocol.orNull) }
                 configureNodeSetupTask(nodeExtension)
             }
         }
@@ -86,7 +87,7 @@ class NodePlugin : Plugin<Project> {
         }
     }
 
-    private fun addRepository(distUrl: String) {
+    private fun addRepository(distUrl: String, allowInsecureProtocol: Boolean?) {
         project.repositories.ivy {
             name = "Node.js"
             setUrl(distUrl)
@@ -99,6 +100,9 @@ class NodePlugin : Plugin<Project> {
             content {
                 includeModule("org.nodejs", "node")
             }
+            if (GradleVersion.current() >= GradleVersion.version("6.0")) {
+                allowInsecureProtocol?.let { isAllowInsecureProtocol = it }
+            }
         }
     }
 

src/test/groovy/com/github/gradle/node/NodeExtensionTest.groovy

@@ -15,6 +15,7 @@ class NodeExtensionTest extends AbstractProjectTest {
         nodeExtension.npmCommand.get() == 'npm'
         nodeExtension.npxCommand.get() == 'npx'
         nodeExtension.distBaseUrl.get() == 'https://nodejs.org/dist'
+        nodeExtension.allowInsecureProtocol.orNull == null
         nodeExtension.workDir.get() != null
         nodeExtension.nodeProjectDir.get() != null
         nodeExtension.version.get() == DEFAULT_NODE_VERSION

src/test/groovy/com/github/gradle/node/task/NodeTask_integTest.groovy

@@ -267,4 +267,31 @@ class NodeTask_integTest extends AbstractIntegTest {
         result.task(":nodeSetup").outcome == TaskOutcome.SKIPPED
         result.task(":hello").outcome == TaskOutcome.SUCCESS
     }
+
+    def 'make sure build works with allowInsecureProtocol false using a custom repository'() {
+        given:
+        Assume.assumeFalse(gradleVersion < GradleVersion.version("6.8"))
+        copyResources("fixtures/node-disallow-insecure-protocol")
+
+        when:
+        def result = build("hello")
+
+        then:
+        result.task(":nodeSetup").outcome == TaskOutcome.SUCCESS
+        result.task(":hello").outcome == TaskOutcome.SUCCESS
+    }
+
+    def 'make sure build works with allowInsecureProtocol true using a custom repository'() {
+        given:
+        Assume.assumeFalse(gradleVersion < GradleVersion.version("6.8"))
+        copyResources("fixtures/node-allow-insecure-protocol")
+
+        when:
+        def result = build("hello")
+
+        then:
+        result.task(":nodeSetup").outcome == TaskOutcome.SUCCESS
+        result.task(":hello").outcome == TaskOutcome.SUCCESS
+    }
+
 }

src/test/resources/fixtures/node-allow-insecure-protocol/build.gradle

@@ -0,0 +1,19 @@
+plugins {
+    id "com.github.node-gradle.node"
+}
+
+node {
+    version = "12.13.0"
+    distBaseUrl = "http://nodejs.org/dist/"
+    download = true
+    allowInsecureProtocol = true
+    workDir = file("build/node")
+}
+
+task hello(type: NodeTask) {
+    script = file("simple.js")
+    args = []
+    outputs.upToDateWhen {
+        true
+    }
+}

src/test/resources/fixtures/node-allow-insecure-protocol/simple.js

@@ -0,0 +1 @@
+console.log("Hello World");

src/test/resources/fixtures/node-disallow-insecure-protocol/build.gradle

@@ -0,0 +1,19 @@
+plugins {
+    id "com.github.node-gradle.node"
+}
+
+node {
+    version = "12.13.0"
+    distBaseUrl = "https://nodejs.org/dist/"
+    download = true
+    allowInsecureProtocol = false
+    workDir = file("build/node")
+}
+
+task hello(type: NodeTask) {
+    script = file("simple.js")
+    args = []
+    outputs.upToDateWhen {
+        true
+    }
+}

src/test/resources/fixtures/node-disallow-insecure-protocol/simple.js

@@ -0,0 +1 @@
+console.log("Hello World");