This PR updates the reports sent to include a more detailed OS version string, similar to what is used by the usagereporter and systeminfo call. It also reports parts of the destination hostname, if using S3 and the host is a known public cloud. This is done to avoid leaking internal hostnames or actual bucket names, but still provide some way to identify what storage service is used.
75 lines
4.1 KiB
C#
75 lines
4.1 KiB
C#
// Copyright (C) 2025, The Duplicati Team
|
|
// https://duplicati.com, hello@duplicati.com
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
|
// copy of this software and associated documentation files (the "Software"),
|
|
// to deal in the Software without restriction, including without limitation
|
|
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
// and/or sell copies of the Software, and to permit persons to whom the
|
|
// Software is furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
// DEALINGS IN THE SOFTWARE.
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Globalization;
|
|
using System.Threading.Tasks;
|
|
using Duplicati.Library.AutoUpdater;
|
|
|
|
namespace Duplicati.Library.Main.Operation
|
|
{
|
|
internal static class SystemInfoHandler
|
|
{
|
|
public static Task RunAsync(SystemInfoResults results)
|
|
=> Task.Run(() => results.Lines = GetSystemInfo().ToArray());
|
|
|
|
public static IEnumerable<string> GetSystemInfo()
|
|
{
|
|
yield return string.Format("Duplicati: {0} ({1})", Library.Utility.Utility.getEntryAssembly().FullName, System.Reflection.Assembly.GetExecutingAssembly().FullName);
|
|
|
|
yield return string.Format("Autoupdate urls: {0}", string.Join(";", AutoUpdater.AutoUpdateSettings.URLs));
|
|
yield return string.Format("Default data folder: {0}", AutoUpdater.DataFolderManager.GetDataFolder(DataFolderManager.AccessMode.ProbeOnly));
|
|
yield return string.Format("Install folder: {0}", AutoUpdater.UpdaterManager.INSTALLATIONDIR);
|
|
yield return string.Format("Version name: \"{0}\" ({1})", AutoUpdater.UpdaterManager.SelfVersion.Displayname, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
|
|
yield return string.Format("Current Version folder {0}", System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location));
|
|
|
|
yield return string.Format("OS: {0}", Library.Utility.OSInfoHelper.PlatformString);
|
|
yield return string.Format("OSType: {0}", AutoUpdater.UpdaterManager.OperatingSystemName);
|
|
|
|
yield return string.Format("64bit: {0} ({1})", Environment.Is64BitOperatingSystem, Environment.Is64BitProcess);
|
|
yield return string.Format("Machinename: {0}", Environment.MachineName);
|
|
yield return string.Format("Processors: {0}", Environment.ProcessorCount);
|
|
yield return string.Format(".Net Version: {0}", Environment.Version);
|
|
yield return string.Format("Locale: {0}, {1}, {2}", CultureInfo.CurrentCulture, CultureInfo.CurrentUICulture, CultureInfo.InstalledUICulture);
|
|
yield return string.Format("Date/time strings: {0} - {1}", CultureInfo.CurrentCulture.DateTimeFormat.LongDatePattern, CultureInfo.CurrentCulture.DateTimeFormat.LongTimePattern);
|
|
yield return string.Format("Tempdir: {0}", Library.Utility.TempFolder.SystemTempPath);
|
|
|
|
Type sqlite = null;
|
|
string sqliteversion = "";
|
|
|
|
try { sqlite = SQLiteHelper.SQLiteLoader.SQLiteConnectionType; }
|
|
catch { }
|
|
|
|
if (sqlite != null)
|
|
{
|
|
try { sqliteversion = SQLiteHelper.SQLiteLoader.SQLiteVersion; }
|
|
catch { }
|
|
|
|
yield return string.Format("SQLite: {0} - {1}", sqliteversion, sqlite.FullName);
|
|
yield return string.Format("SQLite assembly: {0}", sqlite.Assembly.Location);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|