Add "Scanning..." and "Failed" messages to downloads and misc changes

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "ms-dotnettools.csharp",
+        "ms-dotnettools.csdevkit",
+        "ms-dotnettools.vscodeintellicode-csharp",
+        "avaloniateam.vscode-avalonia"
+    ]
+}

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      // Use IntelliSense to find out which attributes exist for C# debugging
+      // Use hover for the description of the existing attributes
+      // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
+      "name": ".NET Core Launch (console)",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/UnitystationLauncher/bin/Debug/net7.0/StationHub.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/UnitystationLauncher",
+      // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+      "console": "internalConsole",
+      "stopAtEntry": false
+    },
+    {
+      "name": ".NET Core Attach",
+      "type": "coreclr",
+      "request": "attach"
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,41 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/UnitystationLauncher.sln",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary;ForceNoAlign"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "publish",
+        "${workspaceFolder}/UnitystationLauncher.sln",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary;ForceNoAlign"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "watch",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "watch",
+        "run",
+        "--project",
+        "${workspaceFolder}/UnitystationLauncher.sln"
+      ],
+      "problemMatcher": "$msCompile"
+    }
+  ]
+}

UnitystationLauncher.Tests/MocksRepository/InstallationService/MockNoActiveDownloads.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using UnitystationLauncher.Models;
 using UnitystationLauncher.Models.Api;
 using UnitystationLauncher.Services.Interface;
@@ -22,7 +23,7 @@ public List<Installation> GetInstallations()
         return null;
     }
 
-    public (Download?, string) DownloadInstallation(Server server)
+    public Task<(Download?, string)> DownloadInstallationAsync(Server server)
     {
         throw new NotImplementedException();
     }

UnitystationLauncher.Tests/MocksRepository/PingService/MockPingReturnsNull.cs

@@ -6,7 +6,7 @@ namespace UnitystationLauncher.Tests.MocksRepository.PingService;
 
 public class MockPingReturnsNull : IPingService
 {
-    public Task<string> GetPing(Server server)
+    public Task<string> GetPingAsync(Server server)
     {
         return Task.FromResult(null as string)!;
     }

UnitystationLauncher.Tests/MocksRepository/PingService/MockPingStaticPingTime.cs

@@ -12,7 +12,7 @@ public MockPingStaticPingTime(int pingInMilliseconds)
     {
         _pingTime = $"{pingInMilliseconds}ms";
     }
-    public Task<string> GetPing(Server server)
+    public Task<string> GetPingAsync(Server server)
     {
         return Task.FromResult(_pingTime);
     }

UnitystationLauncher.Tests/MocksRepository/PingService/MockPingThrowsException.cs

@@ -6,7 +6,7 @@ namespace UnitystationLauncher.Tests.MocksRepository.PingService;
 
 public class MockPingThrowsException : IPingService
 {
-    public Task<string> GetPing(Server server)
+    public Task<string> GetPingAsync(Server server)
     {
         throw new();
     }

UnitystationLauncher/Constants/ApiUrls.cs

@@ -2,13 +2,20 @@ namespace UnitystationLauncher.Constants;
 
 public static class ApiUrls
 {
-    public const string ApiBaseUrl = "https://api.unitystation.org";
-    public const string ServerListUrl = $"{ApiBaseUrl}/serverlist";
-    public const string ValidateUrl = $"{ApiBaseUrl}/validatehubclient";
-    public const string ValidateTokenUrl = $"{ApiBaseUrl}/validatetoken?data=";
-    public const string SignOutUrl = $"{ApiBaseUrl}/signout?data=";
-
-    public const string ChangelogBaseUrl = "https://changelog.unitystation.org";
-    public const string Latest10VersionsUrl = $"{ChangelogBaseUrl}/all-changes?format=json&limit=10";
-    public const string LatestBlogPosts = $"{ChangelogBaseUrl}/posts/?format=json";
+    private static string ApiBaseUrl => "https://api.unitystation.org";
+    public static string ServerListUrl => $"{ApiBaseUrl}/serverlist";
+    public static string ValidateUrl => $"{ApiBaseUrl}/validatehubclient";
+    public static string ValidateTokenUrl => $"{ApiBaseUrl}/validatetoken?data=";
+    public static string SignOutUrl => $"{ApiBaseUrl}/signout?data=";
+
+    private static string ChangelogBaseUrl => "https://changelog.unitystation.org";
+    public static string Latest10VersionsUrl => $"{ChangelogBaseUrl}/all-changes?format=json&limit=10";
+    public static string LatestBlogPosts => $"{ChangelogBaseUrl}/posts/?format=json";
+
+    private static string CdnBaseUrl => "https://unitystationfile.b-cdn.net";
+    public static string GoodFilesBaseUrl => $"{CdnBaseUrl}/GoodFiles";
+    public static string AllowedGoodFilesUrl => $"{GoodFilesBaseUrl}/AllowGoodFiles.json";
+
+    private static string RawGitHubFileBaseUrl => "https://raw.githubusercontent.com/unitystation/unitystation/develop";
+    public static string CodeScanListUrl => $"{RawGitHubFileBaseUrl}/CodeScanList.json";
 }

UnitystationLauncher/Constants/AssemblyNames.cs

@@ -0,0 +1,6 @@
+namespace UnitystationLauncher.Constants;
+
+public static class AssemblyNames
+{
+    public const string SystemAssemblyName = "mscorlib";
+}

UnitystationLauncher/Constants/FolderNames.cs

@@ -0,0 +1,8 @@
+namespace UnitystationLauncher.Constants;
+
+public static class FolderNames
+{
+    public const string Managed = "Managed";
+    public const string Plugins = "Plugins";
+    public const string UnitystationData = "Unitystation_Data";
+}

UnitystationLauncher/ContentScanning/AssemblyTypeCheckerHelpers.cs

@@ -24,15 +24,11 @@ namespace UnitystationLauncher.ContentScanning;
 /// </summary>
 internal static class AssemblyTypeCheckerHelpers
 {
-    // Used to be in Sandbox.yml, moved out of there to facilitate faster loading.
-    internal const string SystemAssemblyName = "mscorlib"; //TODO check security
-    //UnityEngine.dll
-    //mscorlib
-    //System.Runtime
+    private static readonly bool _parallelReferencedMembersScanning = true;
 
-    internal static Resolver CreateResolver(DirectoryInfo ManagedPath)
+    internal static Resolver CreateResolver(DirectoryInfo managedPath)
     {
-        return new Resolver(ManagedPath);
+        return new(managedPath);
     }
 
     internal static string FormatMethodName(MetadataReader reader, MethodDefinition method)
@@ -57,13 +53,13 @@ internal static void CheckNoUnmanagedMethodDefs(MetadataReader reader, Concurren
                 or MethodImplAttributes.Runtime))
             {
                 string err = $"Method has illegal MethodImplAttributes: {FormatMethodName(reader, methodDef)}";
-                errors.Add(new SandboxError(err));
+                errors.Add(new(err));
             }
 
             if ((attr & (MethodAttributes.PinvokeImpl | MethodAttributes.UnmanagedExport)) != 0)
             {
                 string err = $"Method has illegal MethodAttributes: {FormatMethodName(reader, methodDef)}";
-                errors.Add(new SandboxError(err));
+                errors.Add(new(err));
             }
         }
     }
