From 7fb4da12ed47b2a5ee35a802a5e2f0bd1c25e0ef Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Tue, 5 Jul 2022 23:29:39 -0700 Subject: [PATCH] Use https for server URLs (#359) --- src/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs | 4 ++-- src/SymClient/Program.cs | 8 ++++---- src/SymClient/README.md | 4 ++-- src/dotnet-symbol/Program.cs | 6 +++--- src/dotnet-symbol/Properties/Resources.Designer.cs | 8 ++++---- src/dotnet-symbol/Properties/Resources.resx | 4 ++-- src/dotnet-symbol/README.md | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs b/src/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs index 8b3054ce..827de097 100644 --- a/src/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs +++ b/src/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs @@ -118,12 +118,12 @@ private async Task DownloadFile(FileStream downloadStream, Stream compareStream, SymbolStores.SymbolStore store = null; if (ms) { - Uri.TryCreate("http://msdl.microsoft.com/download/symbols/", UriKind.Absolute, out Uri uri); + Uri.TryCreate("https://msdl.microsoft.com/download/symbols/", UriKind.Absolute, out Uri uri); store = new HttpSymbolStore(_tracer, store, uri); } if (mi) { - Uri.TryCreate("http://symweb.corp.microsoft.com/", UriKind.Absolute, out Uri uri); + Uri.TryCreate("https://symweb/", UriKind.Absolute, out Uri uri); store = new SymwebHttpSymbolStore(_tracer, store, uri); } var generator = new FileKeyGenerator(_tracer, file); diff --git a/src/SymClient/Program.cs b/src/SymClient/Program.cs index ce76885e..fdb3f785 100644 --- a/src/SymClient/Program.cs +++ b/src/SymClient/Program.cs @@ -57,13 +57,13 @@ public static void Main(string[] args) { case "-ms": case "--microsoft-symbol-server": - Uri.TryCreate("http://msdl.microsoft.com/download/symbols/", UriKind.Absolute, out uri); + Uri.TryCreate("https://msdl.microsoft.com/download/symbols/", UriKind.Absolute, out uri); program.SymbolServers.Add(new ServerInfo {Uri = uri, PersonalAccessToken = null}); break; case "-mi": case "--ms-internal-server": - Uri.TryCreate("http://symweb.corp.microsoft.com/", UriKind.Absolute, out uri); + Uri.TryCreate("https://symweb/", UriKind.Absolute, out uri); program.SymbolServers.Add(new ServerInfo {Uri = uri, PersonalAccessToken = null, InternalSymwebServer = true}); break; @@ -219,8 +219,8 @@ private static void PrintUsage() { Console.WriteLine(@" SymClient [options] --ms|--microsoft-symbol-server Add 'http://msdl.microsoft.com/download/symbols' symbol server path --mi|--ms-internal-server Add 'http://symweb.corp.microsoft.com' symbol server path +-ms|--microsoft-symbol-server Add 'https://msdl.microsoft.com/download/symbols' symbol server path +-mi|--ms-internal-server Add 'https://symweb' symbol server path -s |--server-path Add a http server path -as|--authenticated-server-path Add a http PAT authenticated server path -c |--cache-directory Add a cache directory diff --git a/src/SymClient/README.md b/src/SymClient/README.md index 384c4ab5..0898346a 100644 --- a/src/SymClient/README.md +++ b/src/SymClient/README.md @@ -4,8 +4,8 @@ This tool can download all the files needed for debugging (symbols, modules, SOS SymClient [options] - -ms|--microsoft-symbol-server Add 'http://msdl.microsoft.com/download/symbols' symbol server path - -mi|--ms-internal-server Add 'http://symweb.corp.microsoft.com' symbol server path + -ms|--microsoft-symbol-server Add 'https://msdl.microsoft.com/download/symbols' symbol server path + -mi|--ms-internal-server Add 'https://symweb' symbol server path -s |--server-path Add a http server path -as|--authenticated-server-path Add a http PAT authenticated server path -c |--cache-directory Add a cache directory diff --git a/src/dotnet-symbol/Program.cs b/src/dotnet-symbol/Program.cs index 3aa85ac7..af38c029 100644 --- a/src/dotnet-symbol/Program.cs +++ b/src/dotnet-symbol/Program.cs @@ -60,12 +60,12 @@ public static void Main(string[] args) switch (args[i]) { case "--microsoft-symbol-server": - Uri.TryCreate("http://msdl.microsoft.com/download/symbols/", UriKind.Absolute, out uri); + Uri.TryCreate("https://msdl.microsoft.com/download/symbols/", UriKind.Absolute, out uri); program.SymbolServers.Add(new ServerInfo { Uri = uri, PersonalAccessToken = null }); break; case "--internal-server": - Uri.TryCreate("http://symweb.corp.microsoft.com/", UriKind.Absolute, out uri); + Uri.TryCreate("https://symweb/", UriKind.Absolute, out uri); program.SymbolServers.Add(new ServerInfo { Uri = uri, PersonalAccessToken = null, InternalSymwebServer = true }); break; @@ -187,7 +187,7 @@ public static void Main(string[] args) // Default to public Microsoft symbol server if (program.SymbolServers.Count == 0) { - Uri.TryCreate("http://msdl.microsoft.com/download/symbols/", UriKind.Absolute, out Uri uri); + Uri.TryCreate("https://msdl.microsoft.com/download/symbols/", UriKind.Absolute, out Uri uri); program.SymbolServers.Add(new ServerInfo { Uri = uri, PersonalAccessToken = null }); } foreach (ServerInfo server in program.SymbolServers) diff --git a/src/dotnet-symbol/Properties/Resources.Designer.cs b/src/dotnet-symbol/Properties/Resources.Designer.cs index 917d0377..5a9e6f7a 100644 --- a/src/dotnet-symbol/Properties/Resources.Designer.cs +++ b/src/dotnet-symbol/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace dotnet.symbol.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -112,10 +112,10 @@ internal static string NoInputFiles { /// <FILES> List of files. Can contain wildcards. /// ///Options: - /// --microsoft-symbol-server Add 'http://msdl.microsoft.com/download/symbols' symbol server path (default). - /// --internal-server Add 'http://symweb.corp.microsoft.com' internal symbol server path. + /// --microsoft-symbol-server Add 'https://msdl.microsoft.com/download/symbols' symbol server path (default). + /// --internal-server Add 'https://symweb' internal symbol server path. /// --server-path <symbol server path> Add a http server path. - /// --authenticated-server-path <pat> <server path> Add a http PA [rest of string was truncated]";. + /// --authenticated-server-path <pat> <server path> Add a http PAT authenticated s [rest of string was truncated]";. /// internal static string UsageOptions { get { diff --git a/src/dotnet-symbol/Properties/Resources.resx b/src/dotnet-symbol/Properties/Resources.resx index 6e8d6ddc..cba53603 100644 --- a/src/dotnet-symbol/Properties/Resources.resx +++ b/src/dotnet-symbol/Properties/Resources.resx @@ -139,8 +139,8 @@ Arguments: <FILES> List of files. Can contain wildcards. Options: - --microsoft-symbol-server Add 'http://msdl.microsoft.com/download/symbols' symbol server path (default). - --internal-server Add 'http://symweb.corp.microsoft.com' internal symbol server path. + --microsoft-symbol-server Add 'https://msdl.microsoft.com/download/symbols' symbol server path (default). + --internal-server Add 'https://symweb' internal symbol server path. --server-path <symbol server path> Add a http server path. --authenticated-server-path <pat> <server path> Add a http PAT authenticated server path. --cache-directory <file cache directory> Add a cache directory. diff --git a/src/dotnet-symbol/README.md b/src/dotnet-symbol/README.md index d2943373..110c0c3b 100644 --- a/src/dotnet-symbol/README.md +++ b/src/dotnet-symbol/README.md @@ -8,8 +8,8 @@ This tool can download all the files needed for debugging (symbols, modules, SOS List of files. Can contain wildcards. Options: - --microsoft-symbol-server Add 'http://msdl.microsoft.com/download/symbols' symbol server path (default). - --internal-server Add 'http://symweb.corp.microsoft.com' internal symbol server path. + --microsoft-symbol-server Add 'https://msdl.microsoft.com/download/symbols' symbol server path (default). + --internal-server Add 'https://symweb' internal symbol server path. --server-path Add a http server path. --authenticated-server-path Add a http PAT authenticated server path. --cache-directory Add a cache directory. @@ -45,7 +45,7 @@ This downloads just the host program needed to load a core dump on Linux or macO To download the symbol files for a specific assembly: - dotnet-symbol --symbols --cache-directory c:\temp\symcache --server-path http://symweb --output c:\temp\symout System.Threading.dll + dotnet-symbol --symbols --cache-directory c:\temp\symcache --server-path https://symweb --output c:\temp\symout System.Threading.dll Downloads all the symbol files for the shared runtime: