Encode artifact filenames when combined as URL

Author: chrisvire

application/common/models/Build.php

@@ -498,11 +498,15 @@ public function getArtifactUrlBase() {
         return $this->artifact_url_base;
     }
 
+    public function encodeFilename($filename) {
+        return rawurlencode($filename);
+    }
+
     private function getArtifactUrl($pattern) {
         $filename = $this->getArtifactFilename($pattern);
         if (!empty($filename))
         {
-            return $this->artifact_url_base . $filename;
+            return $this->artifact_url_base . $this->encodeFilename($filename);
         }
         return null;
     }
@@ -536,7 +540,7 @@ private function getArtifactUrls($pattern) {
         {
             $urls = array();
             foreach ($filenames as $filename) {
-                array_push($urls, $this->artifact_url_base . $filename);
+                array_push($urls, $this->artifact_url_base . $this->encodeFilename($filename));
             }
             return $urls;
         }

application/tests/unit/common/components/BuildTest.php

@@ -91,4 +91,10 @@ public function testFindAllRunningByJobId()
         $this->assertEquals(2, $numberOfRunningBuilds, " *** Incorrect number of active builds");
 
     }
+    public function testArtifactEncoding() {
+        $this->setContainerObjects();
+        $build = Build::findOne(['id' => 12]);
+        $apks = $build->apks();
+        $this->assertContains("https://s3-us-west-2.amazonaws.com/sil-appbuilder-artifacts/testing/jobs/build_scriptureappbuilder_22/1/Test%2B1.0.apk", $apks, " *** filename not encoded correctly");
+    }
 }

application/tests/unit/fixtures/data/common/models/Build.php

@@ -25,7 +25,7 @@
         'result' => 'SUCCESS',
         'error' => NULL,
         'artifact_url_base' => 'https://s3-us-west-2.amazonaws.com/sil-appbuilder-artifacts/testing/jobs/build_scriptureappbuilder_22/1/',
-        'artifact_files' => 'about.txt,console.log,package_name.txt,Test-1.0-output.log,Test-1.0.apk,version.json,version_code.txt,whats_new.txt,play-listing/index.html,play-listing/manifest.json',
+        'artifact_files' => 'about.txt,console.log,package_name.txt,Test+1.0-output.log,Test+1.0.apk,version.json,version_code.txt,whats_new.txt,play-listing/index.html,play-listing/manifest.json',
         'created' => Utils::getDatetime(),
         'updated' => Utils::getDatetime(),
         'channel' => 'unpublished',