@@ -83,7 +79,7 @@ internal static void CheckNoTypeAbuse(MetadataReader reader, ConcurrentBag<Sandb
                 if (typeDef.GetFields().Count > 0)
                 {
                     string err = $"Explicit layout type {type} may not have fields.";
-                    errors.Add(new SandboxError(err));
+                    errors.Add(new(err));
                 }
             }
         }
@@ -99,7 +95,7 @@ internal static List<MTypeReferenced> GetReferencedTypes(MetadataReader reader,
                 }
                 catch (UnsupportedMetadataException e)
                 {
-                    errors.Add(new SandboxError(e));
+                    errors.Add(new(e));
                     return null;
                 }
             })
@@ -109,8 +105,7 @@ internal static List<MTypeReferenced> GetReferencedTypes(MetadataReader reader,
 
     internal static List<MMemberRef> GetReferencedMembers(MetadataReader reader, ConcurrentBag<SandboxError> errors)
     {
-        bool Parallel = true;
-        if (Parallel)
+        if (_parallelReferencedMembersScanning)
         {
             return reader.MemberReferences.AsParallel()
                 .Select(memRefHandle =>
@@ -130,7 +125,7 @@ internal static List<MMemberRef> GetReferencedMembers(MetadataReader reader, Con
                                 }
                                 catch (UnsupportedMetadataException u)
                                 {
-                                    errors.Add(new SandboxError(u));
+                                    errors.Add(new(u));
                                     return null;
                                 }
 
@@ -144,7 +139,7 @@ internal static List<MMemberRef> GetReferencedMembers(MetadataReader reader, Con
                                 }
                                 catch (UnsupportedMetadataException u)
                                 {
-                                    errors.Add(new SandboxError(u));
+                                    errors.Add(new(u));
                                     return null;
                                 }
 
@@ -154,7 +149,7 @@ internal static List<MMemberRef> GetReferencedMembers(MetadataReader reader, Con
                             {
                                 TypeSpecification typeSpec = reader.GetTypeSpecification((TypeSpecificationHandle)memRef.Parent);
                                 // Generic type reference.
-                                TypeProvider provider = new TypeProvider();
+                                TypeProvider provider = new();
                                 parent = typeSpec.DecodeSignature(provider, 0);
 
                                 if (parent.IsCoreTypeDefined())
@@ -168,18 +163,18 @@ internal static List<MMemberRef> GetReferencedMembers(MetadataReader reader, Con
                             }
                         case HandleKind.ModuleReference:
                             {
-                                errors.Add(new SandboxError(
+                                errors.Add(new(
                                     $"Module global variables and methods are unsupported. Name: {memName}"));
                                 return null;
                             }
                         case HandleKind.MethodDefinition:
                             {
-                                errors.Add(new SandboxError($"Vararg calls are unsupported. Name: {memName}"));
+                                errors.Add(new($"Vararg calls are unsupported. Name: {memName}"));
                                 return null;
                             }
                         default:
                             {
-                                errors.Add(new SandboxError(
+                                errors.Add(new(
                                     $"Unsupported member ref parent type: {memRef.Parent.Kind}. Name: {memName}"));
                                 return null;
                             }
@@ -236,7 +231,7 @@ internal static List<MMemberRef> GetReferencedMembers(MetadataReader reader, Con
                                 }
                                 catch (UnsupportedMetadataException u)
                                 {
-                                    errors.Add(new SandboxError(u));
+                                    errors.Add(new(u));
                                     return null;
                                 }
 
@@ -250,7 +245,7 @@ internal static List<MMemberRef> GetReferencedMembers(MetadataReader reader, Con
                                 }
                                 catch (UnsupportedMetadataException u)
                                 {
-                                    errors.Add(new SandboxError(u));
+                                    errors.Add(new(u));
                                     return null;
                                 }
 
@@ -260,7 +255,7 @@ internal static List<MMemberRef> GetReferencedMembers(MetadataReader reader, Con
                             {
                                 TypeSpecification typeSpec = reader.GetTypeSpecification((TypeSpecificationHandle)memRef.Parent);
                                 // Generic type reference.
-                                TypeProvider provider = new TypeProvider();
+                                TypeProvider provider = new();
                                 parent = typeSpec.DecodeSignature(provider, 0);
 
                                 if (parent.IsCoreTypeDefined())
@@ -274,18 +269,18 @@ internal static List<MMemberRef> GetReferencedMembers(MetadataReader reader, Con
                             }
                         case HandleKind.ModuleReference:
                             {
-                                errors.Add(new SandboxError(
+                                errors.Add(new(
                                     $"Module global variables and methods are unsupported. Name: {memName}"));
                                 return null;
                             }
                         case HandleKind.MethodDefinition:
                             {
-                                errors.Add(new SandboxError($"Vararg calls are unsupported. Name: {memName}"));
+                                errors.Add(new($"Vararg calls are unsupported. Name: {memName}"));
                                 return null;
                             }
                         default:
                             {
-                                errors.Add(new SandboxError(
+                                errors.Add(new(
                                     $"Unsupported member ref parent type: {memRef.Parent.Kind}. Name: {memName}"));
                                 return null;
                             }
@@ -344,14 +339,14 @@ internal static bool ParseInheritType(MType ownerType, EntityHandle handle, [Not
                 }
                 catch (UnsupportedMetadataException u)
                 {
-                    errors.Add(new SandboxError(u));
+                    errors.Add(new(u));
                     return false;
                 }
 
             case HandleKind.TypeSpecification:
                 TypeSpecification typeSpec = reader.GetTypeSpecification((TypeSpecificationHandle)handle);
                 // Generic type reference.
-                TypeProvider provider = new TypeProvider();
+                TypeProvider provider = new();
                 type = typeSpec.DecodeSignature(provider, 0);
 
                 if (type.IsCoreTypeDefined())
@@ -364,7 +359,7 @@ internal static bool ParseInheritType(MType ownerType, EntityHandle handle, [Not
                 break;
 
             default:
-                errors.Add(new SandboxError(
+                errors.Add(new(
                     $"Unsupported BaseType of kind {handle.Kind} on type {ownerType}"));
                 return false;
         }
@@ -421,7 +416,7 @@ internal static MTypeReferenced ParseTypeReference(MetadataReader reader, TypeRe
                     $"TypeRef to {typeRef.ResolutionScope.Kind} for type {nameSpace}.{name}");
         }
 
-        return new MTypeReferenced(resScope, name, nameSpace);
+        return new(resScope, name, nameSpace);
     }
 
     internal static string? NilNullString(MetadataReader reader, StringHandle handle)
@@ -442,6 +437,6 @@ internal static MTypeDefined GetTypeFromDefinition(MetadataReader reader, TypeDe
             enclosing = GetTypeFromDefinition(reader, typeDef.GetDeclaringType());
         }
 
-        return new MTypeDefined(name, ns, enclosing);
+        return new(name, ns, enclosing);
     }
 }