bitwarden · justindbaur · Oct 25, 2024 · Oct 18, 2024 · Oct 23, 2024 · Oct 23, 2024
@@ -1,4 +1,3 @@
-using System.Text.Json.Nodes;
 using Bitwarden.Extensions.Hosting.Features;
 
 var builder = WebApplication.CreateBuilder(args);

@@ -1,4 +1,4 @@
-using Bitwarden.Extensions.Hosting.Exceptions;
+using Bitwarden.Extensions.Hosting.Exceptions;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
 

@@ -1,4 +1,4 @@
-namespace Bitwarden.Extensions.Hosting;
+namespace Bitwarden.Extensions.Hosting;
 
 /// <summary>
 /// Options for configuring the Bitwarden host.

@@ -1,5 +1,3 @@
-using System.Text.Json.Nodes;
-
 namespace Bitwarden.Extensions.Hosting.Features;
 
 /// <summary>

@@ -1,4 +1,3 @@
-using System.Text.Json.Nodes;
 using Bitwarden.Extensions.Hosting.Features;
 
 namespace Microsoft.Extensions.DependencyInjection;

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
-using System.Text.Json;
 using System.Text.Json.Nodes;
+using Bitwarden.Extensions.Hosting.Utilities;
 using LaunchDarkly.Logging;
 using LaunchDarkly.Sdk;
 using LaunchDarkly.Sdk.Server;
@@ -65,8 +65,8 @@
        var flagValues = new Dictionary<string, JsonValue>();

        if (!flagsState.Valid)
        {
            return flagValues;
        }

        foreach (var knownFlag in _featureFlagOptions.CurrentValue.KnownFlags)
@@ -100,24 +100,24 @@
        static void AddCommon(ContextBuilder contextBuilder, HttpContext httpContext)
        {
            if (httpContext.Request.Headers.TryGetValue("bitwarden-client-version", out var clientVersion))
            {
                contextBuilder.Set("client-version", clientVersion);
            }

            if (httpContext.Request.Headers.TryGetValue("device-type", out var deviceType))
            {
                contextBuilder.Set("device-type", deviceType);
            }
        }

        var httpContext = _httpContextAccessor.HttpContext;
        if (httpContext == null)
        {
            _logger.LogMissingHttpContext();
            return Context.Builder(AnonymousUser)
                .Kind(ContextKind.Default)
                .Anonymous(true)
                .Build();
        }

        // TODO: We need to start enforcing this
@@ -135,15 +135,15 @@
        }

        // TODO: Need to start enforcing this
        var organizations = httpContext.User.FindAll("organization");

        var contextBuilder = Context.Builder(subject)
            .Kind(ContextKind.Default) // TODO: This is not right
            .Set("organizations", LdValue.ArrayFrom(organizations.Select(c => LdValue.Of(c.Value))));

        AddCommon(contextBuilder, httpContext);

        return contextBuilder.Build();
    }
 }

@@ -152,6 +152,7 @@
 {
     private readonly ILoggerFactory _loggerFactory;
     private readonly IHostEnvironment _hostEnvironment;
+    private readonly VersionInfo _versionInfo;
 
     private LdClient _client;
 
@@ -163,6 +164,15 @@
         _loggerFactory = loggerFactory;
         _hostEnvironment = hostEnvironment;
 
+        var versionInfo = _hostEnvironment.GetVersionInfo();
+
+        if (versionInfo == null)
+        {
+            throw new InvalidOperationException("Unable to attain version information for the current application.");
+        }
+
+        _versionInfo = versionInfo;
+
         BuildClient(featureFlagOptions.CurrentValue);
         // Subscribe to options changes.
         featureFlagOptions.OnChange(BuildClient);
@@ -176,8 +186,8 @@
             .ApplicationInfo(Components.ApplicationInfo()
                 .ApplicationId(_hostEnvironment.ApplicationName)
                 .ApplicationName(_hostEnvironment.ApplicationName)
-                .ApplicationVersion(AssemblyHelpers.GetGitHash() ?? $"v{AssemblyHelpers.GetVersion()}")
-            // .ApplicationVersionName(AssemblyHelpers.GetVersion()) THIS DOESN'T WORK
+                .ApplicationVersion(_versionInfo.GitHash)
+                .ApplicationVersionName(_versionInfo.Version.ToString())
             )
             .DataSource(BuildDataSource(featureFlagOptions.FlagValues))
             .Events(Components.NoEvents);
@@ -203,13 +213,13 @@
                flag.ValueForAll(LdValue.Of(boolValue));
            }
            else if (int.TryParse(valueSpan, out var intValue))
            {
                flag.ValueForAll(LdValue.Of(intValue));
            }
            else
            {
                flag.ValueForAll(LdValue.Of(value));
            }

            source.Update(flag);
        }

