Linux support (#795)

DominicBoettger · kblok · commit 1153fffd3823 · 2018-12-16T19:58:35.000-03:00
diff --git a/appveyor-linux.yml b/appveyor-linux.yml
@@ -0,0 +1,45 @@
+version: 1.0.{build}
+image: ubuntu1804
+configuration: Release
+environment:
+  git_access_token:
+    secure: FxcQ9C8a/NgcQB5dFdZts6ZWEDT4zMhA4qPQAYwWc7huMmhmTIl1sbFEIaAWQMTL
+  matrix:
+    - framework: netcoreapp2.0
+
+before_build:
+- sh: >-
+    sudo apt-get -y install gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget xvfb
+
+    dotnet restore lib/PuppeteerSharp.sln
+
+    dotnet dev-certs https -ep lib/PuppeteerSharp.TestServer/testCert.cer
+
+    sudo openssl x509 -inform der -in lib/PuppeteerSharp.TestServer/testCert.cer -out /usr/local/share/ca-certificates/testCert.crt -outform pem
+
+    sudo update-ca-certificates
+
+build_script:
+- sh: >-
+    dotnet build -f $framework ./lib/PuppeteerSharp.Tests.CloseMe/PuppeteerSharp.Tests.CloseMe.csproj
+
+    dotnet build -f $framework ./lib/PuppeteerSharp.DevicesFetcher/PuppeteerSharp.DevicesFetcher.csproj
+
+    dotnet build -f $framework ./lib/PuppeteerSharp.Tests.DumpIO/PuppeteerSharp.Tests.DumpIO.csproj
+
+    dotnet build ./lib/PuppeteerSharp.TestServer/PuppeteerSharp.TestServer.csproj
+
+    dotnet build -f $framework ./lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj
+
+test_script:
+- sh: >-
+    Xvfb :1 -screen 5 1024x768x8 &
+
+    export DISPLAY=:1.5
+
+    cd lib/PuppeteerSharp.Tests
+
+    dotnet test -f $framework -s test.runsettings
+
+cache:
+  - $HOME/.nuget/packages
diff --git a/appveyor.yml b/appveyor.yml
@@ -39,4 +39,4 @@ on_success:
 
     c:\projects\puppeteer-sharp\appveyor\GenerateDocs.ps1
 cache:
-  - $HOME/.nuget/packages
+  - $HOME/.nuget/packages
diff --git a/lib/PuppeteerSharp.Tests/FrameTests/FrameManagementTests.cs b/lib/PuppeteerSharp.Tests/FrameTests/FrameManagementTests.cs
@@ -31,10 +31,10 @@ public async Task ShouldSendEventsWhenFramesAreManipulatedDynamically()
 
             Page.FrameAttached += (sender, e) => attachedFrames.Add(e.Frame);
 
-            await FrameUtils.AttachFrameAsync(Page, "frame1", "./assets/frame.html");
+            await FrameUtils.AttachFrameAsync(Page, "frame1", "./Assets/frame.html");
 
             Assert.Single(attachedFrames);
-            Assert.Contains("/assets/frame.html", attachedFrames[0].Url);
+            Assert.Contains("/Assets/frame.html", attachedFrames[0].Url);
 
             // validate framenavigated events
             var navigatedFrames = new List<Frame>();
diff --git a/lib/PuppeteerSharp.Tests/InputTests/InputTests.cs b/lib/PuppeteerSharp.Tests/InputTests/InputTests.cs
@@ -166,7 +166,7 @@ public async Task ShouldClickTheButtonAfterNavigation()
         public async Task ShouldUploadTheFile()
         {
             await Page.GoToAsync(TestConstants.ServerUrl + "/input/fileupload.html");
-            var filePath = "./assets/file-to-upload.txt";
+            var filePath = "./Assets/file-to-upload.txt";
             var input = await Page.QuerySelectorAsync("input");
             await input.UploadFileAsync(filePath);
             Assert.Equal("file-to-upload.txt", await Page.EvaluateFunctionAsync<string>("e => e.files[0].name", input));
diff --git a/lib/PuppeteerSharp.Tests/PageTests/AddScriptTagTests.cs b/lib/PuppeteerSharp.Tests/PageTests/AddScriptTagTests.cs
@@ -44,7 +44,7 @@ public async Task ShouldWorkWithAPathAndTypeModule()
             await Page.GoToAsync(TestConstants.EmptyPage);
             await Page.AddScriptTagAsync(new AddTagOptions
             {
-                Path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("assets", "es6", "es6pathimport.js")),
+                Path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("Assets", "es6", "es6pathimport.js")),
                 Type = "module"
             });
             await Page.WaitForFunctionAsync("() => window.__es6injected");
