Merge branch 'master' into accept-encoding-gzip

atifaziz · atifaziz · commit 7911257ca27d · 2020-08-07T17:00:04.000+02:00
# Conflicts:
#	src/Dotnet.Script.Core/ScriptDownloader.cs
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1
 
 # https://www.nuget.org/packages/dotnet-script/
 RUN dotnet tool install dotnet-script --tool-path /usr/bin
diff --git a/src/Dotnet.Script.Core/ScriptDownloader.cs b/src/Dotnet.Script.Core/ScriptDownloader.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.IO;
+using System.IO.Compression;
 using System.Net;
 using System.Net.Http;
-using System.Net.Mime;
 using System.Threading.Tasks;
 
 namespace Dotnet.Script.Core
@@ -11,7 +11,6 @@ public class ScriptDownloader
     {
         public async Task<string> Download(string uri)
         {
-            const string plainTextMediaType = "text/plain";
             using (HttpClient client = new HttpClient(new HttpClientHandler
             {
                 // Avoid Deflate due to bugs. For more info, see:
@@ -25,14 +24,22 @@ public async Task<string> Download(string uri)
 
                     using (HttpContent content = response.Content)
                     {
-                        string mediaType = content.Headers.ContentType.MediaType;
-
-                        if (string.IsNullOrWhiteSpace(mediaType) || mediaType.Equals(plainTextMediaType, StringComparison.InvariantCultureIgnoreCase))
+                        var mediaType = content.Headers.ContentType.MediaType?.ToLowerInvariant().Trim();
+                        switch (mediaType)
                         {
-                            return await content.ReadAsStringAsync();
+                            case null:
+                            case "":
+                            case "text/plain":
+                                return await content.ReadAsStringAsync();
+                            case "application/gzip":
+                            case "application/x-gzip":
+                                using (var stream = await content.ReadAsStreamAsync())
+                                using (var gzip = new GZipStream(stream, CompressionMode.Decompress))
+                                using (var reader = new StreamReader(gzip))
+                                    return await reader.ReadToEndAsync();
+                            default:
+                                throw new NotSupportedException($"The media type '{mediaType}' is not supported when executing a script over http/https");
                         }
-
-                        throw new NotSupportedException($"The media type '{mediaType}' is not supported when executing a script over http/https");
                     }
                 }
             }
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -241,12 +241,15 @@ public void ShouldSupportInlineNugetReferencesWithTrailingSemicoloninEvaluatedCo
             Assert.Contains("AutoMapper.MapperConfiguration", result.output);
         }
 
-        [Fact]
-        public void ShouldExecuteRemoteScript()
+        [Theory]
+        [InlineData("https://gist.githubusercontent.com/seesharper/5d6859509ea8364a1fdf66bbf5b7923d/raw/0a32bac2c3ea807f9379a38e251d93e39c8131cb/HelloWorld.csx",
+                    "Hello World")]
+        [InlineData("https://github.com/filipw/dotnet-script/files/5035247/hello.csx.gz",
+                    "Hello, world!")]
+        public void ShouldExecuteRemoteScript(string url, string output)
         {
-            var url = "https://gist.githubusercontent.com/seesharper/5d6859509ea8364a1fdf66bbf5b7923d/raw/0a32bac2c3ea807f9379a38e251d93e39c8131cb/HelloWorld.csx";
             var result = ScriptTestRunner.Default.Execute(url);
-            Assert.Contains("Hello World", result.output);
+            Assert.Contains(output, result.output);
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/dotnet/core/sdk:3.0`
	`1`	`+FROM mcr.microsoft.com/dotnet/core/sdk:3.1`
`2`	`2`
`3`	`3`	`# https://www.nuget.org/packages/dotnet-script/`
`4`	`4`	`RUN dotnet tool install dotnet-script --tool-path /usr/bin`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using System.IO.Compression;`
`3`	`4`	`using System.Net;`
`4`	`5`	`using System.Net.Http;`
`5`		`-using System.Net.Mime;`
`6`	`6`	`using System.Threading.Tasks;`
`7`	`7`
`8`	`8`	`namespace Dotnet.Script.Core`
`@@ -11,7 +11,6 @@ public class ScriptDownloader`
`11`	`11`	`{`
`12`	`12`	`public async Task<string> Download(string uri)`
`13`	`13`	`{`
`14`		`- const string plainTextMediaType = "text/plain";`
`15`	`14`	`using (HttpClient client = new HttpClient(new HttpClientHandler`
`16`	`15`	`{`
`17`	`16`	`// Avoid Deflate due to bugs. For more info, see:`
`@@ -25,14 +24,22 @@ public async Task<string> Download(string uri)`
`25`	`24`
`26`	`25`	`using (HttpContent content = response.Content)`
`27`	`26`	`{`
`28`		`- string mediaType = content.Headers.ContentType.MediaType;`
`29`		`-`
`30`		`- if (string.IsNullOrWhiteSpace(mediaType) \|\| mediaType.Equals(plainTextMediaType, StringComparison.InvariantCultureIgnoreCase))`
	`27`	`+ var mediaType = content.Headers.ContentType.MediaType?.ToLowerInvariant().Trim();`
	`28`	`+ switch (mediaType)`
`31`	`29`	`{`
`32`		`- return await content.ReadAsStringAsync();`
	`30`	`+ case null:`
	`31`	`+ case "":`
	`32`	`+ case "text/plain":`
	`33`	`+ return await content.ReadAsStringAsync();`
	`34`	`+ case "application/gzip":`
	`35`	`+ case "application/x-gzip":`
	`36`	`+ using (var stream = await content.ReadAsStreamAsync())`
	`37`	`+ using (var gzip = new GZipStream(stream, CompressionMode.Decompress))`
	`38`	`+ using (var reader = new StreamReader(gzip))`
	`39`	`+ return await reader.ReadToEndAsync();`
	`40`	`+ default:`
	`41`	`+ throw new NotSupportedException($"The media type '{mediaType}' is not supported when executing a script over http/https");`
`33`	`42`	`}`
`34`		`-`
`35`		`- throw new NotSupportedException($"The media type '{mediaType}' is not supported when executing a script over http/https");`
`36`	`43`	`}`
`37`	`44`	`}`
`38`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,12 +241,15 @@ public void ShouldSupportInlineNugetReferencesWithTrailingSemicoloninEvaluatedCo`
`241`	`241`	`Assert.Contains("AutoMapper.MapperConfiguration", result.output);`
`242`	`242`	`}`
`243`	`243`
`244`		`- [Fact]`
`245`		`- public void ShouldExecuteRemoteScript()`
	`244`	`+ [Theory]`
	`245`	`+ [InlineData("https://gist.githubusercontent.com/seesharper/5d6859509ea8364a1fdf66bbf5b7923d/raw/0a32bac2c3ea807f9379a38e251d93e39c8131cb/HelloWorld.csx",`
	`246`	`+ "Hello World")]`
	`247`	`+ [InlineData("https://github.com/filipw/dotnet-script/files/5035247/hello.csx.gz",`
	`248`	`+ "Hello, world!")]`
	`249`	`+ public void ShouldExecuteRemoteScript(string url, string output)`
`246`	`250`	`{`
`247`		`- var url = "https://gist.githubusercontent.com/seesharper/5d6859509ea8364a1fdf66bbf5b7923d/raw/0a32bac2c3ea807f9379a38e251d93e39c8131cb/HelloWorld.csx";`
`248`	`251`	`var result = ScriptTestRunner.Default.Execute(url);`
`249`		`- Assert.Contains("Hello World", result.output);`
	`252`	`+ Assert.Contains(output, result.output);`
`250`	`253`	`}`
`251`	`254`
`252`	`255`	`[Fact]`