@@ -1,4 +1,4 @@
-namespace Bitwarden.Extensions.Hosting;
+namespace Bitwarden.Extensions.Hosting;
 
 /// <summary>
 /// Global settings.

@@ -0,0 +1,33 @@
+using System.Reflection;
+using Microsoft.Extensions.Hosting;
+
+namespace Bitwarden.Extensions.Hosting.Utilities;
+
+internal static class HostEnvironmentExtensions
+{
+    public static VersionInfo? GetVersionInfo(this IHostEnvironment hostEnvironment)
+    {
+        try
+        {
+            var appAssembly = Assembly.Load(new AssemblyName(hostEnvironment.ApplicationName));
+            var assemblyInformationalVersionAttribute = appAssembly
+                .GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+
+            if (assemblyInformationalVersionAttribute == null)
+            {
+                return null;
+            }
+
+            if (!VersionInfo.TryParse(assemblyInformationalVersionAttribute.InformationalVersion, null, out var versionInfo))
+            {
+                return null;
+            }
+
+            return versionInfo;
+        }
+        catch (FileNotFoundException)
+        {
+            return null;
+        }
+    }
+}
@@ -0,0 +1,68 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
+
+namespace Bitwarden.Extensions.Hosting;
+
+internal sealed partial class VersionInfo : ISpanParsable<VersionInfo>
+{
+    [GeneratedRegex("[0-9a-f]{5,40}")]
+    private static partial Regex GitHashRegex();
+
+    private VersionInfo(Version version, string gitHash)
+    {
+        Version = version;
+        GitHash = gitHash;
+    }
+
+    public Version Version { get; }
+    public string GitHash { get; }
+
+    /// <inheritdoc />
+    public static VersionInfo Parse(ReadOnlySpan<char> s, IFormatProvider? provider)
+    {
+        if (!TryParse(s, provider, out var result))
+        {
+            throw new FormatException();
+        }
+
+        return result;
+    }
+
+    /// <inheritdoc />
+    public static VersionInfo Parse(string? s, IFormatProvider? provider)
+        => Parse(s.AsSpan(), provider);
+
+    /// <inheritdoc />
+    public static bool TryParse(
+        ReadOnlySpan<char> s,
+        IFormatProvider? provider,
+        [MaybeNullWhen(returnValue: false)] out VersionInfo result)
+    {
+        result = null;
+        var plusIndex = s.IndexOf('+');
+
+        if (plusIndex == -1)
+        {
+            return false;
+        }
+
+        if (!Version.TryParse(s[0..plusIndex], out var version))
+        {
+            return false;
+        }
+
+        var gitHash = s[++plusIndex..];
+
+        if (!GitHashRegex().IsMatch(gitHash))
+        {
+            return false;
+        }
+
+        result = new VersionInfo(version, gitHash.ToString());
+        return true;
+    }
+
+    /// <inheritdoc />
+    public static bool TryParse(string? s, IFormatProvider? provider, [MaybeNullWhen(returnValue: false)] out VersionInfo result)
+        => TryParse(s.AsSpan(), provider, out result);
+}
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.Http.Json;
-using System.Text.Json.Nodes;
 using Bitwarden.Extensions.Hosting.Features;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;

@@ -1,4 +1,3 @@
-using System.Text.Json.Nodes;
 using Bitwarden.Extensions.Hosting.Features;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;

@@ -3,8 +3,8 @@
 using LaunchDarkly.Sdk.Server;
 using LaunchDarkly.Sdk.Server.Interfaces;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
 using NSubstitute;
 
 namespace Bitwarden.Extensions.Hosting.Tests.Features;

@@ -0,0 +1,28 @@
+namespace Bitwarden.Extensions.Hosting.Tests.Utilities;
+
+public class VersionInfoTests
+{
+    [Theory]
+    [InlineData("1.0.0+af18b2952b5ddf910bd2f729a7c89a04b8d67084", "1.0.0", "af18b2952b5ddf910bd2f729a7c89a04b8d67084")]
+    [InlineData("1.0.0+af18b", "1.0.0", "af18b")]
+    public void TryParse_Works(string input, string version, string gitHash)
+    {
+        var success = VersionInfo.TryParse(input, null, out var versionInfo);
+
+        Assert.True(success);
+        Assert.Equal(version, versionInfo!.Version.ToString());
+        Assert.Equal(gitHash, versionInfo.GitHash);
+    }
+
+    [Theory]
+    [InlineData("")]
+    [InlineData(null)]
+    [InlineData("1.0.0")]
+    [InlineData("1.0.0+")]
+    [InlineData("1.0.0+af18")]
+    [InlineData("1.0.0+XXXXXXX")]
+    public void TryParse_Fails(string? input)
+    {
+        Assert.False(VersionInfo.TryParse(input, null, out _));
+    }
+}