@@ -79,7 +79,7 @@ public async Task ShouldWorkWithAPath()
             await Page.GoToAsync(TestConstants.EmptyPage);
             var scriptHandle = await Page.AddScriptTagAsync(new AddTagOptions
             {
-                Path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("assets", "injectedfile.js"))
+                Path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("Assets", "injectedfile.js"))
             });
             Assert.NotNull(scriptHandle as ElementHandle);
             Assert.Equal(42, await Page.EvaluateExpressionAsync<int>("__injected"));
@@ -91,10 +91,10 @@ public async Task ShouldIncludeSourcemapWhenPathIsProvided()
             await Page.GoToAsync(TestConstants.EmptyPage);
             await Page.AddScriptTagAsync(new AddTagOptions
             {
-                Path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("assets", "injectedfile.js"))
+                Path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("Assets", "injectedfile.js"))
             });
             var result = await Page.EvaluateExpressionAsync<string>("__injectedError.stack");
-            Assert.Contains(Path.Combine("assets", "injectedfile.js"), result);
+            Assert.Contains(Path.Combine("Assets", "injectedfile.js"), result);
         }
 
         [Fact]
diff --git a/lib/PuppeteerSharp.Tests/PageTests/AddStyleTagTests.cs b/lib/PuppeteerSharp.Tests/PageTests/AddStyleTagTests.cs
@@ -44,7 +44,7 @@ public async Task ShouldThrowAnErrorIfLoadingFromUrlFail()
         public async Task ShouldWorkWithAPath()
         {
             await Page.GoToAsync(TestConstants.EmptyPage);
-            var styleHandle = await Page.AddStyleTagAsync(new AddTagOptions { Path = "assets/injectedstyle.css" });
+            var styleHandle = await Page.AddStyleTagAsync(new AddTagOptions { Path = "Assets/injectedstyle.css" });
             Assert.NotNull(styleHandle as ElementHandle);
             Assert.Equal("rgb(255, 0, 0)", await Page.EvaluateExpressionAsync<string>(
                 "window.getComputedStyle(document.querySelector('body')).getPropertyValue('background-color')"));
@@ -56,11 +56,11 @@ public async Task ShouldIncludeSourcemapWhenPathIsProvided()
             await Page.GoToAsync(TestConstants.EmptyPage);
             await Page.AddStyleTagAsync(new AddTagOptions
             {
-                Path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("assets", "injectedstyle.css"))
+                Path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("Assets", "injectedstyle.css"))
             });
             var styleHandle = await Page.QuerySelectorAsync("style");
             var styleContent = await Page.EvaluateFunctionAsync<string>("style => style.innerHTML", styleHandle);
-            Assert.Contains(Path.Combine("assets", "injectedstyle.css"), styleContent);
+            Assert.Contains(Path.Combine("Assets", "injectedstyle.css"), styleContent);
         }
 
         [Fact]
diff --git a/lib/PuppeteerSharp.Tests/PageTests/GotoTests.cs b/lib/PuppeteerSharp.Tests/PageTests/GotoTests.cs
@@ -318,7 +318,7 @@ public async Task ShouldFailWhenNavigatingAndShowTheUrlAtTheErrorMessage()
         [Fact]
         public async Task ResponseOkShouldBeTrueForFile()
         {
-            var fileToNavigate = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("assets", "file-to-upload.txt"));
+            var fileToNavigate = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("Assets", "file-to-upload.txt"));
             var url = new Uri(fileToNavigate).AbsoluteUri;
 
             var response = await Page.GoToAsync(url);
diff --git a/lib/PuppeteerSharp.Tests/PageTests/SetRequestInterceptionTests.cs b/lib/PuppeteerSharp.Tests/PageTests/SetRequestInterceptionTests.cs
@@ -524,7 +524,7 @@ public async Task ShouldWorkWithFileURLs()
                 await e.Request.ContinueAsync();
             };
 
-            var uri = new Uri(Path.Combine(Directory.GetCurrentDirectory(), "assets", "one-style.html")).AbsoluteUri;
+            var uri = new Uri(Path.Combine(Directory.GetCurrentDirectory(), "Assets", "one-style.html")).AbsoluteUri;
             await Page.GoToAsync(uri);
             Assert.Equal(2, urls.Count);
             Assert.Contains("one-style.html", urls);
diff --git a/lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj b/lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj
@@ -2,11 +2,13 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="MicrosoftExtensions.Logging.Xunit" Version="1.0.0" />
+    <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0002" />
diff --git a/lib/PuppeteerSharp.Tests/PuppeteerTests/BrowserFetcherTests.cs b/lib/PuppeteerSharp.Tests/PuppeteerTests/BrowserFetcherTests.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using PuppeteerSharp.Helpers.Linux;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -39,7 +41,14 @@ public async Task ShouldDownloadAndExtractLinuxBinary()
                 revisionInfo = await browserFetcher.DownloadAsync(123456);
                 Assert.True(revisionInfo.Local);
                 Assert.Equal("LINUX BINARY\n", File.ReadAllText(revisionInfo.ExecutablePath));
-                Assert.Equal(new[] {123456}, browserFetcher.LocalRevisions());
+
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    Assert.Equal(
+                        BrowserFetcher.BrowserPermissionsInLinux,
+                        LinuxSysCall.GetFileMode(revisionInfo.ExecutablePath) & BrowserFetcher.BrowserPermissionsInLinux);
+                }
+                Assert.Equal(new[] { 123456 }, browserFetcher.LocalRevisions());
                 browserFetcher.Remove(123456);
                 Assert.Empty(browserFetcher.LocalRevisions());
 
diff --git a/lib/PuppeteerSharp.Tests/RequestTests/RespondTests.cs b/lib/PuppeteerSharp.Tests/RequestTests/RespondTests.cs
@@ -43,7 +43,7 @@ public async Task ShouldAllowMockingBinaryResponses()
             await Page.SetRequestInterceptionAsync(true);
             Page.Request += async (sender, e) =>
             {
-                var imageData = File.ReadAllBytes("./assets/pptr.png");
+                var imageData = File.ReadAllBytes("./Assets/pptr.png");
                 await e.Request.RespondAsync(new ResponseData
                 {
                     ContentType = "image/png",
diff --git a/lib/PuppeteerSharp.sln b/lib/PuppeteerSharp.sln
@@ -1,4 +1,5 @@
-﻿Microsoft Visual Studio Solution File, Format Version 12.00
+﻿
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -12,7 +13,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PuppeteerSharp.Tests.DumpIO
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PuppeteerSharp.Tests.CloseMe", "PuppeteerSharp.Tests.CloseMe\PuppeteerSharp.Tests.CloseMe.csproj", "{B1B0358F-88A2-4038-9974-7850D906C76B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PuppeteerSharp.DevicesFetcher", "PuppeteerSharp.DevicesFetcher\PuppeteerSharp.DevicesFetcher.csproj", "{A500694A-3649-4474-BC71-C835FA19B865}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PuppeteerSharp.DevicesFetcher", "PuppeteerSharp.DevicesFetcher\PuppeteerSharp.DevicesFetcher.csproj", "{A500694A-3649-4474-BC71-C835FA19B865}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,9 +52,6 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F9F7978B-89C0-4A54-8D80-A1E93E401D4C}
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F9F7978B-89C0-4A54-8D80-A1E93E401D4C}
-	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
 		$0.DotNetNamingPolicy = $1
diff --git a/lib/PuppeteerSharp/BrowserFetcher.cs b/lib/PuppeteerSharp/BrowserFetcher.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using System.Net;
 using System.IO.Compression;
+using PuppeteerSharp.Helpers.Linux;
 
 namespace PuppeteerSharp
 {
@@ -33,6 +34,13 @@ public class BrowserFetcher
             {Platform.Win64, "{0}/chromium-browser-snapshots/Win_x64/{1}/{2}.zip"}
         };
 
+        internal static readonly FilePermissions BrowserPermissionsInLinux =
+            FilePermissions.S_IRWXU |
+            FilePermissions.S_IRGRP |
+            FilePermissions.S_IXGRP |
+            FilePermissions.S_IROTH |
+            FilePermissions.S_IXOTH;
+
         /// <summary>
         /// Default chromiumg revision.
         /// </summary>
@@ -195,7 +203,13 @@ public async Task<RevisionInfo> DownloadAsync(int revision)
 
             new FileInfo(zipPath).Delete();
 
-            return RevisionInfo(revision);
+            var revisionInfo = RevisionInfo(revision);
+
+            if (revisionInfo != null && (GetCurrentPlatform() == Platform.Linux || GetCurrentPlatform() == Platform.MacOS))
+            {
+                LinuxSysCall.SetPermissions(revisionInfo.ExecutablePath, BrowserPermissionsInLinux);
+            }
+            return revisionInfo;
         }
 
         /// <summary>
diff --git a/lib/PuppeteerSharp/Helpers/Linux/FilePermissions.cs b/lib/PuppeteerSharp/Helpers/Linux/FilePermissions.cs
@@ -0,0 +1,27 @@
+﻿using System;
+namespace PuppeteerSharp.Helpers.Linux
+{
+    [Flags]
+    internal enum FilePermissions : uint
+    {
+        S_ISUID = 0x0800, // Set user ID on execution
+        S_ISGID = 0x0400, // Set group ID on execution
+        S_ISVTX = 0x0200, // Save swapped text after use (sticky).
+        S_IRUSR = 0x0100, // Read by owner
+        S_IWUSR = 0x0080, // Write by owner
+        S_IXUSR = 0x0040, // Execute by owner
+        S_IRGRP = 0x0020, // Read by group
+        S_IWGRP = 0x0010, // Write by group
+        S_IXGRP = 0x0008, // Execute by group
+        S_IROTH = 0x0004, // Read by other
+        S_IWOTH = 0x0002, // Write by other
+        S_IXOTH = 0x0001, // Execute by other
+
+        S_IRWXG = (S_IRGRP | S_IWGRP | S_IXGRP),
+        S_IRWXU = (S_IRUSR | S_IWUSR | S_IXUSR),
+        S_IRWXO = (S_IROTH | S_IWOTH | S_IXOTH),
+        ACCESSPERMS = (S_IRWXU | S_IRWXG | S_IRWXO), // 0777
+        ALLPERMS = (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO), // 07777
+        DEFFILEMODE = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH), // 0666
+    }
+}
diff --git a/lib/PuppeteerSharp/Helpers/Linux/LinuxSysCall.cs b/lib/PuppeteerSharp/Helpers/Linux/LinuxSysCall.cs
@@ -0,0 +1,60 @@
+﻿using System;
+using System.Runtime.InteropServices;
+
+namespace PuppeteerSharp.Helpers.Linux
+{
+    internal static class LinuxSysCall
+    {
+        [DllImport("libc", SetLastError = true, EntryPoint = "chmod")]
+        internal static extern int Chmod(string path, uint mode);
+
+        [DllImport("MonoPosixHelper", EntryPoint = "Mono_Posix_FromFilePermissions")]
+        internal static extern int FromFilePermissions(FilePermissions value, out uint rval);
+
+        [DllImport("MonoPosixHelper", EntryPoint = "helper_Mono_Posix_Stat")]
+        internal extern static int GetStats(
+            string filename,
+            bool dereference,
+            out int device,
+            out int inode,
+            out int mode,
+            out int nlinks,
+            out int uid,
+            out int gid,
+            out int rdev,
+            out long size,
+            out long blksize,
+            out long blocks,
+            out long atime,
+            out long mtime,
+            out long ctime);
+
+        internal static void SetPermissions(string path, FilePermissions filePermissions)
+        {
+            FromFilePermissions(filePermissions, out var permissions);
+            Chmod(path, permissions);
+        }
+
+        internal static FilePermissions GetFileMode(string filename)
+        {
+            GetStats(
+                filename,
+                false,
+                out var device,
+                out var inode,
+                out var mode,
+                out var nlinks,
+                out var uid,
+                out var gid,
+                out var rdev,
+                out var size,
+                out var blksize,
+                out var blocks,
+                out var atime,
+                out var mtime,
+                out var ctime);
+
+            return (FilePermissions)mode;
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public async Task ShouldClickTheButtonAfterNavigation()`
`166`	`166`	`public async Task ShouldUploadTheFile()`
`167`	`167`	`{`
`168`	`168`	`await Page.GoToAsync(TestConstants.ServerUrl + "/input/fileupload.html");`
`169`		`- var filePath = "./assets/file-to-upload.txt";`
	`169`	`+ var filePath = "./Assets/file-to-upload.txt";`
`170`	`170`	`var input = await Page.QuerySelectorAsync("input");`
`171`	`171`	`await input.UploadFileAsync(filePath);`
`172`	`172`	`Assert.Equal("file-to-upload.txt", await Page.EvaluateFunctionAsync<string>("e => e.files[0].name", input));`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public async Task ShouldFailWhenNavigatingAndShowTheUrlAtTheErrorMessage()`
`318`	`318`	`[Fact]`
`319`	`319`	`public async Task ResponseOkShouldBeTrueForFile()`
`320`	`320`	`{`
`321`		`- var fileToNavigate = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("assets", "file-to-upload.txt"));`
	`321`	`+ var fileToNavigate = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("Assets", "file-to-upload.txt"));`
`322`	`322`	`var url = new Uri(fileToNavigate).AbsoluteUri;`
`323`	`323`
`324`	`324`	`var response = await Page.GoToAsync(url);`