From 9ea2b055c43b695a280bd3cc6249617979c3a742 Mon Sep 17 00:00:00 2001 From: Robin Dittrich Date: Tue, 24 Mar 2026 16:21:33 +0100 Subject: [PATCH 01/44] Update to dotnet 10, fix namespaces and code consistency --- Dockerfile | 4 +-- global.json | 2 +- .../BaGetter.Protocol.Samples.Tests.csproj | 2 +- .../Sample03_Metadata.cs | 5 ++-- .../BaGetterWebApplication.csproj | 2 +- samples/BaGetterWebApplication/Program.cs | 8 +++--- .../AliyunApplicationExtensions.cs | 6 +++-- src/BaGetter.Aliyun/AliyunStorageService.cs | 2 +- src/BaGetter.Aliyun/BaGetter.Aliyun.csproj | 2 +- src/BaGetter.Aws/AwsApplicationExtensions.cs | 6 +++-- src/BaGetter.Aws/BaGetter.Aws.csproj | 3 +-- src/BaGetter.Aws/S3StorageOptions.cs | 2 +- src/BaGetter.Aws/S3StorageService.cs | 2 +- .../AzureApplicationExtensions.cs | 10 ++++++-- src/BaGetter.Azure/BaGetter.Azure.csproj | 3 +-- .../Configuration/AzureBlobStorageOptions.cs | 4 +-- .../Configuration/AzureSearchOptions.cs | 2 +- .../Configuration/AzureTableOptions.cs | 2 +- .../Extensions/StorageExceptionExtensions.cs | 4 +-- .../Storage/BlobStorageService.cs | 6 +++-- src/BaGetter.Azure/Table/PackageEntity.cs | 4 +-- .../Table/PackageEntityExtensions.cs | 4 +-- .../Table/TableOperationBuilder.cs | 4 +-- .../Table/TablePackageDatabase.cs | 5 +++- .../Table/TableSearchService.cs | 7 ++++-- .../ApiKeyAuthenticationService.cs | 2 +- .../Authentication/AuthenticationConstants.cs | 8 +----- .../Authentication/IAuthenticationService.cs | 2 +- src/BaGetter.Core/BaGetter.Core.csproj | 2 +- src/BaGetter.Core/Configuration/ApiKey.cs | 6 ----- .../Configuration/BaGetterOptions.cs | 3 +-- .../Configuration/BindOptions.cs | 2 +- .../Configuration/DatabaseOptions.cs | 2 +- .../Configuration/FileSystemStorageOptions.cs | 2 +- .../Configuration/HealthCheckOptions.cs | 2 +- .../MirrorAuthenticationOptions.cs | 2 +- .../Configuration/MirrorAuthenticationType.cs | 2 +- .../Configuration/MirrorOptions.cs | 2 +- .../NugetAuthenticationOptions.cs | 4 +-- .../Configuration/NugetCredentials.cs | 2 +- .../Configuration/PackageDeletionBehavior.cs | 2 +- .../Configuration/PackageOverwriteAllowed.cs | 2 +- .../Configuration/RetentionOptions.cs | 2 +- .../Configuration/SearchOptions.cs | 2 +- .../Configuration/StatisticsOptions.cs | 2 +- .../Configuration/StorageOptions.cs | 2 +- .../Content/DefaultPackageContentService.cs | 3 ++- .../Content/IPackageContentService.cs | 2 +- src/BaGetter.Core/Entities/AbstractContext.cs | 3 ++- .../Converters/StringArrayComparer.cs | 2 +- .../Converters/StringArrayToJsonConverter.cs | 2 +- .../Converters/UriToStringConverter.cs | 2 +- src/BaGetter.Core/Entities/IContext.cs | 2 +- src/BaGetter.Core/Entities/NullContext.cs | 2 +- src/BaGetter.Core/Entities/Package.cs | 2 +- .../Entities/PackageDependency.cs | 2 +- src/BaGetter.Core/Entities/PackageType.cs | 2 +- src/BaGetter.Core/Entities/SemVerLevel.cs | 2 +- src/BaGetter.Core/Entities/TargetFramework.cs | 2 +- .../BaGetterApplicationExtensions.cs | 6 +++-- ...DependencyInjectionExtensions.Providers.cs | 5 +++- .../DependencyInjectionExtensions.cs | 14 ++++++++++- .../Extensions/HealthCheckExtensions.cs | 1 + src/BaGetter.Core/Extensions/IProvider.cs | 2 +- .../PackageArchiveReaderExtensions.cs | 3 ++- .../Extensions/StreamExtensions.cs | 3 +-- src/BaGetter.Core/Extensions/SystemTime.cs | 2 +- src/BaGetter.Core/IPackageDatabase.cs | 2 ++ src/BaGetter.Core/IPackageService.cs | 2 ++ .../Indexing/FrameworkCompatibilityService.cs | 2 +- .../IFrameworkCompatibilityService.cs | 2 +- .../Indexing/IPackageDeletionService.cs | 3 ++- .../Indexing/IPackageIndexingService.cs | 2 +- .../Indexing/ISymbolIndexingService.cs | 2 +- .../Indexing/PackageDeletionService.cs | 5 +++- .../Indexing/PackageIndexingService.cs | 7 +++++- .../Indexing/SymbolIndexingService.cs | 4 ++- .../BaGetRegistrationIndexPageItem.cs | 2 +- .../Metadata/BaGetterPackageMetadata.cs | 2 +- .../Metadata/BaGetterRegistrationIndexPage.cs | 2 +- .../BaGetterRegistrationIndexResponse.cs | 2 +- .../Metadata/DefaultPackageMetadataService.cs | 2 +- .../Metadata/IPackageMetadataService.cs | 2 +- .../Metadata/PackageRegistration.cs | 3 ++- .../Metadata/RegistrationBuilder.cs | 3 ++- src/BaGetter.Core/PackageDatabase.cs | 1 + src/BaGetter.Core/PackageService.cs | 3 +++ .../Search/AutocompleteRequest.cs | 2 +- .../Search/DatabaseSearchService.cs | 5 +++- .../Search/DependentsResponse.cs | 2 +- src/BaGetter.Core/Search/ISearchIndexer.cs | 3 ++- .../Search/ISearchResponseBuilder.cs | 3 ++- src/BaGetter.Core/Search/ISearchService.cs | 2 +- src/BaGetter.Core/Search/NullSearchIndexer.cs | 3 ++- src/BaGetter.Core/Search/NullSearchService.cs | 2 +- src/BaGetter.Core/Search/SearchRequest.cs | 2 +- .../Search/SearchResponseBuilder.cs | 3 ++- src/BaGetter.Core/Search/VersionsRequest.cs | 2 +- .../ServiceIndex/BaGetterServiceIndex.cs | 2 +- .../ServiceIndex/IServiceIndexService.cs | 2 +- .../Statistics/StatisticsService.cs | 2 ++ .../Storage/FileStorageService.cs | 4 ++- .../Storage/IPackageStorageService.cs | 3 ++- src/BaGetter.Core/Storage/IStorageService.cs | 2 +- .../Storage/ISymbolStorageService.cs | 2 +- .../Storage/NullStorageService.cs | 2 +- .../Storage/PackageStorageService.cs | 3 ++- .../Storage/SymbolStorageService.cs | 2 +- .../Clients/DisabledUpstreamClient.cs | 3 ++- .../Upstream/Clients/V2UpstreamClient.cs | 4 ++- .../Upstream/Clients/V3UpstreamClient.cs | 5 +++- .../Upstream/DownloadsImporter.cs | 3 ++- .../Upstream/IPackageDownloadsSource.cs | 2 +- src/BaGetter.Core/Upstream/IUpstreamClient.cs | 7 +++--- .../Upstream/PackageDownloadsJsonSource.cs | 2 +- .../Validation/RequiredIfAttribute.cs | 2 +- .../Validation/ValidateBaGetOptions.cs | 2 +- .../Validation/ValidateStartupOptions.cs | 3 ++- .../BaGetter.Database.MySql.csproj | 2 +- .../MySqlApplicationExtensions.cs | 5 ++-- src/BaGetter.Database.MySql/MySqlContext.cs | 3 ++- .../BaGetter.Database.PostgreSql.csproj | 2 +- .../PostgreSqlApplicationExtensions.cs | 5 ++-- .../PostgreSqlContext.cs | 3 ++- .../BaGetter.Database.SqlServer.csproj | 2 +- .../SqlServerApplicationExtensions.cs | 5 ++-- .../SqlServerContext.cs | 3 ++- .../BaGetter.Database.Sqlite.csproj | 2 +- .../SqliteApplicationExtensions.cs | 5 ++-- src/BaGetter.Database.Sqlite/SqliteContext.cs | 3 ++- src/BaGetter.Gcp/BaGetter.Gcp.csproj | 2 +- .../GoogleCloudApplicationExtensions.cs | 6 +++-- src/BaGetter.Gcp/GoogleCloudStorageOptions.cs | 2 +- src/BaGetter.Gcp/GoogleCloudStorageService.cs | 3 +-- .../BaGetter.Protocol.csproj | 2 +- .../Catalog/CatalogClient.cs | 2 ++ .../Catalog/CatalogProcessor.cs | 4 +-- .../Catalog/ICatalogClient.cs | 2 +- .../Catalog/NullCatalogClient.cs | 2 +- .../Catalog/RawCatalogClient.cs | 3 ++- .../PackageDependencyRangeJsonConverter.cs | 2 +- .../StringOrStringArrayJsonConverter.cs | 2 +- .../Extensions/CatalogModelExtensions.cs | 2 +- .../Extensions/HttpClientExtensions.cs | 2 +- .../NuGetClientFactoryExtensions.cs | 2 +- .../PackageContentModelExtensions.cs | 2 +- .../PackageMetadataModelExtensions.cs | 6 ++--- .../Extensions/SearchModelExtensions.cs | 2 +- .../Extensions/ServiceIndexModelExtensions.cs | 2 +- .../Models/DependencyItem.cs | 2 +- .../Models/PackageMetadata.cs | 2 +- src/BaGetter.Protocol/Models/SearchResult.cs | 2 +- src/BaGetter.Protocol/NuGetClient.cs | 14 +++++++---- src/BaGetter.Protocol/NuGetClientFactory.cs | 7 +++++- .../PackageContent/IPackageContentClient.cs | 2 +- .../PackageContent/PackageContentClient.cs | 2 ++ .../PackageContent/RawPackageContentClient.cs | 3 ++- .../PackageMetadata/IPackageMetadataClient.cs | 2 +- .../PackageMetadata/PackageMetadataClient.cs | 2 ++ .../RawPackageMetadataClient.cs | 3 ++- .../Search/AutocompleteClient.cs | 2 ++ .../Search/IAutocompleteClient.cs | 2 +- src/BaGetter.Protocol/Search/ISearchClient.cs | 2 +- .../Search/NullAutocompleteClient.cs | 2 +- .../Search/RawAutocompleteClient.cs | 3 ++- .../Search/RawSearchClient.cs | 3 ++- src/BaGetter.Protocol/Search/SearchClient.cs | 2 ++ .../ServiceIndex/IServiceIndexClient.cs | 2 +- .../ServiceIndex/RawServiceIndexClient.cs | 3 ++- .../ServiceIndex/ServiceIndexClient.cs | 2 ++ src/BaGetter.Tencent/BaGetter.Tencent.csproj | 2 +- .../TencentApplicationExtensions.cs | 3 +++ src/BaGetter.Tencent/TencentStorageService.cs | 2 +- .../NugetBasicAuthenticationHandler.cs | 2 +- src/BaGetter.Web/BaGetter.Web.csproj | 4 +-- src/BaGetter.Web/BaGetterEndpointBuilder.cs | 3 +-- .../Controllers/PackageContentController.cs | 6 ++--- .../Controllers/PackageMetadataController.cs | 6 ++--- .../Controllers/PackagePublishController.cs | 6 ++++- .../Controllers/SearchController.cs | 6 ++--- .../Controllers/ServiceIndexController.cs | 6 ++--- .../Controllers/SymbolController.cs | 9 ++++--- .../Extensions/HttpRequestExtensions.cs | 4 +-- .../IApplicationBuilderExtensions.cs | 2 +- .../Extensions/IHostExtensions.cs | 5 +++- .../IServiceCollectionExtensions.cs | 8 +++--- .../Extensions/RazorExtensions.cs | 2 +- src/BaGetter.Web/Pages/Index.cshtml | 20 ++++++++------- src/BaGetter.Web/Pages/Index.cshtml.cs | 4 +-- src/BaGetter.Web/Pages/Package.cshtml | 25 +++++++++++-------- src/BaGetter.Web/Pages/Package.cshtml.cs | 5 +++- src/BaGetter.Web/Pages/Shared/_Layout.cshtml | 2 +- src/BaGetter.Web/Pages/Statistics.cshtml | 1 + src/BaGetter.Web/Pages/Statistics.cshtml.cs | 4 +-- src/BaGetter.Web/Pages/Upload.cshtml | 9 ++++--- src/BaGetter.Web/Pages/_ViewImports.cshtml | 6 +---- src/BaGetter/BaGetter.csproj | 2 +- src/BaGetter/ConfigureBaGetterServer.cs | 2 +- src/BaGetter/IServiceCollectionExtensions.cs | 3 +-- src/BaGetter/Program.cs | 4 +-- src/BaGetter/Startup.cs | 18 +++++++++---- src/BaGetter/ValidateBaGetterOptions.cs | 6 +---- .../BaGetter.Core.Tests.csproj | 2 +- .../DefaultPackageMetadataServiceTests.cs | 2 ++ .../Metadata/ModelTests.cs | 1 + .../Metadata/PackageRegistrationTests.cs | 2 ++ .../Metadata/RegistrationBuilderTests.cs | 2 ++ .../Search/DatabaseSearchServiceTests.cs | 3 +++ .../Search/SearchResponseBuilderTests.cs | 4 +++ .../Services/FileStorageServiceTests.cs | 2 ++ .../Services/PackageDatabaseTests.cs | 1 + .../Services/PackageDeletionServiceTests.cs | 4 +++ .../PackageIndexingServiceInMemoryTests.cs | 8 +++++- .../Services/PackageIndexingServiceTests.cs | 7 +++++- .../Services/PackageServiceTests.cs | 13 ++++++---- .../Services/PackageStorageServiceTests.cs | 2 ++ .../BaGetter.Core.Tests/Support/Generator.cs | 2 ++ .../Support/InMemoryPackageDatabase.cs | 2 +- .../Support/NullStorageService.cs | 3 +-- .../Upstream/DisabledUpstreamClientTests.cs | 1 + .../Upstream/DownloadsImporterTests.cs | 2 ++ .../PackageDownloadsJsonSourceTests.cs | 1 + .../Upstream/UpstreamAuthenticationTests.cs | 2 ++ .../Upstream/V3UpstreamClientTests.cs | 2 ++ .../BaGetter.Protocol.Tests.csproj | 2 +- ...ackageDependencyRangeJsonConverterTests.cs | 4 +-- .../StringOrStringArrayJsonConverterTests.cs | 4 +-- .../Models/PackageMetadataTests.cs | 9 +++---- .../NuGetClientFactoryTests.cs | 1 + .../NuGetClientTests.cs | 1 + .../RawAutocompleteClientTests.cs | 3 ++- .../RawCatalogClientTests.cs | 4 +-- .../RawPackageContentClientTests.cs | 3 ++- .../RawPackageMetadataClientTests.cs | 3 ++- .../RawSearchClientTests.cs | 3 ++- .../RawServiceIndexClientTests.cs | 4 ++- .../Support/ProtocolFixture.cs | 9 ++++--- .../Support/TestDataHttpMessageHandler.cs | 2 +- tests/BaGetter.Tests/ApiIntegrationTests.cs | 3 ++- .../BaGetClientIntegrationTests.cs | 14 ++++++----- .../BaGetter - Backup.Tests.csproj | 15 ++++++----- tests/BaGetter.Tests/BaGetter.Tests.csproj | 2 +- tests/BaGetter.Tests/HostIntegrationTests.cs | 2 +- .../BaGetter.Tests/MirrorIntegrationTests.cs | 1 + .../NuGetClientIntegrationTests.cs | 1 + ...AnonymousAuthenticationIntegrationTests.cs | 5 +--- .../NugetAuthenticationIntegrationTests.cs | 9 ++----- .../Support/BaGetApplication.cs | 8 +++--- .../HttpSourceResourceProviderTestHost.cs | 2 +- .../Support/StreamExtensions.cs | 2 +- tests/BaGetter.Tests/Support/TestResources.cs | 2 +- .../Support/TestableHttpSource.cs | 2 +- tests/BaGetter.Tests/Support/XunitLogger.cs | 2 +- .../Support/XunitLoggerProvider.cs | 2 +- .../TestData/TestData.Designer.cs | 5 +--- .../NugetBasicAuthenticationHandlerTests.cs | 4 +-- .../BaGetter.Web.Tests.csproj | 2 +- .../Pages/IndexModelFacts.cs | 5 ++-- .../Pages/PackageModelFacts.cs | 12 ++++++--- 259 files changed, 547 insertions(+), 373 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf5a988fb..173b42092 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG Version=1.0.0 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build ARG Version ARG TARGETARCH WORKDIR /src @@ -37,7 +37,7 @@ RUN mkdir -p "/data/packages" \ mkdir -p "/data/db" ## Create final image -FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS base # install cultures (same approach as Alpine SDK image) RUN apk add --no-cache icu-libs icu-data-full tzdata # disable the invariant mode (set in base image) diff --git a/global.json b/global.json index 214a6386b..461364425 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.306", + "version": "10.0.104", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/samples/BaGetter.Protocol.Samples.Tests/BaGetter.Protocol.Samples.Tests.csproj b/samples/BaGetter.Protocol.Samples.Tests/BaGetter.Protocol.Samples.Tests.csproj index ae3faefab..095aabd2e 100644 --- a/samples/BaGetter.Protocol.Samples.Tests/BaGetter.Protocol.Samples.Tests.csproj +++ b/samples/BaGetter.Protocol.Samples.Tests/BaGetter.Protocol.Samples.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 false IDE0007 diff --git a/samples/BaGetter.Protocol.Samples.Tests/Sample03_Metadata.cs b/samples/BaGetter.Protocol.Samples.Tests/Sample03_Metadata.cs index 94dfd8d4d..b649d752b 100644 --- a/samples/BaGetter.Protocol.Samples.Tests/Sample03_Metadata.cs +++ b/samples/BaGetter.Protocol.Samples.Tests/Sample03_Metadata.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using BaGetter.Protocol.Models; using NuGet.Versioning; using Xunit; @@ -16,7 +15,7 @@ public async Task GetAllPackageMetadata() // Find the metadata for all versions of a package. NuGetClient client = new NuGetClient("https://api.nuget.org/v3/index.json"); - IReadOnlyList items = await client.GetPackageMetadataAsync("Newtonsoft.Json"); + var items = await client.GetPackageMetadataAsync("Newtonsoft.Json"); if (!items.Any()) { Console.WriteLine($"Package 'Newtonsoft.Json' does not exist"); @@ -42,7 +41,7 @@ public async Task GetPackageMetadata() string packageId = "Newtonsoft.Json"; NuGetVersion packageVersion = new NuGetVersion("12.0.1"); - PackageMetadata metadata = await client.GetPackageMetadataAsync(packageId, packageVersion); + var metadata = await client.GetPackageMetadataAsync(packageId, packageVersion); Console.WriteLine($"Listed: {metadata.Listed}"); Console.WriteLine($"Tags: {metadata.Tags}"); diff --git a/samples/BaGetterWebApplication/BaGetterWebApplication.csproj b/samples/BaGetterWebApplication/BaGetterWebApplication.csproj index ac3e03237..de2098fb7 100644 --- a/samples/BaGetterWebApplication/BaGetterWebApplication.csproj +++ b/samples/BaGetterWebApplication/BaGetterWebApplication.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/samples/BaGetterWebApplication/Program.cs b/samples/BaGetterWebApplication/Program.cs index 00ade27ad..4400f2181 100644 --- a/samples/BaGetterWebApplication/Program.cs +++ b/samples/BaGetterWebApplication/Program.cs @@ -1,5 +1,7 @@ -using BaGetter; +using BaGetter.Core.Extensions; +using BaGetter.Database.Sqlite; using BaGetter.Web; +using BaGetter.Web.Extensions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Hosting; @@ -8,8 +10,8 @@ // This will add the BaGetter services and options to the container. builder.Services.AddBaGetterWebApplication(bagetter => { - bagetter.AddSqliteDatabase(); - bagetter.AddFileStorage(); + SqliteApplicationExtensions.AddSqliteDatabase(bagetter); + BaGetterApplicationExtensions.AddFileStorage(bagetter); }); var app = builder.Build(); diff --git a/src/BaGetter.Aliyun/AliyunApplicationExtensions.cs b/src/BaGetter.Aliyun/AliyunApplicationExtensions.cs index f60ff9c5a..93527ba89 100644 --- a/src/BaGetter.Aliyun/AliyunApplicationExtensions.cs +++ b/src/BaGetter.Aliyun/AliyunApplicationExtensions.cs @@ -1,12 +1,14 @@ using System; using Aliyun.OSS; -using BaGetter.Aliyun; using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; +using BaGetter.Core.Storage; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; -namespace BaGetter; +namespace BaGetter.Aliyun; public static class AliyunApplicationExtensions { diff --git a/src/BaGetter.Aliyun/AliyunStorageService.cs b/src/BaGetter.Aliyun/AliyunStorageService.cs index c0d078a85..213cf6253 100644 --- a/src/BaGetter.Aliyun/AliyunStorageService.cs +++ b/src/BaGetter.Aliyun/AliyunStorageService.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; using Aliyun.OSS; -using BaGetter.Core; +using BaGetter.Core.Storage; using Microsoft.Extensions.Options; namespace BaGetter.Aliyun; diff --git a/src/BaGetter.Aliyun/BaGetter.Aliyun.csproj b/src/BaGetter.Aliyun/BaGetter.Aliyun.csproj index 1eda2bc73..7578b5fba 100644 --- a/src/BaGetter.Aliyun/BaGetter.Aliyun.csproj +++ b/src/BaGetter.Aliyun/BaGetter.Aliyun.csproj @@ -2,7 +2,7 @@ NuGet;Alibaba;Cloud The libraries to host BaGetter on Alibaba Cloud (Aliyun). - net9.0 + net10.0 diff --git a/src/BaGetter.Aws/AwsApplicationExtensions.cs b/src/BaGetter.Aws/AwsApplicationExtensions.cs index 2e70fd64c..6831a5549 100644 --- a/src/BaGetter.Aws/AwsApplicationExtensions.cs +++ b/src/BaGetter.Aws/AwsApplicationExtensions.cs @@ -3,13 +3,15 @@ using Amazon; using Amazon.Runtime; using Amazon.S3; -using BaGetter.Aws; using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; +using BaGetter.Core.Storage; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; -namespace BaGetter; +namespace BaGetter.Aws; public static class AwsApplicationExtensions { diff --git a/src/BaGetter.Aws/BaGetter.Aws.csproj b/src/BaGetter.Aws/BaGetter.Aws.csproj index 6e9e91ca4..e02a57156 100644 --- a/src/BaGetter.Aws/BaGetter.Aws.csproj +++ b/src/BaGetter.Aws/BaGetter.Aws.csproj @@ -1,8 +1,7 @@ - net9.0 - + net10.0 NuGet;Amazon;Cloud The libraries to host BaGetter on AWS. diff --git a/src/BaGetter.Aws/S3StorageOptions.cs b/src/BaGetter.Aws/S3StorageOptions.cs index aa30002f7..0cbe9d65d 100644 --- a/src/BaGetter.Aws/S3StorageOptions.cs +++ b/src/BaGetter.Aws/S3StorageOptions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using BaGetter.Core; +using BaGetter.Core.Validation; namespace BaGetter.Aws; diff --git a/src/BaGetter.Aws/S3StorageService.cs b/src/BaGetter.Aws/S3StorageService.cs index 160359acf..70d414c30 100644 --- a/src/BaGetter.Aws/S3StorageService.cs +++ b/src/BaGetter.Aws/S3StorageService.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Amazon.S3; using Amazon.S3.Model; -using BaGetter.Core; +using BaGetter.Core.Storage; using Microsoft.Extensions.Options; namespace BaGetter.Aws; diff --git a/src/BaGetter.Azure/AzureApplicationExtensions.cs b/src/BaGetter.Azure/AzureApplicationExtensions.cs index bca4bf413..7f0a691ea 100644 --- a/src/BaGetter.Azure/AzureApplicationExtensions.cs +++ b/src/BaGetter.Azure/AzureApplicationExtensions.cs @@ -2,13 +2,19 @@ using Azure.Data.Tables; using Azure.Storage; using Azure.Storage.Blobs; -using BaGetter.Azure; +using BaGetter.Azure.Configuration; +using BaGetter.Azure.Storage; +using BaGetter.Azure.Table; using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; +using BaGetter.Core.Search; +using BaGetter.Core.Storage; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; -namespace BaGetter +namespace BaGetter.Azure { public static class AzureApplicationExtensions { diff --git a/src/BaGetter.Azure/BaGetter.Azure.csproj b/src/BaGetter.Azure/BaGetter.Azure.csproj index ce89a11f3..5c4a39095 100644 --- a/src/BaGetter.Azure/BaGetter.Azure.csproj +++ b/src/BaGetter.Azure/BaGetter.Azure.csproj @@ -1,8 +1,7 @@ - net9.0 - + net10.0 NuGet;Azure;Cloud The libraries to host BaGetter on Azure. diff --git a/src/BaGetter.Azure/Configuration/AzureBlobStorageOptions.cs b/src/BaGetter.Azure/Configuration/AzureBlobStorageOptions.cs index 6e349e05c..c7a4d4d91 100644 --- a/src/BaGetter.Azure/Configuration/AzureBlobStorageOptions.cs +++ b/src/BaGetter.Azure/Configuration/AzureBlobStorageOptions.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace BaGetter.Azure +namespace BaGetter.Azure.Configuration { /// /// BaGetter's configurations to use Azure Blob Storage to store packages. @@ -22,7 +22,7 @@ public class AzureBlobStorageOptions : IValidatableObject /// /// The Azure Blob Storage access key. Ignored if is provided. - /// + /// public string AccessKey { get; set; } /// diff --git a/src/BaGetter.Azure/Configuration/AzureSearchOptions.cs b/src/BaGetter.Azure/Configuration/AzureSearchOptions.cs index 11a165bf9..709b09e5c 100644 --- a/src/BaGetter.Azure/Configuration/AzureSearchOptions.cs +++ b/src/BaGetter.Azure/Configuration/AzureSearchOptions.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BaGetter.Azure +namespace BaGetter.Azure.Configuration { public class AzureSearchOptions { diff --git a/src/BaGetter.Azure/Configuration/AzureTableOptions.cs b/src/BaGetter.Azure/Configuration/AzureTableOptions.cs index 60351e1e5..1c9283cd0 100644 --- a/src/BaGetter.Azure/Configuration/AzureTableOptions.cs +++ b/src/BaGetter.Azure/Configuration/AzureTableOptions.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BaGetter.Azure +namespace BaGetter.Azure.Configuration { public class AzureTableOptions { diff --git a/src/BaGetter.Azure/Extensions/StorageExceptionExtensions.cs b/src/BaGetter.Azure/Extensions/StorageExceptionExtensions.cs index 115c808f8..d4ce69248 100644 --- a/src/BaGetter.Azure/Extensions/StorageExceptionExtensions.cs +++ b/src/BaGetter.Azure/Extensions/StorageExceptionExtensions.cs @@ -1,7 +1,7 @@ -using Azure; using System.Net; +using Azure; -namespace BaGetter.Azure +namespace BaGetter.Azure.Extensions { internal static class StorageExceptionExtensions diff --git a/src/BaGetter.Azure/Storage/BlobStorageService.cs b/src/BaGetter.Azure/Storage/BlobStorageService.cs index 7a2c1a0e3..ddbf0958c 100644 --- a/src/BaGetter.Azure/Storage/BlobStorageService.cs +++ b/src/BaGetter.Azure/Storage/BlobStorageService.cs @@ -6,9 +6,11 @@ using Azure.Storage.Blobs; using Azure.Storage.Blobs.Models; using Azure.Storage.Sas; -using BaGetter.Core; +using BaGetter.Azure.Extensions; +using BaGetter.Core.Extensions; +using BaGetter.Core.Storage; -namespace BaGetter.Azure +namespace BaGetter.Azure.Storage { // See: https://github.com/NuGet/NuGetGallery/blob/master/src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs public class BlobStorageService : IStorageService diff --git a/src/BaGetter.Azure/Table/PackageEntity.cs b/src/BaGetter.Azure/Table/PackageEntity.cs index 6e2daed84..dc432e055 100644 --- a/src/BaGetter.Azure/Table/PackageEntity.cs +++ b/src/BaGetter.Azure/Table/PackageEntity.cs @@ -1,9 +1,9 @@ using System; using Azure; using Azure.Data.Tables; -using BaGetter.Core; +using BaGetter.Core.Entities; -namespace BaGetter.Azure +namespace BaGetter.Azure.Table { /// /// The Azure Table Storage entity that maps to a . diff --git a/src/BaGetter.Azure/Table/PackageEntityExtensions.cs b/src/BaGetter.Azure/Table/PackageEntityExtensions.cs index 8a23231b6..1ffcb7bd9 100644 --- a/src/BaGetter.Azure/Table/PackageEntityExtensions.cs +++ b/src/BaGetter.Azure/Table/PackageEntityExtensions.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json; -using BaGetter.Core; +using BaGetter.Core.Entities; -namespace BaGetter.Azure +namespace BaGetter.Azure.Table { public static class PackageEntityExtensions { diff --git a/src/BaGetter.Azure/Table/TableOperationBuilder.cs b/src/BaGetter.Azure/Table/TableOperationBuilder.cs index 979edba8c..1bec1f4ec 100644 --- a/src/BaGetter.Azure/Table/TableOperationBuilder.cs +++ b/src/BaGetter.Azure/Table/TableOperationBuilder.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using BaGetter.Core; +using BaGetter.Core.Entities; using Newtonsoft.Json; -namespace BaGetter.Azure +namespace BaGetter.Azure.Table { public class TableOperationBuilder { diff --git a/src/BaGetter.Azure/Table/TablePackageDatabase.cs b/src/BaGetter.Azure/Table/TablePackageDatabase.cs index 9bf5341d7..4d2303366 100644 --- a/src/BaGetter.Azure/Table/TablePackageDatabase.cs +++ b/src/BaGetter.Azure/Table/TablePackageDatabase.cs @@ -6,12 +6,15 @@ using System.Threading.Tasks; using Azure; using Azure.Data.Tables; +using BaGetter.Azure.Configuration; +using BaGetter.Azure.Extensions; using BaGetter.Core; +using BaGetter.Core.Entities; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using NuGet.Versioning; -namespace BaGetter.Azure +namespace BaGetter.Azure.Table { /// /// Stores the metadata of packages using Azure Table Storage. diff --git a/src/BaGetter.Azure/Table/TableSearchService.cs b/src/BaGetter.Azure/Table/TableSearchService.cs index 6fc62adcc..a2060a2af 100644 --- a/src/BaGetter.Azure/Table/TableSearchService.cs +++ b/src/BaGetter.Azure/Table/TableSearchService.cs @@ -5,11 +5,14 @@ using System.Threading.Tasks; using Azure; using Azure.Data.Tables; -using BaGetter.Core; +using BaGetter.Azure.Configuration; +using BaGetter.Core.Entities; +using BaGetter.Core.Metadata; +using BaGetter.Core.Search; using BaGetter.Protocol.Models; using Microsoft.Extensions.Options; -namespace BaGetter.Azure +namespace BaGetter.Azure.Table { public class TableSearchService : ISearchService { diff --git a/src/BaGetter.Core/Authentication/ApiKeyAuthenticationService.cs b/src/BaGetter.Core/Authentication/ApiKeyAuthenticationService.cs index 1a7cfb54b..4425e3121 100644 --- a/src/BaGetter.Core/Authentication/ApiKeyAuthenticationService.cs +++ b/src/BaGetter.Core/Authentication/ApiKeyAuthenticationService.cs @@ -5,7 +5,7 @@ using BaGetter.Core.Configuration; using Microsoft.Extensions.Options; -namespace BaGetter.Core; +namespace BaGetter.Core.Authentication; public class ApiKeyAuthenticationService : IAuthenticationService { diff --git a/src/BaGetter.Core/Authentication/AuthenticationConstants.cs b/src/BaGetter.Core/Authentication/AuthenticationConstants.cs index f6ff708ea..f7d8e0526 100644 --- a/src/BaGetter.Core/Authentication/AuthenticationConstants.cs +++ b/src/BaGetter.Core/Authentication/AuthenticationConstants.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BaGetter.Authentication; +namespace BaGetter.Core.Authentication; public static class AuthenticationConstants { public const string NugetBasicAuthenticationScheme = "NugetBasicAuthentication"; diff --git a/src/BaGetter.Core/Authentication/IAuthenticationService.cs b/src/BaGetter.Core/Authentication/IAuthenticationService.cs index 6cd3547fb..37c46459a 100644 --- a/src/BaGetter.Core/Authentication/IAuthenticationService.cs +++ b/src/BaGetter.Core/Authentication/IAuthenticationService.cs @@ -1,7 +1,7 @@ using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Core; +namespace BaGetter.Core.Authentication; public interface IAuthenticationService { diff --git a/src/BaGetter.Core/BaGetter.Core.csproj b/src/BaGetter.Core/BaGetter.Core.csproj index 04d25e6da..c3ccf2b28 100644 --- a/src/BaGetter.Core/BaGetter.Core.csproj +++ b/src/BaGetter.Core/BaGetter.Core.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 NuGet The core libraries that power BaGetter. diff --git a/src/BaGetter.Core/Configuration/ApiKey.cs b/src/BaGetter.Core/Configuration/ApiKey.cs index bb94f661a..83ee81f6a 100644 --- a/src/BaGetter.Core/Configuration/ApiKey.cs +++ b/src/BaGetter.Core/Configuration/ApiKey.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace BaGetter.Core.Configuration; public class ApiKey { diff --git a/src/BaGetter.Core/Configuration/BaGetterOptions.cs b/src/BaGetter.Core/Configuration/BaGetterOptions.cs index 8b2e94648..c860bacde 100644 --- a/src/BaGetter.Core/Configuration/BaGetterOptions.cs +++ b/src/BaGetter.Core/Configuration/BaGetterOptions.cs @@ -1,7 +1,6 @@ using System; -using BaGetter.Core.Configuration; -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class BaGetterOptions { diff --git a/src/BaGetter.Core/Configuration/BindOptions.cs b/src/BaGetter.Core/Configuration/BindOptions.cs index d815a68ac..b3053e670 100644 --- a/src/BaGetter.Core/Configuration/BindOptions.cs +++ b/src/BaGetter.Core/Configuration/BindOptions.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Options; -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; /// /// Automatically binds configs to options. diff --git a/src/BaGetter.Core/Configuration/DatabaseOptions.cs b/src/BaGetter.Core/Configuration/DatabaseOptions.cs index f2fbee842..f90f4302d 100644 --- a/src/BaGetter.Core/Configuration/DatabaseOptions.cs +++ b/src/BaGetter.Core/Configuration/DatabaseOptions.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class DatabaseOptions { diff --git a/src/BaGetter.Core/Configuration/FileSystemStorageOptions.cs b/src/BaGetter.Core/Configuration/FileSystemStorageOptions.cs index 08d2ac46e..089ededd9 100644 --- a/src/BaGetter.Core/Configuration/FileSystemStorageOptions.cs +++ b/src/BaGetter.Core/Configuration/FileSystemStorageOptions.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class FileSystemStorageOptions : IValidatableObject { diff --git a/src/BaGetter.Core/Configuration/HealthCheckOptions.cs b/src/BaGetter.Core/Configuration/HealthCheckOptions.cs index 2e673a283..b2c832f2b 100644 --- a/src/BaGetter.Core/Configuration/HealthCheckOptions.cs +++ b/src/BaGetter.Core/Configuration/HealthCheckOptions.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class HealthCheckOptions : IValidatableObject { diff --git a/src/BaGetter.Core/Configuration/MirrorAuthenticationOptions.cs b/src/BaGetter.Core/Configuration/MirrorAuthenticationOptions.cs index c9bc76007..aa523ca4b 100644 --- a/src/BaGetter.Core/Configuration/MirrorAuthenticationOptions.cs +++ b/src/BaGetter.Core/Configuration/MirrorAuthenticationOptions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class MirrorAuthenticationOptions { diff --git a/src/BaGetter.Core/Configuration/MirrorAuthenticationType.cs b/src/BaGetter.Core/Configuration/MirrorAuthenticationType.cs index 89d683003..96aacc861 100644 --- a/src/BaGetter.Core/Configuration/MirrorAuthenticationType.cs +++ b/src/BaGetter.Core/Configuration/MirrorAuthenticationType.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public enum MirrorAuthenticationType { diff --git a/src/BaGetter.Core/Configuration/MirrorOptions.cs b/src/BaGetter.Core/Configuration/MirrorOptions.cs index c13f60f90..0dab28d4a 100644 --- a/src/BaGetter.Core/Configuration/MirrorOptions.cs +++ b/src/BaGetter.Core/Configuration/MirrorOptions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class MirrorOptions : IValidatableObject { diff --git a/src/BaGetter.Core/Configuration/NugetAuthenticationOptions.cs b/src/BaGetter.Core/Configuration/NugetAuthenticationOptions.cs index 4d608fd8b..3decdde96 100644 --- a/src/BaGetter.Core/Configuration/NugetAuthenticationOptions.cs +++ b/src/BaGetter.Core/Configuration/NugetAuthenticationOptions.cs @@ -1,6 +1,4 @@ -using BaGetter.Core.Configuration; - -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public sealed class NugetAuthenticationOptions { diff --git a/src/BaGetter.Core/Configuration/NugetCredentials.cs b/src/BaGetter.Core/Configuration/NugetCredentials.cs index 5cd5579bf..e037bd61c 100644 --- a/src/BaGetter.Core/Configuration/NugetCredentials.cs +++ b/src/BaGetter.Core/Configuration/NugetCredentials.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public sealed class NugetCredentials { diff --git a/src/BaGetter.Core/Configuration/PackageDeletionBehavior.cs b/src/BaGetter.Core/Configuration/PackageDeletionBehavior.cs index 2d4528d71..5a36863df 100644 --- a/src/BaGetter.Core/Configuration/PackageDeletionBehavior.cs +++ b/src/BaGetter.Core/Configuration/PackageDeletionBehavior.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; /// /// How BaGetter should interpret package deletion requests. diff --git a/src/BaGetter.Core/Configuration/PackageOverwriteAllowed.cs b/src/BaGetter.Core/Configuration/PackageOverwriteAllowed.cs index 8291efd8b..86c51b7f6 100644 --- a/src/BaGetter.Core/Configuration/PackageOverwriteAllowed.cs +++ b/src/BaGetter.Core/Configuration/PackageOverwriteAllowed.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; /// /// How BaGetter should react to a package being pushed that already exists. diff --git a/src/BaGetter.Core/Configuration/RetentionOptions.cs b/src/BaGetter.Core/Configuration/RetentionOptions.cs index 48bc10133..27501920c 100644 --- a/src/BaGetter.Core/Configuration/RetentionOptions.cs +++ b/src/BaGetter.Core/Configuration/RetentionOptions.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class RetentionOptions { diff --git a/src/BaGetter.Core/Configuration/SearchOptions.cs b/src/BaGetter.Core/Configuration/SearchOptions.cs index 0e0c3aada..d645427fa 100644 --- a/src/BaGetter.Core/Configuration/SearchOptions.cs +++ b/src/BaGetter.Core/Configuration/SearchOptions.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class SearchOptions { diff --git a/src/BaGetter.Core/Configuration/StatisticsOptions.cs b/src/BaGetter.Core/Configuration/StatisticsOptions.cs index 5aa25c9d6..ff9119ee9 100644 --- a/src/BaGetter.Core/Configuration/StatisticsOptions.cs +++ b/src/BaGetter.Core/Configuration/StatisticsOptions.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class StatisticsOptions : IValidatableObject { diff --git a/src/BaGetter.Core/Configuration/StorageOptions.cs b/src/BaGetter.Core/Configuration/StorageOptions.cs index e2a32f6b3..35514f4d4 100644 --- a/src/BaGetter.Core/Configuration/StorageOptions.cs +++ b/src/BaGetter.Core/Configuration/StorageOptions.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Configuration; public class StorageOptions { diff --git a/src/BaGetter.Core/Content/DefaultPackageContentService.cs b/src/BaGetter.Core/Content/DefaultPackageContentService.cs index b122c268c..a5888a7f2 100644 --- a/src/BaGetter.Core/Content/DefaultPackageContentService.cs +++ b/src/BaGetter.Core/Content/DefaultPackageContentService.cs @@ -3,10 +3,11 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Storage; using BaGetter.Protocol.Models; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Content; /// /// Implements the NuGet Package Content resource in NuGet's V3 protocol. diff --git a/src/BaGetter.Core/Content/IPackageContentService.cs b/src/BaGetter.Core/Content/IPackageContentService.cs index 1c4018bda..a4e527846 100644 --- a/src/BaGetter.Core/Content/IPackageContentService.cs +++ b/src/BaGetter.Core/Content/IPackageContentService.cs @@ -4,7 +4,7 @@ using BaGetter.Protocol.Models; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Content; /// /// The Package Content resource, used to download NuGet packages and to fetch other metadata. diff --git a/src/BaGetter.Core/Entities/AbstractContext.cs b/src/BaGetter.Core/Entities/AbstractContext.cs index 3e1874493..7e9f2cff2 100644 --- a/src/BaGetter.Core/Entities/AbstractContext.cs +++ b/src/BaGetter.Core/Entities/AbstractContext.cs @@ -1,9 +1,10 @@ using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities.Converters; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace BaGetter.Core; +namespace BaGetter.Core.Entities; public abstract class AbstractContext : DbContext, IContext where TContext : DbContext { diff --git a/src/BaGetter.Core/Entities/Converters/StringArrayComparer.cs b/src/BaGetter.Core/Entities/Converters/StringArrayComparer.cs index 973ebbf7b..35e24b7dc 100644 --- a/src/BaGetter.Core/Entities/Converters/StringArrayComparer.cs +++ b/src/BaGetter.Core/Entities/Converters/StringArrayComparer.cs @@ -2,7 +2,7 @@ using System.Linq; using Microsoft.EntityFrameworkCore.ChangeTracking; -namespace BaGetter.Core; +namespace BaGetter.Core.Entities.Converters; public class StringArrayComparer : ValueComparer { diff --git a/src/BaGetter.Core/Entities/Converters/StringArrayToJsonConverter.cs b/src/BaGetter.Core/Entities/Converters/StringArrayToJsonConverter.cs index f7814af81..013fe7089 100644 --- a/src/BaGetter.Core/Entities/Converters/StringArrayToJsonConverter.cs +++ b/src/BaGetter.Core/Entities/Converters/StringArrayToJsonConverter.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Newtonsoft.Json; -namespace BaGetter.Core; +namespace BaGetter.Core.Entities.Converters; public class StringArrayToJsonConverter : ValueConverter { diff --git a/src/BaGetter.Core/Entities/Converters/UriToStringConverter.cs b/src/BaGetter.Core/Entities/Converters/UriToStringConverter.cs index 90c91bead..360b4761f 100644 --- a/src/BaGetter.Core/Entities/Converters/UriToStringConverter.cs +++ b/src/BaGetter.Core/Entities/Converters/UriToStringConverter.cs @@ -1,7 +1,7 @@ using System; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace BaGetter.Core; +namespace BaGetter.Core.Entities.Converters; public class UriToStringConverter : ValueConverter { diff --git a/src/BaGetter.Core/Entities/IContext.cs b/src/BaGetter.Core/Entities/IContext.cs index 2e96f9229..01019fc3f 100644 --- a/src/BaGetter.Core/Entities/IContext.cs +++ b/src/BaGetter.Core/Entities/IContext.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -namespace BaGetter.Core; +namespace BaGetter.Core.Entities; public interface IContext { diff --git a/src/BaGetter.Core/Entities/NullContext.cs b/src/BaGetter.Core/Entities/NullContext.cs index 898a03a11..80248c66c 100644 --- a/src/BaGetter.Core/Entities/NullContext.cs +++ b/src/BaGetter.Core/Entities/NullContext.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -namespace BaGetter.Core; +namespace BaGetter.Core.Entities; public class NullContext : IContext { diff --git a/src/BaGetter.Core/Entities/Package.cs b/src/BaGetter.Core/Entities/Package.cs index d3c44ebdf..f1067705b 100644 --- a/src/BaGetter.Core/Entities/Package.cs +++ b/src/BaGetter.Core/Entities/Package.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Entities; // See NuGetGallery's: https://github.com/NuGet/NuGetGallery/blob/master/src/NuGetGallery.Core/Entities/Package.cs [DebuggerDisplay("{Id} {Version}")] diff --git a/src/BaGetter.Core/Entities/PackageDependency.cs b/src/BaGetter.Core/Entities/PackageDependency.cs index b00d820f1..aed2c76fa 100644 --- a/src/BaGetter.Core/Entities/PackageDependency.cs +++ b/src/BaGetter.Core/Entities/PackageDependency.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Entities; // See NuGetGallery.Core's: https://github.com/NuGet/NuGetGallery/blob/master/src/NuGetGallery.Core/Entities/PackageDependency.cs public class PackageDependency diff --git a/src/BaGetter.Core/Entities/PackageType.cs b/src/BaGetter.Core/Entities/PackageType.cs index 465423d16..b45f2dd3f 100644 --- a/src/BaGetter.Core/Entities/PackageType.cs +++ b/src/BaGetter.Core/Entities/PackageType.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Entities; // See NuGetGallery.Core's: https://github.com/NuGet/NuGetGallery/blob/master/src/NuGetGallery.Core/Entities/PackageType.cs public class PackageType diff --git a/src/BaGetter.Core/Entities/SemVerLevel.cs b/src/BaGetter.Core/Entities/SemVerLevel.cs index 6d89fc2a1..22ad45794 100644 --- a/src/BaGetter.Core/Entities/SemVerLevel.cs +++ b/src/BaGetter.Core/Entities/SemVerLevel.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Entities; public enum SemVerLevel { diff --git a/src/BaGetter.Core/Entities/TargetFramework.cs b/src/BaGetter.Core/Entities/TargetFramework.cs index 511caae8e..17203956a 100644 --- a/src/BaGetter.Core/Entities/TargetFramework.cs +++ b/src/BaGetter.Core/Entities/TargetFramework.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Entities; public class TargetFramework { diff --git a/src/BaGetter.Core/Extensions/BaGetterApplicationExtensions.cs b/src/BaGetter.Core/Extensions/BaGetterApplicationExtensions.cs index 59f1a73cf..f5ced3ce6 100644 --- a/src/BaGetter.Core/Extensions/BaGetterApplicationExtensions.cs +++ b/src/BaGetter.Core/Extensions/BaGetterApplicationExtensions.cs @@ -1,10 +1,12 @@ using System; -using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Search; using BaGetter.Core.Statistics; +using BaGetter.Core.Storage; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace BaGetter; +namespace BaGetter.Core.Extensions; public static class BaGetterApplicationExtensions { diff --git a/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.Providers.cs b/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.Providers.cs index b0de4b776..8d8aaedfb 100644 --- a/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.Providers.cs +++ b/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.Providers.cs @@ -1,11 +1,14 @@ using System; using System.Collections.Generic; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using BaGetter.Core.Search; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace BaGetter.Core; +namespace BaGetter.Core.Extensions; public static partial class DependencyInjectionExtensions { diff --git a/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs b/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs index e4d71e85e..e35575aa5 100644 --- a/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs +++ b/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs @@ -4,14 +4,26 @@ using System.Net.Http.Headers; using System.Reflection; using System.Text; +using BaGetter.Core.Authentication; +using BaGetter.Core.Configuration; +using BaGetter.Core.Content; +using BaGetter.Core.Entities; +using BaGetter.Core.Indexing; +using BaGetter.Core.Metadata; +using BaGetter.Core.Search; +using BaGetter.Core.ServiceIndex; using BaGetter.Core.Statistics; +using BaGetter.Core.Storage; +using BaGetter.Core.Upstream; +using BaGetter.Core.Upstream.Clients; +using BaGetter.Core.Validation; using BaGetter.Protocol; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; -namespace BaGetter.Core; +namespace BaGetter.Core.Extensions; public static partial class DependencyInjectionExtensions { diff --git a/src/BaGetter.Core/Extensions/HealthCheckExtensions.cs b/src/BaGetter.Core/Extensions/HealthCheckExtensions.cs index 059b51370..bebc9e841 100644 --- a/src/BaGetter.Core/Extensions/HealthCheckExtensions.cs +++ b/src/BaGetter.Core/Extensions/HealthCheckExtensions.cs @@ -5,6 +5,7 @@ using System.Text.Json.Serialization; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Configuration; using Microsoft.Extensions.Diagnostics.HealthChecks; namespace BaGetter.Core.Extensions; diff --git a/src/BaGetter.Core/Extensions/IProvider.cs b/src/BaGetter.Core/Extensions/IProvider.cs index 0b45b3bee..cd0571040 100644 --- a/src/BaGetter.Core/Extensions/IProvider.cs +++ b/src/BaGetter.Core/Extensions/IProvider.cs @@ -1,7 +1,7 @@ using System; using Microsoft.Extensions.Configuration; -namespace BaGetter.Core; +namespace BaGetter.Core.Extensions; /// /// Attempts to provide the . diff --git a/src/BaGetter.Core/Extensions/PackageArchiveReaderExtensions.cs b/src/BaGetter.Core/Extensions/PackageArchiveReaderExtensions.cs index 4cbd84852..d6fb86b5c 100644 --- a/src/BaGetter.Core/Extensions/PackageArchiveReaderExtensions.cs +++ b/src/BaGetter.Core/Extensions/PackageArchiveReaderExtensions.cs @@ -4,10 +4,11 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; using NuGet.Common; using NuGet.Packaging; -namespace BaGetter.Core; +namespace BaGetter.Core.Extensions; using NuGetPackageType = NuGet.Packaging.Core.PackageType; diff --git a/src/BaGetter.Core/Extensions/StreamExtensions.cs b/src/BaGetter.Core/Extensions/StreamExtensions.cs index 70c6fd96f..f0f4df05e 100644 --- a/src/BaGetter.Core/Extensions/StreamExtensions.cs +++ b/src/BaGetter.Core/Extensions/StreamExtensions.cs @@ -1,11 +1,10 @@ using System; using System.IO; -using System.Linq; using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Core; +namespace BaGetter.Core.Extensions; public static class StreamExtensions { diff --git a/src/BaGetter.Core/Extensions/SystemTime.cs b/src/BaGetter.Core/Extensions/SystemTime.cs index 96922f3e6..438113848 100644 --- a/src/BaGetter.Core/Extensions/SystemTime.cs +++ b/src/BaGetter.Core/Extensions/SystemTime.cs @@ -1,6 +1,6 @@ using System; -namespace BaGetter.Core; +namespace BaGetter.Core.Extensions; /// /// A wrapper that allows for unit tests related to system time. diff --git a/src/BaGetter.Core/IPackageDatabase.cs b/src/BaGetter.Core/IPackageDatabase.cs index d855b06ec..19857bf67 100644 --- a/src/BaGetter.Core/IPackageDatabase.cs +++ b/src/BaGetter.Core/IPackageDatabase.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Storage; using NuGet.Versioning; namespace BaGetter.Core; diff --git a/src/BaGetter.Core/IPackageService.cs b/src/BaGetter.Core/IPackageService.cs index 1d0d0213b..d95f0758d 100644 --- a/src/BaGetter.Core/IPackageService.cs +++ b/src/BaGetter.Core/IPackageService.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Upstream; using NuGet.Versioning; namespace BaGetter.Core; diff --git a/src/BaGetter.Core/Indexing/FrameworkCompatibilityService.cs b/src/BaGetter.Core/Indexing/FrameworkCompatibilityService.cs index df207c165..d3158f7c5 100644 --- a/src/BaGetter.Core/Indexing/FrameworkCompatibilityService.cs +++ b/src/BaGetter.Core/Indexing/FrameworkCompatibilityService.cs @@ -4,7 +4,7 @@ using System.Linq; using NuGet.Frameworks; -namespace BaGetter.Core; +namespace BaGetter.Core.Indexing; using static NuGet.Frameworks.FrameworkConstants; diff --git a/src/BaGetter.Core/Indexing/IFrameworkCompatibilityService.cs b/src/BaGetter.Core/Indexing/IFrameworkCompatibilityService.cs index 0903fa640..9546f8c5e 100644 --- a/src/BaGetter.Core/Indexing/IFrameworkCompatibilityService.cs +++ b/src/BaGetter.Core/Indexing/IFrameworkCompatibilityService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace BaGetter.Core; +namespace BaGetter.Core.Indexing; /// /// Used to determine the compatibility matrix between frameworks. diff --git a/src/BaGetter.Core/Indexing/IPackageDeletionService.cs b/src/BaGetter.Core/Indexing/IPackageDeletionService.cs index 3934873f6..f8f054ee4 100644 --- a/src/BaGetter.Core/Indexing/IPackageDeletionService.cs +++ b/src/BaGetter.Core/Indexing/IPackageDeletionService.cs @@ -1,8 +1,9 @@ using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Indexing; public interface IPackageDeletionService { diff --git a/src/BaGetter.Core/Indexing/IPackageIndexingService.cs b/src/BaGetter.Core/Indexing/IPackageIndexingService.cs index 7e1b999f8..c47779a73 100644 --- a/src/BaGetter.Core/Indexing/IPackageIndexingService.cs +++ b/src/BaGetter.Core/Indexing/IPackageIndexingService.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Core; +namespace BaGetter.Core.Indexing; /// /// The result of attempting to index a package. diff --git a/src/BaGetter.Core/Indexing/ISymbolIndexingService.cs b/src/BaGetter.Core/Indexing/ISymbolIndexingService.cs index 698c00830..89a34ff96 100644 --- a/src/BaGetter.Core/Indexing/ISymbolIndexingService.cs +++ b/src/BaGetter.Core/Indexing/ISymbolIndexingService.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Core; +namespace BaGetter.Core.Indexing; /// /// The result of attempting to index a symbol package. diff --git a/src/BaGetter.Core/Indexing/PackageDeletionService.cs b/src/BaGetter.Core/Indexing/PackageDeletionService.cs index 85a51984c..24a8a6046 100644 --- a/src/BaGetter.Core/Indexing/PackageDeletionService.cs +++ b/src/BaGetter.Core/Indexing/PackageDeletionService.cs @@ -3,11 +3,14 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using BaGetter.Core.Storage; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Indexing; public class PackageDeletionService : IPackageDeletionService { diff --git a/src/BaGetter.Core/Indexing/PackageIndexingService.cs b/src/BaGetter.Core/Indexing/PackageIndexingService.cs index ad015718d..cb879feb9 100644 --- a/src/BaGetter.Core/Indexing/PackageIndexingService.cs +++ b/src/BaGetter.Core/Indexing/PackageIndexingService.cs @@ -2,11 +2,16 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using BaGetter.Core.Extensions; +using BaGetter.Core.Search; +using BaGetter.Core.Storage; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using NuGet.Packaging; -namespace BaGetter.Core; +namespace BaGetter.Core.Indexing; public class PackageIndexingService : IPackageIndexingService { diff --git a/src/BaGetter.Core/Indexing/SymbolIndexingService.cs b/src/BaGetter.Core/Indexing/SymbolIndexingService.cs index a6a50b1fb..ad07567f3 100644 --- a/src/BaGetter.Core/Indexing/SymbolIndexingService.cs +++ b/src/BaGetter.Core/Indexing/SymbolIndexingService.cs @@ -5,10 +5,12 @@ using System.Reflection.Metadata; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Extensions; +using BaGetter.Core.Storage; using Microsoft.Extensions.Logging; using NuGet.Packaging; -namespace BaGetter.Core; +namespace BaGetter.Core.Indexing; // Based off: https://github.com/NuGet/NuGetGallery/blob/master/src/NuGetGallery/Services/SymbolPackageUploadService.cs // Based off: https://github.com/NuGet/NuGet.Jobs/blob/master/src/Validation.Symbols/SymbolsValidatorService.cs#L44 diff --git a/src/BaGetter.Core/Metadata/BaGetRegistrationIndexPageItem.cs b/src/BaGetter.Core/Metadata/BaGetRegistrationIndexPageItem.cs index db7beaa7d..991c5ae4b 100644 --- a/src/BaGetter.Core/Metadata/BaGetRegistrationIndexPageItem.cs +++ b/src/BaGetter.Core/Metadata/BaGetRegistrationIndexPageItem.cs @@ -1,7 +1,7 @@ using System.Text.Json.Serialization; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.Metadata; /// /// BaGetter's extensions to a registration index page. diff --git a/src/BaGetter.Core/Metadata/BaGetterPackageMetadata.cs b/src/BaGetter.Core/Metadata/BaGetterPackageMetadata.cs index b880581f1..20831ad85 100644 --- a/src/BaGetter.Core/Metadata/BaGetterPackageMetadata.cs +++ b/src/BaGetter.Core/Metadata/BaGetterPackageMetadata.cs @@ -2,7 +2,7 @@ using System.Text.Json.Serialization; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.Metadata; /// /// BaGetter's extensions to the package metadata model. diff --git a/src/BaGetter.Core/Metadata/BaGetterRegistrationIndexPage.cs b/src/BaGetter.Core/Metadata/BaGetterRegistrationIndexPage.cs index 571eb58e4..d939973e4 100644 --- a/src/BaGetter.Core/Metadata/BaGetterRegistrationIndexPage.cs +++ b/src/BaGetter.Core/Metadata/BaGetterRegistrationIndexPage.cs @@ -2,7 +2,7 @@ using System.Text.Json.Serialization; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.Metadata; /// /// BaGetter's extensions to a registration index page. diff --git a/src/BaGetter.Core/Metadata/BaGetterRegistrationIndexResponse.cs b/src/BaGetter.Core/Metadata/BaGetterRegistrationIndexResponse.cs index 16d0c4079..ba4c6047c 100644 --- a/src/BaGetter.Core/Metadata/BaGetterRegistrationIndexResponse.cs +++ b/src/BaGetter.Core/Metadata/BaGetterRegistrationIndexResponse.cs @@ -2,7 +2,7 @@ using System.Text.Json.Serialization; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.Metadata; /// /// BaGetter's extensions to a registration index response. diff --git a/src/BaGetter.Core/Metadata/DefaultPackageMetadataService.cs b/src/BaGetter.Core/Metadata/DefaultPackageMetadataService.cs index 32ea1be70..d8c58d3a4 100644 --- a/src/BaGetter.Core/Metadata/DefaultPackageMetadataService.cs +++ b/src/BaGetter.Core/Metadata/DefaultPackageMetadataService.cs @@ -5,7 +5,7 @@ using BaGetter.Protocol.Models; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Metadata; /// public class DefaultPackageMetadataService : IPackageMetadataService diff --git a/src/BaGetter.Core/Metadata/IPackageMetadataService.cs b/src/BaGetter.Core/Metadata/IPackageMetadataService.cs index 433c9f40d..14e7cac10 100644 --- a/src/BaGetter.Core/Metadata/IPackageMetadataService.cs +++ b/src/BaGetter.Core/Metadata/IPackageMetadataService.cs @@ -3,7 +3,7 @@ using BaGetter.Protocol.Models; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Metadata; /// /// The Package Metadata client, used to fetch packages' metadata. diff --git a/src/BaGetter.Core/Metadata/PackageRegistration.cs b/src/BaGetter.Core/Metadata/PackageRegistration.cs index 2a2a6ee3f..291550c50 100644 --- a/src/BaGetter.Core/Metadata/PackageRegistration.cs +++ b/src/BaGetter.Core/Metadata/PackageRegistration.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; +using BaGetter.Core.Entities; -namespace BaGetter.Core; +namespace BaGetter.Core.Metadata; /// /// The information on all versions of a package. diff --git a/src/BaGetter.Core/Metadata/RegistrationBuilder.cs b/src/BaGetter.Core/Metadata/RegistrationBuilder.cs index db0388525..6b94c661a 100644 --- a/src/BaGetter.Core/Metadata/RegistrationBuilder.cs +++ b/src/BaGetter.Core/Metadata/RegistrationBuilder.cs @@ -1,9 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; +using BaGetter.Core.Entities; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.Metadata; public class RegistrationBuilder { diff --git a/src/BaGetter.Core/PackageDatabase.cs b/src/BaGetter.Core/PackageDatabase.cs index f860fdba6..c6f454154 100644 --- a/src/BaGetter.Core/PackageDatabase.cs +++ b/src/BaGetter.Core/PackageDatabase.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; using Microsoft.EntityFrameworkCore; using NuGet.Versioning; diff --git a/src/BaGetter.Core/PackageService.cs b/src/BaGetter.Core/PackageService.cs index b5df07a21..24b2fd4d8 100644 --- a/src/BaGetter.Core/PackageService.cs +++ b/src/BaGetter.Core/PackageService.cs @@ -3,6 +3,9 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Indexing; +using BaGetter.Core.Upstream; using Microsoft.Extensions.Logging; using NuGet.Versioning; diff --git a/src/BaGetter.Core/Search/AutocompleteRequest.cs b/src/BaGetter.Core/Search/AutocompleteRequest.cs index 48ecd819d..1aa94cfc6 100644 --- a/src/BaGetter.Core/Search/AutocompleteRequest.cs +++ b/src/BaGetter.Core/Search/AutocompleteRequest.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Search; /// /// The NuGet V3 search request. diff --git a/src/BaGetter.Core/Search/DatabaseSearchService.cs b/src/BaGetter.Core/Search/DatabaseSearchService.cs index d07e5ce8f..49121d475 100644 --- a/src/BaGetter.Core/Search/DatabaseSearchService.cs +++ b/src/BaGetter.Core/Search/DatabaseSearchService.cs @@ -3,10 +3,13 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Indexing; +using BaGetter.Core.Metadata; using BaGetter.Protocol.Models; using Microsoft.EntityFrameworkCore; -namespace BaGetter.Core; +namespace BaGetter.Core.Search; public class DatabaseSearchService : ISearchService { diff --git a/src/BaGetter.Core/Search/DependentsResponse.cs b/src/BaGetter.Core/Search/DependentsResponse.cs index 9320e412d..87a25e9e6 100644 --- a/src/BaGetter.Core/Search/DependentsResponse.cs +++ b/src/BaGetter.Core/Search/DependentsResponse.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace BaGetter.Core; +namespace BaGetter.Core.Search; /// /// The package ids that depend on the queried package. diff --git a/src/BaGetter.Core/Search/ISearchIndexer.cs b/src/BaGetter.Core/Search/ISearchIndexer.cs index 5823236b0..1f117080d 100644 --- a/src/BaGetter.Core/Search/ISearchIndexer.cs +++ b/src/BaGetter.Core/Search/ISearchIndexer.cs @@ -1,7 +1,8 @@ using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; -namespace BaGetter.Core; +namespace BaGetter.Core.Search; public interface ISearchIndexer { diff --git a/src/BaGetter.Core/Search/ISearchResponseBuilder.cs b/src/BaGetter.Core/Search/ISearchResponseBuilder.cs index f5a97cbd1..1e65c56cb 100644 --- a/src/BaGetter.Core/Search/ISearchResponseBuilder.cs +++ b/src/BaGetter.Core/Search/ISearchResponseBuilder.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; +using BaGetter.Core.Metadata; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.Search; public interface ISearchResponseBuilder { diff --git a/src/BaGetter.Core/Search/ISearchService.cs b/src/BaGetter.Core/Search/ISearchService.cs index 4b59fc7ec..72c8db1d4 100644 --- a/src/BaGetter.Core/Search/ISearchService.cs +++ b/src/BaGetter.Core/Search/ISearchService.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.Search; /// /// The service used to search for packages. diff --git a/src/BaGetter.Core/Search/NullSearchIndexer.cs b/src/BaGetter.Core/Search/NullSearchIndexer.cs index e4f8c35c9..aa6e937e4 100644 --- a/src/BaGetter.Core/Search/NullSearchIndexer.cs +++ b/src/BaGetter.Core/Search/NullSearchIndexer.cs @@ -1,7 +1,8 @@ using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; -namespace BaGetter.Core; +namespace BaGetter.Core.Search; /// /// A no-op indexer, used when search does not need to index packages. diff --git a/src/BaGetter.Core/Search/NullSearchService.cs b/src/BaGetter.Core/Search/NullSearchService.cs index 2a0a29ea5..b478b7808 100644 --- a/src/BaGetter.Core/Search/NullSearchService.cs +++ b/src/BaGetter.Core/Search/NullSearchService.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.Search; /// /// A minimal search service implementation, used for advanced scenarios. diff --git a/src/BaGetter.Core/Search/SearchRequest.cs b/src/BaGetter.Core/Search/SearchRequest.cs index 528acebf2..b37195ffa 100644 --- a/src/BaGetter.Core/Search/SearchRequest.cs +++ b/src/BaGetter.Core/Search/SearchRequest.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Search; /// /// The NuGet V3 search request. diff --git a/src/BaGetter.Core/Search/SearchResponseBuilder.cs b/src/BaGetter.Core/Search/SearchResponseBuilder.cs index 7090e34e4..467f6ce4b 100644 --- a/src/BaGetter.Core/Search/SearchResponseBuilder.cs +++ b/src/BaGetter.Core/Search/SearchResponseBuilder.cs @@ -1,9 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; +using BaGetter.Core.Metadata; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.Search; public class SearchResponseBuilder : ISearchResponseBuilder { diff --git a/src/BaGetter.Core/Search/VersionsRequest.cs b/src/BaGetter.Core/Search/VersionsRequest.cs index 455ed064b..8cf57a33b 100644 --- a/src/BaGetter.Core/Search/VersionsRequest.cs +++ b/src/BaGetter.Core/Search/VersionsRequest.cs @@ -1,4 +1,4 @@ -namespace BaGetter.Core; +namespace BaGetter.Core.Search; /// /// The NuGet V3 enumerate package versions request. diff --git a/src/BaGetter.Core/ServiceIndex/BaGetterServiceIndex.cs b/src/BaGetter.Core/ServiceIndex/BaGetterServiceIndex.cs index 4a57f08c8..13d4f1f00 100644 --- a/src/BaGetter.Core/ServiceIndex/BaGetterServiceIndex.cs +++ b/src/BaGetter.Core/ServiceIndex/BaGetterServiceIndex.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.ServiceIndex; public class BaGetterServiceIndex : IServiceIndexService { diff --git a/src/BaGetter.Core/ServiceIndex/IServiceIndexService.cs b/src/BaGetter.Core/ServiceIndex/IServiceIndexService.cs index 6fcc8e7cd..d3d713d6a 100644 --- a/src/BaGetter.Core/ServiceIndex/IServiceIndexService.cs +++ b/src/BaGetter.Core/ServiceIndex/IServiceIndexService.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Core; +namespace BaGetter.Core.ServiceIndex; /// /// The NuGet Service Index service, used to discover other resources. diff --git a/src/BaGetter.Core/Statistics/StatisticsService.cs b/src/BaGetter.Core/Statistics/StatisticsService.cs index 1ffecfbf6..5cab4fe6a 100644 --- a/src/BaGetter.Core/Statistics/StatisticsService.cs +++ b/src/BaGetter.Core/Statistics/StatisticsService.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Extensions; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; diff --git a/src/BaGetter.Core/Storage/FileStorageService.cs b/src/BaGetter.Core/Storage/FileStorageService.cs index 183866e93..289d331cc 100644 --- a/src/BaGetter.Core/Storage/FileStorageService.cs +++ b/src/BaGetter.Core/Storage/FileStorageService.cs @@ -2,9 +2,11 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; using Microsoft.Extensions.Options; -namespace BaGetter.Core; +namespace BaGetter.Core.Storage; /// /// Stores content on disk. diff --git a/src/BaGetter.Core/Storage/IPackageStorageService.cs b/src/BaGetter.Core/Storage/IPackageStorageService.cs index 3cc2ac5b7..0787b7e83 100644 --- a/src/BaGetter.Core/Storage/IPackageStorageService.cs +++ b/src/BaGetter.Core/Storage/IPackageStorageService.cs @@ -1,9 +1,10 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Storage; /// /// Stores packages' content. Packages' state are stored by the diff --git a/src/BaGetter.Core/Storage/IStorageService.cs b/src/BaGetter.Core/Storage/IStorageService.cs index 53997e00d..8b047ed4c 100644 --- a/src/BaGetter.Core/Storage/IStorageService.cs +++ b/src/BaGetter.Core/Storage/IStorageService.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Core; +namespace BaGetter.Core.Storage; /// /// A low-level storage abstraction. diff --git a/src/BaGetter.Core/Storage/ISymbolStorageService.cs b/src/BaGetter.Core/Storage/ISymbolStorageService.cs index 01003a173..604e960db 100644 --- a/src/BaGetter.Core/Storage/ISymbolStorageService.cs +++ b/src/BaGetter.Core/Storage/ISymbolStorageService.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Core; +namespace BaGetter.Core.Storage; /// /// Stores the content of symbols, also known as PDBs. diff --git a/src/BaGetter.Core/Storage/NullStorageService.cs b/src/BaGetter.Core/Storage/NullStorageService.cs index 10d3ee2af..624fd3613 100644 --- a/src/BaGetter.Core/Storage/NullStorageService.cs +++ b/src/BaGetter.Core/Storage/NullStorageService.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Core; +namespace BaGetter.Core.Storage; /// /// A minimal storage implementation, used for advanced scenarios. diff --git a/src/BaGetter.Core/Storage/PackageStorageService.cs b/src/BaGetter.Core/Storage/PackageStorageService.cs index fb24ccea2..e5f7e66e8 100644 --- a/src/BaGetter.Core/Storage/PackageStorageService.cs +++ b/src/BaGetter.Core/Storage/PackageStorageService.cs @@ -2,10 +2,11 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; using Microsoft.Extensions.Logging; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Storage; public class PackageStorageService : IPackageStorageService { diff --git a/src/BaGetter.Core/Storage/SymbolStorageService.cs b/src/BaGetter.Core/Storage/SymbolStorageService.cs index 5bd9defbf..0b995e43b 100644 --- a/src/BaGetter.Core/Storage/SymbolStorageService.cs +++ b/src/BaGetter.Core/Storage/SymbolStorageService.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Core; +namespace BaGetter.Core.Storage; public class SymbolStorageService : ISymbolStorageService { diff --git a/src/BaGetter.Core/Upstream/Clients/DisabledUpstreamClient.cs b/src/BaGetter.Core/Upstream/Clients/DisabledUpstreamClient.cs index 493a7116c..cee389bdc 100644 --- a/src/BaGetter.Core/Upstream/Clients/DisabledUpstreamClient.cs +++ b/src/BaGetter.Core/Upstream/Clients/DisabledUpstreamClient.cs @@ -2,9 +2,10 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Upstream.Clients; /// /// The client used when there are no upstream package sources. diff --git a/src/BaGetter.Core/Upstream/Clients/V2UpstreamClient.cs b/src/BaGetter.Core/Upstream/Clients/V2UpstreamClient.cs index 434bdde3b..943e711b5 100644 --- a/src/BaGetter.Core/Upstream/Clients/V2UpstreamClient.cs +++ b/src/BaGetter.Core/Upstream/Clients/V2UpstreamClient.cs @@ -4,6 +4,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using NuGet.Common; @@ -13,7 +15,7 @@ using NuGet.Protocol.Core.Types; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Upstream.Clients; using ILogger = Microsoft.Extensions.Logging.ILogger; using INuGetLogger = NuGet.Common.ILogger; diff --git a/src/BaGetter.Core/Upstream/Clients/V3UpstreamClient.cs b/src/BaGetter.Core/Upstream/Clients/V3UpstreamClient.cs index 20b96c34e..f3a9abbf0 100644 --- a/src/BaGetter.Core/Upstream/Clients/V3UpstreamClient.cs +++ b/src/BaGetter.Core/Upstream/Clients/V3UpstreamClient.cs @@ -4,12 +4,15 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Extensions; using BaGetter.Protocol; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; using Microsoft.Extensions.Logging; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Upstream.Clients; /// /// The mirroring client for a NuGet server that uses the V3 protocol. diff --git a/src/BaGetter.Core/Upstream/DownloadsImporter.cs b/src/BaGetter.Core/Upstream/DownloadsImporter.cs index a67c20e34..58d1c2fbf 100644 --- a/src/BaGetter.Core/Upstream/DownloadsImporter.cs +++ b/src/BaGetter.Core/Upstream/DownloadsImporter.cs @@ -3,10 +3,11 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -namespace BaGetter.Core; +namespace BaGetter.Core.Upstream; public class DownloadsImporter { diff --git a/src/BaGetter.Core/Upstream/IPackageDownloadsSource.cs b/src/BaGetter.Core/Upstream/IPackageDownloadsSource.cs index 7ce79c758..453103730 100644 --- a/src/BaGetter.Core/Upstream/IPackageDownloadsSource.cs +++ b/src/BaGetter.Core/Upstream/IPackageDownloadsSource.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace BaGetter.Core; +namespace BaGetter.Core.Upstream; public interface IPackageDownloadsSource { diff --git a/src/BaGetter.Core/Upstream/IUpstreamClient.cs b/src/BaGetter.Core/Upstream/IUpstreamClient.cs index 80458bf12..1252c58cc 100644 --- a/src/BaGetter.Core/Upstream/IUpstreamClient.cs +++ b/src/BaGetter.Core/Upstream/IUpstreamClient.cs @@ -1,10 +1,11 @@ -using NuGet.Versioning; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Upstream; /// /// A client to interact with an upstream package source. diff --git a/src/BaGetter.Core/Upstream/PackageDownloadsJsonSource.cs b/src/BaGetter.Core/Upstream/PackageDownloadsJsonSource.cs index 2032da48c..5c4de6070 100644 --- a/src/BaGetter.Core/Upstream/PackageDownloadsJsonSource.cs +++ b/src/BaGetter.Core/Upstream/PackageDownloadsJsonSource.cs @@ -9,7 +9,7 @@ using Newtonsoft.Json.Linq; using NuGet.Versioning; -namespace BaGetter.Core; +namespace BaGetter.Core.Upstream; /// See: public class PackageDownloadsJsonSource : IPackageDownloadsSource diff --git a/src/BaGetter.Core/Validation/RequiredIfAttribute.cs b/src/BaGetter.Core/Validation/RequiredIfAttribute.cs index 0d5ccea76..3d603ab2c 100644 --- a/src/BaGetter.Core/Validation/RequiredIfAttribute.cs +++ b/src/BaGetter.Core/Validation/RequiredIfAttribute.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Globalization; -namespace BaGetter.Core; +namespace BaGetter.Core.Validation; /// /// Provides conditional validation based on related property value. diff --git a/src/BaGetter.Core/Validation/ValidateBaGetOptions.cs b/src/BaGetter.Core/Validation/ValidateBaGetOptions.cs index 8f160e434..5d2548ef3 100644 --- a/src/BaGetter.Core/Validation/ValidateBaGetOptions.cs +++ b/src/BaGetter.Core/Validation/ValidateBaGetOptions.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using Microsoft.Extensions.Options; -namespace BaGetter.Core; +namespace BaGetter.Core.Validation; /// /// A configuration that validates options using data annotations. diff --git a/src/BaGetter.Core/Validation/ValidateStartupOptions.cs b/src/BaGetter.Core/Validation/ValidateStartupOptions.cs index 80a1421ba..de5e27286 100644 --- a/src/BaGetter.Core/Validation/ValidateStartupOptions.cs +++ b/src/BaGetter.Core/Validation/ValidateStartupOptions.cs @@ -1,8 +1,9 @@ using System; +using BaGetter.Core.Configuration; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace BaGetter.Core; +namespace BaGetter.Core.Validation; /// /// Validates BaGetter's options, used at startup. diff --git a/src/BaGetter.Database.MySql/BaGetter.Database.MySql.csproj b/src/BaGetter.Database.MySql/BaGetter.Database.MySql.csproj index a340335f7..26e9cbef8 100644 --- a/src/BaGetter.Database.MySql/BaGetter.Database.MySql.csproj +++ b/src/BaGetter.Database.MySql/BaGetter.Database.MySql.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 latest NuGet The libraries to host BaGetter on MySQL. diff --git a/src/BaGetter.Database.MySql/MySqlApplicationExtensions.cs b/src/BaGetter.Database.MySql/MySqlApplicationExtensions.cs index 17fccdc64..a9628cab4 100644 --- a/src/BaGetter.Database.MySql/MySqlApplicationExtensions.cs +++ b/src/BaGetter.Database.MySql/MySqlApplicationExtensions.cs @@ -1,9 +1,10 @@ using System; using BaGetter.Core; -using BaGetter.Database.MySql; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; using Microsoft.Extensions.DependencyInjection; -namespace BaGetter; +namespace BaGetter.Database.MySql; public static class MySqlApplicationExtensions { diff --git a/src/BaGetter.Database.MySql/MySqlContext.cs b/src/BaGetter.Database.MySql/MySqlContext.cs index 8d26078dc..5cd2f37a3 100644 --- a/src/BaGetter.Database.MySql/MySqlContext.cs +++ b/src/BaGetter.Database.MySql/MySqlContext.cs @@ -1,4 +1,5 @@ -using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; using MySqlConnector; diff --git a/src/BaGetter.Database.PostgreSql/BaGetter.Database.PostgreSql.csproj b/src/BaGetter.Database.PostgreSql/BaGetter.Database.PostgreSql.csproj index b0a859043..b618c4ec8 100644 --- a/src/BaGetter.Database.PostgreSql/BaGetter.Database.PostgreSql.csproj +++ b/src/BaGetter.Database.PostgreSql/BaGetter.Database.PostgreSql.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 NuGet The libraries to host BaGetter on PostgreSQL. diff --git a/src/BaGetter.Database.PostgreSql/PostgreSqlApplicationExtensions.cs b/src/BaGetter.Database.PostgreSql/PostgreSqlApplicationExtensions.cs index 7b34332a8..f80d8841e 100644 --- a/src/BaGetter.Database.PostgreSql/PostgreSqlApplicationExtensions.cs +++ b/src/BaGetter.Database.PostgreSql/PostgreSqlApplicationExtensions.cs @@ -1,9 +1,10 @@ using System; using BaGetter.Core; -using BaGetter.Database.PostgreSql; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; using Microsoft.Extensions.DependencyInjection; -namespace BaGetter; +namespace BaGetter.Database.PostgreSql; public static class PostgreSqlApplicationExtensions { diff --git a/src/BaGetter.Database.PostgreSql/PostgreSqlContext.cs b/src/BaGetter.Database.PostgreSql/PostgreSqlContext.cs index 36882769f..fddc965ba 100644 --- a/src/BaGetter.Database.PostgreSql/PostgreSqlContext.cs +++ b/src/BaGetter.Database.PostgreSql/PostgreSqlContext.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; -using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; using Npgsql; diff --git a/src/BaGetter.Database.SqlServer/BaGetter.Database.SqlServer.csproj b/src/BaGetter.Database.SqlServer/BaGetter.Database.SqlServer.csproj index a4314e332..cb093a386 100644 --- a/src/BaGetter.Database.SqlServer/BaGetter.Database.SqlServer.csproj +++ b/src/BaGetter.Database.SqlServer/BaGetter.Database.SqlServer.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 NuGet The libraries to host BaGetter on SQL Server. diff --git a/src/BaGetter.Database.SqlServer/SqlServerApplicationExtensions.cs b/src/BaGetter.Database.SqlServer/SqlServerApplicationExtensions.cs index 0fa4774d5..ee7d41897 100644 --- a/src/BaGetter.Database.SqlServer/SqlServerApplicationExtensions.cs +++ b/src/BaGetter.Database.SqlServer/SqlServerApplicationExtensions.cs @@ -1,9 +1,10 @@ using System; using BaGetter.Core; -using BaGetter.Database.SqlServer; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; using Microsoft.Extensions.DependencyInjection; -namespace BaGetter; +namespace BaGetter.Database.SqlServer; public static class SqlServerApplicationExtensions { diff --git a/src/BaGetter.Database.SqlServer/SqlServerContext.cs b/src/BaGetter.Database.SqlServer/SqlServerContext.cs index 36c7964bc..893a0681c 100644 --- a/src/BaGetter.Database.SqlServer/SqlServerContext.cs +++ b/src/BaGetter.Database.SqlServer/SqlServerContext.cs @@ -1,5 +1,6 @@ using System.Linq; -using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; using Microsoft.Data.SqlClient; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; diff --git a/src/BaGetter.Database.Sqlite/BaGetter.Database.Sqlite.csproj b/src/BaGetter.Database.Sqlite/BaGetter.Database.Sqlite.csproj index 87fb4d009..b0c770131 100644 --- a/src/BaGetter.Database.Sqlite/BaGetter.Database.Sqlite.csproj +++ b/src/BaGetter.Database.Sqlite/BaGetter.Database.Sqlite.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable NuGet The libraries to host BaGetter on SQLite. diff --git a/src/BaGetter.Database.Sqlite/SqliteApplicationExtensions.cs b/src/BaGetter.Database.Sqlite/SqliteApplicationExtensions.cs index a9e6db146..ec0ba604f 100644 --- a/src/BaGetter.Database.Sqlite/SqliteApplicationExtensions.cs +++ b/src/BaGetter.Database.Sqlite/SqliteApplicationExtensions.cs @@ -1,9 +1,10 @@ using System; using BaGetter.Core; -using BaGetter.Database.Sqlite; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; using Microsoft.Extensions.DependencyInjection; -namespace BaGetter; +namespace BaGetter.Database.Sqlite; public static class SqliteApplicationExtensions { diff --git a/src/BaGetter.Database.Sqlite/SqliteContext.cs b/src/BaGetter.Database.Sqlite/SqliteContext.cs index 5e70a2b66..fdeec5141 100644 --- a/src/BaGetter.Database.Sqlite/SqliteContext.cs +++ b/src/BaGetter.Database.Sqlite/SqliteContext.cs @@ -1,7 +1,8 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; diff --git a/src/BaGetter.Gcp/BaGetter.Gcp.csproj b/src/BaGetter.Gcp/BaGetter.Gcp.csproj index 05c2945a1..7be090f61 100644 --- a/src/BaGetter.Gcp/BaGetter.Gcp.csproj +++ b/src/BaGetter.Gcp/BaGetter.Gcp.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 NuGet;Google;Cloud The libraries to host BaGetter on the Google Cloud Platform. diff --git a/src/BaGetter.Gcp/GoogleCloudApplicationExtensions.cs b/src/BaGetter.Gcp/GoogleCloudApplicationExtensions.cs index 6354bef98..778030da6 100644 --- a/src/BaGetter.Gcp/GoogleCloudApplicationExtensions.cs +++ b/src/BaGetter.Gcp/GoogleCloudApplicationExtensions.cs @@ -1,10 +1,12 @@ using System; using BaGetter.Core; -using BaGetter.Gcp; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; +using BaGetter.Core.Storage; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace BaGetter; +namespace BaGetter.Gcp; public static class GoogleCloudApplicationExtensions { diff --git a/src/BaGetter.Gcp/GoogleCloudStorageOptions.cs b/src/BaGetter.Gcp/GoogleCloudStorageOptions.cs index a2ebceff3..861a4a628 100644 --- a/src/BaGetter.Gcp/GoogleCloudStorageOptions.cs +++ b/src/BaGetter.Gcp/GoogleCloudStorageOptions.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using BaGetter.Core; +using BaGetter.Core.Configuration; namespace BaGetter.Gcp; diff --git a/src/BaGetter.Gcp/GoogleCloudStorageService.cs b/src/BaGetter.Gcp/GoogleCloudStorageService.cs index 583a6c043..783b394fa 100644 --- a/src/BaGetter.Gcp/GoogleCloudStorageService.cs +++ b/src/BaGetter.Gcp/GoogleCloudStorageService.cs @@ -1,11 +1,10 @@ using System; using System.IO; -using System.Linq; using System.Net; using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; -using BaGetter.Core; +using BaGetter.Core.Storage; using Google; using Google.Cloud.Storage.V1; using Microsoft.Extensions.Options; diff --git a/src/BaGetter.Protocol/BaGetter.Protocol.csproj b/src/BaGetter.Protocol/BaGetter.Protocol.csproj index c1a4d64da..f7b19c1b5 100644 --- a/src/BaGetter.Protocol/BaGetter.Protocol.csproj +++ b/src/BaGetter.Protocol/BaGetter.Protocol.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net10.0 NuGet;Protocol Libraries to interact with NuGet server APIs. diff --git a/src/BaGetter.Protocol/Catalog/CatalogClient.cs b/src/BaGetter.Protocol/Catalog/CatalogClient.cs index 37032c9fe..f56107ed8 100644 --- a/src/BaGetter.Protocol/Catalog/CatalogClient.cs +++ b/src/BaGetter.Protocol/Catalog/CatalogClient.cs @@ -1,8 +1,10 @@ using System; using System.Threading; using System.Threading.Tasks; +using BaGetter.Protocol.Catalog; using BaGetter.Protocol.Models; +// ReSharper disable once CheckNamespace namespace BaGetter.Protocol; public partial class NuGetClientFactory diff --git a/src/BaGetter.Protocol/Catalog/CatalogProcessor.cs b/src/BaGetter.Protocol/Catalog/CatalogProcessor.cs index 0c45f11e2..cea47ece9 100644 --- a/src/BaGetter.Protocol/Catalog/CatalogProcessor.cs +++ b/src/BaGetter.Protocol/Catalog/CatalogProcessor.cs @@ -1,6 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; using Microsoft.Extensions.Logging; @@ -188,8 +189,7 @@ private async Task GetMinCommitTimestamp(CancellationToken cance { var minCommitTimestamp = await _cursor.GetAsync(cancellationToken); - minCommitTimestamp = minCommitTimestamp - ?? _options.DefaultMinCommitTimestamp + minCommitTimestamp ??= _options.DefaultMinCommitTimestamp ?? _options.MinCommitTimestamp; if (minCommitTimestamp.Value < _options.MinCommitTimestamp) diff --git a/src/BaGetter.Protocol/Catalog/ICatalogClient.cs b/src/BaGetter.Protocol/Catalog/ICatalogClient.cs index 26f951792..83d38da41 100644 --- a/src/BaGetter.Protocol/Catalog/ICatalogClient.cs +++ b/src/BaGetter.Protocol/Catalog/ICatalogClient.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Catalog; /// /// The Catalog client, used to discover package events.
diff --git a/src/BaGetter.Protocol/Catalog/NullCatalogClient.cs b/src/BaGetter.Protocol/Catalog/NullCatalogClient.cs index 634975ad1..3526552ed 100644 --- a/src/BaGetter.Protocol/Catalog/NullCatalogClient.cs +++ b/src/BaGetter.Protocol/Catalog/NullCatalogClient.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.Catalog; public class NullCatalogClient : ICatalogClient { diff --git a/src/BaGetter.Protocol/Catalog/RawCatalogClient.cs b/src/BaGetter.Protocol/Catalog/RawCatalogClient.cs index bb95f6a54..069aed41e 100644 --- a/src/BaGetter.Protocol/Catalog/RawCatalogClient.cs +++ b/src/BaGetter.Protocol/Catalog/RawCatalogClient.cs @@ -3,9 +3,10 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.Catalog; public class RawCatalogClient : ICatalogClient { diff --git a/src/BaGetter.Protocol/Converters/PackageDependencyRangeJsonConverter.cs b/src/BaGetter.Protocol/Converters/PackageDependencyRangeJsonConverter.cs index 1a1a357e7..b9c65796c 100644 --- a/src/BaGetter.Protocol/Converters/PackageDependencyRangeJsonConverter.cs +++ b/src/BaGetter.Protocol/Converters/PackageDependencyRangeJsonConverter.cs @@ -2,7 +2,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.Converters; /// /// This is an internal API that may be changed or removed without notice in any release. diff --git a/src/BaGetter.Protocol/Converters/StringOrStringArrayJsonConverter.cs b/src/BaGetter.Protocol/Converters/StringOrStringArrayJsonConverter.cs index f30c3ac7f..c4f5e0b7e 100644 --- a/src/BaGetter.Protocol/Converters/StringOrStringArrayJsonConverter.cs +++ b/src/BaGetter.Protocol/Converters/StringOrStringArrayJsonConverter.cs @@ -3,7 +3,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.Converters; /// /// This is an internal API that may be changed or removed without notice in any release. diff --git a/src/BaGetter.Protocol/Extensions/CatalogModelExtensions.cs b/src/BaGetter.Protocol/Extensions/CatalogModelExtensions.cs index b4ebf3360..9239b56ae 100644 --- a/src/BaGetter.Protocol/Extensions/CatalogModelExtensions.cs +++ b/src/BaGetter.Protocol/Extensions/CatalogModelExtensions.cs @@ -5,7 +5,7 @@ using NuGet.Frameworks; using NuGet.Versioning; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Extensions; /// /// These are documented interpretations of values returned by the catalog API. diff --git a/src/BaGetter.Protocol/Extensions/HttpClientExtensions.cs b/src/BaGetter.Protocol/Extensions/HttpClientExtensions.cs index 85a3049a8..b16273768 100644 --- a/src/BaGetter.Protocol/Extensions/HttpClientExtensions.cs +++ b/src/BaGetter.Protocol/Extensions/HttpClientExtensions.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Extensions; internal static class HttpClientExtensions { diff --git a/src/BaGetter.Protocol/Extensions/NuGetClientFactoryExtensions.cs b/src/BaGetter.Protocol/Extensions/NuGetClientFactoryExtensions.cs index 1485da4f6..dfded7482 100644 --- a/src/BaGetter.Protocol/Extensions/NuGetClientFactoryExtensions.cs +++ b/src/BaGetter.Protocol/Extensions/NuGetClientFactoryExtensions.cs @@ -1,7 +1,7 @@ using BaGetter.Protocol.Catalog; using Microsoft.Extensions.Logging; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Extensions; public static class NuGetClientFactoryExtensions { diff --git a/src/BaGetter.Protocol/Extensions/PackageContentModelExtensions.cs b/src/BaGetter.Protocol/Extensions/PackageContentModelExtensions.cs index b8fe31cdf..7adb5040a 100644 --- a/src/BaGetter.Protocol/Extensions/PackageContentModelExtensions.cs +++ b/src/BaGetter.Protocol/Extensions/PackageContentModelExtensions.cs @@ -3,7 +3,7 @@ using BaGetter.Protocol.Models; using NuGet.Versioning; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Extensions; /// /// These are documented interpretations of values returned by the Package Content resource. diff --git a/src/BaGetter.Protocol/Extensions/PackageMetadataModelExtensions.cs b/src/BaGetter.Protocol/Extensions/PackageMetadataModelExtensions.cs index 055aebbb9..e2a6a5e8d 100644 --- a/src/BaGetter.Protocol/Extensions/PackageMetadataModelExtensions.cs +++ b/src/BaGetter.Protocol/Extensions/PackageMetadataModelExtensions.cs @@ -1,7 +1,7 @@ using BaGetter.Protocol.Models; using NuGet.Versioning; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Extensions; /// /// These are documented interpretations of values returned by the @@ -14,7 +14,7 @@ public static class RegistrationModelExtensions /// /// The package metadata. /// The package version. - public static NuGetVersion ParseVersion(this PackageMetadata package) + public static NuGetVersion ParseVersion(this Models.PackageMetadata package) { return NuGetVersion.Parse(package.Version); } @@ -24,7 +24,7 @@ public static NuGetVersion ParseVersion(this PackageMetadata package) /// /// The package metadata. /// True if the package is listed. - public static bool IsListed(this PackageMetadata package) + public static bool IsListed(this Models.PackageMetadata package) { if (package.Listed.HasValue) { diff --git a/src/BaGetter.Protocol/Extensions/SearchModelExtensions.cs b/src/BaGetter.Protocol/Extensions/SearchModelExtensions.cs index 3ef730eb3..82752f7ff 100644 --- a/src/BaGetter.Protocol/Extensions/SearchModelExtensions.cs +++ b/src/BaGetter.Protocol/Extensions/SearchModelExtensions.cs @@ -1,7 +1,7 @@ using BaGetter.Protocol.Models; using NuGet.Versioning; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Extensions; /// /// These are documented interpretations of values returned by the Search resource. diff --git a/src/BaGetter.Protocol/Extensions/ServiceIndexModelExtensions.cs b/src/BaGetter.Protocol/Extensions/ServiceIndexModelExtensions.cs index b6f0bed0c..b8913c257 100644 --- a/src/BaGetter.Protocol/Extensions/ServiceIndexModelExtensions.cs +++ b/src/BaGetter.Protocol/Extensions/ServiceIndexModelExtensions.cs @@ -2,7 +2,7 @@ using System.Linq; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Extensions; /// /// These are documented interpretations of values returned by the Service Index resource. diff --git a/src/BaGetter.Protocol/Models/DependencyItem.cs b/src/BaGetter.Protocol/Models/DependencyItem.cs index d25316c8f..4b31a3482 100644 --- a/src/BaGetter.Protocol/Models/DependencyItem.cs +++ b/src/BaGetter.Protocol/Models/DependencyItem.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Converters; namespace BaGetter.Protocol.Models; diff --git a/src/BaGetter.Protocol/Models/PackageMetadata.cs b/src/BaGetter.Protocol/Models/PackageMetadata.cs index ddd1bca8e..7e835bdf0 100644 --- a/src/BaGetter.Protocol/Models/PackageMetadata.cs +++ b/src/BaGetter.Protocol/Models/PackageMetadata.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text.Json.Serialization; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Converters; namespace BaGetter.Protocol.Models; diff --git a/src/BaGetter.Protocol/Models/SearchResult.cs b/src/BaGetter.Protocol/Models/SearchResult.cs index 8e5782863..9a7a5b8c2 100644 --- a/src/BaGetter.Protocol/Models/SearchResult.cs +++ b/src/BaGetter.Protocol/Models/SearchResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Converters; namespace BaGetter.Protocol.Models; diff --git a/src/BaGetter.Protocol/NuGetClient.cs b/src/BaGetter.Protocol/NuGetClient.cs index 50cb305e9..b0760963a 100644 --- a/src/BaGetter.Protocol/NuGetClient.cs +++ b/src/BaGetter.Protocol/NuGetClient.cs @@ -6,7 +6,11 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; +using BaGetter.Protocol.PackageContent; +using BaGetter.Protocol.PackageMetadata; +using BaGetter.Protocol.Search; using NuGet.Versioning; namespace BaGetter.Protocol; @@ -166,8 +170,8 @@ public virtual async Task> ListPackageVersionsAsync( var packages = await GetPackageMetadataAsync(packageId, cancellationToken); return packages - .Where(p => p.IsListed()) - .Select(p => p.ParseVersion()) + .Where(p => RegistrationModelExtensions.IsListed(p)) + .Select(p => RegistrationModelExtensions.ParseVersion(p)) .ToList(); } @@ -204,11 +208,11 @@ public virtual async Task> ListPackageVersionsAsync( /// The package ID. /// A token to cancel the task. /// The package's metadata, or an empty list if the package does not exist. - public virtual async Task> GetPackageMetadataAsync( + public virtual async Task> GetPackageMetadataAsync( string packageId, CancellationToken cancellationToken = default) { - var result = new List(); + var result = new List(); var registrationIndex = await _metadataClient.GetRegistrationIndexOrNullAsync(packageId, cancellationToken); @@ -251,7 +255,7 @@ public virtual async Task> GetPackageMetadataAsyn /// /// The package could not be found. /// - public virtual async Task GetPackageMetadataAsync( + public virtual async Task GetPackageMetadataAsync( string packageId, NuGetVersion packageVersion, CancellationToken cancellationToken = default) diff --git a/src/BaGetter.Protocol/NuGetClientFactory.cs b/src/BaGetter.Protocol/NuGetClientFactory.cs index 1ac4f41e2..85a7e8eea 100644 --- a/src/BaGetter.Protocol/NuGetClientFactory.cs +++ b/src/BaGetter.Protocol/NuGetClientFactory.cs @@ -2,8 +2,13 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Catalog; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; +using BaGetter.Protocol.PackageContent; +using BaGetter.Protocol.PackageMetadata; +using BaGetter.Protocol.Search; +using BaGetter.Protocol.ServiceIndex; namespace BaGetter.Protocol; diff --git a/src/BaGetter.Protocol/PackageContent/IPackageContentClient.cs b/src/BaGetter.Protocol/PackageContent/IPackageContentClient.cs index e87c68f63..535540185 100644 --- a/src/BaGetter.Protocol/PackageContent/IPackageContentClient.cs +++ b/src/BaGetter.Protocol/PackageContent/IPackageContentClient.cs @@ -4,7 +4,7 @@ using BaGetter.Protocol.Models; using NuGet.Versioning; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.PackageContent; /// /// The Package Content resource, used to download NuGet packages and to fetch other metadata. diff --git a/src/BaGetter.Protocol/PackageContent/PackageContentClient.cs b/src/BaGetter.Protocol/PackageContent/PackageContentClient.cs index e6391e97c..24e65931e 100644 --- a/src/BaGetter.Protocol/PackageContent/PackageContentClient.cs +++ b/src/BaGetter.Protocol/PackageContent/PackageContentClient.cs @@ -3,8 +3,10 @@ using System.Threading; using System.Threading.Tasks; using BaGetter.Protocol.Models; +using BaGetter.Protocol.PackageContent; using NuGet.Versioning; +// ReSharper disable once CheckNamespace namespace BaGetter.Protocol; public partial class NuGetClientFactory diff --git a/src/BaGetter.Protocol/PackageContent/RawPackageContentClient.cs b/src/BaGetter.Protocol/PackageContent/RawPackageContentClient.cs index e68b30521..f6f3d7afd 100644 --- a/src/BaGetter.Protocol/PackageContent/RawPackageContentClient.cs +++ b/src/BaGetter.Protocol/PackageContent/RawPackageContentClient.cs @@ -4,10 +4,11 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; using NuGet.Versioning; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.PackageContent; /// /// The client to interact with an upstream source's Package Content resource. diff --git a/src/BaGetter.Protocol/PackageMetadata/IPackageMetadataClient.cs b/src/BaGetter.Protocol/PackageMetadata/IPackageMetadataClient.cs index 0f968e40f..5865eb7dd 100644 --- a/src/BaGetter.Protocol/PackageMetadata/IPackageMetadataClient.cs +++ b/src/BaGetter.Protocol/PackageMetadata/IPackageMetadataClient.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.PackageMetadata; /// /// The Package Metadata client, used to fetch packages' metadata. diff --git a/src/BaGetter.Protocol/PackageMetadata/PackageMetadataClient.cs b/src/BaGetter.Protocol/PackageMetadata/PackageMetadataClient.cs index 060bc9865..ae09fd510 100644 --- a/src/BaGetter.Protocol/PackageMetadata/PackageMetadataClient.cs +++ b/src/BaGetter.Protocol/PackageMetadata/PackageMetadataClient.cs @@ -2,7 +2,9 @@ using System.Threading; using System.Threading.Tasks; using BaGetter.Protocol.Models; +using BaGetter.Protocol.PackageMetadata; +// ReSharper disable once CheckNamespace namespace BaGetter.Protocol; public partial class NuGetClientFactory diff --git a/src/BaGetter.Protocol/PackageMetadata/RawPackageMetadataClient.cs b/src/BaGetter.Protocol/PackageMetadata/RawPackageMetadataClient.cs index a9ddf7f79..cebcc5099 100644 --- a/src/BaGetter.Protocol/PackageMetadata/RawPackageMetadataClient.cs +++ b/src/BaGetter.Protocol/PackageMetadata/RawPackageMetadataClient.cs @@ -2,9 +2,10 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.PackageMetadata; /// /// The client to interact with an upstream source's Package Metadata resource. diff --git a/src/BaGetter.Protocol/Search/AutocompleteClient.cs b/src/BaGetter.Protocol/Search/AutocompleteClient.cs index a6811b849..eb71087fe 100644 --- a/src/BaGetter.Protocol/Search/AutocompleteClient.cs +++ b/src/BaGetter.Protocol/Search/AutocompleteClient.cs @@ -2,7 +2,9 @@ using System.Threading; using System.Threading.Tasks; using BaGetter.Protocol.Models; +using BaGetter.Protocol.Search; +// ReSharper disable once CheckNamespace namespace BaGetter.Protocol; public partial class NuGetClientFactory diff --git a/src/BaGetter.Protocol/Search/IAutocompleteClient.cs b/src/BaGetter.Protocol/Search/IAutocompleteClient.cs index ce64544c3..308df51f2 100644 --- a/src/BaGetter.Protocol/Search/IAutocompleteClient.cs +++ b/src/BaGetter.Protocol/Search/IAutocompleteClient.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Search; /// /// The client used to search for packages. diff --git a/src/BaGetter.Protocol/Search/ISearchClient.cs b/src/BaGetter.Protocol/Search/ISearchClient.cs index d77fbbbb7..daaf4cd7c 100644 --- a/src/BaGetter.Protocol/Search/ISearchClient.cs +++ b/src/BaGetter.Protocol/Search/ISearchClient.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.Search; /// /// The client used to search for packages. diff --git a/src/BaGetter.Protocol/Search/NullAutocompleteClient.cs b/src/BaGetter.Protocol/Search/NullAutocompleteClient.cs index 8f7abf352..157533570 100644 --- a/src/BaGetter.Protocol/Search/NullAutocompleteClient.cs +++ b/src/BaGetter.Protocol/Search/NullAutocompleteClient.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.Search; public class NullAutocompleteClient : IAutocompleteClient { diff --git a/src/BaGetter.Protocol/Search/RawAutocompleteClient.cs b/src/BaGetter.Protocol/Search/RawAutocompleteClient.cs index 190b79b7d..6f04a2226 100644 --- a/src/BaGetter.Protocol/Search/RawAutocompleteClient.cs +++ b/src/BaGetter.Protocol/Search/RawAutocompleteClient.cs @@ -2,9 +2,10 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.Search; /// /// The client used to search for packages. diff --git a/src/BaGetter.Protocol/Search/RawSearchClient.cs b/src/BaGetter.Protocol/Search/RawSearchClient.cs index 49e33439a..a366bc0a0 100644 --- a/src/BaGetter.Protocol/Search/RawSearchClient.cs +++ b/src/BaGetter.Protocol/Search/RawSearchClient.cs @@ -4,9 +4,10 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.Search; /// /// The client used to search for packages. diff --git a/src/BaGetter.Protocol/Search/SearchClient.cs b/src/BaGetter.Protocol/Search/SearchClient.cs index 43dac75ab..d989f5932 100644 --- a/src/BaGetter.Protocol/Search/SearchClient.cs +++ b/src/BaGetter.Protocol/Search/SearchClient.cs @@ -2,7 +2,9 @@ using System.Threading; using System.Threading.Tasks; using BaGetter.Protocol.Models; +using BaGetter.Protocol.Search; +// ReSharper disable once CheckNamespace namespace BaGetter.Protocol; public partial class NuGetClientFactory diff --git a/src/BaGetter.Protocol/ServiceIndex/IServiceIndexClient.cs b/src/BaGetter.Protocol/ServiceIndex/IServiceIndexClient.cs index b119761ec..0b4246f70 100644 --- a/src/BaGetter.Protocol/ServiceIndex/IServiceIndexClient.cs +++ b/src/BaGetter.Protocol/ServiceIndex/IServiceIndexClient.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol; +namespace BaGetter.Protocol.ServiceIndex; /// /// The NuGet Service Index client, used to discover other resources. diff --git a/src/BaGetter.Protocol/ServiceIndex/RawServiceIndexClient.cs b/src/BaGetter.Protocol/ServiceIndex/RawServiceIndexClient.cs index 33d4b1a0c..4d84345e0 100644 --- a/src/BaGetter.Protocol/ServiceIndex/RawServiceIndexClient.cs +++ b/src/BaGetter.Protocol/ServiceIndex/RawServiceIndexClient.cs @@ -2,9 +2,10 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; -namespace BaGetter.Protocol.Internal; +namespace BaGetter.Protocol.ServiceIndex; /// /// The NuGet Service Index client, used to discover other resources. diff --git a/src/BaGetter.Protocol/ServiceIndex/ServiceIndexClient.cs b/src/BaGetter.Protocol/ServiceIndex/ServiceIndexClient.cs index 91e6f6167..a734efe3b 100644 --- a/src/BaGetter.Protocol/ServiceIndex/ServiceIndexClient.cs +++ b/src/BaGetter.Protocol/ServiceIndex/ServiceIndexClient.cs @@ -2,7 +2,9 @@ using System.Threading; using System.Threading.Tasks; using BaGetter.Protocol.Models; +using BaGetter.Protocol.ServiceIndex; +// ReSharper disable once CheckNamespace namespace BaGetter.Protocol; public partial class NuGetClientFactory diff --git a/src/BaGetter.Tencent/BaGetter.Tencent.csproj b/src/BaGetter.Tencent/BaGetter.Tencent.csproj index 434765158..777902cb5 100644 --- a/src/BaGetter.Tencent/BaGetter.Tencent.csproj +++ b/src/BaGetter.Tencent/BaGetter.Tencent.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable The libraries to host BaGetter on Tencent Cloud. enable diff --git a/src/BaGetter.Tencent/TencentApplicationExtensions.cs b/src/BaGetter.Tencent/TencentApplicationExtensions.cs index 96fe60ea9..4652a9af4 100644 --- a/src/BaGetter.Tencent/TencentApplicationExtensions.cs +++ b/src/BaGetter.Tencent/TencentApplicationExtensions.cs @@ -1,4 +1,7 @@ using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; +using BaGetter.Core.Storage; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; diff --git a/src/BaGetter.Tencent/TencentStorageService.cs b/src/BaGetter.Tencent/TencentStorageService.cs index aa6a2994f..698fd7759 100644 --- a/src/BaGetter.Tencent/TencentStorageService.cs +++ b/src/BaGetter.Tencent/TencentStorageService.cs @@ -1,4 +1,4 @@ -using BaGetter.Core; +using BaGetter.Core.Storage; using Microsoft.Extensions.Options; namespace BaGetter.Tencent; diff --git a/src/BaGetter.Web/Authentication/NugetBasicAuthenticationHandler.cs b/src/BaGetter.Web/Authentication/NugetBasicAuthenticationHandler.cs index ef5031e79..53a7d9915 100644 --- a/src/BaGetter.Web/Authentication/NugetBasicAuthenticationHandler.cs +++ b/src/BaGetter.Web/Authentication/NugetBasicAuthenticationHandler.cs @@ -7,8 +7,8 @@ using System.Text; using System.Threading.Tasks; using System; -using BaGetter.Core; using System.Linq; +using BaGetter.Core.Configuration; namespace BaGetter.Web.Authentication; diff --git a/src/BaGetter.Web/BaGetter.Web.csproj b/src/BaGetter.Web/BaGetter.Web.csproj index ff350457c..c2e02fca1 100644 --- a/src/BaGetter.Web/BaGetter.Web.csproj +++ b/src/BaGetter.Web/BaGetter.Web.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 NuGet BaGetter's NuGet server implementation @@ -21,6 +21,6 @@ - + diff --git a/src/BaGetter.Web/BaGetterEndpointBuilder.cs b/src/BaGetter.Web/BaGetterEndpointBuilder.cs index c35fb4401..32f7e6eec 100644 --- a/src/BaGetter.Web/BaGetterEndpointBuilder.cs +++ b/src/BaGetter.Web/BaGetterEndpointBuilder.cs @@ -1,10 +1,9 @@ using System.Diagnostics.CodeAnalysis; -using BaGetter.Web; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Constraints; -namespace BaGetter; +namespace BaGetter.Web; [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Would be a breaking change since it's part of the public API")] public class BaGetterEndpointBuilder diff --git a/src/BaGetter.Web/Controllers/PackageContentController.cs b/src/BaGetter.Web/Controllers/PackageContentController.cs index 62e3bfdd1..7d34ddb74 100644 --- a/src/BaGetter.Web/Controllers/PackageContentController.cs +++ b/src/BaGetter.Web/Controllers/PackageContentController.cs @@ -1,14 +1,14 @@ using System; using System.Threading; using System.Threading.Tasks; -using BaGetter.Authentication; -using BaGetter.Core; +using BaGetter.Core.Authentication; +using BaGetter.Core.Content; using BaGetter.Protocol.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using NuGet.Versioning; -namespace BaGetter.Web; +namespace BaGetter.Web.Controllers; /// /// The Package Content resource, used to download content from packages. diff --git a/src/BaGetter.Web/Controllers/PackageMetadataController.cs b/src/BaGetter.Web/Controllers/PackageMetadataController.cs index 914068f5b..1f2cf05ad 100644 --- a/src/BaGetter.Web/Controllers/PackageMetadataController.cs +++ b/src/BaGetter.Web/Controllers/PackageMetadataController.cs @@ -1,14 +1,14 @@ using System; using System.Threading; using System.Threading.Tasks; -using BaGetter.Authentication; -using BaGetter.Core; +using BaGetter.Core.Authentication; +using BaGetter.Core.Metadata; using BaGetter.Protocol.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using NuGet.Versioning; -namespace BaGetter.Web; +namespace BaGetter.Web.Controllers; /// /// The Package Metadata resource, used to fetch packages' information. diff --git a/src/BaGetter.Web/Controllers/PackagePublishController.cs b/src/BaGetter.Web/Controllers/PackagePublishController.cs index c66b3bbe1..8bb3384a3 100644 --- a/src/BaGetter.Web/Controllers/PackagePublishController.cs +++ b/src/BaGetter.Web/Controllers/PackagePublishController.cs @@ -2,12 +2,16 @@ using System.Threading; using System.Threading.Tasks; using BaGetter.Core; +using BaGetter.Core.Authentication; +using BaGetter.Core.Configuration; +using BaGetter.Core.Indexing; +using BaGetter.Web.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using NuGet.Versioning; -namespace BaGetter.Web; +namespace BaGetter.Web.Controllers; public class PackagePublishController : Controller { diff --git a/src/BaGetter.Web/Controllers/SearchController.cs b/src/BaGetter.Web/Controllers/SearchController.cs index fe39d2d63..ac6545b60 100644 --- a/src/BaGetter.Web/Controllers/SearchController.cs +++ b/src/BaGetter.Web/Controllers/SearchController.cs @@ -1,13 +1,13 @@ using System; using System.Threading; using System.Threading.Tasks; -using BaGetter.Authentication; -using BaGetter.Core; +using BaGetter.Core.Authentication; +using BaGetter.Core.Search; using BaGetter.Protocol.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace BaGetter.Web; +namespace BaGetter.Web.Controllers; [Authorize(AuthenticationSchemes = AuthenticationConstants.NugetBasicAuthenticationScheme, Policy = AuthenticationConstants.NugetUserPolicy)] public class SearchController : Controller diff --git a/src/BaGetter.Web/Controllers/ServiceIndexController.cs b/src/BaGetter.Web/Controllers/ServiceIndexController.cs index 2e66edff1..22bd03eda 100644 --- a/src/BaGetter.Web/Controllers/ServiceIndexController.cs +++ b/src/BaGetter.Web/Controllers/ServiceIndexController.cs @@ -1,13 +1,13 @@ using System; using System.Threading; using System.Threading.Tasks; -using BaGetter.Authentication; -using BaGetter.Core; +using BaGetter.Core.Authentication; +using BaGetter.Core.ServiceIndex; using BaGetter.Protocol.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace BaGetter.Web; +namespace BaGetter.Web.Controllers; /// /// The NuGet Service Index. This aids NuGet client to discover this server's services. diff --git a/src/BaGetter.Web/Controllers/SymbolController.cs b/src/BaGetter.Web/Controllers/SymbolController.cs index 2cd99a383..800934f2e 100644 --- a/src/BaGetter.Web/Controllers/SymbolController.cs +++ b/src/BaGetter.Web/Controllers/SymbolController.cs @@ -1,14 +1,17 @@ using System; using System.Threading; using System.Threading.Tasks; -using BaGetter.Authentication; -using BaGetter.Core; +using BaGetter.Core.Authentication; +using BaGetter.Core.Configuration; +using BaGetter.Core.Indexing; +using BaGetter.Core.Storage; +using BaGetter.Web.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace BaGetter.Web; +namespace BaGetter.Web.Controllers; [Authorize(AuthenticationSchemes = AuthenticationConstants.NugetBasicAuthenticationScheme, Policy = AuthenticationConstants.NugetUserPolicy)] public class SymbolController : Controller diff --git a/src/BaGetter.Web/Extensions/HttpRequestExtensions.cs b/src/BaGetter.Web/Extensions/HttpRequestExtensions.cs index f825af1b2..39af25d83 100644 --- a/src/BaGetter.Web/Extensions/HttpRequestExtensions.cs +++ b/src/BaGetter.Web/Extensions/HttpRequestExtensions.cs @@ -1,10 +1,10 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using BaGetter.Core; +using BaGetter.Core.Extensions; using Microsoft.AspNetCore.Http; -namespace BaGetter.Web; +namespace BaGetter.Web.Extensions; public static class HttpRequestExtensions { diff --git a/src/BaGetter.Web/Extensions/IApplicationBuilderExtensions.cs b/src/BaGetter.Web/Extensions/IApplicationBuilderExtensions.cs index 259a04218..c1226dd5f 100644 --- a/src/BaGetter.Web/Extensions/IApplicationBuilderExtensions.cs +++ b/src/BaGetter.Web/Extensions/IApplicationBuilderExtensions.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.Builder; -namespace BaGetter.Web; +namespace BaGetter.Web.Extensions; public static class IApplicationBuilderExtensions { diff --git a/src/BaGetter.Web/Extensions/IHostExtensions.cs b/src/BaGetter.Web/Extensions/IHostExtensions.cs index 794bf1018..f5940a791 100644 --- a/src/BaGetter.Web/Extensions/IHostExtensions.cs +++ b/src/BaGetter.Web/Extensions/IHostExtensions.cs @@ -2,11 +2,14 @@ using System.Threading; using System.Threading.Tasks; using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using BaGetter.Core.Validation; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; -namespace BaGetter.Web; +namespace BaGetter.Web.Extensions; public static class IHostExtensions { diff --git a/src/BaGetter.Web/Extensions/IServiceCollectionExtensions.cs b/src/BaGetter.Web/Extensions/IServiceCollectionExtensions.cs index 2b08aecee..96ce538cb 100644 --- a/src/BaGetter.Web/Extensions/IServiceCollectionExtensions.cs +++ b/src/BaGetter.Web/Extensions/IServiceCollectionExtensions.cs @@ -1,14 +1,12 @@ using System; using System.Text.Json.Serialization; -using BaGetter.Authentication; using BaGetter.Core; -using BaGetter.Web; -using BaGetter.Web.Authentication; +using BaGetter.Core.Extensions; +using BaGetter.Web.Controllers; using BaGetter.Web.Helper; -using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.DependencyInjection; -namespace BaGetter; +namespace BaGetter.Web.Extensions; public static class IServiceCollectionExtensions { diff --git a/src/BaGetter.Web/Extensions/RazorExtensions.cs b/src/BaGetter.Web/Extensions/RazorExtensions.cs index b16f34780..8aa11d5b2 100644 --- a/src/BaGetter.Web/Extensions/RazorExtensions.cs +++ b/src/BaGetter.Web/Extensions/RazorExtensions.cs @@ -1,6 +1,6 @@ using Humanizer; -namespace BaGetter.Web; +namespace BaGetter.Web.Extensions; public static class RazorExtensions { diff --git a/src/BaGetter.Web/Pages/Index.cshtml b/src/BaGetter.Web/Pages/Index.cshtml index 4595be5fa..23bba0d29 100644 --- a/src/BaGetter.Web/Pages/Index.cshtml +++ b/src/BaGetter.Web/Pages/Index.cshtml @@ -1,4 +1,6 @@ @page +@using BaGetter.Protocol.Models +@using BaGetter.Web.Extensions @model IndexModel @{ @@ -37,7 +39,7 @@
    - @foreach (var packageType in PackageTypes) + @foreach (KeyValuePair packageType in PackageTypes) {
  • @packageType.Value
    • } @@ -56,7 +58,7 @@
      - @foreach (var framework in TargetFrameworks) + @foreach (KeyValuePair framework in TargetFrameworks) { @if (framework.Key.StartsWith("divider")) { @@ -101,7 +103,7 @@ } else { - @foreach (var package in Model.Packages) + @foreach (SearchResult package in Model.Packages) {
      } - var showPreviousLink = Model.PageIndex > 1; - var showNextLink = Model.Packages.Count >= IndexModel.ResultsPerPage; + bool showPreviousLink = Model.PageIndex > 1; + bool showNextLink = Model.Packages.Count >= IndexModel.ResultsPerPage; if (showPreviousLink || showNextLink) { @@ -246,10 +248,10 @@ else int? page = null) { // Use model's value if the argument was skipped. - packageType = packageType ?? Model.PackageType; - framework = framework ?? Model.Framework; - prerelease = prerelease ?? Model.Prerelease; - page = page ?? Model.PageIndex; + packageType ??= Model.PackageType; + framework ??= Model.Framework; + prerelease ??= Model.Prerelease; + page ??= Model.PageIndex; // Remove query parameters that have default value if (packageType == "any") packageType = null; diff --git a/src/BaGetter.Web/Pages/Index.cshtml.cs b/src/BaGetter.Web/Pages/Index.cshtml.cs index ee8702689..7f291da43 100644 --- a/src/BaGetter.Web/Pages/Index.cshtml.cs +++ b/src/BaGetter.Web/Pages/Index.cshtml.cs @@ -3,12 +3,12 @@ using System.ComponentModel.DataAnnotations; using System.Threading; using System.Threading.Tasks; -using BaGetter.Core; +using BaGetter.Core.Search; using BaGetter.Protocol.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace BaGetter.Web; +namespace BaGetter.Web.Pages; public class IndexModel : PageModel { diff --git a/src/BaGetter.Web/Pages/Package.cshtml b/src/BaGetter.Web/Pages/Package.cshtml index 61988b631..5f54075d5 100644 --- a/src/BaGetter.Web/Pages/Package.cshtml +++ b/src/BaGetter.Web/Pages/Package.cshtml @@ -1,4 +1,7 @@ @page "/packages/{id}/{version?}" +@using BaGetter.Core.Search +@using Humanizer +@using Microsoft.AspNetCore.Html @model PackageModel @{ @@ -94,7 +97,7 @@ else - @foreach (var package in Model.UsedBy) + @foreach (PackageDependent package in Model.UsedBy) { @@ -128,7 +131,7 @@ else } else { - foreach (var group in Model.DependencyGroups) + foreach (PackageModel.DependencyGroupModel group in Model.DependencyGroups) {

      @group.Name @@ -141,7 +144,7 @@ else } else { - @foreach (var dependency in group.Dependencies) + @foreach (PackageModel.DependencyModel dependency in group.Dependencies) {
    • - @for (var i = 0; i < Model.Versions.Count; i++) + @for (int i = 0; i < Model.Versions.Count; i++) { - var version = Model.Versions[i]; - var alwaysShow = Json.Serialize(i < DefaultVisibleVersions); + PackageModel.VersionModel version = Model.Versions[i]; + IHtmlContent alwaysShow = Json.Serialize(i < DefaultVisibleVersions); @version.Version.ToNormalizedString() @@ -269,7 +272,7 @@ else

      Tags

      - @foreach(var tag in Model.Package.Tags) + @foreach(string tag in Model.Package.Tags) { @tag } @@ -286,7 +289,7 @@ else let tabs = [ @if (Model.IsDotnetTemplate) { - + , { name: ".NET CLI", prefix: ">", @@ -296,7 +299,7 @@ else } else if (Model.IsDotnetTool) { - + , { name: ".NET CLI", prefix: ">", @@ -306,7 +309,7 @@ else } else { - + , { name: ".NET CLI", prefix: ">", @@ -326,7 +329,7 @@ else name: "Package Manager", prefix: "PM>", content: ["Install-Package @Model.Package.Id -Version @Model.Package.NormalizedVersionString"] - } + }, } ]; diff --git a/src/BaGetter.Web/Pages/Package.cshtml.cs b/src/BaGetter.Web/Pages/Package.cshtml.cs index 843539b6d..a374037e7 100644 --- a/src/BaGetter.Web/Pages/Package.cshtml.cs +++ b/src/BaGetter.Web/Pages/Package.cshtml.cs @@ -5,13 +5,16 @@ using System.Threading; using System.Threading.Tasks; using BaGetter.Core; +using BaGetter.Core.Content; +using BaGetter.Core.Entities; +using BaGetter.Core.Search; using Markdig; using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.RazorPages; using NuGet.Frameworks; using NuGet.Versioning; -namespace BaGetter.Web; +namespace BaGetter.Web.Pages; public class PackageModel : PageModel { diff --git a/src/BaGetter.Web/Pages/Shared/_Layout.cshtml b/src/BaGetter.Web/Pages/Shared/_Layout.cshtml index a06f9d34d..7352df67b 100644 --- a/src/BaGetter.Web/Pages/Shared/_Layout.cshtml +++ b/src/BaGetter.Web/Pages/Shared/_Layout.cshtml @@ -1,6 +1,6 @@ +@using BaGetter.Core.Configuration @using BaGetter.Web.Extensions @using BaGetter.Web.Helper -@using Microsoft.AspNetCore.Mvc.TagHelpers @using Microsoft.Extensions.Options @inject IOptions StatisticsOptions diff --git a/src/BaGetter.Web/Pages/Statistics.cshtml b/src/BaGetter.Web/Pages/Statistics.cshtml index e2fa077dd..c4aec6774 100644 --- a/src/BaGetter.Web/Pages/Statistics.cshtml +++ b/src/BaGetter.Web/Pages/Statistics.cshtml @@ -2,6 +2,7 @@ @model StatisticsModel +@using BaGetter.Core.Configuration @using BaGetter.Core.Statistics @using BaGetter.Web.Helper @using Microsoft.Extensions.Options diff --git a/src/BaGetter.Web/Pages/Statistics.cshtml.cs b/src/BaGetter.Web/Pages/Statistics.cshtml.cs index 101422be0..90cd752df 100644 --- a/src/BaGetter.Web/Pages/Statistics.cshtml.cs +++ b/src/BaGetter.Web/Pages/Statistics.cshtml.cs @@ -1,9 +1,9 @@ -using BaGetter.Core; +using BaGetter.Core.Configuration; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Options; -namespace BaGetter.Web; +namespace BaGetter.Web.Pages; public class StatisticsModel : PageModel { diff --git a/src/BaGetter.Web/Pages/Upload.cshtml b/src/BaGetter.Web/Pages/Upload.cshtml index 06c76a53c..e6dd8d472 100644 --- a/src/BaGetter.Web/Pages/Upload.cshtml +++ b/src/BaGetter.Web/Pages/Upload.cshtml @@ -1,12 +1,13 @@ @page -@inject IUrlGenerator _url +@using BaGetter.Core +@inject IUrlGenerator URL @{ ViewData["Title"] = "Upload package"; - var baseUrl = Url.PageLink("/Index"); - var publishUrl = _url.GetPackagePublishResourceUrl(); - var serviceIndexUrl = _url.GetServiceIndexUrl(); + string baseUrl = Url.PageLink("/Index"); + string publishUrl = URL.GetPackagePublishResourceUrl(); + string serviceIndexUrl = URL.GetServiceIndexUrl(); }

      diff --git a/src/BaGetter.Web/Pages/_ViewImports.cshtml b/src/BaGetter.Web/Pages/_ViewImports.cshtml index 41baafbff..a4987d31e 100644 --- a/src/BaGetter.Web/Pages/_ViewImports.cshtml +++ b/src/BaGetter.Web/Pages/_ViewImports.cshtml @@ -1,7 +1,3 @@ -@using BaGetter -@using BaGetter.Core -@using Humanizer -@using Microsoft.AspNetCore.Html -@namespace BaGetter.Web +@namespace BaGetter.Web.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, BaGetter.Web diff --git a/src/BaGetter/BaGetter.csproj b/src/BaGetter/BaGetter.csproj index 6c79a3575..26ceeccea 100644 --- a/src/BaGetter/BaGetter.csproj +++ b/src/BaGetter/BaGetter.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/src/BaGetter/ConfigureBaGetterServer.cs b/src/BaGetter/ConfigureBaGetterServer.cs index 35988d7e1..5bcb152b8 100644 --- a/src/BaGetter/ConfigureBaGetterServer.cs +++ b/src/BaGetter/ConfigureBaGetterServer.cs @@ -1,4 +1,4 @@ -using BaGetter.Core; +using BaGetter.Core.Configuration; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Cors.Infrastructure; using Microsoft.AspNetCore.Http.Features; diff --git a/src/BaGetter/IServiceCollectionExtensions.cs b/src/BaGetter/IServiceCollectionExtensions.cs index f2bc7b005..44e935545 100644 --- a/src/BaGetter/IServiceCollectionExtensions.cs +++ b/src/BaGetter/IServiceCollectionExtensions.cs @@ -1,10 +1,9 @@ -using BaGetter.Authentication; using BaGetter.Core; using BaGetter.Web.Authentication; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using System; +using BaGetter.Core.Authentication; namespace BaGetter; diff --git a/src/BaGetter/Program.cs b/src/BaGetter/Program.cs index 6227bd2f4..d06070c89 100644 --- a/src/BaGetter/Program.cs +++ b/src/BaGetter/Program.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -using BaGetter.Core; -using BaGetter.Web; +using BaGetter.Core.Upstream; +using BaGetter.Web.Extensions; using McMaster.Extensions.CommandLineUtils; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; diff --git a/src/BaGetter/Startup.cs b/src/BaGetter/Startup.cs index 8b549e795..229ef5504 100644 --- a/src/BaGetter/Startup.cs +++ b/src/BaGetter/Startup.cs @@ -1,13 +1,21 @@ using System; -using BaGetter.Authentication; +using BaGetter.Aliyun; +using BaGetter.Aws; +using BaGetter.Azure; using BaGetter.Core; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; using BaGetter.Core.Extensions; +using BaGetter.Core.Search; +using BaGetter.Core.Storage; +using BaGetter.Database.MySql; +using BaGetter.Database.PostgreSql; +using BaGetter.Database.Sqlite; +using BaGetter.Database.SqlServer; +using BaGetter.Gcp; using BaGetter.Tencent; using BaGetter.Web; -using BaGetter.Web.Authentication; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authentication.OAuth; -using Microsoft.AspNetCore.Authorization; +using BaGetter.Web.Extensions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; diff --git a/src/BaGetter/ValidateBaGetterOptions.cs b/src/BaGetter/ValidateBaGetterOptions.cs index c41b7d8de..adfa63d89 100644 --- a/src/BaGetter/ValidateBaGetterOptions.cs +++ b/src/BaGetter/ValidateBaGetterOptions.cs @@ -1,10 +1,6 @@ using System; using System.Collections.Generic; -using BaGetter.Core; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Cors.Infrastructure; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.HttpOverrides; +using BaGetter.Core.Configuration; using Microsoft.Extensions.Options; namespace BaGetter; diff --git a/tests/BaGetter.Core.Tests/BaGetter.Core.Tests.csproj b/tests/BaGetter.Core.Tests/BaGetter.Core.Tests.csproj index 8cd63d9f6..13b881269 100644 --- a/tests/BaGetter.Core.Tests/BaGetter.Core.Tests.csproj +++ b/tests/BaGetter.Core.Tests/BaGetter.Core.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/tests/BaGetter.Core.Tests/Metadata/DefaultPackageMetadataServiceTests.cs b/tests/BaGetter.Core.Tests/Metadata/DefaultPackageMetadataServiceTests.cs index f55ee36e4..ea1d7225c 100644 --- a/tests/BaGetter.Core.Tests/Metadata/DefaultPackageMetadataServiceTests.cs +++ b/tests/BaGetter.Core.Tests/Metadata/DefaultPackageMetadataServiceTests.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Metadata; using Moq; using NuGet.Versioning; using Xunit; diff --git a/tests/BaGetter.Core.Tests/Metadata/ModelTests.cs b/tests/BaGetter.Core.Tests/Metadata/ModelTests.cs index 460e89741..c2663e553 100644 --- a/tests/BaGetter.Core.Tests/Metadata/ModelTests.cs +++ b/tests/BaGetter.Core.Tests/Metadata/ModelTests.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using System.Text.Json.Serialization; +using BaGetter.Core.Metadata; using BaGetter.Protocol.Models; using Xunit; diff --git a/tests/BaGetter.Core.Tests/Metadata/PackageRegistrationTests.cs b/tests/BaGetter.Core.Tests/Metadata/PackageRegistrationTests.cs index 4bdadefa2..f70469ee7 100644 --- a/tests/BaGetter.Core.Tests/Metadata/PackageRegistrationTests.cs +++ b/tests/BaGetter.Core.Tests/Metadata/PackageRegistrationTests.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using BaGetter.Core.Entities; +using BaGetter.Core.Metadata; using Xunit; namespace BaGetter.Core.Tests.Metadata; diff --git a/tests/BaGetter.Core.Tests/Metadata/RegistrationBuilderTests.cs b/tests/BaGetter.Core.Tests/Metadata/RegistrationBuilderTests.cs index f6703679a..5a45e870d 100644 --- a/tests/BaGetter.Core.Tests/Metadata/RegistrationBuilderTests.cs +++ b/tests/BaGetter.Core.Tests/Metadata/RegistrationBuilderTests.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; +using BaGetter.Core.Entities; +using BaGetter.Core.Metadata; using BaGetter.Core.Tests.Support; using Moq; using Xunit; diff --git a/tests/BaGetter.Core.Tests/Search/DatabaseSearchServiceTests.cs b/tests/BaGetter.Core.Tests/Search/DatabaseSearchServiceTests.cs index 6c63b5247..80ee215be 100644 --- a/tests/BaGetter.Core.Tests/Search/DatabaseSearchServiceTests.cs +++ b/tests/BaGetter.Core.Tests/Search/DatabaseSearchServiceTests.cs @@ -1,4 +1,7 @@ using System; +using BaGetter.Core.Entities; +using BaGetter.Core.Indexing; +using BaGetter.Core.Search; using Moq; using Xunit; diff --git a/tests/BaGetter.Core.Tests/Search/SearchResponseBuilderTests.cs b/tests/BaGetter.Core.Tests/Search/SearchResponseBuilderTests.cs index d66dd0b80..8fcfc738f 100644 --- a/tests/BaGetter.Core.Tests/Search/SearchResponseBuilderTests.cs +++ b/tests/BaGetter.Core.Tests/Search/SearchResponseBuilderTests.cs @@ -1,3 +1,7 @@ +using BaGetter.Core.Entities; +using BaGetter.Core.Metadata; +using BaGetter.Core.Search; + namespace BaGetter.Core.Tests.Search; using System; diff --git a/tests/BaGetter.Core.Tests/Services/FileStorageServiceTests.cs b/tests/BaGetter.Core.Tests/Services/FileStorageServiceTests.cs index 7f4685f5d..951536803 100644 --- a/tests/BaGetter.Core.Tests/Services/FileStorageServiceTests.cs +++ b/tests/BaGetter.Core.Tests/Services/FileStorageServiceTests.cs @@ -3,6 +3,8 @@ using System.IO; using System.Text; using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Storage; using Microsoft.Extensions.Options; using Moq; using Xunit; diff --git a/tests/BaGetter.Core.Tests/Services/PackageDatabaseTests.cs b/tests/BaGetter.Core.Tests/Services/PackageDatabaseTests.cs index 59031b36f..96cdc4808 100644 --- a/tests/BaGetter.Core.Tests/Services/PackageDatabaseTests.cs +++ b/tests/BaGetter.Core.Tests/Services/PackageDatabaseTests.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; +using BaGetter.Core.Entities; using Moq; using Xunit; diff --git a/tests/BaGetter.Core.Tests/Services/PackageDeletionServiceTests.cs b/tests/BaGetter.Core.Tests/Services/PackageDeletionServiceTests.cs index c553e3d28..f931351f3 100644 --- a/tests/BaGetter.Core.Tests/Services/PackageDeletionServiceTests.cs +++ b/tests/BaGetter.Core.Tests/Services/PackageDeletionServiceTests.cs @@ -1,5 +1,9 @@ using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using BaGetter.Core.Indexing; +using BaGetter.Core.Storage; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/BaGetter.Core.Tests/Services/PackageIndexingServiceInMemoryTests.cs b/tests/BaGetter.Core.Tests/Services/PackageIndexingServiceInMemoryTests.cs index 61f81eb60..87361d9cb 100644 --- a/tests/BaGetter.Core.Tests/Services/PackageIndexingServiceInMemoryTests.cs +++ b/tests/BaGetter.Core.Tests/Services/PackageIndexingServiceInMemoryTests.cs @@ -1,8 +1,13 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using BaGetter.Core.Extensions; +using BaGetter.Core.Indexing; +using BaGetter.Core.Search; +using BaGetter.Core.Storage; using BaGetter.Core.Tests.Support; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -10,6 +15,7 @@ using NuGet.Packaging; using NuGet.Versioning; using Xunit; +using NullStorageService = BaGetter.Core.Storage.NullStorageService; namespace BaGetter.Core.Tests.Services; diff --git a/tests/BaGetter.Core.Tests/Services/PackageIndexingServiceTests.cs b/tests/BaGetter.Core.Tests/Services/PackageIndexingServiceTests.cs index 5cd273c8e..8e6d78654 100644 --- a/tests/BaGetter.Core.Tests/Services/PackageIndexingServiceTests.cs +++ b/tests/BaGetter.Core.Tests/Services/PackageIndexingServiceTests.cs @@ -1,6 +1,11 @@ -using System.Collections.Generic; using System.IO; using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using BaGetter.Core.Extensions; +using BaGetter.Core.Indexing; +using BaGetter.Core.Search; +using BaGetter.Core.Storage; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/BaGetter.Core.Tests/Services/PackageServiceTests.cs b/tests/BaGetter.Core.Tests/Services/PackageServiceTests.cs index 47215ab05..37607bc8e 100644 --- a/tests/BaGetter.Core.Tests/Services/PackageServiceTests.cs +++ b/tests/BaGetter.Core.Tests/Services/PackageServiceTests.cs @@ -4,12 +4,15 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Indexing; +using BaGetter.Core.Upstream; using Microsoft.Extensions.Logging; using Moq; using NuGet.Versioning; using Xunit; -namespace BaGetter.Core.Tests; +namespace BaGetter.Core.Tests.Services; public class PackageServiceTests { @@ -94,8 +97,8 @@ private void Setup( IReadOnlyList localPackages = null, IReadOnlyList upstreamPackages = null) { - localPackages = localPackages ?? new List(); - upstreamPackages = upstreamPackages ?? new List(); + localPackages ??= new List(); + upstreamPackages ??= new List(); _db .Setup(p => p.FindAsync( @@ -184,8 +187,8 @@ private void Setup( IReadOnlyList localPackages = null, IReadOnlyList upstreamPackages = null) { - localPackages = localPackages ?? new List(); - upstreamPackages = upstreamPackages ?? new List(); + localPackages ??= new List(); + upstreamPackages ??= new List(); _db .Setup(p => p.FindAsync( diff --git a/tests/BaGetter.Core.Tests/Services/PackageStorageServiceTests.cs b/tests/BaGetter.Core.Tests/Services/PackageStorageServiceTests.cs index 3f1604ffe..19debb6d0 100644 --- a/tests/BaGetter.Core.Tests/Services/PackageStorageServiceTests.cs +++ b/tests/BaGetter.Core.Tests/Services/PackageStorageServiceTests.cs @@ -4,6 +4,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Storage; using Microsoft.Extensions.Logging; using Moq; using NuGet.Versioning; diff --git a/tests/BaGetter.Core.Tests/Support/Generator.cs b/tests/BaGetter.Core.Tests/Support/Generator.cs index 2db690bdf..6c0a8c283 100644 --- a/tests/BaGetter.Core.Tests/Support/Generator.cs +++ b/tests/BaGetter.Core.Tests/Support/Generator.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using BaGetter.Core.Entities; +using BaGetter.Core.Metadata; using NuGet.Versioning; namespace BaGetter.Core.Tests.Support; diff --git a/tests/BaGetter.Core.Tests/Support/InMemoryPackageDatabase.cs b/tests/BaGetter.Core.Tests/Support/InMemoryPackageDatabase.cs index 0595a34c8..c15db4559 100644 --- a/tests/BaGetter.Core.Tests/Support/InMemoryPackageDatabase.cs +++ b/tests/BaGetter.Core.Tests/Support/InMemoryPackageDatabase.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; using NuGet.Versioning; namespace BaGetter.Core.Tests.Support; diff --git a/tests/BaGetter.Core.Tests/Support/NullStorageService.cs b/tests/BaGetter.Core.Tests/Support/NullStorageService.cs index 05f4b94e3..e10f258cb 100644 --- a/tests/BaGetter.Core.Tests/Support/NullStorageService.cs +++ b/tests/BaGetter.Core.Tests/Support/NullStorageService.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Storage; namespace BaGetter.Core.Tests.Support; public class NullStorageService : IStorageService diff --git a/tests/BaGetter.Core.Tests/Upstream/DisabledUpstreamClientTests.cs b/tests/BaGetter.Core.Tests/Upstream/DisabledUpstreamClientTests.cs index ca89f02f5..c8732675d 100644 --- a/tests/BaGetter.Core.Tests/Upstream/DisabledUpstreamClientTests.cs +++ b/tests/BaGetter.Core.Tests/Upstream/DisabledUpstreamClientTests.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using BaGetter.Core.Upstream.Clients; using Xunit; namespace BaGetter.Core.Tests.Upstream; diff --git a/tests/BaGetter.Core.Tests/Upstream/DownloadsImporterTests.cs b/tests/BaGetter.Core.Tests/Upstream/DownloadsImporterTests.cs index c21a4d102..588a7af9a 100644 --- a/tests/BaGetter.Core.Tests/Upstream/DownloadsImporterTests.cs +++ b/tests/BaGetter.Core.Tests/Upstream/DownloadsImporterTests.cs @@ -1,4 +1,6 @@ using System; +using BaGetter.Core.Entities; +using BaGetter.Core.Upstream; using Microsoft.Extensions.Logging; using Moq; using Xunit; diff --git a/tests/BaGetter.Core.Tests/Upstream/PackageDownloadsJsonSourceTests.cs b/tests/BaGetter.Core.Tests/Upstream/PackageDownloadsJsonSourceTests.cs index b686ed03e..30784f763 100644 --- a/tests/BaGetter.Core.Tests/Upstream/PackageDownloadsJsonSourceTests.cs +++ b/tests/BaGetter.Core.Tests/Upstream/PackageDownloadsJsonSourceTests.cs @@ -1,5 +1,6 @@ using System; using System.Net.Http; +using BaGetter.Core.Upstream; using Microsoft.Extensions.Logging; using Moq; using Xunit; diff --git a/tests/BaGetter.Core.Tests/Upstream/UpstreamAuthenticationTests.cs b/tests/BaGetter.Core.Tests/Upstream/UpstreamAuthenticationTests.cs index f58bf67ac..32f386949 100644 --- a/tests/BaGetter.Core.Tests/Upstream/UpstreamAuthenticationTests.cs +++ b/tests/BaGetter.Core.Tests/Upstream/UpstreamAuthenticationTests.cs @@ -12,6 +12,8 @@ using System.Net.Http.Json; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Extensions; using Xunit; namespace BaGetter.Core.Tests.Upstream; diff --git a/tests/BaGetter.Core.Tests/Upstream/V3UpstreamClientTests.cs b/tests/BaGetter.Core.Tests/Upstream/V3UpstreamClientTests.cs index d6de0ab8a..88de4e0b4 100644 --- a/tests/BaGetter.Core.Tests/Upstream/V3UpstreamClientTests.cs +++ b/tests/BaGetter.Core.Tests/Upstream/V3UpstreamClientTests.cs @@ -3,6 +3,8 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using BaGetter.Core.Entities; +using BaGetter.Core.Upstream.Clients; using BaGetter.Protocol; using BaGetter.Protocol.Models; using Microsoft.Extensions.Logging; diff --git a/tests/BaGetter.Protocol.Tests/BaGetter.Protocol.Tests.csproj b/tests/BaGetter.Protocol.Tests/BaGetter.Protocol.Tests.csproj index c8011c4b0..dd420065c 100644 --- a/tests/BaGetter.Protocol.Tests/BaGetter.Protocol.Tests.csproj +++ b/tests/BaGetter.Protocol.Tests/BaGetter.Protocol.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/tests/BaGetter.Protocol.Tests/Converters/PackageDependencyRangeJsonConverterTests.cs b/tests/BaGetter.Protocol.Tests/Converters/PackageDependencyRangeJsonConverterTests.cs index 6d58ad1e4..b8e093865 100644 --- a/tests/BaGetter.Protocol.Tests/Converters/PackageDependencyRangeJsonConverterTests.cs +++ b/tests/BaGetter.Protocol.Tests/Converters/PackageDependencyRangeJsonConverterTests.cs @@ -1,8 +1,8 @@ using System.Text.Json; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Converters; using Xunit; -namespace BaGetter.Protocol.Tests; +namespace BaGetter.Protocol.Tests.Converters; public class PackageDependencyRangeJsonConverterTests { diff --git a/tests/BaGetter.Protocol.Tests/Converters/StringOrStringArrayJsonConverterTests.cs b/tests/BaGetter.Protocol.Tests/Converters/StringOrStringArrayJsonConverterTests.cs index 25de0309e..8bfec81ca 100644 --- a/tests/BaGetter.Protocol.Tests/Converters/StringOrStringArrayJsonConverterTests.cs +++ b/tests/BaGetter.Protocol.Tests/Converters/StringOrStringArrayJsonConverterTests.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Text.Json; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Converters; using Xunit; -namespace BaGetter.Protocol.Tests; +namespace BaGetter.Protocol.Tests.Converters; public class StringOrStringArrayJsonConverterTests { diff --git a/tests/BaGetter.Protocol.Tests/Models/PackageMetadataTests.cs b/tests/BaGetter.Protocol.Tests/Models/PackageMetadataTests.cs index 20ab90998..43113d754 100644 --- a/tests/BaGetter.Protocol.Tests/Models/PackageMetadataTests.cs +++ b/tests/BaGetter.Protocol.Tests/Models/PackageMetadataTests.cs @@ -1,5 +1,4 @@ using System.Text.Json; -using BaGetter.Protocol.Models; using Xunit; namespace BaGetter.Protocol.Tests.Models; @@ -39,7 +38,7 @@ public void Tags_EmptyArray_ShouldDeserialize() """; // Act - var result = JsonSerializer.Deserialize(stringToDeserialize, _serializerOptions); + var result = JsonSerializer.Deserialize(stringToDeserialize, _serializerOptions); // Assert Assert.NotNull(result.Tags); @@ -72,7 +71,7 @@ public void Tags_EmptyString_ShouldDeserialize() """; // Act - var result = JsonSerializer.Deserialize(stringToDeserialize, _serializerOptions); + var result = JsonSerializer.Deserialize(stringToDeserialize, _serializerOptions); // Assert Assert.NotNull(result.Tags); @@ -105,7 +104,7 @@ public void Tags_SingleEntry_ShouldDeserializeSingleTag() """; // Act - var result = JsonSerializer.Deserialize(stringToDeserialize, _serializerOptions); + var result = JsonSerializer.Deserialize(stringToDeserialize, _serializerOptions); // Assert Assert.NotNull(result.Tags); @@ -138,7 +137,7 @@ public void Tags_HasMultipleEntries_ShouldDeserializeMultipleTags() """; // Act - var result = JsonSerializer.Deserialize(stringToDeserialize, _serializerOptions); + var result = JsonSerializer.Deserialize(stringToDeserialize, _serializerOptions); // Assert Assert.NotNull(result.Tags); diff --git a/tests/BaGetter.Protocol.Tests/NuGetClientFactoryTests.cs b/tests/BaGetter.Protocol.Tests/NuGetClientFactoryTests.cs index 7f6bc7787..b1dde44e0 100644 --- a/tests/BaGetter.Protocol.Tests/NuGetClientFactoryTests.cs +++ b/tests/BaGetter.Protocol.Tests/NuGetClientFactoryTests.cs @@ -1,3 +1,4 @@ +using BaGetter.Protocol.Tests.Support; using Xunit; namespace BaGetter.Protocol.Tests; diff --git a/tests/BaGetter.Protocol.Tests/NuGetClientTests.cs b/tests/BaGetter.Protocol.Tests/NuGetClientTests.cs index 2cc7834da..b4e5c6ae0 100644 --- a/tests/BaGetter.Protocol.Tests/NuGetClientTests.cs +++ b/tests/BaGetter.Protocol.Tests/NuGetClientTests.cs @@ -1,3 +1,4 @@ +using BaGetter.Protocol.Tests.Support; using Xunit; namespace BaGetter.Protocol.Tests; diff --git a/tests/BaGetter.Protocol.Tests/RawAutocompleteClientTests.cs b/tests/BaGetter.Protocol.Tests/RawAutocompleteClientTests.cs index 1974be1be..143365075 100644 --- a/tests/BaGetter.Protocol.Tests/RawAutocompleteClientTests.cs +++ b/tests/BaGetter.Protocol.Tests/RawAutocompleteClientTests.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Search; +using BaGetter.Protocol.Tests.Support; using Xunit; namespace BaGetter.Protocol.Tests; diff --git a/tests/BaGetter.Protocol.Tests/RawCatalogClientTests.cs b/tests/BaGetter.Protocol.Tests/RawCatalogClientTests.cs index e5bd72377..7e5b5e569 100644 --- a/tests/BaGetter.Protocol.Tests/RawCatalogClientTests.cs +++ b/tests/BaGetter.Protocol.Tests/RawCatalogClientTests.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Threading.Tasks; -using BaGetter.Protocol.Internal; -using BaGetter.Protocol.Models; +using BaGetter.Protocol.Catalog; +using BaGetter.Protocol.Tests.Support; using Xunit; namespace BaGetter.Protocol.Tests; diff --git a/tests/BaGetter.Protocol.Tests/RawPackageContentClientTests.cs b/tests/BaGetter.Protocol.Tests/RawPackageContentClientTests.cs index b3fcbb121..b1d273524 100644 --- a/tests/BaGetter.Protocol.Tests/RawPackageContentClientTests.cs +++ b/tests/BaGetter.Protocol.Tests/RawPackageContentClientTests.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.PackageContent; +using BaGetter.Protocol.Tests.Support; using Xunit; namespace BaGetter.Protocol.Tests; diff --git a/tests/BaGetter.Protocol.Tests/RawPackageMetadataClientTests.cs b/tests/BaGetter.Protocol.Tests/RawPackageMetadataClientTests.cs index ec91d34c7..f02b0df08 100644 --- a/tests/BaGetter.Protocol.Tests/RawPackageMetadataClientTests.cs +++ b/tests/BaGetter.Protocol.Tests/RawPackageMetadataClientTests.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.PackageMetadata; +using BaGetter.Protocol.Tests.Support; using Xunit; namespace BaGetter.Protocol.Tests; diff --git a/tests/BaGetter.Protocol.Tests/RawSearchClientTests.cs b/tests/BaGetter.Protocol.Tests/RawSearchClientTests.cs index 567544bd2..9418fafd0 100644 --- a/tests/BaGetter.Protocol.Tests/RawSearchClientTests.cs +++ b/tests/BaGetter.Protocol.Tests/RawSearchClientTests.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Search; +using BaGetter.Protocol.Tests.Support; using Xunit; namespace BaGetter.Protocol.Tests; diff --git a/tests/BaGetter.Protocol.Tests/RawServiceIndexClientTests.cs b/tests/BaGetter.Protocol.Tests/RawServiceIndexClientTests.cs index 566d642d6..6037bbbb9 100644 --- a/tests/BaGetter.Protocol.Tests/RawServiceIndexClientTests.cs +++ b/tests/BaGetter.Protocol.Tests/RawServiceIndexClientTests.cs @@ -1,5 +1,7 @@ using System.Threading.Tasks; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Extensions; +using BaGetter.Protocol.ServiceIndex; +using BaGetter.Protocol.Tests.Support; using Xunit; namespace BaGetter.Protocol.Tests; diff --git a/tests/BaGetter.Protocol.Tests/Support/ProtocolFixture.cs b/tests/BaGetter.Protocol.Tests/Support/ProtocolFixture.cs index e9aa4da74..e820761e7 100644 --- a/tests/BaGetter.Protocol.Tests/Support/ProtocolFixture.cs +++ b/tests/BaGetter.Protocol.Tests/Support/ProtocolFixture.cs @@ -1,8 +1,11 @@ -using System.Net; using System.Net.Http; -using BaGetter.Protocol.Internal; +using BaGetter.Protocol.Catalog; +using BaGetter.Protocol.PackageContent; +using BaGetter.Protocol.PackageMetadata; +using BaGetter.Protocol.Search; +using BaGetter.Protocol.ServiceIndex; -namespace BaGetter.Protocol.Tests; +namespace BaGetter.Protocol.Tests.Support; public class ProtocolFixture { diff --git a/tests/BaGetter.Protocol.Tests/Support/TestDataHttpMessageHandler.cs b/tests/BaGetter.Protocol.Tests/Support/TestDataHttpMessageHandler.cs index 5c36f8ce3..d4fea2efc 100644 --- a/tests/BaGetter.Protocol.Tests/Support/TestDataHttpMessageHandler.cs +++ b/tests/BaGetter.Protocol.Tests/Support/TestDataHttpMessageHandler.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Threading.Tasks; -namespace BaGetter.Protocol.Tests; +namespace BaGetter.Protocol.Tests.Support; /// /// Based off: diff --git a/tests/BaGetter.Tests/ApiIntegrationTests.cs b/tests/BaGetter.Tests/ApiIntegrationTests.cs index 3148742d5..b53584e06 100644 --- a/tests/BaGetter.Tests/ApiIntegrationTests.cs +++ b/tests/BaGetter.Tests/ApiIntegrationTests.cs @@ -3,6 +3,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; +using BaGetter.Tests.Support; using Xunit; using Xunit.Abstractions; @@ -35,7 +36,7 @@ public async Task IndexReturnsOk() var content = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Equal(TestData.ServiceIndex, content); + Assert.Equal(TestData.TestData.ServiceIndex, content); } [Fact] diff --git a/tests/BaGetter.Tests/BaGetClientIntegrationTests.cs b/tests/BaGetter.Tests/BaGetClientIntegrationTests.cs index 267958358..beb4f3690 100644 --- a/tests/BaGetter.Tests/BaGetClientIntegrationTests.cs +++ b/tests/BaGetter.Tests/BaGetClientIntegrationTests.cs @@ -3,7 +3,9 @@ using System.Net.Http; using System.Threading.Tasks; using BaGetter.Protocol; +using BaGetter.Protocol.Extensions; using BaGetter.Protocol.Models; +using BaGetter.Tests.Support; using NuGet.Versioning; using Xunit; using Xunit.Abstractions; @@ -44,12 +46,12 @@ public async Task ValidIndex() Assert.Equal("3.0.0", index.Version); Assert.Equal(12, index.Resources.Count); - Assert.NotEmpty(index.GetResourceUrl(new[] { "PackageBaseAddress/3.0.0" })); - Assert.NotEmpty(index.GetResourceUrl(new[] { "PackagePublish/2.0.0" })); - Assert.NotEmpty(index.GetResourceUrl(new[] { "RegistrationsBaseUrl" })); - Assert.NotEmpty(index.GetResourceUrl(new[] { "SearchAutocompleteService" })); - Assert.NotEmpty(index.GetResourceUrl(new[] { "SearchQueryService" })); - Assert.NotEmpty(index.GetResourceUrl(new[] { "SymbolPackagePublish/4.9.0" })); + Assert.NotEmpty(ServiceIndexModelExtensions.GetResourceUrl(index, new[] { "PackageBaseAddress/3.0.0" })); + Assert.NotEmpty(ServiceIndexModelExtensions.GetResourceUrl(index, new[] { "PackagePublish/2.0.0" })); + Assert.NotEmpty(ServiceIndexModelExtensions.GetResourceUrl(index, new[] { "RegistrationsBaseUrl" })); + Assert.NotEmpty(ServiceIndexModelExtensions.GetResourceUrl(index, new[] { "SearchAutocompleteService" })); + Assert.NotEmpty(ServiceIndexModelExtensions.GetResourceUrl(index, new[] { "SearchQueryService" })); + Assert.NotEmpty(ServiceIndexModelExtensions.GetResourceUrl(index, new[] { "SymbolPackagePublish/4.9.0" })); } [Fact] diff --git a/tests/BaGetter.Tests/BaGetter - Backup.Tests.csproj b/tests/BaGetter.Tests/BaGetter - Backup.Tests.csproj index a6d4dbcda..887e84553 100644 --- a/tests/BaGetter.Tests/BaGetter - Backup.Tests.csproj +++ b/tests/BaGetter.Tests/BaGetter - Backup.Tests.csproj @@ -1,8 +1,7 @@ - net8.0 - 8.0 + net10.0 @@ -10,13 +9,13 @@ - - - + + + - + @@ -42,8 +41,8 @@ - - + + all runtime; build; native; contentfiles; analyzers diff --git a/tests/BaGetter.Tests/BaGetter.Tests.csproj b/tests/BaGetter.Tests/BaGetter.Tests.csproj index dfc6378f4..449b0bf6a 100644 --- a/tests/BaGetter.Tests/BaGetter.Tests.csproj +++ b/tests/BaGetter.Tests/BaGetter.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/tests/BaGetter.Tests/HostIntegrationTests.cs b/tests/BaGetter.Tests/HostIntegrationTests.cs index f0672b0d4..f29b364e5 100644 --- a/tests/BaGetter.Tests/HostIntegrationTests.cs +++ b/tests/BaGetter.Tests/HostIntegrationTests.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using BaGetter.Core; +using BaGetter.Core.Entities; using BaGetter.Database.Sqlite; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; diff --git a/tests/BaGetter.Tests/MirrorIntegrationTests.cs b/tests/BaGetter.Tests/MirrorIntegrationTests.cs index 731db76c7..0594858ad 100644 --- a/tests/BaGetter.Tests/MirrorIntegrationTests.cs +++ b/tests/BaGetter.Tests/MirrorIntegrationTests.cs @@ -3,6 +3,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; +using BaGetter.Tests.Support; using Xunit; using Xunit.Abstractions; diff --git a/tests/BaGetter.Tests/NuGetClientIntegrationTests.cs b/tests/BaGetter.Tests/NuGetClientIntegrationTests.cs index cf58d2053..abe5af5ca 100644 --- a/tests/BaGetter.Tests/NuGetClientIntegrationTests.cs +++ b/tests/BaGetter.Tests/NuGetClientIntegrationTests.cs @@ -4,6 +4,7 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using BaGetter.Tests.Support; using NuGet.Configuration; using NuGet.Protocol; using NuGet.Protocol.Core.Types; diff --git a/tests/BaGetter.Tests/NugetAllowAnonymousAuthenticationIntegrationTests.cs b/tests/BaGetter.Tests/NugetAllowAnonymousAuthenticationIntegrationTests.cs index d0e780277..8d7aeb1ae 100644 --- a/tests/BaGetter.Tests/NugetAllowAnonymousAuthenticationIntegrationTests.cs +++ b/tests/BaGetter.Tests/NugetAllowAnonymousAuthenticationIntegrationTests.cs @@ -1,13 +1,10 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Net; using System.Net.Http; -using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; -using BaGetter.Core; -using Microsoft.AspNetCore.Http; +using BaGetter.Tests.Support; using Microsoft.Extensions.Primitives; using Xunit; using Xunit.Abstractions; diff --git a/tests/BaGetter.Tests/NugetAuthenticationIntegrationTests.cs b/tests/BaGetter.Tests/NugetAuthenticationIntegrationTests.cs index 0ce6f553f..09b7a4168 100644 --- a/tests/BaGetter.Tests/NugetAuthenticationIntegrationTests.cs +++ b/tests/BaGetter.Tests/NugetAuthenticationIntegrationTests.cs @@ -1,15 +1,10 @@ using System; -using System.Collections; -using System.Collections.Generic; using System.Net; using System.Net.Http; -using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; -using BaGetter.Authentication; -using BaGetter.Core; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Primitives; +using BaGetter.Core.Authentication; +using BaGetter.Tests.Support; using Xunit; using Xunit.Abstractions; diff --git a/tests/BaGetter.Tests/Support/BaGetApplication.cs b/tests/BaGetter.Tests/Support/BaGetApplication.cs index 6888e71e0..a2862c3b3 100644 --- a/tests/BaGetter.Tests/Support/BaGetApplication.cs +++ b/tests/BaGetter.Tests/Support/BaGetApplication.cs @@ -4,9 +4,9 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using BaGetter.Authentication; -using BaGetter.Core; -using BaGetter.Web.Authentication; +using BaGetter.Core.Entities; +using BaGetter.Core.Extensions; +using BaGetter.Core.Indexing; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.EntityFrameworkCore; @@ -19,7 +19,7 @@ using Moq; using Xunit.Abstractions; -namespace BaGetter.Tests; +namespace BaGetter.Tests.Support; public class BaGetterApplication : WebApplicationFactory { diff --git a/tests/BaGetter.Tests/Support/HttpSourceResourceProviderTestHost.cs b/tests/BaGetter.Tests/Support/HttpSourceResourceProviderTestHost.cs index 419530287..3ed213d98 100644 --- a/tests/BaGetter.Tests/Support/HttpSourceResourceProviderTestHost.cs +++ b/tests/BaGetter.Tests/Support/HttpSourceResourceProviderTestHost.cs @@ -8,7 +8,7 @@ using NuGet.Protocol; using NuGet.Protocol.Core.Types; -namespace BaGetter.Tests; +namespace BaGetter.Tests.Support; /// /// Similar to official HttpSourceResourceProvider, but uses test host. diff --git a/tests/BaGetter.Tests/Support/StreamExtensions.cs b/tests/BaGetter.Tests/Support/StreamExtensions.cs index cbaa63206..b48b16c60 100644 --- a/tests/BaGetter.Tests/Support/StreamExtensions.cs +++ b/tests/BaGetter.Tests/Support/StreamExtensions.cs @@ -1,7 +1,7 @@ using System.IO; using Newtonsoft.Json; -namespace BaGetter.Tests; +namespace BaGetter.Tests.Support; public static class StreamExtensions { diff --git a/tests/BaGetter.Tests/Support/TestResources.cs b/tests/BaGetter.Tests/Support/TestResources.cs index f45d09837..38e62fc90 100644 --- a/tests/BaGetter.Tests/Support/TestResources.cs +++ b/tests/BaGetter.Tests/Support/TestResources.cs @@ -1,6 +1,6 @@ using System.IO; -namespace BaGetter.Tests; +namespace BaGetter.Tests.Support; public static class TestResources { diff --git a/tests/BaGetter.Tests/Support/TestableHttpSource.cs b/tests/BaGetter.Tests/Support/TestableHttpSource.cs index 962930a0c..98a79bbf2 100644 --- a/tests/BaGetter.Tests/Support/TestableHttpSource.cs +++ b/tests/BaGetter.Tests/Support/TestableHttpSource.cs @@ -7,7 +7,7 @@ using NuGet.Protocol; using NuGet.Protocol.Core.Types; -namespace BaGetter.Tests; +namespace BaGetter.Tests.Support; public class TestableHttpSource : HttpSource { diff --git a/tests/BaGetter.Tests/Support/XunitLogger.cs b/tests/BaGetter.Tests/Support/XunitLogger.cs index 94baa5954..145d0764e 100644 --- a/tests/BaGetter.Tests/Support/XunitLogger.cs +++ b/tests/BaGetter.Tests/Support/XunitLogger.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging; using Xunit.Abstractions; -namespace BaGetter.Tests; +namespace BaGetter.Tests.Support; /// /// Based off: diff --git a/tests/BaGetter.Tests/Support/XunitLoggerProvider.cs b/tests/BaGetter.Tests/Support/XunitLoggerProvider.cs index 88d3b43db..ad5a8e2a2 100644 --- a/tests/BaGetter.Tests/Support/XunitLoggerProvider.cs +++ b/tests/BaGetter.Tests/Support/XunitLoggerProvider.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging; using Xunit.Abstractions; -namespace BaGetter.Tests; +namespace BaGetter.Tests.Support; /// /// Based off: diff --git a/tests/BaGetter.Tests/TestData/TestData.Designer.cs b/tests/BaGetter.Tests/TestData/TestData.Designer.cs index ae74bfc23..5954383dc 100644 --- a/tests/BaGetter.Tests/TestData/TestData.Designer.cs +++ b/tests/BaGetter.Tests/TestData/TestData.Designer.cs @@ -8,10 +8,7 @@ // //------------------------------------------------------------------------------ -namespace BaGetter.Tests { - using System; - - +namespace BaGetter.Tests.TestData { /// /// A strongly-typed resource class, for looking up localized strings, etc. /// diff --git a/tests/BaGetter.Web.Tests/Authentication/NugetBasicAuthenticationHandlerTests.cs b/tests/BaGetter.Web.Tests/Authentication/NugetBasicAuthenticationHandlerTests.cs index d55bcd202..cee733512 100644 --- a/tests/BaGetter.Web.Tests/Authentication/NugetBasicAuthenticationHandlerTests.cs +++ b/tests/BaGetter.Web.Tests/Authentication/NugetBasicAuthenticationHandlerTests.cs @@ -3,7 +3,7 @@ using System.Text; using System.Text.Encodings.Web; using System.Threading.Tasks; -using BaGetter.Core; +using BaGetter.Core.Configuration; using BaGetter.Web.Authentication; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; @@ -13,7 +13,7 @@ using Moq; using Xunit; -namespace BaGetter.Web.Tests; +namespace BaGetter.Web.Tests.Authentication; public class NugetBasicAuthenticationHandlerTests { diff --git a/tests/BaGetter.Web.Tests/BaGetter.Web.Tests.csproj b/tests/BaGetter.Web.Tests/BaGetter.Web.Tests.csproj index a9be3809d..2735f6f27 100644 --- a/tests/BaGetter.Web.Tests/BaGetter.Web.Tests.csproj +++ b/tests/BaGetter.Web.Tests/BaGetter.Web.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/tests/BaGetter.Web.Tests/Pages/IndexModelFacts.cs b/tests/BaGetter.Web.Tests/Pages/IndexModelFacts.cs index 03e8e7239..b6c6fa88c 100644 --- a/tests/BaGetter.Web.Tests/Pages/IndexModelFacts.cs +++ b/tests/BaGetter.Web.Tests/Pages/IndexModelFacts.cs @@ -1,11 +1,12 @@ using System.Threading; using System.Threading.Tasks; -using BaGetter.Core; +using BaGetter.Core.Search; using BaGetter.Protocol.Models; +using BaGetter.Web.Pages; using Moq; using Xunit; -namespace BaGetter.Web.Tests; +namespace BaGetter.Web.Tests.Pages; public class IndexModelFacts { diff --git a/tests/BaGetter.Web.Tests/Pages/PackageModelFacts.cs b/tests/BaGetter.Web.Tests/Pages/PackageModelFacts.cs index c31537b14..eb9d243ff 100644 --- a/tests/BaGetter.Web.Tests/Pages/PackageModelFacts.cs +++ b/tests/BaGetter.Web.Tests/Pages/PackageModelFacts.cs @@ -5,11 +5,15 @@ using System.Threading; using System.Threading.Tasks; using BaGetter.Core; +using BaGetter.Core.Content; +using BaGetter.Core.Entities; +using BaGetter.Core.Search; +using BaGetter.Web.Pages; using Moq; using NuGet.Versioning; using Xunit; -namespace BaGetter.Web.Tests; +namespace BaGetter.Web.Tests.Pages; public class PackageModelFacts { @@ -341,9 +345,9 @@ private Package CreatePackage( IEnumerable dependencies = null, IEnumerable packageTypes = null) { - published = published ?? DateTime.Now; - dependencies = dependencies ?? Array.Empty(); - packageTypes = packageTypes ?? Array.Empty(); + published ??= DateTime.Now; + dependencies ??= Array.Empty(); + packageTypes ??= Array.Empty(); return new Package { From bf302e1840818b7a9ef24da9ac51ec5d75e12b53 Mon Sep 17 00:00:00 2001 From: Robin Dittrich <43466794+RWL-Dittrich@users.noreply.github.com> Date: Wed, 8 Apr 2026 13:17:41 +0200 Subject: [PATCH 02/44] Feature/plat 672 add entra auth (#2) * First entra implementation * Styling fixes and other dashboard improvements * small frontend improvements and remove email from user fields * Entra App Roles instead of groups * Enhance Entra authentication: throw exceptions for disabled users and UI login restrictions; update group permissions handling in UI * Implement authentication checks across multiple pages: require sign-in for package browsing, details, statistics, and upload instructions * fix test * Update label styles for role synchronization and enable Razor runtime compilation * update claude.md with codebase updates * Enhance upload page authentication messages and remove Razor runtime compilation * Clarify default role claim description in EntraOptions * Update role claim type in Entra authentication options * Log warning on Entra authentication remote failure and simplify error response * Validate token expiry date to ensure it is set in the future * remove unused injected _authOptions in Logout.cshtml.cs * fix: align SymbolController auth fallback with PackagePublishController Agent-Logs-Url: https://github.com/Niverplast/BaGetter/sessions/f1102320-a576-4469-9fdc-d0111f4de964 Co-authored-by: RWL-Dittrich <43466794+RWL-Dittrich@users.noreply.github.com> * Fetch all groups from the DB at once * Remove old implementation plan * feat: add IsAdmin claim to user authentication and update admin check logic * feat: move IsAdmin column to Users table and migrate existing permissions * feat: enhance Entra authentication setup with environment-based cookie policy * feat: add cancellation token support for permission checks in FeedPermissionHandler * feat: centralize cookie name in authentication constants * Apply suggestion: remove include folder packages\ Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Robin Dittrich <43466794+RWL-Dittrich@users.noreply.github.com> * feat: use case-insensitive comparison for AppRoleValue hash set * feat: configure cookie authentication for test server and adjust token expiration handling * Squash migrations Fixed nuget push -k Cleaned up some code Fixed comments * feat: update authentication mode handling to use 'Config' instead of 'None' * feat: update authentication mode in integration tests to use 'Config' * feat: add filtered unique indexes for EntraObjectId and AppRoleValue in User and Group entities. Then recreate migrations * Fix comments * Update CLAUDE.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Robin Dittrich <43466794+RWL-Dittrich@users.noreply.github.com> --------- Signed-off-by: Robin Dittrich <43466794+RWL-Dittrich@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .gitignore | 4 +- CLAUDE.md | 131 ++ Directory.Packages.props | 4 +- docs/docs/authentication.md | 363 ++++++ .../Sample01_Download.cs | 17 +- .../Sample02_Search.cs | 16 +- .../Sample03_Metadata.cs | 13 +- .../Authentication/AuthResult.cs | 5 + .../Authentication/AuthenticationConstants.cs | 6 + .../FeedAuthenticationService.cs | 130 ++ .../Authentication/GroupService.cs | 208 ++++ .../IFeedAuthenticationService.cs | 10 + .../Authentication/IGroupService.cs | 23 + .../Authentication/IPermissionService.cs | 16 + .../Authentication/ITokenService.cs | 17 + .../Authentication/IUserService.cs | 28 + .../Authentication/PermissionService.cs | 154 +++ .../Authentication/TokenService.cs | 164 +++ .../Authentication/UserService.cs | 244 ++++ src/BaGetter.Core/BaGetter.Core.csproj | 1 + .../Configuration/AuthenticationMode.cs | 28 + .../Configuration/EntraOptions.cs | 39 + .../NugetAuthenticationOptions.cs | 30 +- src/BaGetter.Core/Entities/AbstractContext.cs | 148 +++ src/BaGetter.Core/Entities/AuthProvider.cs | 7 + src/BaGetter.Core/Entities/FeedPermission.cs | 14 + src/BaGetter.Core/Entities/Group.cs | 15 + src/BaGetter.Core/Entities/IContext.cs | 5 + src/BaGetter.Core/Entities/NullContext.cs | 5 + .../Entities/PermissionSource.cs | 7 + .../Entities/PersonalAccessToken.cs | 19 + src/BaGetter.Core/Entities/PrincipalType.cs | 7 + src/BaGetter.Core/Entities/User.cs | 26 + src/BaGetter.Core/Entities/UserGroup.cs | 12 + .../DependencyInjectionExtensions.cs | 6 + ...20260408095928_AddAuthEntities.Designer.cs | 531 +++++++++ .../20260408095928_AddAuthEntities.cs | 286 +++++ .../Migrations/MySqlContextModelSnapshot.cs | 295 ++++- .../MySqlDesignTimeContextFactory.cs | 42 + ...20260408095917_AddAuthEntities.Designer.cs | 531 +++++++++ .../20260408095917_AddAuthEntities.cs | 197 +++ .../PostgreSqlContextModelSnapshot.cs | 283 ++++- ...20260408095854_AddAuthEntities.Designer.cs | 532 +++++++++ .../20260408095854_AddAuthEntities.cs | 199 ++++ .../SqlServerContextModelSnapshot.cs | 415 ++++++- .../SqlServerContext.cs | 17 + ...20260408095906_AddAuthEntities.Designer.cs | 517 ++++++++ .../20260408095906_AddAuthEntities.cs | 197 +++ .../Migrations/SqliteContextModelSnapshot.cs | 389 +++++- .../Authentication/FeedPermissionHandler.cs | 74 ++ .../FeedPermissionRequirement.cs | 17 + .../NugetBasicAuthenticationHandler.cs | 123 +- .../Controllers/PackagePublishController.cs | 49 +- .../Controllers/ServiceIndexController.cs | 4 +- .../Controllers/SymbolController.cs | 44 +- src/BaGetter.Web/Pages/Account/Tokens.cshtml | 120 ++ .../Pages/Account/Tokens.cshtml.cs | 130 ++ src/BaGetter.Web/Pages/Admin/Accounts.cshtml | 163 +++ .../Pages/Admin/Accounts.cshtml.cs | 188 +++ src/BaGetter.Web/Pages/Admin/Groups.cshtml | 178 +++ src/BaGetter.Web/Pages/Admin/Groups.cshtml.cs | 211 ++++ src/BaGetter.Web/Pages/Index.cshtml | 26 +- src/BaGetter.Web/Pages/Login.cshtml | 70 ++ src/BaGetter.Web/Pages/Login.cshtml.cs | 186 +++ src/BaGetter.Web/Pages/Logout.cshtml | 6 + src/BaGetter.Web/Pages/Logout.cshtml.cs | 29 + src/BaGetter.Web/Pages/Package.cshtml | 30 +- src/BaGetter.Web/Pages/Shared/_Layout.cshtml | 64 +- .../Pages/Shared/_LoginPartial.cshtml | 63 + src/BaGetter.Web/Pages/Statistics.cshtml | 13 + src/BaGetter.Web/Pages/Upload.cshtml | 59 +- src/BaGetter.Web/wwwroot/css/site.css | 399 +++++++ .../Authentication/EntraRoleSyncService.cs | 124 ++ src/BaGetter/BaGetter.csproj | 6 + .../ConfigureRazorRuntimeCompilation.cs | 31 - src/BaGetter/IServiceCollectionExtensions.cs | 161 ++- src/BaGetter/Properties/launchSettings.json | 9 + src/BaGetter/Startup.cs | 11 +- src/BaGetter/ValidateBaGetterOptions.cs | 42 + src/BaGetter/appsettings.json | 40 +- .../Authentication/GroupServiceTests.cs | 495 ++++++++ .../Authentication/PermissionServiceTests.cs | 372 ++++++ .../Authentication/TokenServiceTests.cs | 320 +++++ .../Authentication/UserServiceTests.cs | 402 +++++++ .../BaGetter.Core.Tests.csproj | 1 + .../Support/TestDbContext.cs | 25 + .../EntraRoleSyncServiceTests.cs | 290 +++++ .../FeedAuthenticationIntegrationTests.cs | 497 ++++++++ tests/BaGetter.Tests/HostIntegrationTests.cs | 12 +- .../NugetAuthenticationIntegrationTests.cs | 6 +- .../Support/BaGetApplication.cs | 7 + .../Support/TestableHttpSource.cs | 2 +- .../WebUiAuthenticationIntegrationTests.cs | 1052 +++++++++++++++++ .../NugetBasicAuthenticationHandlerTests.cs | 7 +- 94 files changed, 12203 insertions(+), 308 deletions(-) create mode 100644 CLAUDE.md create mode 100644 docs/docs/authentication.md create mode 100644 src/BaGetter.Core/Authentication/AuthResult.cs create mode 100644 src/BaGetter.Core/Authentication/FeedAuthenticationService.cs create mode 100644 src/BaGetter.Core/Authentication/GroupService.cs create mode 100644 src/BaGetter.Core/Authentication/IFeedAuthenticationService.cs create mode 100644 src/BaGetter.Core/Authentication/IGroupService.cs create mode 100644 src/BaGetter.Core/Authentication/IPermissionService.cs create mode 100644 src/BaGetter.Core/Authentication/ITokenService.cs create mode 100644 src/BaGetter.Core/Authentication/IUserService.cs create mode 100644 src/BaGetter.Core/Authentication/PermissionService.cs create mode 100644 src/BaGetter.Core/Authentication/TokenService.cs create mode 100644 src/BaGetter.Core/Authentication/UserService.cs create mode 100644 src/BaGetter.Core/Configuration/AuthenticationMode.cs create mode 100644 src/BaGetter.Core/Configuration/EntraOptions.cs create mode 100644 src/BaGetter.Core/Entities/AuthProvider.cs create mode 100644 src/BaGetter.Core/Entities/FeedPermission.cs create mode 100644 src/BaGetter.Core/Entities/Group.cs create mode 100644 src/BaGetter.Core/Entities/PermissionSource.cs create mode 100644 src/BaGetter.Core/Entities/PersonalAccessToken.cs create mode 100644 src/BaGetter.Core/Entities/PrincipalType.cs create mode 100644 src/BaGetter.Core/Entities/User.cs create mode 100644 src/BaGetter.Core/Entities/UserGroup.cs create mode 100644 src/BaGetter.Database.MySql/Migrations/20260408095928_AddAuthEntities.Designer.cs create mode 100644 src/BaGetter.Database.MySql/Migrations/20260408095928_AddAuthEntities.cs create mode 100644 src/BaGetter.Database.MySql/MySqlDesignTimeContextFactory.cs create mode 100644 src/BaGetter.Database.PostgreSql/Migrations/20260408095917_AddAuthEntities.Designer.cs create mode 100644 src/BaGetter.Database.PostgreSql/Migrations/20260408095917_AddAuthEntities.cs create mode 100644 src/BaGetter.Database.SqlServer/Migrations/20260408095854_AddAuthEntities.Designer.cs create mode 100644 src/BaGetter.Database.SqlServer/Migrations/20260408095854_AddAuthEntities.cs create mode 100644 src/BaGetter.Database.Sqlite/Migrations/20260408095906_AddAuthEntities.Designer.cs create mode 100644 src/BaGetter.Database.Sqlite/Migrations/20260408095906_AddAuthEntities.cs create mode 100644 src/BaGetter.Web/Authentication/FeedPermissionHandler.cs create mode 100644 src/BaGetter.Web/Authentication/FeedPermissionRequirement.cs create mode 100644 src/BaGetter.Web/Pages/Account/Tokens.cshtml create mode 100644 src/BaGetter.Web/Pages/Account/Tokens.cshtml.cs create mode 100644 src/BaGetter.Web/Pages/Admin/Accounts.cshtml create mode 100644 src/BaGetter.Web/Pages/Admin/Accounts.cshtml.cs create mode 100644 src/BaGetter.Web/Pages/Admin/Groups.cshtml create mode 100644 src/BaGetter.Web/Pages/Admin/Groups.cshtml.cs create mode 100644 src/BaGetter.Web/Pages/Login.cshtml create mode 100644 src/BaGetter.Web/Pages/Login.cshtml.cs create mode 100644 src/BaGetter.Web/Pages/Logout.cshtml create mode 100644 src/BaGetter.Web/Pages/Logout.cshtml.cs create mode 100644 src/BaGetter.Web/Pages/Shared/_LoginPartial.cshtml create mode 100644 src/BaGetter/Authentication/EntraRoleSyncService.cs delete mode 100644 src/BaGetter/ConfigureRazorRuntimeCompilation.cs create mode 100644 tests/BaGetter.Core.Tests/Authentication/GroupServiceTests.cs create mode 100644 tests/BaGetter.Core.Tests/Authentication/PermissionServiceTests.cs create mode 100644 tests/BaGetter.Core.Tests/Authentication/TokenServiceTests.cs create mode 100644 tests/BaGetter.Core.Tests/Authentication/UserServiceTests.cs create mode 100644 tests/BaGetter.Core.Tests/Support/TestDbContext.cs create mode 100644 tests/BaGetter.Tests/Authentication/EntraRoleSyncServiceTests.cs create mode 100644 tests/BaGetter.Tests/FeedAuthenticationIntegrationTests.cs create mode 100644 tests/BaGetter.Tests/WebUiAuthenticationIntegrationTests.cs diff --git a/.gitignore b/.gitignore index 828b85b53..34f114659 100644 --- a/.gitignore +++ b/.gitignore @@ -277,4 +277,6 @@ __pycache__/ # Chart dependencies charts/ -Chart.lock \ No newline at end of file +Chart.lock + +.claude \ No newline at end of file diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 000000000..c15fca1df --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,131 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## What is BaGetter + +BaGetter is a lightweight, open-source NuGet and symbol server (ASP.NET Core, .NET 10). Community fork of BaGet. Implements NuGet v3 protocol with pluggable database, storage, and search backends. + +## Build & Test Commands + +```bash +dotnet restore +dotnet build --no-restore +dotnet test --no-build --verbosity normal +dotnet run --project src/BaGetter # runs on http://localhost:5000 +``` + +Run a single test class or method: +```bash +dotnet test --filter "FullyQualifiedName~UserServiceTests" +dotnet test --filter "FullyQualifiedName~UserServiceTests.TheGetOrCreateEntraUserAsyncMethod" +``` + +EF Core migrations (example for SQLite): +```bash +dotnet ef migrations add MigrationName --project src/BaGetter.Database.Sqlite --startup-project src/BaGetter +``` + +Requires .NET SDK 10.0.104 (pinned in `global.json`). + +## Architecture + +### Provider Pattern + +Storage, database, and search services use a configuration-driven provider pattern (`IProvider`). Multiple implementations coexist in DI (registered via `TryAddTransient`); the active one is selected by `appsettings.json` config at runtime. This is the core extensibility mechanism. + +### Project Layout + +- **`src/BaGetter/`** — ASP.NET Core host. Entry point (`Program.cs`), DI/middleware setup (`Startup.cs`), config. +- **`src/BaGetter.Core/`** — Business logic, EF Core entities, authentication services, configuration options, storage/search interfaces. Database-agnostic. +- **`src/BaGetter.Web/`** — HTTP controllers, Razor pages, endpoint routing (`BaGetterEndpointBuilder.cs`), health checks. +- **`src/BaGetter.Protocol/`** — NuGet v3 protocol client and models for upstream feed communication. +- **`src/BaGetter.Database.{Sqlite,SqlServer,PostgreSql,MySql}/`** — EF Core context + migrations per database provider. +- **`src/BaGetter.{Aws,Azure,Gcp,Aliyun,Tencent}/`** — Cloud storage provider implementations. + +### Key Interfaces + +| Interface | Purpose | +|-----------|---------| +| `IPackageDatabase` | Package CRUD operations | +| `IStorageService` | Raw blob storage | +| `IPackageStorageService` | Package-specific storage (nupkg, nuspec, readme, icon) | +| `ISearchService` / `ISearchIndexer` | Package search and indexing | +| `IContext` | EF Core DbContext abstraction | + +### Authentication + +Supports multiple simultaneous auth modes controlled by `AuthenticationMode` enum (`Config`, `Local`, `Entra`, `Hybrid`). `Config` is the backward-compatible mode. Auth services live in `src/BaGetter.Core/Authentication/`. + +- **NuGetBasicAuth** is the default scheme; it forwards to the cookie scheme when a session cookie is present without an `Authorization` header (browser vs. client tool detection). +- **Entra ID** uses `AddMicrosoftIdentityWebApp()` (authorization code flow). `EntraRoleSyncService` syncs Entra app roles to local groups on token validation. Cookie name is `BaGetter.Auth`, 60-minute sliding session. +- **`IFeedAuthenticationService`** provides two auth paths: `AuthenticateByTokenAsync()` (PAT) and `AuthenticateByCredentialsAsync()` (username/password). +- **`FeedPermissionHandler`** (AuthorizationHandler) enforces feed-level permissions using the default feed ID `"default"`. +- Passwords use bcrypt; tokens store prefix + hash. + +Authentication config structure: +```json +"Authentication": { + "Mode": "Hybrid", + "Entra": { + "Instance": "https://login.microsoftonline.com/", + "TenantId": "", + "ClientId": "", + "ClientSecret": "", + "CallbackPath": "/signin-oidc" + }, + "MaxTokenExpiryDays": 365, + "MaxFailedAttempts": 5, + "LockoutMinutes": 15 +} +``` + +### Data Model + +Defined in `src/BaGetter.Core/Entities/AbstractContext.cs`. Core entities: Package, PackageDependency, PackageType, TargetFramework, User, PersonalAccessToken, Group, UserGroup, FeedPermission. + +### API Endpoints + +Routes defined in `BaGetterEndpointBuilder.cs`: +- Service index: `GET /v3/index.json` +- Search/autocomplete: `GET /v3/search`, `GET /v3/autocomplete` +- Package metadata: `GET /v3/registration/{id}/index.json` +- Package content: `GET /v3/package/{id}/{version}/{id}.nupkg` +- Publish: `PUT /api/v2/package` +- Symbols: `PUT /api/v2/symbol`, `GET /api/download/symbols/...` + +### Middleware + +- **`OperationCancelledMiddleware`** converts `OperationCanceledException` to HTTP 409 Conflict. +- **`ConfigureBaGetterServer`** (implements multiple `IConfigureOptions`) configures CORS, `FormOptions` (multipart upload limits via `MaxPackageSizeGiB`), forwarded headers, and IIS options. + +## Configuration + +Options class: `BaGetterOptions` in `src/BaGetter.Core/Configuration/`. Config sources (in order): `appsettings.json`, env vars, user secrets, Docker secrets (`/run/secrets/`), optional `BAGET_CONFIG_ROOT` env var. + +`ValidateBaGetterOptions` validates all config at startup — database/storage/search types against whitelists, Entra config completeness when required, and numeric minimums (token expiry, failed attempts, lockout). + +## Code Style + +Enforced via `.editorconfig`: 4-space indent (2-space for JSON), PascalCase for public APIs/constants, `_camelCase` for private fields, `var` preferred, System usings first, all usings outside namespace. + +Additional enforced rules (warning severity): +- File-scoped namespaces (`namespace Foo;`) +- Accessibility modifiers always required +- Readonly fields where possible +- No `this.` qualification +- Predefined types (`int`, `string`) over framework types (`Int32`, `String`) +- No primary constructors (`csharp_style_prefer_primary_constructors = false`) +- No expression-bodied methods or constructors (properties/accessors OK) + +Suppress CS1591 for non-public XML doc comments. + +## Testing + +xUnit + Moq. Test projects mirror source: `tests/BaGetter.Core.Tests/`, `tests/BaGetter.Web.Tests/`, `tests/BaGetter.Protocol.Tests/`. Integration tests use in-memory SQLite. + +**`BaGetterApplication`** (WebApplicationFactory) is the integration test host — it mocks `SystemTime` to 2020-01-01, creates temp-dir SQLite databases, and wires up `XunitLoggerProvider`. Use `BaGetWebApplicationFactoryExtensions` helpers (`AddPackageAsync`, `AddSymbolPackageAsync`) to seed test data. Override config via in-memory dictionary config sources in test setup. + +## Centralized Package Versions + +All NuGet package versions managed in `Directory.Packages.props` at repo root. Do not specify versions in individual `.csproj` files. diff --git a/Directory.Packages.props b/Directory.Packages.props index 5d7200bed..1faf0b0f3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,6 +7,7 @@ + @@ -19,6 +20,7 @@ + @@ -47,4 +49,4 @@ - + \ No newline at end of file diff --git a/docs/docs/authentication.md b/docs/docs/authentication.md new file mode 100644 index 000000000..e51542403 --- /dev/null +++ b/docs/docs/authentication.md @@ -0,0 +1,363 @@ +# Authentication + +BaGetter supports multiple authentication modes for controlling access to your NuGet feed. You can use Azure Entra ID (formerly Azure AD) for enterprise single sign-on, local database-backed accounts, or a hybrid of both. + +## Authentication modes + +The `Authentication.Mode` setting controls which authentication mechanisms are active: + +| Mode | Description | +|------|-------------| +| `Config` | (Default) Config-file-based auth. Uses API keys and basic auth credentials defined in appsettings.json. No database-backed users. | +| `Entra` | Azure Entra ID (OIDC) authentication only. Users sign in via their organization's Entra ID tenant. | +| `Local` | Local database-backed accounts only. Admins create user accounts with passwords. | +| `Hybrid` | Both Entra ID and local accounts are active. Users can sign in with either method. | + +```json +{ + "Authentication": { + "Mode": "Hybrid" + } +} +``` + +:::info + +When `Mode` is `Config` (or the `Authentication` section is omitted), BaGetter uses `Credentials` and `ApiKeys` from configuration. Existing deployments require no changes. + +::: + +## Azure Entra ID setup + +### Prerequisites + +1. An Azure Entra ID (Azure AD) tenant +2. An App Registration in your tenant +3. A client secret for the App Registration +4. (Optional) App Roles defined in the App Registration for role-based group sync + +### Step 1: Create an App Registration + +1. Go to the [Azure Portal](https://portal.azure.com) > **Microsoft Entra ID** > **App registrations** > **New registration** +2. Set the **Name** (e.g., "BaGetter NuGet Feed") +3. Set **Supported account types** to "Accounts in this organizational directory only" (single tenant) +4. Set the **Redirect URI** to `https://your-bagetter-url/signin-oidc` (type: Web) +5. Click **Register** +6. Note the **Application (client) ID** and **Directory (tenant) ID** from the overview page + +### Step 2: Create a client secret + +1. In your App Registration, go to **Certificates & secrets** > **Client secrets** > **New client secret** +2. Add a description and expiration period +3. Copy the secret **Value** immediately (it will not be shown again) + +### Step 3: Define App Roles (recommended) + +App Roles allow you to manage admin access and group memberships through Azure AD instead of manually in BaGetter. Roles appear in the `roles` claim of the ID token. + +1. In your App Registration, go to **App roles** > **Create app role** +2. Create roles matching your team structure: + +| Display Name | Value | Allowed Member Types | Description | +|---|---|---|---| +| Administrator | `Admin` | Users/Groups | Full admin access to BaGetter | +| Frontend Team | `TeamFrontend` | Users/Groups | Auto-joins "Frontend Team" group | +| Backend Team | `TeamBackend` | Users/Groups | Auto-joins "Backend Team" group | + +3. In **Enterprise Applications** > your app > **Users and groups**, assign users or Entra security groups to the appropriate App Roles. + +:::info + +The `Admin` App Role is special and hardcoded. Any user whose token contains a role with value `Admin` is automatically granted `IsAdmin = true` and full access to all feeds. This cannot be overridden. All other role values work through group membership and feed permissions. + +::: + +### Step 4: Configure BaGetter + +Add the Entra configuration to `appsettings.json`: + +```json +{ + "Authentication": { + "Mode": "Entra", + "Entra": { + "Instance": "https://login.microsoftonline.com/", + "TenantId": "", + "ClientId": "", + "ClientSecret": "", + "CallbackPath": "/signin-oidc", + "RoleClaim": "roles" + } + } +} +``` + +:::warning + +Do not store the `ClientSecret` in `appsettings.json` in production. Use environment variables, Docker secrets, or a secrets manager instead: + +```shell +# Environment variable +Authentication__Entra__ClientSecret=your-client-secret + +# Docker secret file +/run/secrets/Authentication__Entra__ClientSecret +``` + +::: + +### Entra configuration reference + +| Setting | Required | Default | Description | +|---------|----------|---------|-------------| +| `Instance` | Yes | -- | The Azure AD instance URL (e.g., `https://login.microsoftonline.com/`) | +| `TenantId` | Yes | -- | Your Azure AD tenant ID | +| `ClientId` | Yes | -- | The application (client) ID from your App Registration | +| `ClientSecret` | Yes | -- | The client secret value | +| `CallbackPath` | No | `/signin-oidc` | The OIDC callback path. Must match the redirect URI in your App Registration. | +| `RoleClaim` | No | `roles` | The token claim name to read App Roles from. Change only if your identity provider uses a non-standard claim name. | + +### How Entra authentication works + +When a user signs in via Entra ID: + +1. The user is redirected to Microsoft's login page +2. After successful authentication, the OIDC token is validated +3. BaGetter automatically provisions a local user record linked to the Entra Object ID +4. The `roles` claim is read from the token +5. **Admin sync (bidirectional):** If the token contains the `Admin` role, `IsAdmin` is set to `true`. If not, `IsAdmin` is set to `false`. Admin status is always driven by the token — there is no way to persist admin for an Entra user outside of the App Role. +6. **Group membership sync (full reconciliation):** The user is added to all BaGetter groups whose `AppRoleValue` matches a role in the token, and removed from role-linked groups whose role is no longer present. Manually-managed groups (no `AppRoleValue`) are never touched. +7. A session cookie (`BaGetter.Auth`) is issued with a 60-minute sliding expiration + +## Local accounts + +When `Mode` is `Local` or `Hybrid`, administrators can create local user accounts. Local accounts use bcrypt-hashed passwords and support account lockout after repeated failed login attempts. + +### Account lockout + +Local accounts are protected by an automatic lockout mechanism: + +| Setting | Default | Description | +|---------|---------|-------------| +| `MaxFailedAttempts` | `5` | Number of consecutive failed logins before lockout | +| `LockoutMinutes` | `15` | Duration (in minutes) that the account remains locked | + +```json +{ + "Authentication": { + "Mode": "Local", + "MaxFailedAttempts": 5, + "LockoutMinutes": 15 + } +} +``` + +After `MaxFailedAttempts` consecutive failed logins, the account is locked for `LockoutMinutes`. The counter resets on successful login. + +## Personal access tokens (PATs) + +Personal access tokens allow users to authenticate with NuGet CLI tools without using their interactive login credentials. PATs are available for both Entra and local users. + +### How PATs work + +- Users generate PATs from the web UI (available when signed in) +- Each token has a name and an expiration date +- The plaintext token is shown only once at creation time +- Tokens are stored as SHA-256 hashes in the database +- Tokens can be revoked at any time + +### Token expiry + +The maximum allowed token lifetime is controlled by the `MaxTokenExpiryDays` setting: + +```json +{ + "Authentication": { + "MaxTokenExpiryDays": 365 + } +} +``` + +### Using PATs with NuGet clients + +Use the PAT as the password when configuring a NuGet source. The username can be any non-empty string: + +```shell +# dotnet CLI +dotnet nuget add source "https://your-bagetter-url/v3/index.json" \ + --name "BaGetter" \ + --username "pat" \ + --password "" + +# NuGet CLI +nuget sources add -Name "BaGetter" \ + -Source "https://your-bagetter-url/v3/index.json" \ + -UserName "pat" \ + -Password "" +``` + +To push packages using a PAT: + +```shell +dotnet nuget push -s https://your-bagetter-url/v3/index.json \ + -k \ + package.1.0.0.nupkg +``` + +## Feed permissions + +BaGetter uses a feed-scoped permission model. Permissions can be granted to individual users or groups. + +| Permission | Description | +|------------|-------------| +| `Pull` | Can restore/download packages from the feed | +| `Push` | Can publish packages to the feed | +| `Admin` | Full control, including managing users, groups, and permissions | + +Permissions are evaluated by the authorization handler on every NuGet API request. Users without the required permission for an operation receive a `401 Unauthorized` or `403 Forbidden` response. + +### Group permissions + +Permissions can be assigned to groups. A user inherits permissions from all groups they belong to. Groups come in two flavors: + +- **Role-linked groups** have an `AppRoleValue` set (e.g., `"TeamFrontend"`). Membership for Entra users is automatically synchronized from the token's `roles` claim on each sign-in. Admins cannot manually add or remove Entra users from these groups — membership is controlled exclusively by Azure AD App Role assignments. Local users can still be manually added. +- **Manually-managed groups** have no `AppRoleValue`. Membership is managed entirely through the BaGetter admin UI for all user types. + +This design lets Azure AD control *who has what role*, while BaGetter controls *what each role grants* (per-feed push/pull permissions). + +## Full configuration reference + +```json +{ + "Authentication": { + "Mode": "Hybrid", + "Entra": { + "Instance": "https://login.microsoftonline.com/", + "TenantId": "", + "ClientId": "", + "ClientSecret": "", + "CallbackPath": "/signin-oidc", + "RoleClaim": "roles" + }, + "MaxTokenExpiryDays": 365, + "MaxFailedAttempts": 5, + "LockoutMinutes": 15, + "Credentials": [ + { + "Username": "legacy-user", + "Password": "legacy-password" + } + ], + "ApiKeys": [ + { + "Key": "legacy-api-key" + } + ] + } +} +``` + +:::info + +The `Credentials` and `ApiKeys` arrays are only used when `Mode` is `Config`. When `Mode` is `Entra`, `Local`, or `Hybrid`, authentication is handled through the database-backed user system and PATs. + +::: + +## Environment variables + +All authentication settings can be provided via environment variables using the double-underscore (`__`) separator: + +| Environment Variable | Description | +|---------------------|-------------| +| `Authentication__Mode` | Authentication mode (`Config`, `Entra`, `Local`, `Hybrid`) | +| `Authentication__Entra__Instance` | Azure AD instance URL | +| `Authentication__Entra__TenantId` | Azure AD tenant ID | +| `Authentication__Entra__ClientId` | Application (client) ID | +| `Authentication__Entra__ClientSecret` | Client secret | +| `Authentication__Entra__CallbackPath` | OIDC callback path | +| `Authentication__Entra__RoleClaim` | Token claim name for App Roles (default: `roles`) | +| `Authentication__MaxTokenExpiryDays` | Maximum PAT lifetime in days | +| `Authentication__MaxFailedAttempts` | Failed login threshold for lockout | +| `Authentication__LockoutMinutes` | Lockout duration in minutes | + +## Docker Compose example + +```yaml +services: + bagetter: + image: bagetter/bagetter:latest + ports: + - "5000:8080" + environment: + - Database__Type=PostgreSql + - Database__ConnectionString=Host=db;Database=bagetter;Username=bagetter;Password=secret + - Storage__Type=FileSystem + - Storage__Path=/srv/baget/packages + - Authentication__Mode=Entra + - Authentication__Entra__Instance=https://login.microsoftonline.com/ + - Authentication__Entra__TenantId=your-tenant-id + - Authentication__Entra__ClientId=your-client-id + - Authentication__Entra__CallbackPath=/signin-oidc + - Authentication__Entra__RoleClaim=roles + volumes: + - bagetter-data:/srv/baget + secrets: + - entra_client_secret + +secrets: + entra_client_secret: + file: ./secrets/entra-client-secret.txt +``` + +When using Docker secrets, create the secret file at the path matching the configuration key: + +```shell +/run/secrets/Authentication__Entra__ClientSecret +``` + +## Database migrations + +When upgrading from a version of BaGetter without authentication support, the required database tables (Users, Groups, UserGroups, PersonalAccessTokens, FeedPermissions) are created automatically on startup via EF Core migrations. No manual migration steps are needed. + +## Troubleshooting + +### "The 'TenantId' config is required for Entra authentication" + +The `Authentication.Entra.TenantId` is missing or empty. Ensure your configuration or environment variables include the tenant ID from your Azure App Registration. + +### "The 'ClientId' config is required for Entra authentication" + +The `Authentication.Entra.ClientId` is missing or empty. Copy the Application (client) ID from the Azure Portal App Registration overview page. + +### OIDC callback fails with "correlation failed" + +This typically means the redirect URI in your Azure App Registration does not match the `CallbackPath` combined with your application's external URL. Verify: + +1. The redirect URI in Azure is set to `https://your-external-url/signin-oidc` +2. Your reverse proxy (if any) is forwarding the `Host` header and the `X-Forwarded-Proto` header correctly +3. The application is using HTTPS in production + +### App Roles are missing from the token + +If users are not getting admin permissions or group memberships despite being assigned App Roles: + +1. Verify that **App Roles** are defined in the App Registration under **App roles** +2. Verify users are assigned to the roles in **Enterprise Applications** > your app > **Users and groups** +3. Check that the token includes the `roles` claim (use [jwt.ms](https://jwt.ms) to decode a token) +4. Ensure the `RoleClaim` config matches the claim name in your token (default: `roles`) +5. Verify that BaGetter groups have the correct `AppRoleValue` set to match the role values in the token + +### Admin role not granting access + +The admin role value is hardcoded as `Admin` (case-sensitive). Verify your App Role in Azure AD has exactly `Admin` as the **Value** (not the display name). + +### Local account is locked out + +If a local account is locked after too many failed attempts, wait for the lockout period to expire (`LockoutMinutes`, default 15 minutes). An administrator can also re-enable the account from the user management page. + +### NuGet client returns 401 Unauthorized + +1. Verify the NuGet source is configured with valid credentials (username/password or PAT) +2. Check that the user has `Pull` permission on the feed +3. If using a PAT, verify it has not expired or been revoked +4. Ensure the `Mode` setting matches your authentication method (e.g., do not use `Credentials` when `Mode` is `Entra`) diff --git a/samples/BaGetter.Protocol.Samples.Tests/Sample01_Download.cs b/samples/BaGetter.Protocol.Samples.Tests/Sample01_Download.cs index 8e2d57380..61995747a 100644 --- a/samples/BaGetter.Protocol.Samples.Tests/Sample01_Download.cs +++ b/samples/BaGetter.Protocol.Samples.Tests/Sample01_Download.cs @@ -1,5 +1,4 @@ using System; -using System.IO; using System.Threading.Tasks; using NuGet.Versioning; using Xunit; @@ -12,12 +11,12 @@ public class Sample01_Download public async Task DownloadPackage() { // Downloads a package file (.nupkg) - NuGetClient client = new NuGetClient("https://api.nuget.org/v3/index.json"); + var client = new NuGetClient("https://api.nuget.org/v3/index.json"); - string packageId = "Newtonsoft.Json"; - NuGetVersion packageVersion = new NuGetVersion("12.0.1"); + var packageId = "Newtonsoft.Json"; + var packageVersion = new NuGetVersion("12.0.1"); - using Stream packageStream = await client.DownloadPackageAsync(packageId, packageVersion); + using var packageStream = await client.DownloadPackageAsync(packageId, packageVersion); Console.WriteLine($"Downloaded package {packageId} {packageVersion}"); } @@ -25,12 +24,12 @@ public async Task DownloadPackage() public async Task DownloadPackageManifest() { // Downloads a package manifest (.nuspec) - NuGetClient client = new NuGetClient("https://api.nuget.org/v3/index.json"); + var client = new NuGetClient("https://api.nuget.org/v3/index.json"); - string packageId = "Newtonsoft.Json"; - NuGetVersion packageVersion = new NuGetVersion("12.0.1"); + var packageId = "Newtonsoft.Json"; + var packageVersion = new NuGetVersion("12.0.1"); - using Stream manifestStream = await client.DownloadPackageManifestAsync(packageId, packageVersion); + using var manifestStream = await client.DownloadPackageManifestAsync(packageId, packageVersion); Console.WriteLine($"Downloaded package {packageId} {packageVersion}'s nuspec"); } } diff --git a/samples/BaGetter.Protocol.Samples.Tests/Sample02_Search.cs b/samples/BaGetter.Protocol.Samples.Tests/Sample02_Search.cs index 016a9def6..a4748f0b5 100644 --- a/samples/BaGetter.Protocol.Samples.Tests/Sample02_Search.cs +++ b/samples/BaGetter.Protocol.Samples.Tests/Sample02_Search.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Threading.Tasks; -using BaGetter.Protocol.Models; using NuGet.Versioning; using Xunit; @@ -13,7 +11,7 @@ public class Sample02_Search public async Task Exists() { // Check if a package exists. - NuGetClient client = new NuGetClient("https://api.nuget.org/v3/index.json"); + var client = new NuGetClient("https://api.nuget.org/v3/index.json"); if (!await client.ExistsAsync("newtonsoft.json")) { @@ -31,11 +29,11 @@ public async Task Exists() public async Task Search() { // Search for packages that are relevant to "json". - NuGetClient client = new NuGetClient("https://api.nuget.org/v3/index.json"); - IReadOnlyList results = await client.SearchAsync("json"); + var client = new NuGetClient("https://api.nuget.org/v3/index.json"); + var results = await client.SearchAsync("json"); var index = 1; - foreach (SearchResult result in results) + foreach (var result in results) { Console.WriteLine($"Result #{index}"); Console.WriteLine($"Package id: {result.PackageId}"); @@ -52,10 +50,10 @@ public async Task Search() public async Task Autocomplete() { // Search for packages whose names' start with "Newt". - NuGetClient client = new NuGetClient("https://api.nuget.org/v3/index.json"); - IReadOnlyList packageIds = await client.AutocompleteAsync("Newt"); + var client = new NuGetClient("https://api.nuget.org/v3/index.json"); + var packageIds = await client.AutocompleteAsync("Newt"); - foreach (string packageId in packageIds) + foreach (var packageId in packageIds) { Console.WriteLine($"Found package ID '{packageId}'"); } diff --git a/samples/BaGetter.Protocol.Samples.Tests/Sample03_Metadata.cs b/samples/BaGetter.Protocol.Samples.Tests/Sample03_Metadata.cs index b649d752b..f91e80e81 100644 --- a/samples/BaGetter.Protocol.Samples.Tests/Sample03_Metadata.cs +++ b/samples/BaGetter.Protocol.Samples.Tests/Sample03_Metadata.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using NuGet.Versioning; @@ -13,7 +12,7 @@ public class Sample03_Metadata public async Task GetAllPackageMetadata() { // Find the metadata for all versions of a package. - NuGetClient client = new NuGetClient("https://api.nuget.org/v3/index.json"); + var client = new NuGetClient("https://api.nuget.org/v3/index.json"); var items = await client.GetPackageMetadataAsync("Newtonsoft.Json"); if (!items.Any()) @@ -36,10 +35,10 @@ public async Task GetAllPackageMetadata() public async Task GetPackageMetadata() { // Find the metadata for a single version of a package. - NuGetClient client = new NuGetClient("https://api.nuget.org/v3/index.json"); + var client = new NuGetClient("https://api.nuget.org/v3/index.json"); - string packageId = "Newtonsoft.Json"; - NuGetVersion packageVersion = new NuGetVersion("12.0.1"); + var packageId = "Newtonsoft.Json"; + var packageVersion = new NuGetVersion("12.0.1"); var metadata = await client.GetPackageMetadataAsync(packageId, packageVersion); @@ -52,9 +51,9 @@ public async Task GetPackageMetadata() public async Task ListVersions() { // Find all versions of a package (including unlisted versions). - NuGetClient client = new NuGetClient("https://api.nuget.org/v3/index.json"); + var client = new NuGetClient("https://api.nuget.org/v3/index.json"); - IReadOnlyList packageVersions = await client.ListPackageVersionsAsync("Newtonsoft.Json", includeUnlisted: true); + var packageVersions = await client.ListPackageVersionsAsync("Newtonsoft.Json", includeUnlisted: true); if (!packageVersions.Any()) { Console.WriteLine($"Package 'Newtonsoft.Json' does not exist"); diff --git a/src/BaGetter.Core/Authentication/AuthResult.cs b/src/BaGetter.Core/Authentication/AuthResult.cs new file mode 100644 index 000000000..9f4af149e --- /dev/null +++ b/src/BaGetter.Core/Authentication/AuthResult.cs @@ -0,0 +1,5 @@ +using System; + +namespace BaGetter.Core.Authentication; + +public record AuthResult(bool IsAuthenticated, Guid? UserId, string Username); diff --git a/src/BaGetter.Core/Authentication/AuthenticationConstants.cs b/src/BaGetter.Core/Authentication/AuthenticationConstants.cs index f7d8e0526..0092dc1d9 100644 --- a/src/BaGetter.Core/Authentication/AuthenticationConstants.cs +++ b/src/BaGetter.Core/Authentication/AuthenticationConstants.cs @@ -3,4 +3,10 @@ public static class AuthenticationConstants { public const string NugetBasicAuthenticationScheme = "NugetBasicAuthentication"; public const string NugetUserPolicy = "NuGetUserPolicy"; + public const string EntraOidcScheme = "EntraOidc"; + public const string CookieScheme = "BaGetterCookie"; + public const string CookieName = "BaGetter.Auth"; + + /// Claim stamped into the cookie that indicates whether the user is an admin. + public const string IsAdminClaim = "bagetter:is_admin"; } diff --git a/src/BaGetter.Core/Authentication/FeedAuthenticationService.cs b/src/BaGetter.Core/Authentication/FeedAuthenticationService.cs new file mode 100644 index 000000000..4c9422b0d --- /dev/null +++ b/src/BaGetter.Core/Authentication/FeedAuthenticationService.cs @@ -0,0 +1,130 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; + +namespace BaGetter.Core.Authentication; + +public class FeedAuthenticationService : IFeedAuthenticationService +{ + private readonly IUserService _userService; + private readonly ITokenService _tokenService; + private readonly NugetAuthenticationOptions _authOptions; + private readonly ILogger _logger; + + public FeedAuthenticationService( + IUserService userService, + ITokenService tokenService, + IOptionsSnapshot authOptions, + ILogger logger) + { + ArgumentNullException.ThrowIfNull(userService); + ArgumentNullException.ThrowIfNull(tokenService); + ArgumentNullException.ThrowIfNull(authOptions); + ArgumentNullException.ThrowIfNull(logger); + + _userService = userService; + _tokenService = tokenService; + _authOptions = authOptions.Value; + _logger = logger; + } + + public async Task AuthenticateByTokenAsync(string token, CancellationToken cancellationToken) + { + if (string.IsNullOrEmpty(token)) + return new AuthResult(false, null, null); + + var pat = await _tokenService.ValidateTokenAsync(token, cancellationToken); + if (pat == null) + { + _logger.LogWarning("Audit: {EventType} - Token authentication failed: invalid or expired token", + "LoginFailure"); + return new AuthResult(false, null, null); + } + + return new AuthResult(true, pat.UserId, pat.User.Username); + } + + public async Task AuthenticateByCredentialsAsync( + string username, + string password, + CancellationToken cancellationToken) + { + if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password)) + return new AuthResult(false, null, null); + + // First, try to authenticate as a local account + if (_authOptions.Mode is AuthenticationMode.Local or AuthenticationMode.Hybrid) + { + var localResult = await TryAuthenticateLocalAccountAsync(username, password, cancellationToken); + if (localResult.IsAuthenticated) + return localResult; + } + + // Then, try to authenticate using the password as a PAT + // (NuGet clients send credentials as username/password in basic auth, + // where password is the PAT token) + if (_authOptions.Mode is AuthenticationMode.Entra or AuthenticationMode.Hybrid) + { + var tokenResult = await AuthenticateByTokenAsync(password, cancellationToken); + if (tokenResult.IsAuthenticated) + { + if (!string.Equals(tokenResult.Username, username, StringComparison.OrdinalIgnoreCase)) + { + _logger.LogWarning("Audit: {EventType} - PAT username mismatch: supplied {SuppliedUsername}, token belongs to {TokenUsername}", + "LoginFailure", username, tokenResult.Username); + return new AuthResult(false, null, null); + } + + return tokenResult; + } + } + + _logger.LogWarning("Audit: {EventType} - Credential authentication failed for username {Username}", + "LoginFailure", username); + return new AuthResult(false, null, null); + } + + private async Task TryAuthenticateLocalAccountAsync( + string username, + string password, + CancellationToken cancellationToken) + { + var user = await _userService.FindByUsernameAsync(username, cancellationToken); + if (user == null || user.AuthProvider != AuthProvider.Local) + return new AuthResult(false, null, null); + + if (!user.IsEnabled) + { + _logger.LogWarning("Audit: {EventType} - Login attempt for disabled local account {Username} ({UserId})", + "LoginFailure", username, user.Id); + return new AuthResult(false, null, null); + } + + if (await _userService.IsLockedOutAsync(user)) + { + _logger.LogWarning("Audit: {EventType} - Login attempt for locked out local account {Username} ({UserId})", + "LoginFailure", username, user.Id); + return new AuthResult(false, null, null); + } + + var passwordValid = await _userService.VerifyPasswordAsync(user, password); + if (!passwordValid) + { + await _userService.RecordFailedLoginAsync(user.Id, cancellationToken); + _logger.LogWarning("Audit: {EventType} - Failed login attempt for local account {Username} ({UserId})", + "LoginFailure", username, user.Id); + return new AuthResult(false, null, null); + } + + await _userService.ResetFailedLoginCountAsync(user.Id, cancellationToken); + + _logger.LogInformation("Audit: {EventType} - Local account {Username} ({UserId}) authenticated successfully", + "LoginSuccess", username, user.Id); + + return new AuthResult(true, user.Id, user.Username); + } +} diff --git a/src/BaGetter.Core/Authentication/GroupService.cs b/src/BaGetter.Core/Authentication/GroupService.cs new file mode 100644 index 000000000..ecd0ab2c3 --- /dev/null +++ b/src/BaGetter.Core/Authentication/GroupService.cs @@ -0,0 +1,208 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Entities; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace BaGetter.Core.Authentication; + +public class GroupService : IGroupService +{ + private readonly IContext _context; + private readonly ILogger _logger; + + public GroupService(IContext context, ILogger logger) + { + _context = context ?? throw new ArgumentNullException(nameof(context)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public async Task FindByIdAsync(Guid groupId, CancellationToken cancellationToken) + { + return await _context.Groups.FirstOrDefaultAsync(g => g.Id == groupId, cancellationToken); + } + + public async Task FindByNameAsync(string name, CancellationToken cancellationToken) + { + return await _context.Groups.FirstOrDefaultAsync(g => g.Name == name, cancellationToken); + } + + public async Task FindByAppRoleValueAsync(string appRoleValue, CancellationToken cancellationToken) + { + return await _context.Groups.FirstOrDefaultAsync( + g => g.AppRoleValue == appRoleValue, cancellationToken); + } + + public async Task CreateGroupAsync( + string name, + string appRoleValue, + string description, + CancellationToken cancellationToken) + { + var group = new Group + { + Id = Guid.NewGuid(), + Name = name, + AppRoleValue = appRoleValue, + Description = description, + CreatedAtUtc = DateTime.UtcNow + }; + + _context.Groups.Add(group); + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Created group {GroupName} with ID {GroupId}", name, group.Id); + return group; + } + + public async Task> GetAllGroupsAsync(CancellationToken cancellationToken) + { + return await _context.Groups + .Include(g => g.UserGroups) + .ThenInclude(ug => ug.User) + .ToListAsync(cancellationToken); + } + + public async Task> GetUserGroupsAsync(Guid userId, CancellationToken cancellationToken) + { + return await _context.UserGroups + .Where(ug => ug.UserId == userId) + .Select(ug => ug.Group) + .ToListAsync(cancellationToken); + } + + public async Task AddUserToGroupAsync(Guid userId, Guid groupId, CancellationToken cancellationToken) + { + if (!await CanManuallyModifyMembershipAsync(groupId, userId, cancellationToken)) + { + throw new InvalidOperationException( + "Cannot manually add an Entra user to a role-linked group. Membership is managed by App Roles."); + } + + var exists = await _context.UserGroups + .AnyAsync(ug => ug.UserId == userId && ug.GroupId == groupId, cancellationToken); + + if (exists) return; + + _context.UserGroups.Add(new UserGroup + { + UserId = userId, + GroupId = groupId + }); + + await _context.SaveChangesAsync(cancellationToken); + _logger.LogInformation("Added user {UserId} to group {GroupId}", userId, groupId); + } + + public async Task RemoveUserFromGroupAsync(Guid userId, Guid groupId, CancellationToken cancellationToken) + { + if (!await CanManuallyModifyMembershipAsync(groupId, userId, cancellationToken)) + { + throw new InvalidOperationException( + "Cannot manually remove an Entra user from a role-linked group. Membership is managed by App Roles."); + } + + var membership = await _context.UserGroups + .FirstOrDefaultAsync(ug => ug.UserId == userId && ug.GroupId == groupId, cancellationToken); + + if (membership == null) return; + + _context.UserGroups.Remove(membership); + await _context.SaveChangesAsync(cancellationToken); + _logger.LogInformation("Removed user {UserId} from group {GroupId}", userId, groupId); + } + + public async Task SyncAppRoleMembershipsAsync( + Guid userId, + IReadOnlyList appRoleValues, + CancellationToken cancellationToken) + { + // Get all role-linked groups the user is currently a member of + var currentMemberships = await _context.UserGroups + .Where(ug => ug.UserId == userId && ug.Group.AppRoleValue != null) + .Include(ug => ug.Group) + .ToListAsync(cancellationToken); + + var currentAppRoleValues = currentMemberships + .Select(ug => ug.Group.AppRoleValue) + .ToHashSet(StringComparer.OrdinalIgnoreCase); + + // Add memberships for new App Roles + var appRoleValueSet = appRoleValues.ToHashSet(StringComparer.OrdinalIgnoreCase); + var newRoles = appRoleValueSet.Where(r => !currentAppRoleValues.Contains(r)).ToList(); + + // Fetch all groups + var groupsForNewRoles = newRoles.Count > 0 + ? await _context.Groups + .Where(g => g.AppRoleValue != null && newRoles.Contains(g.AppRoleValue)) + .ToListAsync(cancellationToken) + : []; + + foreach (var group in groupsForNewRoles) + { + _context.UserGroups.Add(new UserGroup + { + UserId = userId, + GroupId = group.Id + }); + } + + // Remove memberships for role-linked groups whose role is no longer in the token + foreach (var membership in currentMemberships) + { + if (!appRoleValueSet.Contains(membership.Group.AppRoleValue)) + { + _context.UserGroups.Remove(membership); + } + } + + await _context.SaveChangesAsync(cancellationToken); + _logger.LogInformation("Synced App Role memberships for user {UserId}: {RoleCount} roles", + userId, appRoleValues.Count); + } + + public async Task IsRoleLinkedGroupAsync(Guid groupId, CancellationToken cancellationToken) + { + var group = await _context.Groups.FirstOrDefaultAsync(g => g.Id == groupId, cancellationToken); + return group?.AppRoleValue != null; + } + + public async Task CanManuallyModifyMembershipAsync(Guid groupId, Guid userId, CancellationToken cancellationToken) + { + var group = await _context.Groups.FirstOrDefaultAsync(g => g.Id == groupId, cancellationToken); + if (group?.AppRoleValue == null) + return true; // Manually-managed group: always allow + + // Role-linked group: only allow for local users + var user = await _context.Users.FirstOrDefaultAsync(u => u.Id == userId, cancellationToken); + if (user == null) + return false; + + return user.AuthProvider != AuthProvider.Entra; + } + + public async Task DeleteGroupAsync(Guid groupId, CancellationToken cancellationToken) + { + var group = await _context.Groups + .FirstOrDefaultAsync(g => g.Id == groupId, cancellationToken); + if (group == null) return; + + var memberships = await _context.UserGroups + .Where(ug => ug.GroupId == groupId) + .ToListAsync(cancellationToken); + _context.UserGroups.RemoveRange(memberships); + + var permissions = await _context.FeedPermissions + .Where(fp => fp.PrincipalId == groupId && fp.PrincipalType == PrincipalType.Group) + .ToListAsync(cancellationToken); + _context.FeedPermissions.RemoveRange(permissions); + + _context.Groups.Remove(group); + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Deleted group {GroupName} (ID: {GroupId})", group.Name, groupId); + } +} diff --git a/src/BaGetter.Core/Authentication/IFeedAuthenticationService.cs b/src/BaGetter.Core/Authentication/IFeedAuthenticationService.cs new file mode 100644 index 000000000..e4698a9e3 --- /dev/null +++ b/src/BaGetter.Core/Authentication/IFeedAuthenticationService.cs @@ -0,0 +1,10 @@ +using System.Threading; +using System.Threading.Tasks; + +namespace BaGetter.Core.Authentication; + +public interface IFeedAuthenticationService +{ + Task AuthenticateByTokenAsync(string token, CancellationToken cancellationToken); + Task AuthenticateByCredentialsAsync(string username, string password, CancellationToken cancellationToken); +} diff --git a/src/BaGetter.Core/Authentication/IGroupService.cs b/src/BaGetter.Core/Authentication/IGroupService.cs new file mode 100644 index 000000000..70d17a379 --- /dev/null +++ b/src/BaGetter.Core/Authentication/IGroupService.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Entities; + +namespace BaGetter.Core.Authentication; + +public interface IGroupService +{ + Task FindByIdAsync(Guid groupId, CancellationToken cancellationToken); + Task FindByNameAsync(string name, CancellationToken cancellationToken); + Task FindByAppRoleValueAsync(string appRoleValue, CancellationToken cancellationToken); + Task CreateGroupAsync(string name, string appRoleValue, string description, CancellationToken cancellationToken); + Task> GetAllGroupsAsync(CancellationToken cancellationToken); + Task> GetUserGroupsAsync(Guid userId, CancellationToken cancellationToken); + Task AddUserToGroupAsync(Guid userId, Guid groupId, CancellationToken cancellationToken); + Task RemoveUserFromGroupAsync(Guid userId, Guid groupId, CancellationToken cancellationToken); + Task SyncAppRoleMembershipsAsync(Guid userId, IReadOnlyList appRoleValues, CancellationToken cancellationToken); + Task IsRoleLinkedGroupAsync(Guid groupId, CancellationToken cancellationToken); + Task CanManuallyModifyMembershipAsync(Guid groupId, Guid userId, CancellationToken cancellationToken); + Task DeleteGroupAsync(Guid groupId, CancellationToken cancellationToken); +} diff --git a/src/BaGetter.Core/Authentication/IPermissionService.cs b/src/BaGetter.Core/Authentication/IPermissionService.cs new file mode 100644 index 000000000..49a1dac21 --- /dev/null +++ b/src/BaGetter.Core/Authentication/IPermissionService.cs @@ -0,0 +1,16 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Entities; + +namespace BaGetter.Core.Authentication; + +public interface IPermissionService +{ + Task CanPushAsync(Guid userId, string feedId, CancellationToken cancellationToken); + Task CanPullAsync(Guid userId, string feedId, CancellationToken cancellationToken); + Task GetPermissionAsync(Guid principalId, PrincipalType principalType, string feedId, CancellationToken cancellationToken); + Task GrantPermissionAsync(Guid principalId, PrincipalType principalType, string feedId, bool canPush, bool canPull, CancellationToken cancellationToken, PermissionSource source = PermissionSource.Manual); + Task RevokePermissionAsync(Guid permissionId, CancellationToken cancellationToken); + Task RevokePermissionsBySourceAsync(Guid principalId, PrincipalType principalType, string feedId, PermissionSource source, CancellationToken cancellationToken); +} diff --git a/src/BaGetter.Core/Authentication/ITokenService.cs b/src/BaGetter.Core/Authentication/ITokenService.cs new file mode 100644 index 000000000..2d69968ed --- /dev/null +++ b/src/BaGetter.Core/Authentication/ITokenService.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Entities; + +namespace BaGetter.Core.Authentication; + +public record TokenCreateResult(PersonalAccessToken Token, string PlaintextToken); + +public interface ITokenService +{ + Task CreateTokenAsync(Guid userId, string name, DateTime expiresAtUtc, CancellationToken cancellationToken); + Task ValidateTokenAsync(string plaintextToken, CancellationToken cancellationToken); + Task RevokeTokenAsync(Guid tokenId, CancellationToken cancellationToken); + Task> GetUserTokensAsync(Guid userId, CancellationToken cancellationToken); +} diff --git a/src/BaGetter.Core/Authentication/IUserService.cs b/src/BaGetter.Core/Authentication/IUserService.cs new file mode 100644 index 000000000..457f4fa82 --- /dev/null +++ b/src/BaGetter.Core/Authentication/IUserService.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Entities; + +namespace BaGetter.Core.Authentication; + +public interface IUserService +{ + Task FindByIdAsync(Guid userId, CancellationToken cancellationToken); + Task FindByUsernameAsync(string username, CancellationToken cancellationToken); + Task FindByEntraObjectIdAsync(string entraObjectId, CancellationToken cancellationToken); + Task CreateEntraUserAsync(string entraObjectId, string username, string displayName, CancellationToken cancellationToken); + Task CreateLocalUserAsync(string username, string displayName, string password, bool canLoginToUI, Guid? createdByUserId, CancellationToken cancellationToken); + Task UpdateUserAsync(User user, CancellationToken cancellationToken); + Task SetPasswordAsync(Guid userId, string newPassword, CancellationToken cancellationToken); + Task VerifyPasswordAsync(User user, string password); + Task RecordFailedLoginAsync(Guid userId, CancellationToken cancellationToken); + Task ResetFailedLoginCountAsync(Guid userId, CancellationToken cancellationToken); + Task IsLockedOutAsync(User user); + Task> GetAllUsersAsync(CancellationToken cancellationToken); + Task SetEnabledAsync(Guid userId, bool isEnabled, CancellationToken cancellationToken); + Task SetCanLoginToUIAsync(Guid userId, bool canLoginToUI, CancellationToken cancellationToken); + Task IsAdminAsync(Guid userId, CancellationToken cancellationToken); + Task SetAdminAsync(Guid userId, bool isAdmin, CancellationToken cancellationToken); + Task DeleteUserAsync(Guid userId, CancellationToken cancellationToken); +} diff --git a/src/BaGetter.Core/Authentication/PermissionService.cs b/src/BaGetter.Core/Authentication/PermissionService.cs new file mode 100644 index 000000000..d241d3623 --- /dev/null +++ b/src/BaGetter.Core/Authentication/PermissionService.cs @@ -0,0 +1,154 @@ +using System; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Entities; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace BaGetter.Core.Authentication; + +public class PermissionService : IPermissionService +{ + private readonly IContext _context; + private readonly IUserService _userService; + private readonly ILogger _logger; + + public PermissionService(IContext context, IUserService userService, ILogger logger) + { + _context = context ?? throw new ArgumentNullException(nameof(context)); + _userService = userService ?? throw new ArgumentNullException(nameof(userService)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public async Task CanPushAsync(Guid userId, string feedId, CancellationToken cancellationToken) + { + return await HasPermissionAsync(userId, feedId, p => p.CanPush, cancellationToken); + } + + public async Task CanPullAsync(Guid userId, string feedId, CancellationToken cancellationToken) + { + return await HasPermissionAsync(userId, feedId, p => p.CanPull, cancellationToken); + } + + public async Task GetPermissionAsync( + Guid principalId, + PrincipalType principalType, + string feedId, + CancellationToken cancellationToken) + { + return await _context.FeedPermissions.FirstOrDefaultAsync( + p => p.FeedId == feedId && p.PrincipalType == principalType && p.PrincipalId == principalId, + cancellationToken); + } + + public async Task GrantPermissionAsync( + Guid principalId, + PrincipalType principalType, + string feedId, + bool canPush, + bool canPull, + CancellationToken cancellationToken, + PermissionSource source = PermissionSource.Manual) + { + var existing = await _context.FeedPermissions.FirstOrDefaultAsync( + p => p.FeedId == feedId && p.PrincipalType == principalType && p.PrincipalId == principalId, + cancellationToken); + + if (existing != null) + { + existing.CanPush = canPush; + existing.CanPull = canPull; + existing.Source = source; + } + else + { + _context.FeedPermissions.Add(new FeedPermission + { + Id = Guid.NewGuid(), + FeedId = feedId, + PrincipalType = principalType, + PrincipalId = principalId, + CanPush = canPush, + CanPull = canPull, + Source = source + }); + } + + await _context.SaveChangesAsync(cancellationToken); + _logger.LogInformation( + "Audit: {EventType} - Granted permission on feed {FeedId} to {PrincipalType} {PrincipalId}: Push={CanPush}, Pull={CanPull}, Source={Source}", + "PermissionGranted", feedId, principalType, principalId, canPush, canPull, source); + } + + public async Task RevokePermissionsBySourceAsync( + Guid principalId, + PrincipalType principalType, + string feedId, + PermissionSource source, + CancellationToken cancellationToken) + { + var permissions = await _context.FeedPermissions + .Where(p => p.FeedId == feedId + && p.PrincipalType == principalType + && p.PrincipalId == principalId + && p.Source == source) + .ToListAsync(cancellationToken); + + if (permissions.Count == 0) return; + + _context.FeedPermissions.RemoveRange(permissions); + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation( + "Audit: {EventType} - Revoked {Count} {Source} permissions on feed {FeedId} for {PrincipalType} {PrincipalId}", + "PermissionRevoked", permissions.Count, source, feedId, principalType, principalId); + } + + public async Task RevokePermissionAsync(Guid permissionId, CancellationToken cancellationToken) + { + var permission = await _context.FeedPermissions + .FirstOrDefaultAsync(p => p.Id == permissionId, cancellationToken); + + if (permission == null) return; + + _context.FeedPermissions.Remove(permission); + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Audit: {EventType} - Revoked permission {PermissionId}", + "PermissionRevoked", permissionId); + } + + private async Task HasPermissionAsync( + Guid userId, + string feedId, + System.Linq.Expressions.Expression> permissionSelector, + CancellationToken cancellationToken) + { + // Admins always have permission + if (await _userService.IsAdminAsync(userId, cancellationToken)) + return true; + + // Check direct user permissions + var hasDirectPermission = await _context.FeedPermissions + .Where(p => p.FeedId == feedId + && p.PrincipalType == PrincipalType.User + && p.PrincipalId == userId) + .AnyAsync(permissionSelector, cancellationToken); + + if (hasDirectPermission) return true; + + // Check group permissions via user's group memberships + var userGroupIds = _context.UserGroups + .Where(ug => ug.UserId == userId) + .Select(ug => ug.GroupId); + + var hasGroupPermission = await _context.FeedPermissions + .Where(p => p.FeedId == feedId + && p.PrincipalType == PrincipalType.Group + && userGroupIds.Contains(p.PrincipalId)) + .AnyAsync(permissionSelector, cancellationToken); + + return hasGroupPermission; + } +} diff --git a/src/BaGetter.Core/Authentication/TokenService.cs b/src/BaGetter.Core/Authentication/TokenService.cs new file mode 100644 index 000000000..973cdf14c --- /dev/null +++ b/src/BaGetter.Core/Authentication/TokenService.cs @@ -0,0 +1,164 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; + +namespace BaGetter.Core.Authentication; + +public class TokenService : ITokenService +{ + private const string TokenPrefix = "bg_"; + private const int TokenHexLength = 40; + private const int TokenPrefixStoredLength = 8; + + private readonly IContext _context; + private readonly NugetAuthenticationOptions _authOptions; + private readonly ILogger _logger; + + public TokenService( + IContext context, + IOptionsSnapshot authOptions, + ILogger logger) + { + _context = context ?? throw new ArgumentNullException(nameof(context)); + _authOptions = authOptions?.Value ?? throw new ArgumentNullException(nameof(authOptions)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public async Task CreateTokenAsync( + Guid userId, + string name, + DateTime expiresAtUtc, + CancellationToken cancellationToken) + { + if (expiresAtUtc <= DateTime.UtcNow) + { + throw new ArgumentException("Token expiry must be in the future."); + } + + var maxExpiry = DateTime.UtcNow.AddDays(_authOptions.MaxTokenExpiryDays); + if (expiresAtUtc > maxExpiry) + { + throw new ArgumentException( + $"Token expiry cannot exceed {_authOptions.MaxTokenExpiryDays} days from now."); + } + + var plaintextToken = GenerateToken(); + var tokenHash = ComputeHash(plaintextToken); + + var now = DateTime.UtcNow; + var token = new PersonalAccessToken + { + Id = Guid.NewGuid(), + UserId = userId, + Name = name, + TokenHash = tokenHash, + TokenPrefix = plaintextToken[..TokenPrefixStoredLength], + ExpiresAtUtc = expiresAtUtc, + CreatedAtUtc = now, + IsRevoked = false + }; + + _context.PersonalAccessTokens.Add(token); + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Audit: {EventType} - Created PAT {TokenId} for user {UserId} with prefix {TokenPrefix}", + "TokenCreated", token.Id, userId, token.TokenPrefix); + + return new TokenCreateResult(token, plaintextToken); + } + + public async Task ValidateTokenAsync( + string plaintextToken, + CancellationToken cancellationToken) + { + if (string.IsNullOrEmpty(plaintextToken)) + return null; + + var tokenHash = ComputeHash(plaintextToken); + + var token = await _context.PersonalAccessTokens + .Include(t => t.User) + .FirstOrDefaultAsync(t => t.TokenHash == tokenHash, cancellationToken); + + if (token == null) + return null; + + if (token.IsRevoked) + { + _logger.LogWarning("Audit: {EventType} - Attempted use of revoked token {TokenId}", + "TokenUseRevoked", token.Id); + return null; + } + + if (token.ExpiresAtUtc <= DateTime.UtcNow) + { + _logger.LogWarning("Audit: {EventType} - Attempted use of expired token {TokenId}", + "TokenUseExpired", token.Id); + return null; + } + + if (!token.User.IsEnabled) + { + _logger.LogWarning("Audit: {EventType} - Attempted use of token {TokenId} for disabled user {UserId}", + "TokenUseDisabledUser", token.Id, token.UserId); + return null; + } + + // Update last used timestamp + token.LastUsedAtUtc = DateTime.UtcNow; + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Audit: {EventType} - Token {TokenId} used by user {UserId}", + "TokenUsed", token.Id, token.UserId); + + return token; + } + + public async Task RevokeTokenAsync(Guid tokenId, CancellationToken cancellationToken) + { + var token = await _context.PersonalAccessTokens + .FirstOrDefaultAsync(t => t.Id == tokenId, cancellationToken); + + if (token == null) return; + + token.IsRevoked = true; + token.RevokedAtUtc = DateTime.UtcNow; + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Audit: {EventType} - Revoked token {TokenId}", + "TokenRevoked", tokenId); + } + + public async Task> GetUserTokensAsync( + Guid userId, + CancellationToken cancellationToken) + { + return await _context.PersonalAccessTokens + .Where(t => t.UserId == userId) + .OrderByDescending(t => t.CreatedAtUtc) + .ToListAsync(cancellationToken); + } + + private static string GenerateToken() + { + var bytes = new byte[TokenHexLength / 2]; + RandomNumberGenerator.Fill(bytes); + return TokenPrefix + Convert.ToHexString(bytes).ToLowerInvariant(); + } + + private static string ComputeHash(string token) + { + var bytes = Encoding.UTF8.GetBytes(token); + var hash = SHA256.HashData(bytes); + return Convert.ToHexString(hash).ToLowerInvariant(); + } +} diff --git a/src/BaGetter.Core/Authentication/UserService.cs b/src/BaGetter.Core/Authentication/UserService.cs new file mode 100644 index 000000000..fc8dac6dc --- /dev/null +++ b/src/BaGetter.Core/Authentication/UserService.cs @@ -0,0 +1,244 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; + +namespace BaGetter.Core.Authentication; + +public class UserService : IUserService +{ + private const int BcryptWorkFactor = 12; + + private readonly IContext _context; + private readonly NugetAuthenticationOptions _authOptions; + private readonly ILogger _logger; + + public UserService( + IContext context, + IOptionsSnapshot authOptions, + ILogger logger) + { + _context = context ?? throw new ArgumentNullException(nameof(context)); + _authOptions = authOptions?.Value ?? throw new ArgumentNullException(nameof(authOptions)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public async Task FindByIdAsync(Guid userId, CancellationToken cancellationToken) + { + return await _context.Users.FirstOrDefaultAsync(u => u.Id == userId, cancellationToken); + } + + public async Task FindByUsernameAsync(string username, CancellationToken cancellationToken) + { + return await _context.Users.FirstOrDefaultAsync( + u => u.Username == username, cancellationToken); + } + + public async Task FindByEntraObjectIdAsync(string entraObjectId, CancellationToken cancellationToken) + { + return await _context.Users.FirstOrDefaultAsync( + u => u.EntraObjectId == entraObjectId, cancellationToken); + } + + public async Task CreateEntraUserAsync( + string entraObjectId, + string username, + string displayName, + CancellationToken cancellationToken) + { + var now = DateTime.UtcNow; + var user = new User + { + Id = Guid.NewGuid(), + Username = username, + DisplayName = displayName, + AuthProvider = AuthProvider.Entra, + EntraObjectId = entraObjectId, + IsEnabled = true, + CanLoginToUI = true, + CreatedAtUtc = now, + UpdatedAtUtc = now + }; + + _context.Users.Add(user); + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Audit: {EventType} - Created Entra user {Username} with ID {UserId}", + "AccountCreated", username, user.Id); + return user; + } + + public async Task CreateLocalUserAsync( + string username, + string displayName, + string password, + bool canLoginToUI, + Guid? createdByUserId, + CancellationToken cancellationToken) + { + var now = DateTime.UtcNow; + var user = new User + { + Id = Guid.NewGuid(), + Username = username, + DisplayName = displayName, + AuthProvider = AuthProvider.Local, + PasswordHash = BCrypt.Net.BCrypt.HashPassword(password, BcryptWorkFactor), + IsEnabled = true, + CanLoginToUI = canLoginToUI, + CreatedByUserId = createdByUserId, + CreatedAtUtc = now, + UpdatedAtUtc = now + }; + + _context.Users.Add(user); + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Audit: {EventType} - Created local user {Username} with ID {UserId} by {CreatedBy}", + "AccountCreated", username, user.Id, createdByUserId); + return user; + } + + public async Task UpdateUserAsync(User user, CancellationToken cancellationToken) + { + user.UpdatedAtUtc = DateTime.UtcNow; + await _context.SaveChangesAsync(cancellationToken); + } + + public async Task SetPasswordAsync(Guid userId, string newPassword, CancellationToken cancellationToken) + { + var user = await FindByIdAsync(userId, cancellationToken); + if (user == null) + throw new InvalidOperationException($"User {userId} not found."); + + user.PasswordHash = BCrypt.Net.BCrypt.HashPassword(newPassword, BcryptWorkFactor); + user.UpdatedAtUtc = DateTime.UtcNow; + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Audit: {EventType} - Password updated for user {UserId}", + "PasswordReset", userId); + } + + public Task VerifyPasswordAsync(User user, string password) + { + if (user == null) throw new ArgumentNullException(nameof(user)); + if (string.IsNullOrEmpty(user.PasswordHash)) return Task.FromResult(false); + + var result = BCrypt.Net.BCrypt.Verify(password, user.PasswordHash); + return Task.FromResult(result); + } + + public async Task RecordFailedLoginAsync(Guid userId, CancellationToken cancellationToken) + { + var user = await FindByIdAsync(userId, cancellationToken); + if (user == null) return; + + user.FailedLoginCount++; + if (user.FailedLoginCount >= _authOptions.MaxFailedAttempts) + { + user.LockedUntilUtc = DateTime.UtcNow.AddMinutes(_authOptions.LockoutMinutes); + _logger.LogWarning("Audit: {EventType} - User {UserId} locked out until {LockedUntil} after {Attempts} failed attempts", + "AccountLockedOut", userId, user.LockedUntilUtc, user.FailedLoginCount); + } + + user.UpdatedAtUtc = DateTime.UtcNow; + await _context.SaveChangesAsync(cancellationToken); + } + + public async Task ResetFailedLoginCountAsync(Guid userId, CancellationToken cancellationToken) + { + var user = await FindByIdAsync(userId, cancellationToken); + if (user == null) return; + + user.FailedLoginCount = 0; + user.LockedUntilUtc = null; + user.UpdatedAtUtc = DateTime.UtcNow; + await _context.SaveChangesAsync(cancellationToken); + } + + public Task IsLockedOutAsync(User user) + { + if (user == null) throw new ArgumentNullException(nameof(user)); + + var isLocked = user.LockedUntilUtc.HasValue && user.LockedUntilUtc.Value > DateTime.UtcNow; + return Task.FromResult(isLocked); + } + + public async Task> GetAllUsersAsync(CancellationToken cancellationToken) + { + return await _context.Users.ToListAsync(cancellationToken); + } + + public async Task SetEnabledAsync(Guid userId, bool isEnabled, CancellationToken cancellationToken) + { + var user = await FindByIdAsync(userId, cancellationToken); + if (user == null) + throw new InvalidOperationException($"User {userId} not found."); + + user.IsEnabled = isEnabled; + user.UpdatedAtUtc = DateTime.UtcNow; + await _context.SaveChangesAsync(cancellationToken); + + var eventType = isEnabled ? "AccountEnabled" : "AccountDisabled"; + _logger.LogInformation("Audit: {EventType} - User {UserId} enabled state set to {IsEnabled}", + eventType, userId, isEnabled); + } + + public async Task SetCanLoginToUIAsync(Guid userId, bool canLoginToUI, CancellationToken cancellationToken) + { + var user = await FindByIdAsync(userId, cancellationToken); + if (user == null) + throw new InvalidOperationException($"User {userId} not found."); + + user.CanLoginToUI = canLoginToUI; + user.UpdatedAtUtc = DateTime.UtcNow; + await _context.SaveChangesAsync(cancellationToken); + + var eventType = canLoginToUI ? "UIAccessGranted" : "UIAccessRevoked"; + _logger.LogInformation("Audit: {EventType} - User {UserId} web UI access set to {CanLoginToUI}", + eventType, userId, canLoginToUI); + } + + public async Task IsAdminAsync(Guid userId, CancellationToken cancellationToken) + { + var user = await FindByIdAsync(userId, cancellationToken); + return user?.IsAdmin == true; + } + + public async Task SetAdminAsync(Guid userId, bool isAdmin, CancellationToken cancellationToken) + { + var user = await FindByIdAsync(userId, cancellationToken); + if (user == null) + throw new InvalidOperationException($"User {userId} not found."); + + user.IsAdmin = isAdmin; + user.UpdatedAtUtc = DateTime.UtcNow; + await _context.SaveChangesAsync(cancellationToken); + + var eventType = isAdmin ? "AdminGranted" : "AdminRevoked"; + _logger.LogInformation("Audit: {EventType} - User {UserId} admin state set to {IsAdmin}", + eventType, userId, isAdmin); + } + + public async Task DeleteUserAsync(Guid userId, CancellationToken cancellationToken) + { + var user = await FindByIdAsync(userId, cancellationToken); + if (user == null) + throw new InvalidOperationException($"User {userId} not found."); + + if (user.IsEnabled) + throw new InvalidOperationException($"User {userId} must be disabled before deletion."); + + var username = user.Username; + _context.Users.Remove(user); + await _context.SaveChangesAsync(cancellationToken); + + _logger.LogInformation("Audit: {EventType} - User {Username} ({UserId}) was deleted", + "AccountDeleted", username, userId); + } +} diff --git a/src/BaGetter.Core/BaGetter.Core.csproj b/src/BaGetter.Core/BaGetter.Core.csproj index c3ccf2b28..a1af7c2e0 100644 --- a/src/BaGetter.Core/BaGetter.Core.csproj +++ b/src/BaGetter.Core/BaGetter.Core.csproj @@ -7,6 +7,7 @@ + diff --git a/src/BaGetter.Core/Configuration/AuthenticationMode.cs b/src/BaGetter.Core/Configuration/AuthenticationMode.cs new file mode 100644 index 000000000..255c973d7 --- /dev/null +++ b/src/BaGetter.Core/Configuration/AuthenticationMode.cs @@ -0,0 +1,28 @@ +namespace BaGetter.Core.Configuration; + +/// +/// Controls which authentication mechanisms are active. +/// +public enum AuthenticationMode +{ + /// + /// Config-file-based API key and basic auth. No database-backed users. + /// Credentials are defined in appsettings.json. + /// + Config = 0, + + /// + /// Only Entra ID (OIDC) authentication is enabled. Local accounts are not accepted. + /// + Entra = 1, + + /// + /// Only local account authentication is enabled. Entra ID is not available. + /// + Local = 2, + + /// + /// Both Entra ID and local account authentication are enabled. + /// + Hybrid = 3 +} diff --git a/src/BaGetter.Core/Configuration/EntraOptions.cs b/src/BaGetter.Core/Configuration/EntraOptions.cs new file mode 100644 index 000000000..9061493a5 --- /dev/null +++ b/src/BaGetter.Core/Configuration/EntraOptions.cs @@ -0,0 +1,39 @@ +namespace BaGetter.Core.Configuration; + +/// +/// Configuration for Azure Entra ID (OpenID Connect) authentication. +/// +public class EntraOptions +{ + /// + /// The Azure AD instance URL, e.g. "https://login.microsoftonline.com/". + /// + public string Instance { get; set; } + + /// + /// The Azure AD tenant ID. + /// + public string TenantId { get; set; } + + /// + /// The application (client) ID registered in Azure AD. + /// + public string ClientId { get; set; } + + /// + /// The client secret for the Azure AD application. + /// Should be provided via environment variable or Docker secrets in production. + /// + public string ClientSecret { get; set; } + + /// + /// The callback path for the OpenID Connect sign-in response. + /// + public string CallbackPath { get; set; } = "/signin-oidc"; + + /// + /// The claim name in the token that contains App Role values. + /// Defaults to the standard Microsoft claim for roles, but can be overridden if your token uses a different claim. + /// + public string RoleClaim { get; set; } = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role"; +} diff --git a/src/BaGetter.Core/Configuration/NugetAuthenticationOptions.cs b/src/BaGetter.Core/Configuration/NugetAuthenticationOptions.cs index 3decdde96..d2a8f31d8 100644 --- a/src/BaGetter.Core/Configuration/NugetAuthenticationOptions.cs +++ b/src/BaGetter.Core/Configuration/NugetAuthenticationOptions.cs @@ -3,12 +3,38 @@ namespace BaGetter.Core.Configuration; public sealed class NugetAuthenticationOptions { /// - /// Username and password credentials for downloading packages. + /// Controls which authentication mechanisms are active. + /// Defaults to for backward compatibility. + /// + public AuthenticationMode Mode { get; set; } = AuthenticationMode.Config; + + /// + /// Azure Entra ID (OIDC) configuration. Required when Mode is Entra or Hybrid. + /// + public EntraOptions Entra { get; set; } + + /// + /// Maximum number of days a personal access token can be valid. + /// + public int MaxTokenExpiryDays { get; set; } = 365; + + /// + /// Number of consecutive failed login attempts before a local account is locked out. + /// + public int MaxFailedAttempts { get; set; } = 5; + + /// + /// Duration in minutes that a local account remains locked after exceeding the failed login threshold. + /// + public int LockoutMinutes { get; set; } = 15; + + /// + /// Username and password credentials for downloading packages (used when Mode is Config). /// public NugetCredentials[] Credentials { get; set; } /// - /// Api keys for pushing packages into the feed. + /// Api keys for pushing packages into the feed (used when Mode is Config). /// public ApiKey[] ApiKeys { get; set; } } diff --git a/src/BaGetter.Core/Entities/AbstractContext.cs b/src/BaGetter.Core/Entities/AbstractContext.cs index 7e9f2cff2..61e1a0015 100644 --- a/src/BaGetter.Core/Entities/AbstractContext.cs +++ b/src/BaGetter.Core/Entities/AbstractContext.cs @@ -22,6 +22,17 @@ public abstract class AbstractContext : DbContext, IContext where TCon public const int MaxPackageDependencyVersionRangeLength = 256; + public const int MaxUsernameLength = 256; + public const int MaxDisplayNameLength = 256; + public const int MaxEntraObjectIdLength = 128; + public const int MaxPasswordHashLength = 256; + public const int MaxTokenNameLength = 256; + public const int MaxTokenHashLength = 128; + public const int MaxTokenPrefixLength = 8; + public const int MaxGroupNameLength = 256; + public const int MaxAppRoleValueLength = 128; + public const int MaxFeedIdLength = 128; + protected AbstractContext(DbContextOptions efOptions) : base(efOptions) { } @@ -30,6 +41,11 @@ protected AbstractContext(DbContextOptions efOptions) public DbSet PackageDependencies { get; set; } public DbSet PackageTypes { get; set; } public DbSet TargetFrameworks { get; set; } + public DbSet Users { get; set; } + public DbSet PersonalAccessTokens { get; set; } + public DbSet Groups { get; set; } + public DbSet UserGroups { get; set; } + public DbSet FeedPermissions { get; set; } public Task SaveChangesAsync() => SaveChangesAsync(default); @@ -46,6 +62,11 @@ protected override void OnModelCreating(ModelBuilder builder) builder.Entity(BuildPackageDependencyEntity); builder.Entity(BuildPackageTypeEntity); builder.Entity(BuildTargetFrameworkEntity); + builder.Entity(BuildUserEntity); + builder.Entity(BuildPersonalAccessTokenEntity); + builder.Entity(BuildGroupEntity); + builder.Entity(BuildUserGroupEntity); + builder.Entity(BuildFeedPermissionEntity); } private void BuildPackageEntity(EntityTypeBuilder package) @@ -157,4 +178,131 @@ private void BuildTargetFrameworkEntity(EntityTypeBuilder targe targetFramework.Property(f => f.Moniker).HasMaxLength(MaxTargetFrameworkLength); } + + private void BuildUserEntity(EntityTypeBuilder user) + { + user.HasKey(u => u.Id); + user.HasIndex(u => u.Username).IsUnique(); + user.HasIndex(u => u.EntraObjectId).IsUnique(); + + user.Property(u => u.Username) + .HasMaxLength(MaxUsernameLength) + .IsRequired(); + + user.Property(u => u.DisplayName) + .HasMaxLength(MaxDisplayNameLength) + .IsRequired(); + + user.Property(u => u.AuthProvider) + .IsRequired(); + + user.Property(u => u.EntraObjectId) + .HasMaxLength(MaxEntraObjectIdLength); + + user.Property(u => u.PasswordHash) + .HasMaxLength(MaxPasswordHashLength); + + user.Property(u => u.IsEnabled) + .IsRequired() + .HasDefaultValue(true); + + user.Property(u => u.IsAdmin) + .IsRequired() + .HasDefaultValue(false); + + user.Property(u => u.CanLoginToUI) + .IsRequired(); + + user.Property(u => u.FailedLoginCount) + .IsRequired() + .HasDefaultValue(0); + + user.Property(u => u.CreatedAtUtc).IsRequired(); + user.Property(u => u.UpdatedAtUtc).IsRequired(); + + user.HasOne(u => u.CreatedByUser) + .WithMany() + .HasForeignKey(u => u.CreatedByUserId) + .OnDelete(DeleteBehavior.SetNull); + + user.HasMany(u => u.PersonalAccessTokens) + .WithOne(t => t.User) + .HasForeignKey(t => t.UserId) + .OnDelete(DeleteBehavior.Cascade); + + user.HasMany(u => u.UserGroups) + .WithOne(ug => ug.User) + .HasForeignKey(ug => ug.UserId) + .OnDelete(DeleteBehavior.Cascade); + } + + private void BuildPersonalAccessTokenEntity(EntityTypeBuilder token) + { + token.HasKey(t => t.Id); + token.HasIndex(t => t.TokenHash).IsUnique(); + token.HasIndex(t => t.UserId); + + token.Property(t => t.Name) + .HasMaxLength(MaxTokenNameLength) + .IsRequired(); + + token.Property(t => t.TokenHash) + .HasMaxLength(MaxTokenHashLength) + .IsRequired(); + + token.Property(t => t.TokenPrefix) + .HasMaxLength(MaxTokenPrefixLength) + .IsRequired(); + + token.Property(t => t.ExpiresAtUtc).IsRequired(); + token.Property(t => t.CreatedAtUtc).IsRequired(); + token.Property(t => t.IsRevoked).IsRequired().HasDefaultValue(false); + } + + private void BuildGroupEntity(EntityTypeBuilder group) + { + group.HasKey(g => g.Id); + group.HasIndex(g => g.Name).IsUnique(); + + group.Property(g => g.Name) + .HasMaxLength(MaxGroupNameLength) + .IsRequired(); + + group.Property(g => g.AppRoleValue) + .HasMaxLength(MaxAppRoleValueLength); + + group.HasIndex(g => g.AppRoleValue) + .IsUnique(); + + group.Property(g => g.Description) + .HasMaxLength(DefaultMaxStringLength); + + group.Property(g => g.CreatedAtUtc).IsRequired(); + + group.HasMany(g => g.UserGroups) + .WithOne(ug => ug.Group) + .HasForeignKey(ug => ug.GroupId) + .OnDelete(DeleteBehavior.Cascade); + } + + private void BuildUserGroupEntity(EntityTypeBuilder userGroup) + { + userGroup.HasKey(ug => new { ug.UserId, ug.GroupId }); + } + + private void BuildFeedPermissionEntity(EntityTypeBuilder permission) + { + permission.HasKey(p => p.Id); + permission.HasIndex(p => new { p.FeedId, p.PrincipalType, p.PrincipalId }).IsUnique(); + + permission.Property(p => p.FeedId) + .HasMaxLength(MaxFeedIdLength) + .IsRequired(); + + permission.Property(p => p.PrincipalType).IsRequired(); + permission.Property(p => p.PrincipalId).IsRequired(); + permission.Property(p => p.CanPush).IsRequired().HasDefaultValue(false); + permission.Property(p => p.CanPull).IsRequired().HasDefaultValue(false); + permission.Property(p => p.Source).IsRequired().HasDefaultValue(PermissionSource.Manual); + } } diff --git a/src/BaGetter.Core/Entities/AuthProvider.cs b/src/BaGetter.Core/Entities/AuthProvider.cs new file mode 100644 index 000000000..fab2a52b1 --- /dev/null +++ b/src/BaGetter.Core/Entities/AuthProvider.cs @@ -0,0 +1,7 @@ +namespace BaGetter.Core.Entities; + +public enum AuthProvider +{ + Entra = 0, + Local = 1 +} diff --git a/src/BaGetter.Core/Entities/FeedPermission.cs b/src/BaGetter.Core/Entities/FeedPermission.cs new file mode 100644 index 000000000..53e87f258 --- /dev/null +++ b/src/BaGetter.Core/Entities/FeedPermission.cs @@ -0,0 +1,14 @@ +using System; + +namespace BaGetter.Core.Entities; + +public class FeedPermission +{ + public Guid Id { get; set; } + public string FeedId { get; set; } + public PrincipalType PrincipalType { get; set; } + public Guid PrincipalId { get; set; } + public bool CanPush { get; set; } + public bool CanPull { get; set; } + public PermissionSource Source { get; set; } +} diff --git a/src/BaGetter.Core/Entities/Group.cs b/src/BaGetter.Core/Entities/Group.cs new file mode 100644 index 000000000..97e4be856 --- /dev/null +++ b/src/BaGetter.Core/Entities/Group.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +namespace BaGetter.Core.Entities; + +public class Group +{ + public Guid Id { get; set; } + public string Name { get; set; } + public string AppRoleValue { get; set; } + public string Description { get; set; } + public DateTime CreatedAtUtc { get; set; } + + public List UserGroups { get; set; } +} diff --git a/src/BaGetter.Core/Entities/IContext.cs b/src/BaGetter.Core/Entities/IContext.cs index 01019fc3f..5f022d317 100644 --- a/src/BaGetter.Core/Entities/IContext.cs +++ b/src/BaGetter.Core/Entities/IContext.cs @@ -10,6 +10,11 @@ public interface IContext DatabaseFacade Database { get; } DbSet Packages { get; set; } + DbSet Users { get; set; } + DbSet PersonalAccessTokens { get; set; } + DbSet Groups { get; set; } + DbSet UserGroups { get; set; } + DbSet FeedPermissions { get; set; } /// /// Check whether a is due to a SQL unique constraint violation. diff --git a/src/BaGetter.Core/Entities/NullContext.cs b/src/BaGetter.Core/Entities/NullContext.cs index 80248c66c..6f25fafc2 100644 --- a/src/BaGetter.Core/Entities/NullContext.cs +++ b/src/BaGetter.Core/Entities/NullContext.cs @@ -11,6 +11,11 @@ public class NullContext : IContext public DatabaseFacade Database => throw new NotImplementedException(); public DbSet Packages { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public DbSet Users { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public DbSet PersonalAccessTokens { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public DbSet Groups { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public DbSet UserGroups { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public DbSet FeedPermissions { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } public bool SupportsLimitInSubqueries => throw new NotImplementedException(); diff --git a/src/BaGetter.Core/Entities/PermissionSource.cs b/src/BaGetter.Core/Entities/PermissionSource.cs new file mode 100644 index 000000000..0dd24ad04 --- /dev/null +++ b/src/BaGetter.Core/Entities/PermissionSource.cs @@ -0,0 +1,7 @@ +namespace BaGetter.Core.Entities; + +public enum PermissionSource +{ + Manual = 0, + EntraRole = 1 +} diff --git a/src/BaGetter.Core/Entities/PersonalAccessToken.cs b/src/BaGetter.Core/Entities/PersonalAccessToken.cs new file mode 100644 index 000000000..9f5ba6545 --- /dev/null +++ b/src/BaGetter.Core/Entities/PersonalAccessToken.cs @@ -0,0 +1,19 @@ +using System; + +namespace BaGetter.Core.Entities; + +public class PersonalAccessToken +{ + public Guid Id { get; set; } + public Guid UserId { get; set; } + public string Name { get; set; } + public string TokenHash { get; set; } + public string TokenPrefix { get; set; } + public DateTime ExpiresAtUtc { get; set; } + public DateTime CreatedAtUtc { get; set; } + public DateTime? LastUsedAtUtc { get; set; } + public DateTime? RevokedAtUtc { get; set; } + public bool IsRevoked { get; set; } + + public User User { get; set; } +} diff --git a/src/BaGetter.Core/Entities/PrincipalType.cs b/src/BaGetter.Core/Entities/PrincipalType.cs new file mode 100644 index 000000000..69b41e9cd --- /dev/null +++ b/src/BaGetter.Core/Entities/PrincipalType.cs @@ -0,0 +1,7 @@ +namespace BaGetter.Core.Entities; + +public enum PrincipalType +{ + User = 0, + Group = 1 +} diff --git a/src/BaGetter.Core/Entities/User.cs b/src/BaGetter.Core/Entities/User.cs new file mode 100644 index 000000000..fa6cc458c --- /dev/null +++ b/src/BaGetter.Core/Entities/User.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; + +namespace BaGetter.Core.Entities; + +public class User +{ + public Guid Id { get; set; } + public string Username { get; set; } + public string DisplayName { get; set; } + public AuthProvider AuthProvider { get; set; } + public string EntraObjectId { get; set; } + public string PasswordHash { get; set; } + public bool IsEnabled { get; set; } = true; + public bool IsAdmin { get; set; } + public bool CanLoginToUI { get; set; } + public int FailedLoginCount { get; set; } + public DateTime? LockedUntilUtc { get; set; } + public DateTime CreatedAtUtc { get; set; } + public DateTime UpdatedAtUtc { get; set; } + public Guid? CreatedByUserId { get; set; } + + public User CreatedByUser { get; set; } + public List PersonalAccessTokens { get; set; } + public List UserGroups { get; set; } +} diff --git a/src/BaGetter.Core/Entities/UserGroup.cs b/src/BaGetter.Core/Entities/UserGroup.cs new file mode 100644 index 000000000..1c062d83e --- /dev/null +++ b/src/BaGetter.Core/Entities/UserGroup.cs @@ -0,0 +1,12 @@ +using System; + +namespace BaGetter.Core.Entities; + +public class UserGroup +{ + public Guid UserId { get; set; } + public Guid GroupId { get; set; } + + public User User { get; set; } + public Group Group { get; set; } +} diff --git a/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs b/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs index e35575aa5..442a5cae4 100644 --- a/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs +++ b/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs @@ -84,6 +84,7 @@ private static void AddConfiguration(this IServiceCollection services) services.AddBaGetterOptions(nameof(BaGetterOptions.Search)); services.AddBaGetterOptions(nameof(BaGetterOptions.Storage)); services.AddBaGetterOptions(nameof(BaGetterOptions.Statistics)); + services.AddBaGetterOptions(nameof(BaGetterOptions.Authentication)); } private static void AddBaGetServices(this IServiceCollection services) @@ -105,6 +106,11 @@ private static void AddBaGetServices(this IServiceCollection services) services.TryAddScoped(); services.TryAddTransient(); + services.TryAddTransient(); + services.TryAddTransient(); + services.TryAddTransient(); + services.TryAddTransient(); + services.TryAddTransient(); services.TryAddTransient(); services.TryAddTransient(); services.TryAddTransient(); diff --git a/src/BaGetter.Database.MySql/Migrations/20260408095928_AddAuthEntities.Designer.cs b/src/BaGetter.Database.MySql/Migrations/20260408095928_AddAuthEntities.Designer.cs new file mode 100644 index 000000000..f8d640146 --- /dev/null +++ b/src/BaGetter.Database.MySql/Migrations/20260408095928_AddAuthEntities.Designer.cs @@ -0,0 +1,531 @@ +// +using System; +using BaGetter.Database.MySql; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace BaGetter.Database.MySql.Migrations +{ + [DbContext(typeof(MySqlContext))] + [Migration("20260408095928_AddAuthEntities")] + partial class AddAuthEntities + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.10") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + MySqlModelBuilderExtensions.HasCharSet(modelBuilder, "latin1"); + MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); + + modelBuilder.Entity("BaGetter.Core.Entities.FeedPermission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("CanPull") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("CanPush") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("FeedId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("PrincipalId") + .HasColumnType("char(36)"); + + b.Property("PrincipalType") + .HasColumnType("int"); + + b.Property("Source") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0); + + b.HasKey("Id"); + + b.HasIndex("FeedId", "PrincipalType", "PrincipalId") + .IsUnique(); + + b.ToTable("FeedPermissions"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("AppRoleValue") + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("AppRoleValue") + .IsUnique(); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Key")); + + b.Property("Authors") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Downloads") + .HasColumnType("bigint"); + + b.Property("HasEmbeddedIcon") + .HasColumnType("tinyint(1)"); + + b.Property("HasReadme") + .HasColumnType("tinyint(1)"); + + b.Property("IconUrl") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Id") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("IsPrerelease") + .HasColumnType("tinyint(1)"); + + b.Property("Language") + .HasMaxLength(20) + .HasColumnType("varchar(20)"); + + b.Property("LicenseUrl") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Listed") + .HasColumnType("tinyint(1)"); + + b.Property("MinClientVersion") + .HasMaxLength(44) + .HasColumnType("varchar(44)"); + + b.Property("NormalizedVersionString") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)") + .HasColumnName("Version"); + + b.Property("OriginalVersionString") + .HasMaxLength(64) + .HasColumnType("varchar(64)") + .HasColumnName("OriginalVersion"); + + b.Property("ProjectUrl") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Published") + .HasColumnType("datetime(6)"); + + b.Property("ReleaseNotes") + .HasColumnType("longtext") + .HasColumnName("ReleaseNotes"); + + b.Property("RepositoryType") + .HasMaxLength(100) + .HasColumnType("varchar(100)"); + + b.Property("RepositoryUrl") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("RequireLicenseAcceptance") + .HasColumnType("tinyint(1)"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate() + .HasColumnType("timestamp(6)"); + + b.Property("SemVerLevel") + .HasColumnType("int"); + + b.Property("Summary") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Tags") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Title") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Key"); + + b.HasIndex("Id"); + + b.HasIndex("Id", "NormalizedVersionString") + .IsUnique(); + + b.ToTable("Packages"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Key")); + + b.Property("Id") + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("PackageKey") + .HasColumnType("int"); + + b.Property("TargetFramework") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("VersionRange") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Key"); + + b.HasIndex("Id"); + + b.HasIndex("PackageKey"); + + b.ToTable("PackageDependencies"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Key")); + + b.Property("Name") + .HasMaxLength(512) + .HasColumnType("varchar(512)"); + + b.Property("PackageKey") + .HasColumnType("int"); + + b.Property("Version") + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.HasKey("Key"); + + b.HasIndex("Name"); + + b.HasIndex("PackageKey"); + + b.ToTable("PackageTypes"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("ExpiresAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("IsRevoked") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("LastUsedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("RevokedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("TokenPrefix") + .IsRequired() + .HasMaxLength(8) + .HasColumnType("varchar(8)"); + + b.Property("UserId") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.HasIndex("UserId"); + + b.ToTable("PersonalAccessTokens"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Key")); + + b.Property("Moniker") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("PackageKey") + .HasColumnType("int"); + + b.HasKey("Key"); + + b.HasIndex("Moniker"); + + b.HasIndex("PackageKey"); + + b.ToTable("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("AuthProvider") + .HasColumnType("int"); + + b.Property("CanLoginToUI") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("CreatedByUserId") + .HasColumnType("char(36)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("EntraObjectId") + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("FailedLoginCount") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0); + + b.Property("IsAdmin") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("IsEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(true); + + b.Property("LockedUntilUtc") + .HasColumnType("datetime(6)"); + + b.Property("PasswordHash") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("UpdatedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("CreatedByUserId"); + + b.HasIndex("EntraObjectId") + .IsUnique(); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.Property("UserId") + .HasColumnType("char(36)"); + + b.Property("GroupId") + .HasColumnType("char(36)"); + + b.HasKey("UserId", "GroupId"); + + b.HasIndex("GroupId"); + + b.ToTable("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("Dependencies") + .HasForeignKey("PackageKey"); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("PackageTypes") + .HasForeignKey("PackageKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("PersonalAccessTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("TargetFrameworks") + .HasForeignKey("PackageKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.HasOne("BaGetter.Core.Entities.User", "CreatedByUser") + .WithMany() + .HasForeignKey("CreatedByUserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("CreatedByUser"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.HasOne("BaGetter.Core.Entities.Group", "Group") + .WithMany("UserGroups") + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("UserGroups") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Group"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Navigation("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Navigation("Dependencies"); + + b.Navigation("PackageTypes"); + + b.Navigation("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Navigation("PersonalAccessTokens"); + + b.Navigation("UserGroups"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/BaGetter.Database.MySql/Migrations/20260408095928_AddAuthEntities.cs b/src/BaGetter.Database.MySql/Migrations/20260408095928_AddAuthEntities.cs new file mode 100644 index 000000000..68af3dc3b --- /dev/null +++ b/src/BaGetter.Database.MySql/Migrations/20260408095928_AddAuthEntities.cs @@ -0,0 +1,286 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BaGetter.Database.MySql.Migrations +{ + /// + public partial class AddAuthEntities : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "Key", + table: "TargetFrameworks", + type: "int", + nullable: false, + oldClrType: typeof(int), + oldType: "int") + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); + + migrationBuilder.AlterColumn( + name: "Key", + table: "PackageTypes", + type: "int", + nullable: false, + oldClrType: typeof(int), + oldType: "int") + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); + + migrationBuilder.AlterColumn( + name: "Key", + table: "Packages", + type: "int", + nullable: false, + oldClrType: typeof(int), + oldType: "int") + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); + + migrationBuilder.AlterColumn( + name: "Key", + table: "PackageDependencies", + type: "int", + nullable: false, + oldClrType: typeof(int), + oldType: "int") + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); + + migrationBuilder.CreateTable( + name: "FeedPermissions", + columns: table => new + { + Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), + FeedId = table.Column(type: "varchar(128)", maxLength: 128, nullable: false) + .Annotation("MySql:CharSet", "latin1"), + PrincipalType = table.Column(type: "int", nullable: false), + PrincipalId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), + CanPush = table.Column(type: "tinyint(1)", nullable: false, defaultValue: false), + CanPull = table.Column(type: "tinyint(1)", nullable: false, defaultValue: false), + Source = table.Column(type: "int", nullable: false, defaultValue: 0) + }, + constraints: table => + { + table.PrimaryKey("PK_FeedPermissions", x => x.Id); + }) + .Annotation("MySql:CharSet", "latin1"); + + migrationBuilder.CreateTable( + name: "Groups", + columns: table => new + { + Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), + Name = table.Column(type: "varchar(256)", maxLength: 256, nullable: false) + .Annotation("MySql:CharSet", "latin1"), + AppRoleValue = table.Column(type: "varchar(128)", maxLength: 128, nullable: true) + .Annotation("MySql:CharSet", "latin1"), + Description = table.Column(type: "varchar(4000)", maxLength: 4000, nullable: true) + .Annotation("MySql:CharSet", "latin1"), + CreatedAtUtc = table.Column(type: "datetime(6)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Groups", x => x.Id); + }) + .Annotation("MySql:CharSet", "latin1"); + + migrationBuilder.CreateTable( + name: "Users", + columns: table => new + { + Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), + Username = table.Column(type: "varchar(256)", maxLength: 256, nullable: false) + .Annotation("MySql:CharSet", "latin1"), + DisplayName = table.Column(type: "varchar(256)", maxLength: 256, nullable: false) + .Annotation("MySql:CharSet", "latin1"), + AuthProvider = table.Column(type: "int", nullable: false), + EntraObjectId = table.Column(type: "varchar(128)", maxLength: 128, nullable: true) + .Annotation("MySql:CharSet", "latin1"), + PasswordHash = table.Column(type: "varchar(256)", maxLength: 256, nullable: true) + .Annotation("MySql:CharSet", "latin1"), + IsEnabled = table.Column(type: "tinyint(1)", nullable: false, defaultValue: true), + IsAdmin = table.Column(type: "tinyint(1)", nullable: false, defaultValue: false), + CanLoginToUI = table.Column(type: "tinyint(1)", nullable: false), + FailedLoginCount = table.Column(type: "int", nullable: false, defaultValue: 0), + LockedUntilUtc = table.Column(type: "datetime(6)", nullable: true), + CreatedAtUtc = table.Column(type: "datetime(6)", nullable: false), + UpdatedAtUtc = table.Column(type: "datetime(6)", nullable: false), + CreatedByUserId = table.Column(type: "char(36)", nullable: true, collation: "ascii_general_ci") + }, + constraints: table => + { + table.PrimaryKey("PK_Users", x => x.Id); + table.ForeignKey( + name: "FK_Users_Users_CreatedByUserId", + column: x => x.CreatedByUserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.SetNull); + }) + .Annotation("MySql:CharSet", "latin1"); + + migrationBuilder.CreateTable( + name: "PersonalAccessTokens", + columns: table => new + { + Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), + UserId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), + Name = table.Column(type: "varchar(256)", maxLength: 256, nullable: false) + .Annotation("MySql:CharSet", "latin1"), + TokenHash = table.Column(type: "varchar(128)", maxLength: 128, nullable: false) + .Annotation("MySql:CharSet", "latin1"), + TokenPrefix = table.Column(type: "varchar(8)", maxLength: 8, nullable: false) + .Annotation("MySql:CharSet", "latin1"), + ExpiresAtUtc = table.Column(type: "datetime(6)", nullable: false), + CreatedAtUtc = table.Column(type: "datetime(6)", nullable: false), + LastUsedAtUtc = table.Column(type: "datetime(6)", nullable: true), + RevokedAtUtc = table.Column(type: "datetime(6)", nullable: true), + IsRevoked = table.Column(type: "tinyint(1)", nullable: false, defaultValue: false) + }, + constraints: table => + { + table.PrimaryKey("PK_PersonalAccessTokens", x => x.Id); + table.ForeignKey( + name: "FK_PersonalAccessTokens_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "latin1"); + + migrationBuilder.CreateTable( + name: "UserGroups", + columns: table => new + { + UserId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), + GroupId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci") + }, + constraints: table => + { + table.PrimaryKey("PK_UserGroups", x => new { x.UserId, x.GroupId }); + table.ForeignKey( + name: "FK_UserGroups_Groups_GroupId", + column: x => x.GroupId, + principalTable: "Groups", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_UserGroups_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "latin1"); + + migrationBuilder.CreateIndex( + name: "IX_FeedPermissions_FeedId_PrincipalType_PrincipalId", + table: "FeedPermissions", + columns: new[] { "FeedId", "PrincipalType", "PrincipalId" }, + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Groups_AppRoleValue", + table: "Groups", + column: "AppRoleValue", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Groups_Name", + table: "Groups", + column: "Name", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_PersonalAccessTokens_TokenHash", + table: "PersonalAccessTokens", + column: "TokenHash", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_PersonalAccessTokens_UserId", + table: "PersonalAccessTokens", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_UserGroups_GroupId", + table: "UserGroups", + column: "GroupId"); + + migrationBuilder.CreateIndex( + name: "IX_Users_CreatedByUserId", + table: "Users", + column: "CreatedByUserId"); + + migrationBuilder.CreateIndex( + name: "IX_Users_EntraObjectId", + table: "Users", + column: "EntraObjectId", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Users_Username", + table: "Users", + column: "Username", + unique: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "FeedPermissions"); + + migrationBuilder.DropTable( + name: "PersonalAccessTokens"); + + migrationBuilder.DropTable( + name: "UserGroups"); + + migrationBuilder.DropTable( + name: "Groups"); + + migrationBuilder.DropTable( + name: "Users"); + + migrationBuilder.AlterColumn( + name: "Key", + table: "TargetFrameworks", + type: "int", + nullable: false, + oldClrType: typeof(int), + oldType: "int") + .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); + + migrationBuilder.AlterColumn( + name: "Key", + table: "PackageTypes", + type: "int", + nullable: false, + oldClrType: typeof(int), + oldType: "int") + .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); + + migrationBuilder.AlterColumn( + name: "Key", + table: "Packages", + type: "int", + nullable: false, + oldClrType: typeof(int), + oldType: "int") + .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); + + migrationBuilder.AlterColumn( + name: "Key", + table: "PackageDependencies", + type: "int", + nullable: false, + oldClrType: typeof(int), + oldType: "int") + .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); + } + } +} diff --git a/src/BaGetter.Database.MySql/Migrations/MySqlContextModelSnapshot.cs b/src/BaGetter.Database.MySql/Migrations/MySqlContextModelSnapshot.cs index 729a1cdd4..3b81674da 100644 --- a/src/BaGetter.Database.MySql/Migrations/MySqlContextModelSnapshot.cs +++ b/src/BaGetter.Database.MySql/Migrations/MySqlContextModelSnapshot.cs @@ -3,6 +3,7 @@ using BaGetter.Database.MySql; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable @@ -16,17 +17,93 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.0") + .HasAnnotation("ProductVersion", "9.0.10") .HasAnnotation("Relational:MaxIdentifierLength", 64); MySqlModelBuilderExtensions.HasCharSet(modelBuilder, "latin1"); + MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("BaGetter.Core.Package", b => + modelBuilder.Entity("BaGetter.Core.Entities.FeedPermission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("CanPull") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("CanPush") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("FeedId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("PrincipalId") + .HasColumnType("char(36)"); + + b.Property("PrincipalType") + .HasColumnType("int"); + + b.Property("Source") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0); + + b.HasKey("Id"); + + b.HasIndex("FeedId", "PrincipalType", "PrincipalId") + .IsUnique(); + + b.ToTable("FeedPermissions"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("AppRoleValue") + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("AppRoleValue") + .IsUnique(); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => { b.Property("Key") .ValueGeneratedOnAdd() .HasColumnType("int"); + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Key")); + b.Property("Authors") .HasMaxLength(4000) .HasColumnType("varchar(4000)"); @@ -134,12 +211,14 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Packages"); }); - modelBuilder.Entity("BaGetter.Core.PackageDependency", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => { b.Property("Key") .ValueGeneratedOnAdd() .HasColumnType("int"); + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Key")); + b.Property("Id") .HasMaxLength(128) .HasColumnType("varchar(128)"); @@ -164,12 +243,14 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PackageDependencies"); }); - modelBuilder.Entity("BaGetter.Core.PackageType", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => { b.Property("Key") .ValueGeneratedOnAdd() .HasColumnType("int"); + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Key")); + b.Property("Name") .HasMaxLength(512) .HasColumnType("varchar(512)"); @@ -190,12 +271,65 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PackageTypes"); }); - modelBuilder.Entity("BaGetter.Core.TargetFramework", b => + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("ExpiresAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("IsRevoked") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("LastUsedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("RevokedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("TokenPrefix") + .IsRequired() + .HasMaxLength(8) + .HasColumnType("varchar(8)"); + + b.Property("UserId") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.HasIndex("UserId"); + + b.ToTable("PersonalAccessTokens"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => { b.Property("Key") .ValueGeneratedOnAdd() .HasColumnType("int"); + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Key")); + b.Property("Moniker") .HasMaxLength(256) .HasColumnType("varchar(256)"); @@ -212,18 +346,103 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("TargetFrameworks"); }); - modelBuilder.Entity("BaGetter.Core.PackageDependency", b => + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("AuthProvider") + .HasColumnType("int"); + + b.Property("CanLoginToUI") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("CreatedByUserId") + .HasColumnType("char(36)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("EntraObjectId") + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("FailedLoginCount") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0); + + b.Property("IsAdmin") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("IsEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(true); + + b.Property("LockedUntilUtc") + .HasColumnType("datetime(6)"); + + b.Property("PasswordHash") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("UpdatedAtUtc") + .HasColumnType("datetime(6)"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("CreatedByUserId"); + + b.HasIndex("EntraObjectId") + .IsUnique(); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.Property("UserId") + .HasColumnType("char(36)"); + + b.Property("GroupId") + .HasColumnType("char(36)"); + + b.HasKey("UserId", "GroupId"); + + b.HasIndex("GroupId"); + + b.ToTable("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("Dependencies") .HasForeignKey("PackageKey"); b.Navigation("Package"); }); - modelBuilder.Entity("BaGetter.Core.PackageType", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("PackageTypes") .HasForeignKey("PackageKey") .OnDelete(DeleteBehavior.Cascade) @@ -232,9 +451,20 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Package"); }); - modelBuilder.Entity("BaGetter.Core.TargetFramework", b => + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("PersonalAccessTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("TargetFrameworks") .HasForeignKey("PackageKey") .OnDelete(DeleteBehavior.Cascade) @@ -243,7 +473,41 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Package"); }); - modelBuilder.Entity("BaGetter.Core.Package", b => + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.HasOne("BaGetter.Core.Entities.User", "CreatedByUser") + .WithMany() + .HasForeignKey("CreatedByUserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("CreatedByUser"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.HasOne("BaGetter.Core.Entities.Group", "Group") + .WithMany("UserGroups") + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("UserGroups") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Group"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Navigation("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => { b.Navigation("Dependencies"); @@ -251,6 +515,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("TargetFrameworks"); }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Navigation("PersonalAccessTokens"); + + b.Navigation("UserGroups"); + }); #pragma warning restore 612, 618 } } diff --git a/src/BaGetter.Database.MySql/MySqlDesignTimeContextFactory.cs b/src/BaGetter.Database.MySql/MySqlDesignTimeContextFactory.cs new file mode 100644 index 000000000..933c0ec77 --- /dev/null +++ b/src/BaGetter.Database.MySql/MySqlDesignTimeContextFactory.cs @@ -0,0 +1,42 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Design; +using BaGetter.Core.Configuration; +using Microsoft.Extensions.Options; + +namespace BaGetter.Database.MySql; + +/// +/// Design-time factory for MySqlContext, used by EF Core tools to generate migrations +/// without requiring a live MySQL connection. +/// +public class MySqlDesignTimeContextFactory : IDesignTimeDbContextFactory +{ + public MySqlContext CreateDbContext(string[] args) + { + var optionsBuilder = new DbContextOptionsBuilder(); + optionsBuilder.UseMySql( + "Server=localhost;Database=bagetter_design;", + new MySqlServerVersion(new System.Version(8, 0, 0))); + + var bagetterOptions = Options.Create(new BaGetterOptions + { + Database = new DatabaseOptions + { + Type = "MySql", + ConnectionString = "Server=localhost;Database=bagetter_design;" + } + }); + + return new MySqlContext(optionsBuilder.Options, new OptionsSnapshotWrapper(bagetterOptions.Value)); + } + + /// + /// Minimal IOptionsSnapshot wrapper for design-time use only. + /// + private class OptionsSnapshotWrapper : IOptionsSnapshot where T : class, new() + { + public OptionsSnapshotWrapper(T value) => Value = value; + public T Value { get; } + public T Get(string name) => Value; + } +} diff --git a/src/BaGetter.Database.PostgreSql/Migrations/20260408095917_AddAuthEntities.Designer.cs b/src/BaGetter.Database.PostgreSql/Migrations/20260408095917_AddAuthEntities.Designer.cs new file mode 100644 index 000000000..23accf454 --- /dev/null +++ b/src/BaGetter.Database.PostgreSql/Migrations/20260408095917_AddAuthEntities.Designer.cs @@ -0,0 +1,531 @@ +// +using System; +using BaGetter.Database.PostgreSql; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace BaGetter.Database.PostgreSql.Migrations +{ + [DbContext(typeof(PostgreSqlContext))] + [Migration("20260408095917_AddAuthEntities")] + partial class AddAuthEntities + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.10") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "citext"); + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("BaGetter.Core.Entities.FeedPermission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CanPull") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false); + + b.Property("CanPush") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false); + + b.Property("FeedId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("PrincipalId") + .HasColumnType("uuid"); + + b.Property("PrincipalType") + .HasColumnType("integer"); + + b.Property("Source") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasDefaultValue(0); + + b.HasKey("Id"); + + b.HasIndex("FeedId", "PrincipalType", "PrincipalId") + .IsUnique(); + + b.ToTable("FeedPermissions"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AppRoleValue") + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("CreatedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("AppRoleValue") + .IsUnique(); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Key")); + + b.Property("Authors") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("Downloads") + .HasColumnType("bigint"); + + b.Property("HasEmbeddedIcon") + .HasColumnType("boolean"); + + b.Property("HasReadme") + .HasColumnType("boolean"); + + b.Property("IconUrl") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("Id") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("citext"); + + b.Property("IsPrerelease") + .HasColumnType("boolean"); + + b.Property("Language") + .HasMaxLength(20) + .HasColumnType("character varying(20)"); + + b.Property("LicenseUrl") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("Listed") + .HasColumnType("boolean"); + + b.Property("MinClientVersion") + .HasMaxLength(44) + .HasColumnType("character varying(44)"); + + b.Property("NormalizedVersionString") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("citext") + .HasColumnName("Version"); + + b.Property("OriginalVersionString") + .HasMaxLength(64) + .HasColumnType("character varying(64)") + .HasColumnName("OriginalVersion"); + + b.Property("ProjectUrl") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("Published") + .HasColumnType("timestamp with time zone"); + + b.Property("ReleaseNotes") + .HasColumnType("text") + .HasColumnName("ReleaseNotes"); + + b.Property("RepositoryType") + .HasMaxLength(100) + .HasColumnType("character varying(100)"); + + b.Property("RepositoryUrl") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("RequireLicenseAcceptance") + .HasColumnType("boolean"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate() + .HasColumnType("bytea"); + + b.Property("SemVerLevel") + .HasColumnType("integer"); + + b.Property("Summary") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("Tags") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("Title") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Key"); + + b.HasIndex("Id"); + + b.HasIndex("Id", "NormalizedVersionString") + .IsUnique(); + + b.ToTable("Packages"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Key")); + + b.Property("Id") + .HasMaxLength(128) + .HasColumnType("citext"); + + b.Property("PackageKey") + .HasColumnType("integer"); + + b.Property("TargetFramework") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("VersionRange") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Key"); + + b.HasIndex("Id"); + + b.HasIndex("PackageKey"); + + b.ToTable("PackageDependencies"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Key")); + + b.Property("Name") + .HasMaxLength(512) + .HasColumnType("citext"); + + b.Property("PackageKey") + .HasColumnType("integer"); + + b.Property("Version") + .HasMaxLength(64) + .HasColumnType("character varying(64)"); + + b.HasKey("Key"); + + b.HasIndex("Name"); + + b.HasIndex("PackageKey"); + + b.ToTable("PackageTypes"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CreatedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("ExpiresAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("IsRevoked") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false); + + b.Property("LastUsedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("RevokedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("TokenPrefix") + .IsRequired() + .HasMaxLength(8) + .HasColumnType("character varying(8)"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.HasIndex("UserId"); + + b.ToTable("PersonalAccessTokens"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Key")); + + b.Property("Moniker") + .HasMaxLength(256) + .HasColumnType("citext"); + + b.Property("PackageKey") + .HasColumnType("integer"); + + b.HasKey("Key"); + + b.HasIndex("Moniker"); + + b.HasIndex("PackageKey"); + + b.ToTable("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AuthProvider") + .HasColumnType("integer"); + + b.Property("CanLoginToUI") + .HasColumnType("boolean"); + + b.Property("CreatedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("CreatedByUserId") + .HasColumnType("uuid"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EntraObjectId") + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("FailedLoginCount") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasDefaultValue(0); + + b.Property("IsAdmin") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false); + + b.Property("IsEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(true); + + b.Property("LockedUntilUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("PasswordHash") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("UpdatedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("CreatedByUserId"); + + b.HasIndex("EntraObjectId") + .IsUnique(); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("GroupId") + .HasColumnType("uuid"); + + b.HasKey("UserId", "GroupId"); + + b.HasIndex("GroupId"); + + b.ToTable("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("Dependencies") + .HasForeignKey("PackageKey"); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("PackageTypes") + .HasForeignKey("PackageKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("PersonalAccessTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("TargetFrameworks") + .HasForeignKey("PackageKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.HasOne("BaGetter.Core.Entities.User", "CreatedByUser") + .WithMany() + .HasForeignKey("CreatedByUserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("CreatedByUser"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.HasOne("BaGetter.Core.Entities.Group", "Group") + .WithMany("UserGroups") + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("UserGroups") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Group"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Navigation("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Navigation("Dependencies"); + + b.Navigation("PackageTypes"); + + b.Navigation("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Navigation("PersonalAccessTokens"); + + b.Navigation("UserGroups"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/BaGetter.Database.PostgreSql/Migrations/20260408095917_AddAuthEntities.cs b/src/BaGetter.Database.PostgreSql/Migrations/20260408095917_AddAuthEntities.cs new file mode 100644 index 000000000..ef23654d9 --- /dev/null +++ b/src/BaGetter.Database.PostgreSql/Migrations/20260408095917_AddAuthEntities.cs @@ -0,0 +1,197 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BaGetter.Database.PostgreSql.Migrations +{ + /// + public partial class AddAuthEntities : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "FeedPermissions", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + FeedId = table.Column(type: "character varying(128)", maxLength: 128, nullable: false), + PrincipalType = table.Column(type: "integer", nullable: false), + PrincipalId = table.Column(type: "uuid", nullable: false), + CanPush = table.Column(type: "boolean", nullable: false, defaultValue: false), + CanPull = table.Column(type: "boolean", nullable: false, defaultValue: false), + Source = table.Column(type: "integer", nullable: false, defaultValue: 0) + }, + constraints: table => + { + table.PrimaryKey("PK_FeedPermissions", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Groups", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + Name = table.Column(type: "character varying(256)", maxLength: 256, nullable: false), + AppRoleValue = table.Column(type: "character varying(128)", maxLength: 128, nullable: true), + Description = table.Column(type: "character varying(4000)", maxLength: 4000, nullable: true), + CreatedAtUtc = table.Column(type: "timestamp with time zone", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Groups", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Users", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + Username = table.Column(type: "character varying(256)", maxLength: 256, nullable: false), + DisplayName = table.Column(type: "character varying(256)", maxLength: 256, nullable: false), + AuthProvider = table.Column(type: "integer", nullable: false), + EntraObjectId = table.Column(type: "character varying(128)", maxLength: 128, nullable: true), + PasswordHash = table.Column(type: "character varying(256)", maxLength: 256, nullable: true), + IsEnabled = table.Column(type: "boolean", nullable: false, defaultValue: true), + IsAdmin = table.Column(type: "boolean", nullable: false, defaultValue: false), + CanLoginToUI = table.Column(type: "boolean", nullable: false), + FailedLoginCount = table.Column(type: "integer", nullable: false, defaultValue: 0), + LockedUntilUtc = table.Column(type: "timestamp with time zone", nullable: true), + CreatedAtUtc = table.Column(type: "timestamp with time zone", nullable: false), + UpdatedAtUtc = table.Column(type: "timestamp with time zone", nullable: false), + CreatedByUserId = table.Column(type: "uuid", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Users", x => x.Id); + table.ForeignKey( + name: "FK_Users_Users_CreatedByUserId", + column: x => x.CreatedByUserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.SetNull); + }); + + migrationBuilder.CreateTable( + name: "PersonalAccessTokens", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + UserId = table.Column(type: "uuid", nullable: false), + Name = table.Column(type: "character varying(256)", maxLength: 256, nullable: false), + TokenHash = table.Column(type: "character varying(128)", maxLength: 128, nullable: false), + TokenPrefix = table.Column(type: "character varying(8)", maxLength: 8, nullable: false), + ExpiresAtUtc = table.Column(type: "timestamp with time zone", nullable: false), + CreatedAtUtc = table.Column(type: "timestamp with time zone", nullable: false), + LastUsedAtUtc = table.Column(type: "timestamp with time zone", nullable: true), + RevokedAtUtc = table.Column(type: "timestamp with time zone", nullable: true), + IsRevoked = table.Column(type: "boolean", nullable: false, defaultValue: false) + }, + constraints: table => + { + table.PrimaryKey("PK_PersonalAccessTokens", x => x.Id); + table.ForeignKey( + name: "FK_PersonalAccessTokens_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "UserGroups", + columns: table => new + { + UserId = table.Column(type: "uuid", nullable: false), + GroupId = table.Column(type: "uuid", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_UserGroups", x => new { x.UserId, x.GroupId }); + table.ForeignKey( + name: "FK_UserGroups_Groups_GroupId", + column: x => x.GroupId, + principalTable: "Groups", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_UserGroups_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_FeedPermissions_FeedId_PrincipalType_PrincipalId", + table: "FeedPermissions", + columns: new[] { "FeedId", "PrincipalType", "PrincipalId" }, + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Groups_AppRoleValue", + table: "Groups", + column: "AppRoleValue", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Groups_Name", + table: "Groups", + column: "Name", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_PersonalAccessTokens_TokenHash", + table: "PersonalAccessTokens", + column: "TokenHash", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_PersonalAccessTokens_UserId", + table: "PersonalAccessTokens", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_UserGroups_GroupId", + table: "UserGroups", + column: "GroupId"); + + migrationBuilder.CreateIndex( + name: "IX_Users_CreatedByUserId", + table: "Users", + column: "CreatedByUserId"); + + migrationBuilder.CreateIndex( + name: "IX_Users_EntraObjectId", + table: "Users", + column: "EntraObjectId", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Users_Username", + table: "Users", + column: "Username", + unique: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "FeedPermissions"); + + migrationBuilder.DropTable( + name: "PersonalAccessTokens"); + + migrationBuilder.DropTable( + name: "UserGroups"); + + migrationBuilder.DropTable( + name: "Groups"); + + migrationBuilder.DropTable( + name: "Users"); + } + } +} diff --git a/src/BaGetter.Database.PostgreSql/Migrations/PostgreSqlContextModelSnapshot.cs b/src/BaGetter.Database.PostgreSql/Migrations/PostgreSqlContextModelSnapshot.cs index 1f7738310..35b2987fa 100644 --- a/src/BaGetter.Database.PostgreSql/Migrations/PostgreSqlContextModelSnapshot.cs +++ b/src/BaGetter.Database.PostgreSql/Migrations/PostgreSqlContextModelSnapshot.cs @@ -23,7 +23,80 @@ protected override void BuildModel(ModelBuilder modelBuilder) NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "citext"); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("BaGetter.Core.Package", b => + modelBuilder.Entity("BaGetter.Core.Entities.FeedPermission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CanPull") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false); + + b.Property("CanPush") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false); + + b.Property("FeedId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("PrincipalId") + .HasColumnType("uuid"); + + b.Property("PrincipalType") + .HasColumnType("integer"); + + b.Property("Source") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasDefaultValue(0); + + b.HasKey("Id"); + + b.HasIndex("FeedId", "PrincipalType", "PrincipalId") + .IsUnique(); + + b.ToTable("FeedPermissions"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AppRoleValue") + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("CreatedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("AppRoleValue") + .IsUnique(); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => { b.Property("Key") .ValueGeneratedOnAdd() @@ -138,7 +211,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Packages"); }); - modelBuilder.Entity("BaGetter.Core.PackageDependency", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => { b.Property("Key") .ValueGeneratedOnAdd() @@ -170,7 +243,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PackageDependencies"); }); - modelBuilder.Entity("BaGetter.Core.PackageType", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => { b.Property("Key") .ValueGeneratedOnAdd() @@ -198,7 +271,58 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PackageTypes"); }); - modelBuilder.Entity("BaGetter.Core.TargetFramework", b => + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CreatedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("ExpiresAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("IsRevoked") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false); + + b.Property("LastUsedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("RevokedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("TokenPrefix") + .IsRequired() + .HasMaxLength(8) + .HasColumnType("character varying(8)"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.HasIndex("UserId"); + + b.ToTable("PersonalAccessTokens"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => { b.Property("Key") .ValueGeneratedOnAdd() @@ -222,18 +346,103 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("TargetFrameworks"); }); - modelBuilder.Entity("BaGetter.Core.PackageDependency", b => + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AuthProvider") + .HasColumnType("integer"); + + b.Property("CanLoginToUI") + .HasColumnType("boolean"); + + b.Property("CreatedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("CreatedByUserId") + .HasColumnType("uuid"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EntraObjectId") + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("FailedLoginCount") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasDefaultValue(0); + + b.Property("IsAdmin") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false); + + b.Property("IsEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(true); + + b.Property("LockedUntilUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("PasswordHash") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("UpdatedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("CreatedByUserId"); + + b.HasIndex("EntraObjectId") + .IsUnique(); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("GroupId") + .HasColumnType("uuid"); + + b.HasKey("UserId", "GroupId"); + + b.HasIndex("GroupId"); + + b.ToTable("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("Dependencies") .HasForeignKey("PackageKey"); b.Navigation("Package"); }); - modelBuilder.Entity("BaGetter.Core.PackageType", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("PackageTypes") .HasForeignKey("PackageKey") .OnDelete(DeleteBehavior.Cascade) @@ -242,9 +451,20 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Package"); }); - modelBuilder.Entity("BaGetter.Core.TargetFramework", b => + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("PersonalAccessTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("TargetFrameworks") .HasForeignKey("PackageKey") .OnDelete(DeleteBehavior.Cascade) @@ -253,7 +473,41 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Package"); }); - modelBuilder.Entity("BaGetter.Core.Package", b => + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.HasOne("BaGetter.Core.Entities.User", "CreatedByUser") + .WithMany() + .HasForeignKey("CreatedByUserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("CreatedByUser"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.HasOne("BaGetter.Core.Entities.Group", "Group") + .WithMany("UserGroups") + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("UserGroups") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Group"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Navigation("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => { b.Navigation("Dependencies"); @@ -261,6 +515,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("TargetFrameworks"); }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Navigation("PersonalAccessTokens"); + + b.Navigation("UserGroups"); + }); #pragma warning restore 612, 618 } } diff --git a/src/BaGetter.Database.SqlServer/Migrations/20260408095854_AddAuthEntities.Designer.cs b/src/BaGetter.Database.SqlServer/Migrations/20260408095854_AddAuthEntities.Designer.cs new file mode 100644 index 000000000..73bd4a07f --- /dev/null +++ b/src/BaGetter.Database.SqlServer/Migrations/20260408095854_AddAuthEntities.Designer.cs @@ -0,0 +1,532 @@ +// +using System; +using BaGetter.Database.SqlServer; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace BaGetter.Database.SqlServer.Migrations +{ + [DbContext(typeof(SqlServerContext))] + [Migration("20260408095854_AddAuthEntities")] + partial class AddAuthEntities + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.10") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("BaGetter.Core.Entities.FeedPermission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CanPull") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("CanPush") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("FeedId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("PrincipalId") + .HasColumnType("uniqueidentifier"); + + b.Property("PrincipalType") + .HasColumnType("int"); + + b.Property("Source") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0); + + b.HasKey("Id"); + + b.HasIndex("FeedId", "PrincipalType", "PrincipalId") + .IsUnique(); + + b.ToTable("FeedPermissions"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AppRoleValue") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("AppRoleValue") + .IsUnique() + .HasFilter("[AppRoleValue] IS NOT NULL"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Key")); + + b.Property("Authors") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("Downloads") + .HasColumnType("bigint"); + + b.Property("HasEmbeddedIcon") + .HasColumnType("bit"); + + b.Property("HasReadme") + .HasColumnType("bit"); + + b.Property("IconUrl") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("Id") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("IsPrerelease") + .HasColumnType("bit"); + + b.Property("Language") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); + + b.Property("LicenseUrl") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("Listed") + .HasColumnType("bit"); + + b.Property("MinClientVersion") + .HasMaxLength(44) + .HasColumnType("nvarchar(44)"); + + b.Property("NormalizedVersionString") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("Version"); + + b.Property("OriginalVersionString") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("OriginalVersion"); + + b.Property("ProjectUrl") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("Published") + .HasColumnType("datetime2"); + + b.Property("ReleaseNotes") + .HasColumnType("nvarchar(max)") + .HasColumnName("ReleaseNotes"); + + b.Property("RepositoryType") + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("RepositoryUrl") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("RequireLicenseAcceptance") + .HasColumnType("bit"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate() + .HasColumnType("rowversion"); + + b.Property("SemVerLevel") + .HasColumnType("int"); + + b.Property("Summary") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("Tags") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("Title") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Key"); + + b.HasIndex("Id"); + + b.HasIndex("Id", "NormalizedVersionString") + .IsUnique(); + + b.ToTable("Packages"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Key")); + + b.Property("Id") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("PackageKey") + .HasColumnType("int"); + + b.Property("TargetFramework") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("VersionRange") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Key"); + + b.HasIndex("Id"); + + b.HasIndex("PackageKey"); + + b.ToTable("PackageDependencies"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Key")); + + b.Property("Name") + .HasMaxLength(512) + .HasColumnType("nvarchar(512)"); + + b.Property("PackageKey") + .HasColumnType("int"); + + b.Property("Version") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.HasKey("Key"); + + b.HasIndex("Name"); + + b.HasIndex("PackageKey"); + + b.ToTable("PackageTypes"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime2"); + + b.Property("ExpiresAtUtc") + .HasColumnType("datetime2"); + + b.Property("IsRevoked") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastUsedAtUtc") + .HasColumnType("datetime2"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("RevokedAtUtc") + .HasColumnType("datetime2"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("TokenPrefix") + .IsRequired() + .HasMaxLength(8) + .HasColumnType("nvarchar(8)"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.HasIndex("UserId"); + + b.ToTable("PersonalAccessTokens"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Key")); + + b.Property("Moniker") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("PackageKey") + .HasColumnType("int"); + + b.HasKey("Key"); + + b.HasIndex("Moniker"); + + b.HasIndex("PackageKey"); + + b.ToTable("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuthProvider") + .HasColumnType("int"); + + b.Property("CanLoginToUI") + .HasColumnType("bit"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime2"); + + b.Property("CreatedByUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("EntraObjectId") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("FailedLoginCount") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0); + + b.Property("IsAdmin") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("IsEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(true); + + b.Property("LockedUntilUtc") + .HasColumnType("datetime2"); + + b.Property("PasswordHash") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("UpdatedAtUtc") + .HasColumnType("datetime2"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("CreatedByUserId"); + + b.HasIndex("EntraObjectId") + .IsUnique() + .HasFilter("[EntraObjectId] IS NOT NULL"); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("GroupId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "GroupId"); + + b.HasIndex("GroupId"); + + b.ToTable("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("Dependencies") + .HasForeignKey("PackageKey"); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("PackageTypes") + .HasForeignKey("PackageKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("PersonalAccessTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("TargetFrameworks") + .HasForeignKey("PackageKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.HasOne("BaGetter.Core.Entities.User", "CreatedByUser") + .WithMany() + .HasForeignKey("CreatedByUserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("CreatedByUser"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.HasOne("BaGetter.Core.Entities.Group", "Group") + .WithMany("UserGroups") + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("UserGroups") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Group"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Navigation("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Navigation("Dependencies"); + + b.Navigation("PackageTypes"); + + b.Navigation("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Navigation("PersonalAccessTokens"); + + b.Navigation("UserGroups"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/BaGetter.Database.SqlServer/Migrations/20260408095854_AddAuthEntities.cs b/src/BaGetter.Database.SqlServer/Migrations/20260408095854_AddAuthEntities.cs new file mode 100644 index 000000000..19bf80c18 --- /dev/null +++ b/src/BaGetter.Database.SqlServer/Migrations/20260408095854_AddAuthEntities.cs @@ -0,0 +1,199 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BaGetter.Database.SqlServer.Migrations +{ + /// + public partial class AddAuthEntities : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "FeedPermissions", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + FeedId = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), + PrincipalType = table.Column(type: "int", nullable: false), + PrincipalId = table.Column(type: "uniqueidentifier", nullable: false), + CanPush = table.Column(type: "bit", nullable: false, defaultValue: false), + CanPull = table.Column(type: "bit", nullable: false, defaultValue: false), + Source = table.Column(type: "int", nullable: false, defaultValue: 0) + }, + constraints: table => + { + table.PrimaryKey("PK_FeedPermissions", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Groups", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + Name = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), + AppRoleValue = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), + Description = table.Column(type: "nvarchar(4000)", maxLength: 4000, nullable: true), + CreatedAtUtc = table.Column(type: "datetime2", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Groups", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Users", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + Username = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), + DisplayName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), + AuthProvider = table.Column(type: "int", nullable: false), + EntraObjectId = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), + PasswordHash = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), + IsEnabled = table.Column(type: "bit", nullable: false, defaultValue: true), + IsAdmin = table.Column(type: "bit", nullable: false, defaultValue: false), + CanLoginToUI = table.Column(type: "bit", nullable: false), + FailedLoginCount = table.Column(type: "int", nullable: false, defaultValue: 0), + LockedUntilUtc = table.Column(type: "datetime2", nullable: true), + CreatedAtUtc = table.Column(type: "datetime2", nullable: false), + UpdatedAtUtc = table.Column(type: "datetime2", nullable: false), + CreatedByUserId = table.Column(type: "uniqueidentifier", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Users", x => x.Id); + table.ForeignKey( + name: "FK_Users_Users_CreatedByUserId", + column: x => x.CreatedByUserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.SetNull); + }); + + migrationBuilder.CreateTable( + name: "PersonalAccessTokens", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + UserId = table.Column(type: "uniqueidentifier", nullable: false), + Name = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), + TokenHash = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), + TokenPrefix = table.Column(type: "nvarchar(8)", maxLength: 8, nullable: false), + ExpiresAtUtc = table.Column(type: "datetime2", nullable: false), + CreatedAtUtc = table.Column(type: "datetime2", nullable: false), + LastUsedAtUtc = table.Column(type: "datetime2", nullable: true), + RevokedAtUtc = table.Column(type: "datetime2", nullable: true), + IsRevoked = table.Column(type: "bit", nullable: false, defaultValue: false) + }, + constraints: table => + { + table.PrimaryKey("PK_PersonalAccessTokens", x => x.Id); + table.ForeignKey( + name: "FK_PersonalAccessTokens_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "UserGroups", + columns: table => new + { + UserId = table.Column(type: "uniqueidentifier", nullable: false), + GroupId = table.Column(type: "uniqueidentifier", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_UserGroups", x => new { x.UserId, x.GroupId }); + table.ForeignKey( + name: "FK_UserGroups_Groups_GroupId", + column: x => x.GroupId, + principalTable: "Groups", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_UserGroups_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_FeedPermissions_FeedId_PrincipalType_PrincipalId", + table: "FeedPermissions", + columns: new[] { "FeedId", "PrincipalType", "PrincipalId" }, + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Groups_AppRoleValue", + table: "Groups", + column: "AppRoleValue", + unique: true, + filter: "[AppRoleValue] IS NOT NULL"); + + migrationBuilder.CreateIndex( + name: "IX_Groups_Name", + table: "Groups", + column: "Name", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_PersonalAccessTokens_TokenHash", + table: "PersonalAccessTokens", + column: "TokenHash", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_PersonalAccessTokens_UserId", + table: "PersonalAccessTokens", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_UserGroups_GroupId", + table: "UserGroups", + column: "GroupId"); + + migrationBuilder.CreateIndex( + name: "IX_Users_CreatedByUserId", + table: "Users", + column: "CreatedByUserId"); + + migrationBuilder.CreateIndex( + name: "IX_Users_EntraObjectId", + table: "Users", + column: "EntraObjectId", + unique: true, + filter: "[EntraObjectId] IS NOT NULL"); + + migrationBuilder.CreateIndex( + name: "IX_Users_Username", + table: "Users", + column: "Username", + unique: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "FeedPermissions"); + + migrationBuilder.DropTable( + name: "PersonalAccessTokens"); + + migrationBuilder.DropTable( + name: "UserGroups"); + + migrationBuilder.DropTable( + name: "Groups"); + + migrationBuilder.DropTable( + name: "Users"); + } + } +} diff --git a/src/BaGetter.Database.SqlServer/Migrations/SqlServerContextModelSnapshot.cs b/src/BaGetter.Database.SqlServer/Migrations/SqlServerContextModelSnapshot.cs index e18da18ab..f6a337915 100644 --- a/src/BaGetter.Database.SqlServer/Migrations/SqlServerContextModelSnapshot.cs +++ b/src/BaGetter.Database.SqlServer/Migrations/SqlServerContextModelSnapshot.cs @@ -6,6 +6,8 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +#nullable disable + namespace BaGetter.Database.SqlServer.Migrations { [DbContext(typeof(SqlServerContext))] @@ -15,24 +17,100 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "3.1.18") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + .HasAnnotation("ProductVersion", "9.0.10") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - modelBuilder.Entity("BaGetter.Core.Package", b => + modelBuilder.Entity("BaGetter.Core.Entities.FeedPermission", b => { - b.Property("Key") + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CanPull") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("CanPush") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("FeedId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("PrincipalId") + .HasColumnType("uniqueidentifier"); + + b.Property("PrincipalType") + .HasColumnType("int"); + + b.Property("Source") .ValueGeneratedOnAdd() .HasColumnType("int") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + .HasDefaultValue(0); + + b.HasKey("Id"); + + b.HasIndex("FeedId", "PrincipalType", "PrincipalId") + .IsUnique(); + + b.ToTable("FeedPermissions"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AppRoleValue") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("AppRoleValue") + .IsUnique() + .HasFilter("[AppRoleValue] IS NOT NULL"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Key")); b.Property("Authors") - .HasColumnType("nvarchar(4000)") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); b.Property("Description") - .HasColumnType("nvarchar(4000)") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); b.Property("Downloads") .HasColumnType("bigint"); @@ -44,61 +122,61 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("bit"); b.Property("IconUrl") - .HasColumnType("nvarchar(4000)") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); b.Property("Id") .IsRequired() - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); b.Property("IsPrerelease") .HasColumnType("bit"); b.Property("Language") - .HasColumnType("nvarchar(20)") - .HasMaxLength(20); + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("LicenseUrl") - .HasColumnType("nvarchar(4000)") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); b.Property("Listed") .HasColumnType("bit"); b.Property("MinClientVersion") - .HasColumnType("nvarchar(44)") - .HasMaxLength(44); + .HasMaxLength(44) + .HasColumnType("nvarchar(44)"); b.Property("NormalizedVersionString") .IsRequired() - .HasColumnName("Version") + .HasMaxLength(64) .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnName("Version"); b.Property("OriginalVersionString") - .HasColumnName("OriginalVersion") + .HasMaxLength(64) .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnName("OriginalVersion"); b.Property("ProjectUrl") - .HasColumnType("nvarchar(4000)") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); b.Property("Published") .HasColumnType("datetime2"); b.Property("ReleaseNotes") - .HasColumnName("ReleaseNotes") - .HasColumnType("nvarchar(max)"); + .HasColumnType("nvarchar(max)") + .HasColumnName("ReleaseNotes"); b.Property("RepositoryType") - .HasColumnType("nvarchar(100)") - .HasMaxLength(100); + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); b.Property("RepositoryUrl") - .HasColumnType("nvarchar(4000)") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); b.Property("RequireLicenseAcceptance") .HasColumnType("bit"); @@ -112,16 +190,16 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("int"); b.Property("Summary") - .HasColumnType("nvarchar(4000)") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); b.Property("Tags") - .HasColumnType("nvarchar(4000)") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("nvarchar(4000)"); b.Property("Title") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); b.HasKey("Key"); @@ -133,27 +211,28 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Packages"); }); - modelBuilder.Entity("BaGetter.Core.PackageDependency", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => { b.Property("Key") .ValueGeneratedOnAdd() - .HasColumnType("int") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Key")); b.Property("Id") - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); b.Property("PackageKey") .HasColumnType("int"); b.Property("TargetFramework") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); b.Property("VersionRange") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); b.HasKey("Key"); @@ -164,23 +243,24 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PackageDependencies"); }); - modelBuilder.Entity("BaGetter.Core.PackageType", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => { b.Property("Key") .ValueGeneratedOnAdd() - .HasColumnType("int") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Key")); b.Property("Name") - .HasColumnType("nvarchar(512)") - .HasMaxLength(512); + .HasMaxLength(512) + .HasColumnType("nvarchar(512)"); b.Property("PackageKey") .HasColumnType("int"); b.Property("Version") - .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); b.HasKey("Key"); @@ -191,16 +271,68 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PackageTypes"); }); - modelBuilder.Entity("BaGetter.Core.TargetFramework", b => + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime2"); + + b.Property("ExpiresAtUtc") + .HasColumnType("datetime2"); + + b.Property("IsRevoked") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastUsedAtUtc") + .HasColumnType("datetime2"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("RevokedAtUtc") + .HasColumnType("datetime2"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("TokenPrefix") + .IsRequired() + .HasMaxLength(8) + .HasColumnType("nvarchar(8)"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.HasIndex("UserId"); + + b.ToTable("PersonalAccessTokens"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => { b.Property("Key") .ValueGeneratedOnAdd() - .HasColumnType("int") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Key")); b.Property("Moniker") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); b.Property("PackageKey") .HasColumnType("int"); @@ -214,29 +346,182 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("TargetFrameworks"); }); - modelBuilder.Entity("BaGetter.Core.PackageDependency", b => + modelBuilder.Entity("BaGetter.Core.Entities.User", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuthProvider") + .HasColumnType("int"); + + b.Property("CanLoginToUI") + .HasColumnType("bit"); + + b.Property("CreatedAtUtc") + .HasColumnType("datetime2"); + + b.Property("CreatedByUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("EntraObjectId") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("FailedLoginCount") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0); + + b.Property("IsAdmin") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("IsEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(true); + + b.Property("LockedUntilUtc") + .HasColumnType("datetime2"); + + b.Property("PasswordHash") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("UpdatedAtUtc") + .HasColumnType("datetime2"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("CreatedByUserId"); + + b.HasIndex("EntraObjectId") + .IsUnique() + .HasFilter("[EntraObjectId] IS NOT NULL"); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("GroupId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "GroupId"); + + b.HasIndex("GroupId"); + + b.ToTable("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("Dependencies") .HasForeignKey("PackageKey"); + + b.Navigation("Package"); }); - modelBuilder.Entity("BaGetter.Core.PackageType", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("PackageTypes") .HasForeignKey("PackageKey") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); + + b.Navigation("Package"); }); - modelBuilder.Entity("BaGetter.Core.TargetFramework", b => + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("PersonalAccessTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("TargetFrameworks") .HasForeignKey("PackageKey") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.HasOne("BaGetter.Core.Entities.User", "CreatedByUser") + .WithMany() + .HasForeignKey("CreatedByUserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("CreatedByUser"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.HasOne("BaGetter.Core.Entities.Group", "Group") + .WithMany("UserGroups") + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("UserGroups") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Group"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Navigation("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Navigation("Dependencies"); + + b.Navigation("PackageTypes"); + + b.Navigation("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Navigation("PersonalAccessTokens"); + + b.Navigation("UserGroups"); }); #pragma warning restore 612, 618 } diff --git a/src/BaGetter.Database.SqlServer/SqlServerContext.cs b/src/BaGetter.Database.SqlServer/SqlServerContext.cs index 893a0681c..d55ac374a 100644 --- a/src/BaGetter.Database.SqlServer/SqlServerContext.cs +++ b/src/BaGetter.Database.SqlServer/SqlServerContext.cs @@ -39,6 +39,23 @@ public override bool IsUniqueConstraintViolationException(DbUpdateException exce return false; } + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); + + // SQL Server only allows one NULL in a standard unique index. + // Use filtered indexes so multiple NULLs are permitted. + builder.Entity() + .HasIndex(u => u.EntraObjectId) + .IsUnique() + .HasFilter("[EntraObjectId] IS NOT NULL"); + + builder.Entity() + .HasIndex(g => g.AppRoleValue) + .IsUnique() + .HasFilter("[AppRoleValue] IS NOT NULL"); + } + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { if (!optionsBuilder.IsConfigured) diff --git a/src/BaGetter.Database.Sqlite/Migrations/20260408095906_AddAuthEntities.Designer.cs b/src/BaGetter.Database.Sqlite/Migrations/20260408095906_AddAuthEntities.Designer.cs new file mode 100644 index 000000000..c8b3dd1d1 --- /dev/null +++ b/src/BaGetter.Database.Sqlite/Migrations/20260408095906_AddAuthEntities.Designer.cs @@ -0,0 +1,517 @@ +// +using System; +using BaGetter.Database.Sqlite; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace BaGetter.Database.Sqlite.Migrations +{ + [DbContext(typeof(SqliteContext))] + [Migration("20260408095906_AddAuthEntities")] + partial class AddAuthEntities + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.10"); + + modelBuilder.Entity("BaGetter.Core.Entities.FeedPermission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CanPull") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(false); + + b.Property("CanPush") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(false); + + b.Property("FeedId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT"); + + b.Property("PrincipalId") + .HasColumnType("TEXT"); + + b.Property("PrincipalType") + .HasColumnType("INTEGER"); + + b.Property("Source") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("Id"); + + b.HasIndex("FeedId", "PrincipalType", "PrincipalId") + .IsUnique(); + + b.ToTable("FeedPermissions"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AppRoleValue") + .HasMaxLength(128) + .HasColumnType("TEXT"); + + b.Property("CreatedAtUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppRoleValue") + .IsUnique(); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authors") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("Downloads") + .HasColumnType("INTEGER"); + + b.Property("HasEmbeddedIcon") + .HasColumnType("INTEGER"); + + b.Property("HasReadme") + .HasColumnType("INTEGER"); + + b.Property("IconUrl") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("Id") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT COLLATE NOCASE"); + + b.Property("IsPrerelease") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasMaxLength(20) + .HasColumnType("TEXT"); + + b.Property("LicenseUrl") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("Listed") + .HasColumnType("INTEGER"); + + b.Property("MinClientVersion") + .HasMaxLength(44) + .HasColumnType("TEXT"); + + b.Property("NormalizedVersionString") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("TEXT COLLATE NOCASE") + .HasColumnName("Version"); + + b.Property("OriginalVersionString") + .HasMaxLength(64) + .HasColumnType("TEXT") + .HasColumnName("OriginalVersion"); + + b.Property("ProjectUrl") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("Published") + .HasColumnType("TEXT"); + + b.Property("ReleaseNotes") + .HasColumnType("TEXT") + .HasColumnName("ReleaseNotes"); + + b.Property("RepositoryType") + .HasMaxLength(100) + .HasColumnType("TEXT"); + + b.Property("RepositoryUrl") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("RequireLicenseAcceptance") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate() + .HasColumnType("BLOB"); + + b.Property("SemVerLevel") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("Tags") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("Title") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.HasIndex("Id"); + + b.HasIndex("Id", "NormalizedVersionString") + .IsUnique(); + + b.ToTable("Packages"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Id") + .HasMaxLength(128) + .HasColumnType("TEXT COLLATE NOCASE"); + + b.Property("PackageKey") + .HasColumnType("INTEGER"); + + b.Property("TargetFramework") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("VersionRange") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.HasIndex("Id"); + + b.HasIndex("PackageKey"); + + b.ToTable("PackageDependencies"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasMaxLength(512) + .HasColumnType("TEXT COLLATE NOCASE"); + + b.Property("PackageKey") + .HasColumnType("INTEGER"); + + b.Property("Version") + .HasMaxLength(64) + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.HasIndex("Name"); + + b.HasIndex("PackageKey"); + + b.ToTable("PackageTypes"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CreatedAtUtc") + .HasColumnType("TEXT"); + + b.Property("ExpiresAtUtc") + .HasColumnType("TEXT"); + + b.Property("IsRevoked") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(false); + + b.Property("LastUsedAtUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("RevokedAtUtc") + .HasColumnType("TEXT"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT"); + + b.Property("TokenPrefix") + .IsRequired() + .HasMaxLength(8) + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.HasIndex("UserId"); + + b.ToTable("PersonalAccessTokens"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.Property("Key") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Moniker") + .HasMaxLength(256) + .HasColumnType("TEXT COLLATE NOCASE"); + + b.Property("PackageKey") + .HasColumnType("INTEGER"); + + b.HasKey("Key"); + + b.HasIndex("Moniker"); + + b.HasIndex("PackageKey"); + + b.ToTable("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AuthProvider") + .HasColumnType("INTEGER"); + + b.Property("CanLoginToUI") + .HasColumnType("INTEGER"); + + b.Property("CreatedAtUtc") + .HasColumnType("TEXT"); + + b.Property("CreatedByUserId") + .HasColumnType("TEXT"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EntraObjectId") + .HasMaxLength(128) + .HasColumnType("TEXT"); + + b.Property("FailedLoginCount") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("IsAdmin") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(false); + + b.Property("IsEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("LockedUntilUtc") + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("UpdatedAtUtc") + .HasColumnType("TEXT"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CreatedByUserId"); + + b.HasIndex("EntraObjectId") + .IsUnique(); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.Property("UserId") + .HasColumnType("TEXT"); + + b.Property("GroupId") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "GroupId"); + + b.HasIndex("GroupId"); + + b.ToTable("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("Dependencies") + .HasForeignKey("PackageKey"); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("PackageTypes") + .HasForeignKey("PackageKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("PersonalAccessTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") + .WithMany("TargetFrameworks") + .HasForeignKey("PackageKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.HasOne("BaGetter.Core.Entities.User", "CreatedByUser") + .WithMany() + .HasForeignKey("CreatedByUserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("CreatedByUser"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.HasOne("BaGetter.Core.Entities.Group", "Group") + .WithMany("UserGroups") + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("UserGroups") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Group"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Navigation("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Navigation("Dependencies"); + + b.Navigation("PackageTypes"); + + b.Navigation("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Navigation("PersonalAccessTokens"); + + b.Navigation("UserGroups"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/BaGetter.Database.Sqlite/Migrations/20260408095906_AddAuthEntities.cs b/src/BaGetter.Database.Sqlite/Migrations/20260408095906_AddAuthEntities.cs new file mode 100644 index 000000000..f05bdc38e --- /dev/null +++ b/src/BaGetter.Database.Sqlite/Migrations/20260408095906_AddAuthEntities.cs @@ -0,0 +1,197 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BaGetter.Database.Sqlite.Migrations +{ + /// + public partial class AddAuthEntities : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "FeedPermissions", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + FeedId = table.Column(type: "TEXT", maxLength: 128, nullable: false), + PrincipalType = table.Column(type: "INTEGER", nullable: false), + PrincipalId = table.Column(type: "TEXT", nullable: false), + CanPush = table.Column(type: "INTEGER", nullable: false, defaultValue: false), + CanPull = table.Column(type: "INTEGER", nullable: false, defaultValue: false), + Source = table.Column(type: "INTEGER", nullable: false, defaultValue: 0) + }, + constraints: table => + { + table.PrimaryKey("PK_FeedPermissions", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Groups", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + Name = table.Column(type: "TEXT", maxLength: 256, nullable: false), + AppRoleValue = table.Column(type: "TEXT", maxLength: 128, nullable: true), + Description = table.Column(type: "TEXT", maxLength: 4000, nullable: true), + CreatedAtUtc = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Groups", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Users", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + Username = table.Column(type: "TEXT", maxLength: 256, nullable: false), + DisplayName = table.Column(type: "TEXT", maxLength: 256, nullable: false), + AuthProvider = table.Column(type: "INTEGER", nullable: false), + EntraObjectId = table.Column(type: "TEXT", maxLength: 128, nullable: true), + PasswordHash = table.Column(type: "TEXT", maxLength: 256, nullable: true), + IsEnabled = table.Column(type: "INTEGER", nullable: false, defaultValue: true), + IsAdmin = table.Column(type: "INTEGER", nullable: false, defaultValue: false), + CanLoginToUI = table.Column(type: "INTEGER", nullable: false), + FailedLoginCount = table.Column(type: "INTEGER", nullable: false, defaultValue: 0), + LockedUntilUtc = table.Column(type: "TEXT", nullable: true), + CreatedAtUtc = table.Column(type: "TEXT", nullable: false), + UpdatedAtUtc = table.Column(type: "TEXT", nullable: false), + CreatedByUserId = table.Column(type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Users", x => x.Id); + table.ForeignKey( + name: "FK_Users_Users_CreatedByUserId", + column: x => x.CreatedByUserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.SetNull); + }); + + migrationBuilder.CreateTable( + name: "PersonalAccessTokens", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + UserId = table.Column(type: "TEXT", nullable: false), + Name = table.Column(type: "TEXT", maxLength: 256, nullable: false), + TokenHash = table.Column(type: "TEXT", maxLength: 128, nullable: false), + TokenPrefix = table.Column(type: "TEXT", maxLength: 8, nullable: false), + ExpiresAtUtc = table.Column(type: "TEXT", nullable: false), + CreatedAtUtc = table.Column(type: "TEXT", nullable: false), + LastUsedAtUtc = table.Column(type: "TEXT", nullable: true), + RevokedAtUtc = table.Column(type: "TEXT", nullable: true), + IsRevoked = table.Column(type: "INTEGER", nullable: false, defaultValue: false) + }, + constraints: table => + { + table.PrimaryKey("PK_PersonalAccessTokens", x => x.Id); + table.ForeignKey( + name: "FK_PersonalAccessTokens_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "UserGroups", + columns: table => new + { + UserId = table.Column(type: "TEXT", nullable: false), + GroupId = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_UserGroups", x => new { x.UserId, x.GroupId }); + table.ForeignKey( + name: "FK_UserGroups_Groups_GroupId", + column: x => x.GroupId, + principalTable: "Groups", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_UserGroups_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_FeedPermissions_FeedId_PrincipalType_PrincipalId", + table: "FeedPermissions", + columns: new[] { "FeedId", "PrincipalType", "PrincipalId" }, + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Groups_AppRoleValue", + table: "Groups", + column: "AppRoleValue", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Groups_Name", + table: "Groups", + column: "Name", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_PersonalAccessTokens_TokenHash", + table: "PersonalAccessTokens", + column: "TokenHash", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_PersonalAccessTokens_UserId", + table: "PersonalAccessTokens", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_UserGroups_GroupId", + table: "UserGroups", + column: "GroupId"); + + migrationBuilder.CreateIndex( + name: "IX_Users_CreatedByUserId", + table: "Users", + column: "CreatedByUserId"); + + migrationBuilder.CreateIndex( + name: "IX_Users_EntraObjectId", + table: "Users", + column: "EntraObjectId", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Users_Username", + table: "Users", + column: "Username", + unique: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "FeedPermissions"); + + migrationBuilder.DropTable( + name: "PersonalAccessTokens"); + + migrationBuilder.DropTable( + name: "UserGroups"); + + migrationBuilder.DropTable( + name: "Groups"); + + migrationBuilder.DropTable( + name: "Users"); + } + } +} diff --git a/src/BaGetter.Database.Sqlite/Migrations/SqliteContextModelSnapshot.cs b/src/BaGetter.Database.Sqlite/Migrations/SqliteContextModelSnapshot.cs index 9d8b70cc4..53c34599e 100644 --- a/src/BaGetter.Database.Sqlite/Migrations/SqliteContextModelSnapshot.cs +++ b/src/BaGetter.Database.Sqlite/Migrations/SqliteContextModelSnapshot.cs @@ -5,6 +5,8 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +#nullable disable + namespace BaGetter.Database.Sqlite.Migrations { [DbContext(typeof(SqliteContext))] @@ -13,22 +15,94 @@ partial class SqliteContextModelSnapshot : ModelSnapshot protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.1.18"); + modelBuilder.HasAnnotation("ProductVersion", "9.0.10"); + + modelBuilder.Entity("BaGetter.Core.Entities.FeedPermission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CanPull") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(false); + + b.Property("CanPush") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(false); + + b.Property("FeedId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT"); + + b.Property("PrincipalId") + .HasColumnType("TEXT"); + + b.Property("PrincipalType") + .HasColumnType("INTEGER"); + + b.Property("Source") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("Id"); + + b.HasIndex("FeedId", "PrincipalType", "PrincipalId") + .IsUnique(); + + b.ToTable("FeedPermissions"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AppRoleValue") + .HasMaxLength(128) + .HasColumnType("TEXT"); + + b.Property("CreatedAtUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasMaxLength(4000) + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); - modelBuilder.Entity("BaGetter.Core.Package", b => + b.HasKey("Id"); + + b.HasIndex("AppRoleValue") + .IsUnique(); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => { b.Property("Key") .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); b.Property("Authors") - .HasColumnType("TEXT") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("TEXT"); b.Property("Description") - .HasColumnType("TEXT") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("TEXT"); b.Property("Downloads") .HasColumnType("INTEGER"); @@ -40,61 +114,61 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("INTEGER"); b.Property("IconUrl") - .HasColumnType("TEXT") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("TEXT"); b.Property("Id") .IsRequired() - .HasColumnType("TEXT COLLATE NOCASE") - .HasMaxLength(128); + .HasMaxLength(128) + .HasColumnType("TEXT COLLATE NOCASE"); b.Property("IsPrerelease") .HasColumnType("INTEGER"); b.Property("Language") - .HasColumnType("TEXT") - .HasMaxLength(20); + .HasMaxLength(20) + .HasColumnType("TEXT"); b.Property("LicenseUrl") - .HasColumnType("TEXT") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("TEXT"); b.Property("Listed") .HasColumnType("INTEGER"); b.Property("MinClientVersion") - .HasColumnType("TEXT") - .HasMaxLength(44); + .HasMaxLength(44) + .HasColumnType("TEXT"); b.Property("NormalizedVersionString") .IsRequired() - .HasColumnName("Version") + .HasMaxLength(64) .HasColumnType("TEXT COLLATE NOCASE") - .HasMaxLength(64); + .HasColumnName("Version"); b.Property("OriginalVersionString") - .HasColumnName("OriginalVersion") + .HasMaxLength(64) .HasColumnType("TEXT") - .HasMaxLength(64); + .HasColumnName("OriginalVersion"); b.Property("ProjectUrl") - .HasColumnType("TEXT") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("TEXT"); b.Property("Published") .HasColumnType("TEXT"); b.Property("ReleaseNotes") - .HasColumnName("ReleaseNotes") - .HasColumnType("TEXT"); + .HasColumnType("TEXT") + .HasColumnName("ReleaseNotes"); b.Property("RepositoryType") - .HasColumnType("TEXT") - .HasMaxLength(100); + .HasMaxLength(100) + .HasColumnType("TEXT"); b.Property("RepositoryUrl") - .HasColumnType("TEXT") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("TEXT"); b.Property("RequireLicenseAcceptance") .HasColumnType("INTEGER"); @@ -108,16 +182,16 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("INTEGER"); b.Property("Summary") - .HasColumnType("TEXT") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("TEXT"); b.Property("Tags") - .HasColumnType("TEXT") - .HasMaxLength(4000); + .HasMaxLength(4000) + .HasColumnType("TEXT"); b.Property("Title") - .HasColumnType("TEXT") - .HasMaxLength(256); + .HasMaxLength(256) + .HasColumnType("TEXT"); b.HasKey("Key"); @@ -129,26 +203,26 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Packages"); }); - modelBuilder.Entity("BaGetter.Core.PackageDependency", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => { b.Property("Key") .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); b.Property("Id") - .HasColumnType("TEXT COLLATE NOCASE") - .HasMaxLength(128); + .HasMaxLength(128) + .HasColumnType("TEXT COLLATE NOCASE"); b.Property("PackageKey") .HasColumnType("INTEGER"); b.Property("TargetFramework") - .HasColumnType("TEXT") - .HasMaxLength(256); + .HasMaxLength(256) + .HasColumnType("TEXT"); b.Property("VersionRange") - .HasColumnType("TEXT") - .HasMaxLength(256); + .HasMaxLength(256) + .HasColumnType("TEXT"); b.HasKey("Key"); @@ -159,22 +233,22 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PackageDependencies"); }); - modelBuilder.Entity("BaGetter.Core.PackageType", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => { b.Property("Key") .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); b.Property("Name") - .HasColumnType("TEXT COLLATE NOCASE") - .HasMaxLength(512); + .HasMaxLength(512) + .HasColumnType("TEXT COLLATE NOCASE"); b.Property("PackageKey") .HasColumnType("INTEGER"); b.Property("Version") - .HasColumnType("TEXT") - .HasMaxLength(64); + .HasMaxLength(64) + .HasColumnType("TEXT"); b.HasKey("Key"); @@ -185,15 +259,66 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PackageTypes"); }); - modelBuilder.Entity("BaGetter.Core.TargetFramework", b => + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CreatedAtUtc") + .HasColumnType("TEXT"); + + b.Property("ExpiresAtUtc") + .HasColumnType("TEXT"); + + b.Property("IsRevoked") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(false); + + b.Property("LastUsedAtUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("RevokedAtUtc") + .HasColumnType("TEXT"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT"); + + b.Property("TokenPrefix") + .IsRequired() + .HasMaxLength(8) + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.HasIndex("UserId"); + + b.ToTable("PersonalAccessTokens"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => { b.Property("Key") .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); b.Property("Moniker") - .HasColumnType("TEXT COLLATE NOCASE") - .HasMaxLength(256); + .HasMaxLength(256) + .HasColumnType("TEXT COLLATE NOCASE"); b.Property("PackageKey") .HasColumnType("INTEGER"); @@ -207,29 +332,181 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("TargetFrameworks"); }); - modelBuilder.Entity("BaGetter.Core.PackageDependency", b => + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AuthProvider") + .HasColumnType("INTEGER"); + + b.Property("CanLoginToUI") + .HasColumnType("INTEGER"); + + b.Property("CreatedAtUtc") + .HasColumnType("TEXT"); + + b.Property("CreatedByUserId") + .HasColumnType("TEXT"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EntraObjectId") + .HasMaxLength(128) + .HasColumnType("TEXT"); + + b.Property("FailedLoginCount") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("IsAdmin") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(false); + + b.Property("IsEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("LockedUntilUtc") + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("UpdatedAtUtc") + .HasColumnType("TEXT"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CreatedByUserId"); + + b.HasIndex("EntraObjectId") + .IsUnique(); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.Property("UserId") + .HasColumnType("TEXT"); + + b.Property("GroupId") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "GroupId"); + + b.HasIndex("GroupId"); + + b.ToTable("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PackageDependency", b => + { + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("Dependencies") .HasForeignKey("PackageKey"); + + b.Navigation("Package"); }); - modelBuilder.Entity("BaGetter.Core.PackageType", b => + modelBuilder.Entity("BaGetter.Core.Entities.PackageType", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("PackageTypes") .HasForeignKey("PackageKey") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.PersonalAccessToken", b => + { + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("PersonalAccessTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); }); - modelBuilder.Entity("BaGetter.Core.TargetFramework", b => + modelBuilder.Entity("BaGetter.Core.Entities.TargetFramework", b => { - b.HasOne("BaGetter.Core.Package", "Package") + b.HasOne("BaGetter.Core.Entities.Package", "Package") .WithMany("TargetFrameworks") .HasForeignKey("PackageKey") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.HasOne("BaGetter.Core.Entities.User", "CreatedByUser") + .WithMany() + .HasForeignKey("CreatedByUserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("CreatedByUser"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.UserGroup", b => + { + b.HasOne("BaGetter.Core.Entities.Group", "Group") + .WithMany("UserGroups") + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BaGetter.Core.Entities.User", "User") + .WithMany("UserGroups") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Group"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Group", b => + { + b.Navigation("UserGroups"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.Package", b => + { + b.Navigation("Dependencies"); + + b.Navigation("PackageTypes"); + + b.Navigation("TargetFrameworks"); + }); + + modelBuilder.Entity("BaGetter.Core.Entities.User", b => + { + b.Navigation("PersonalAccessTokens"); + + b.Navigation("UserGroups"); }); #pragma warning restore 612, 618 } diff --git a/src/BaGetter.Web/Authentication/FeedPermissionHandler.cs b/src/BaGetter.Web/Authentication/FeedPermissionHandler.cs new file mode 100644 index 000000000..145ef514e --- /dev/null +++ b/src/BaGetter.Web/Authentication/FeedPermissionHandler.cs @@ -0,0 +1,74 @@ +using System; +using System.Security.Claims; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Authentication; +using BaGetter.Core.Configuration; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Options; + +namespace BaGetter.Web.Authentication; + +public class FeedPermissionHandler : AuthorizationHandler +{ + private const string DefaultFeedId = "default"; + private readonly IPermissionService _permissionService; + private readonly IUserService _userService; + private readonly IOptions _options; + + public FeedPermissionHandler( + IPermissionService permissionService, + IUserService userService, + IOptions options) + { + _permissionService = permissionService; + _userService = userService; + _options = options; + } + + protected override async Task HandleRequirementAsync( + AuthorizationHandlerContext context, + FeedPermissionRequirement requirement) + { + var authMode = _options.Value.Authentication?.Mode ?? AuthenticationMode.Config; + + // In static auth mode, the existing auth handler already did its job + if (authMode == AuthenticationMode.Config) + { + context.Succeed(requirement); + return; + } + + // Anonymous users get a pass if they have the Anonymous claim (static auth mode fallback) + if (context.User.HasClaim(c => c.Type == ClaimTypes.Anonymous)) + { + context.Succeed(requirement); + return; + } + + var userIdClaim = context.User.FindFirst(ClaimTypes.NameIdentifier)?.Value; + if (string.IsNullOrEmpty(userIdClaim) || !Guid.TryParse(userIdClaim, out var userId)) + { + context.Fail(); + return; + } + + var cancellationToken = context.Resource is HttpContext httpContext + ? httpContext.RequestAborted + : CancellationToken.None; + + var hasPermission = requirement.Permission switch + { + FeedPermissionRequirement.Pull => await _permissionService.CanPullAsync(userId, DefaultFeedId, cancellationToken), + FeedPermissionRequirement.Push => await _permissionService.CanPushAsync(userId, DefaultFeedId, cancellationToken), + FeedPermissionRequirement.Admin => await _userService.IsAdminAsync(userId, cancellationToken), + _ => false + }; + + if (hasPermission) + context.Succeed(requirement); + else + context.Fail(); + } +} diff --git a/src/BaGetter.Web/Authentication/FeedPermissionRequirement.cs b/src/BaGetter.Web/Authentication/FeedPermissionRequirement.cs new file mode 100644 index 000000000..4d1f56757 --- /dev/null +++ b/src/BaGetter.Web/Authentication/FeedPermissionRequirement.cs @@ -0,0 +1,17 @@ +using Microsoft.AspNetCore.Authorization; + +namespace BaGetter.Web.Authentication; + +public class FeedPermissionRequirement : IAuthorizationRequirement +{ + public string Permission { get; } + + public FeedPermissionRequirement(string permission) + { + Permission = permission; + } + + public const string Pull = "Pull"; + public const string Push = "Push"; + public const string Admin = "Admin"; +} diff --git a/src/BaGetter.Web/Authentication/NugetBasicAuthenticationHandler.cs b/src/BaGetter.Web/Authentication/NugetBasicAuthenticationHandler.cs index 53a7d9915..e08e67f02 100644 --- a/src/BaGetter.Web/Authentication/NugetBasicAuthenticationHandler.cs +++ b/src/BaGetter.Web/Authentication/NugetBasicAuthenticationHandler.cs @@ -9,39 +9,62 @@ using System; using System.Linq; using BaGetter.Core.Configuration; +using BaGetter.Core.Authentication; +using BaGetter.Web.Extensions; namespace BaGetter.Web.Authentication; public class NugetBasicAuthenticationHandler : AuthenticationHandler { - private readonly IOptions bagetterOptions; + private readonly IOptions _bagetterOptions; + private readonly IFeedAuthenticationService _feedAuthService; public NugetBasicAuthenticationHandler( IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, - IOptions bagetterOptions) + IOptions bagetterOptions, + IFeedAuthenticationService feedAuthService) : base(options, logger, encoder) { - this.bagetterOptions = bagetterOptions; + _bagetterOptions = bagetterOptions; + _feedAuthService = feedAuthService; } - protected override Task HandleAuthenticateAsync() + protected override async Task HandleAuthenticateAsync() { - if (IsAnonymousAllowed()) + var authMode = _bagetterOptions.Value.Authentication?.Mode ?? AuthenticationMode.Config; + + if (authMode == AuthenticationMode.Config) { - return CreateAnonymousAuthenticatonResult(); + // Static auth mode: use configured credentials + return await HandleStaticAuthAsync(); } + // New mode: use database-backed authentication + return await HandleNewAuthenticateAsync(); + } + + protected override async Task HandleChallengeAsync(AuthenticationProperties properties) + { + Response.Headers.WWWAuthenticate = "Basic realm=\"NuGet Server\""; + await base.HandleChallengeAsync(properties); + } + + private Task HandleStaticAuthAsync() + { + if (IsOpenAccessAllowed()) + return CreateAnonymousAuthenticationResult(); + if (!Request.Headers.TryGetValue("Authorization", out var auth)) return Task.FromResult(AuthenticateResult.NoResult()); - string username = null; - string password = null; + string username; + string password; try { var authHeader = AuthenticationHeaderValue.Parse(auth); - var credentialBytes = Convert.FromBase64String(authHeader.Parameter); + var credentialBytes = Convert.FromBase64String(authHeader.Parameter!); var credentials = Encoding.UTF8.GetString(credentialBytes).Split([':'], 2); username = credentials[0]; password = credentials[1]; @@ -51,19 +74,64 @@ protected override Task HandleAuthenticateAsync() return Task.FromResult(AuthenticateResult.Fail("Invalid Authorization Header")); } - if (!ValidateCredentials(username, password)) + if (!ValidateStaticCredentials(username, password)) return Task.FromResult(AuthenticateResult.Fail("Invalid Username or Password")); - return CreateUserAuthenticatonResult(username); + return CreateUserAuthenticationResult(username, null); } - protected override async Task HandleChallengeAsync(AuthenticationProperties properties) + private async Task HandleNewAuthenticateAsync() { - Response.Headers.WWWAuthenticate = "Basic realm=\"NuGet Server\""; - await base.HandleChallengeAsync(properties); + // Try X-NuGet-ApiKey first (used by dotnet nuget push -k ) + var apiKey = Request.Headers[HttpRequestExtensions.ApiKeyHeader].ToString(); + if (!string.IsNullOrEmpty(apiKey)) + { + var tokenResult = await _feedAuthService.AuthenticateByTokenAsync(apiKey, Context.RequestAborted); + if (tokenResult.IsAuthenticated) + { + Logger.LogInformation("Audit: {EventType} - User {Username} ({UserId}) authenticated via API key from {IP}", + "LoginSuccess", tokenResult.Username, tokenResult.UserId, Context.Connection.RemoteIpAddress?.ToString()); + return await CreateUserAuthenticationResult(tokenResult.Username, tokenResult.UserId?.ToString()); + } + } + + if (!Request.Headers.TryGetValue("Authorization", out var auth)) + return AuthenticateResult.NoResult(); + + string username; + string password; + try + { + var authHeader = AuthenticationHeaderValue.Parse(auth); + var credentialBytes = Convert.FromBase64String(authHeader.Parameter!); + var credentials = Encoding.UTF8.GetString(credentialBytes).Split([':'], 2); + username = credentials[0]; + password = credentials[1]; + } + catch + { + return AuthenticateResult.Fail("Invalid Authorization Header"); + } + + var result = await _feedAuthService.AuthenticateByCredentialsAsync( + username, password, Context.RequestAborted); + + if (!result.IsAuthenticated) + { + var failIp = Context.Connection.RemoteIpAddress?.ToString(); + Logger.LogWarning("Audit: {EventType} - Authentication failed for {Username} from {IP}", + "LoginFailure", username, failIp); + return AuthenticateResult.Fail("Invalid Username or Password"); + } + + var ip = Context.Connection.RemoteIpAddress?.ToString(); + Logger.LogInformation("Audit: {EventType} - User {Username} ({UserId}) authenticated from {IP}", + "LoginSuccess", result.Username, result.UserId, ip); + + return await CreateUserAuthenticationResult(result.Username, result.UserId?.ToString()); } - private Task CreateAnonymousAuthenticatonResult() + private Task CreateAnonymousAuthenticationResult() { Claim[] claims = [new Claim(ClaimTypes.Anonymous, string.Empty)]; var identity = new ClaimsIdentity(claims, Scheme.Name); @@ -74,9 +142,16 @@ private Task CreateAnonymousAuthenticatonResult() return Task.FromResult(AuthenticateResult.Success(ticket)); } - private Task CreateUserAuthenticatonResult(string username) + private Task CreateUserAuthenticationResult(string username, string userId) { - Claim[] claims = [new Claim(ClaimTypes.Name, username)]; + var claims = new System.Collections.Generic.List + { + new(ClaimTypes.Name, username) + }; + + if (userId != null) + claims.Add(new Claim(ClaimTypes.NameIdentifier, userId)); + var identity = new ClaimsIdentity(claims, Scheme.Name); var principal = new ClaimsPrincipal(identity); @@ -85,16 +160,16 @@ private Task CreateUserAuthenticatonResult(string username) return Task.FromResult(AuthenticateResult.Success(ticket)); } - private bool IsAnonymousAllowed() + private bool IsOpenAccessAllowed() { - return bagetterOptions.Value.Authentication is null || - bagetterOptions.Value.Authentication.Credentials is null || - bagetterOptions.Value.Authentication.Credentials.Length == 0 || - bagetterOptions.Value.Authentication.Credentials.All(a => string.IsNullOrWhiteSpace(a.Username) && string.IsNullOrWhiteSpace(a.Password)); + return _bagetterOptions.Value.Authentication is null || + _bagetterOptions.Value.Authentication.Credentials is null || + _bagetterOptions.Value.Authentication.Credentials.Length == 0 || + _bagetterOptions.Value.Authentication.Credentials.All(a => string.IsNullOrWhiteSpace(a.Username) && string.IsNullOrWhiteSpace(a.Password)); } - private bool ValidateCredentials(string username, string password) + private bool ValidateStaticCredentials(string username, string password) { - return bagetterOptions.Value.Authentication.Credentials.Any(a => a.Username.Equals(username, StringComparison.OrdinalIgnoreCase) && a.Password == password); + return _bagetterOptions.Value.Authentication.Credentials.Any(a => a.Username.Equals(username, StringComparison.OrdinalIgnoreCase) && a.Password == password); } } diff --git a/src/BaGetter.Web/Controllers/PackagePublishController.cs b/src/BaGetter.Web/Controllers/PackagePublishController.cs index 8bb3384a3..d432d3120 100644 --- a/src/BaGetter.Web/Controllers/PackagePublishController.cs +++ b/src/BaGetter.Web/Controllers/PackagePublishController.cs @@ -1,4 +1,5 @@ using System; +using System.Security.Claims; using System.Threading; using System.Threading.Tasks; using BaGetter.Core; @@ -15,7 +16,11 @@ namespace BaGetter.Web.Controllers; public class PackagePublishController : Controller { + private const string DefaultFeedId = "default"; + private readonly IAuthenticationService _authentication; + private readonly IFeedAuthenticationService _feedAuthentication; + private readonly IPermissionService _permissionService; private readonly IPackageIndexingService _indexer; private readonly IPackageDatabase _packages; private readonly IPackageDeletionService _deleteService; @@ -24,6 +29,8 @@ public class PackagePublishController : Controller public PackagePublishController( IAuthenticationService authentication, + IFeedAuthenticationService feedAuthentication, + IPermissionService permissionService, IPackageIndexingService indexer, IPackageDatabase packages, IPackageDeletionService deletionService, @@ -31,6 +38,8 @@ public PackagePublishController( ILogger logger) { _authentication = authentication ?? throw new ArgumentNullException(nameof(authentication)); + _feedAuthentication = feedAuthentication ?? throw new ArgumentNullException(nameof(feedAuthentication)); + _permissionService = permissionService ?? throw new ArgumentNullException(nameof(permissionService)); _indexer = indexer ?? throw new ArgumentNullException(nameof(indexer)); _packages = packages ?? throw new ArgumentNullException(nameof(packages)); _deleteService = deletionService ?? throw new ArgumentNullException(nameof(deletionService)); @@ -41,8 +50,13 @@ public PackagePublishController( // See: https://docs.microsoft.com/en-us/nuget/api/package-publish-resource#push-a-package public async Task Upload(CancellationToken cancellationToken) { - if (_options.Value.IsReadOnlyMode || - !await _authentication.AuthenticateAsync(Request.GetApiKey(), cancellationToken)) + if (_options.Value.IsReadOnlyMode) + { + HttpContext.Response.StatusCode = 401; + return; + } + + if (!await AuthorizePushAsync(cancellationToken)) { HttpContext.Response.StatusCode = 401; return; @@ -95,7 +109,7 @@ public async Task Delete(string id, string version, CancellationT return NotFound(); } - if (!await _authentication.AuthenticateAsync(Request.GetApiKey(), cancellationToken)) + if (!await AuthorizePushAsync(cancellationToken)) { return Unauthorized(); } @@ -123,7 +137,7 @@ public async Task Relist(string id, string version, CancellationT return NotFound(); } - if (!await _authentication.AuthenticateAsync(Request.GetApiKey(), cancellationToken)) + if (!await AuthorizePushAsync(cancellationToken)) { return Unauthorized(); } @@ -137,4 +151,31 @@ public async Task Relist(string id, string version, CancellationT return NotFound(); } } + + private async Task AuthorizePushAsync(CancellationToken cancellationToken) + { + var authMode = _options.Value.Authentication?.Mode ?? AuthenticationMode.Config; + + if (authMode == AuthenticationMode.Config) + { + // Static auth mode: use configured API key + return await _authentication.AuthenticateAsync(Request.GetApiKey(), cancellationToken); + } + + // New mode: prefer X-NuGet-ApiKey (dotnet nuget push -k ), fall back to + // the user identity already established by Basic auth middleware. + var apiKey = Request.GetApiKey(); + if (!string.IsNullOrEmpty(apiKey)) + { + var authResult = await _feedAuthentication.AuthenticateByTokenAsync(apiKey, cancellationToken); + if (authResult.IsAuthenticated && authResult.UserId.HasValue) + return await _permissionService.CanPushAsync(authResult.UserId.Value, DefaultFeedId, cancellationToken); + } + + var userIdClaim = HttpContext.User.FindFirst(ClaimTypes.NameIdentifier)?.Value; + if (!string.IsNullOrEmpty(userIdClaim) && Guid.TryParse(userIdClaim, out var userId)) + return await _permissionService.CanPushAsync(userId, DefaultFeedId, cancellationToken); + + return false; + } } diff --git a/src/BaGetter.Web/Controllers/ServiceIndexController.cs b/src/BaGetter.Web/Controllers/ServiceIndexController.cs index 22bd03eda..17f4d1862 100644 --- a/src/BaGetter.Web/Controllers/ServiceIndexController.cs +++ b/src/BaGetter.Web/Controllers/ServiceIndexController.cs @@ -1,19 +1,17 @@ using System; using System.Threading; using System.Threading.Tasks; -using BaGetter.Core.Authentication; using BaGetter.Core.ServiceIndex; using BaGetter.Protocol.Models; -using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace BaGetter.Web.Controllers; /// /// The NuGet Service Index. This aids NuGet client to discover this server's services. +/// This is an unauthenticated endpoint, as it is used by clients to discover the endpoint URLs for this server. /// -[Authorize(AuthenticationSchemes = AuthenticationConstants.NugetBasicAuthenticationScheme, Policy = AuthenticationConstants.NugetUserPolicy)] public class ServiceIndexController : Controller { private readonly IServiceIndexService _serviceIndex; diff --git a/src/BaGetter.Web/Controllers/SymbolController.cs b/src/BaGetter.Web/Controllers/SymbolController.cs index 800934f2e..cb3fafbc6 100644 --- a/src/BaGetter.Web/Controllers/SymbolController.cs +++ b/src/BaGetter.Web/Controllers/SymbolController.cs @@ -1,4 +1,5 @@ using System; +using System.Security.Claims; using System.Threading; using System.Threading.Tasks; using BaGetter.Core.Authentication; @@ -16,7 +17,11 @@ namespace BaGetter.Web.Controllers; [Authorize(AuthenticationSchemes = AuthenticationConstants.NugetBasicAuthenticationScheme, Policy = AuthenticationConstants.NugetUserPolicy)] public class SymbolController : Controller { + private const string DefaultFeedId = "default"; + private readonly IAuthenticationService _authentication; + private readonly IFeedAuthenticationService _feedAuthentication; + private readonly IPermissionService _permissionService; private readonly ISymbolIndexingService _indexer; private readonly ISymbolStorageService _storage; private readonly IOptionsSnapshot _options; @@ -24,12 +29,16 @@ public class SymbolController : Controller public SymbolController( IAuthenticationService authentication, + IFeedAuthenticationService feedAuthentication, + IPermissionService permissionService, ISymbolIndexingService indexer, ISymbolStorageService storage, IOptionsSnapshot options, ILogger logger) { _authentication = authentication ?? throw new ArgumentNullException(nameof(authentication)); + _feedAuthentication = feedAuthentication ?? throw new ArgumentNullException(nameof(feedAuthentication)); + _permissionService = permissionService ?? throw new ArgumentNullException(nameof(permissionService)); _indexer = indexer ?? throw new ArgumentNullException(nameof(indexer)); _storage = storage ?? throw new ArgumentNullException(nameof(storage)); _options = options ?? throw new ArgumentNullException(nameof(options)); @@ -39,7 +48,13 @@ public SymbolController( // See: https://docs.microsoft.com/en-us/nuget/api/package-publish-resource#push-a-package public async Task Upload(CancellationToken cancellationToken) { - if (_options.Value.IsReadOnlyMode || !await _authentication.AuthenticateAsync(Request.GetApiKey(), cancellationToken)) + if (_options.Value.IsReadOnlyMode) + { + HttpContext.Response.StatusCode = 401; + return; + } + + if (!await AuthorizePushAsync(cancellationToken)) { HttpContext.Response.StatusCode = 401; return; @@ -89,4 +104,31 @@ public async Task Get(string file, string key) return File(pdbStream, "application/octet-stream"); } + + private async Task AuthorizePushAsync(CancellationToken cancellationToken) + { + var authMode = _options.Value.Authentication?.Mode ?? AuthenticationMode.Config; + + if (authMode == AuthenticationMode.Config) + { + // Static auth mode: use configured API key + return await _authentication.AuthenticateAsync(Request.GetApiKey(), cancellationToken); + } + + // New mode: prefer X-NuGet-ApiKey (dotnet nuget push -k ), fall back to + // the user identity already established by Basic auth middleware. + var apiKey = Request.GetApiKey(); + if (!string.IsNullOrEmpty(apiKey)) + { + var authResult = await _feedAuthentication.AuthenticateByTokenAsync(apiKey, cancellationToken); + if (authResult.IsAuthenticated && authResult.UserId.HasValue) + return await _permissionService.CanPushAsync(authResult.UserId.Value, DefaultFeedId, cancellationToken); + } + + var userIdClaim = HttpContext.User.FindFirst(ClaimTypes.NameIdentifier)?.Value; + if (!string.IsNullOrEmpty(userIdClaim) && Guid.TryParse(userIdClaim, out var userId)) + return await _permissionService.CanPushAsync(userId, DefaultFeedId, cancellationToken); + + return false; + } } diff --git a/src/BaGetter.Web/Pages/Account/Tokens.cshtml b/src/BaGetter.Web/Pages/Account/Tokens.cshtml new file mode 100644 index 000000000..3451465a6 --- /dev/null +++ b/src/BaGetter.Web/Pages/Account/Tokens.cshtml @@ -0,0 +1,120 @@ +@page +@model BaGetter.Web.Pages.Account.TokensModel + +@{ + ViewData["Title"] = "Personal Access Tokens"; +} + +
      +

      Personal Access Tokens

      +
      + + @if (!string.IsNullOrEmpty(Model.NewTokenPlaintext)) + { +
      + Token created successfully! +

      Copy this token now. You will not be able to see it again.

      +
      + @Model.NewTokenPlaintext + +
      +
      + } + + @if (!string.IsNullOrEmpty(Model.ErrorMessage)) + { + + } + +

      Create new token

      +
      + @Html.AntiForgeryToken() +
      + + + +
      +
      + + +
      + +
      + +

      Your tokens

      + @if (Model.Tokens.Count == 0) + { +

      You have no personal access tokens.

      + } + else + { + + + + + + + + + + + + + + @foreach (var token in Model.Tokens) + { + + + + + + + + + + } + +
      PrefixNameCreatedExpiresLast UsedStatus
      @token.TokenPrefix...@token.Name@token.CreatedAtUtc.ToString("yyyy-MM-dd")@token.ExpiresAtUtc.ToString("yyyy-MM-dd")@(token.LastUsedAtUtc?.ToString("yyyy-MM-dd") ?? "Never") + @if (token.IsRevoked) + { + Revoked + } + else if (token.ExpiresAtUtc <= DateTime.UtcNow) + { + Expired + } + else + { + Active + } + + @if (!token.IsRevoked && token.ExpiresAtUtc > DateTime.UtcNow) + { +
      + @Html.AntiForgeryToken() + + +
      + } +
      + } +
      diff --git a/src/BaGetter.Web/Pages/Account/Tokens.cshtml.cs b/src/BaGetter.Web/Pages/Account/Tokens.cshtml.cs new file mode 100644 index 000000000..a323f3a1d --- /dev/null +++ b/src/BaGetter.Web/Pages/Account/Tokens.cshtml.cs @@ -0,0 +1,130 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Security.Claims; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Authentication; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.Extensions.Options; + +namespace BaGetter.Web.Pages.Account; + +[Authorize(AuthenticationSchemes = Core.Authentication.AuthenticationConstants.CookieScheme)] +public class TokensModel : PageModel +{ + private readonly ITokenService _tokenService; + private readonly IOptionsSnapshot _authOptions; + + public TokensModel( + ITokenService tokenService, + IOptionsSnapshot authOptions) + { + _tokenService = tokenService ?? throw new ArgumentNullException(nameof(tokenService)); + _authOptions = authOptions ?? throw new ArgumentNullException(nameof(authOptions)); + } + + public List Tokens { get; set; } = new(); + + [BindProperty] + [Required(ErrorMessage = "Token name is required.")] + [MaxLength(256)] + public string TokenName { get; set; } + + [BindProperty] + [Range(1, 365)] + public int ExpiryDays { get; set; } = 90; + + public string NewTokenPlaintext { get; set; } + + public string ErrorMessage { get; set; } + + public int MaxTokenExpiryDays => _authOptions.Value.MaxTokenExpiryDays; + + private Guid GetUserId() + { + var claim = User.FindFirst(ClaimTypes.NameIdentifier); + return claim != null && Guid.TryParse(claim.Value, out var id) ? id : Guid.Empty; + } + + private bool IsEntraUser() + { + var authProvider = User.FindFirst("auth_provider")?.Value + ?? User.FindFirst("AuthProvider")?.Value; + return string.Equals(authProvider, "Entra", StringComparison.OrdinalIgnoreCase); + } + + public async Task OnGetAsync(CancellationToken cancellationToken) + { + if (!IsEntraUser()) + { + return RedirectToPage("/Index"); + } + + var userId = GetUserId(); + if (userId == Guid.Empty) return RedirectToPage("/Login"); + + Tokens = await _tokenService.GetUserTokensAsync(userId, cancellationToken); + return Page(); + } + + public async Task OnPostCreateAsync(CancellationToken cancellationToken) + { + if (!IsEntraUser()) + { + return RedirectToPage("/Index"); + } + + var userId = GetUserId(); + if (userId == Guid.Empty) return RedirectToPage("/Login"); + + if (!ModelState.IsValid) + { + Tokens = await _tokenService.GetUserTokensAsync(userId, cancellationToken); + return Page(); + } + + var maxDays = _authOptions.Value.MaxTokenExpiryDays; + if (ExpiryDays > maxDays) + { + ExpiryDays = maxDays; + } + + try + { + var result = await _tokenService.CreateTokenAsync( + userId, + TokenName, + DateTime.UtcNow.AddDays(ExpiryDays), + cancellationToken); + + NewTokenPlaintext = result.PlaintextToken; + } + catch (ArgumentException ex) + { + ErrorMessage = ex.Message; + } + + Tokens = await _tokenService.GetUserTokensAsync(userId, cancellationToken); + return Page(); + } + + public async Task OnPostRevokeAsync(Guid tokenId, CancellationToken cancellationToken) + { + if (!IsEntraUser()) + { + return RedirectToPage("/Index"); + } + + var userId = GetUserId(); + if (userId == Guid.Empty) return RedirectToPage("/Login"); + + await _tokenService.RevokeTokenAsync(tokenId, cancellationToken); + + return RedirectToPage(); + } +} diff --git a/src/BaGetter.Web/Pages/Admin/Accounts.cshtml b/src/BaGetter.Web/Pages/Admin/Accounts.cshtml new file mode 100644 index 000000000..08920b69c --- /dev/null +++ b/src/BaGetter.Web/Pages/Admin/Accounts.cshtml @@ -0,0 +1,163 @@ +@page +@model BaGetter.Web.Pages.Admin.AccountsModel + +@{ + ViewData["Title"] = "Accounts"; +} + +
      +

      Accounts

      +
      + + @if (!string.IsNullOrEmpty(Model.SuccessMessage)) + { + + } + + @if (!string.IsNullOrEmpty(Model.ErrorMessage)) + { + + } + +

      Create local account

      +
      + @Html.AntiForgeryToken() +
      +
      +
      + + + +
      +
      + + +
      +
      + + + +
      +
      + +
      + +
      +
      +
      + +

      Existing accounts

      + @if (Model.Users.Count == 0) + { +

      No user accounts found.

      + } + else + { + + + + + + + + + + + + + + + @foreach (var user in Model.Users) + { + + + + + + + + + + + } + +
      UsernameDisplay NameProviderGroupsEnabledUI LoginCreatedActions
      @user.Username@user.DisplayName + @if (user.AuthProvider == BaGetter.Core.Entities.AuthProvider.Entra) + { + Entra + } + else + { + Local + } + + @if (Model.UserGroupMemberships.TryGetValue(user.Id, out var groups) && groups.Count > 0) + { + @foreach (var group in groups) + { + var isRoleSynced = !string.IsNullOrEmpty(group.AppRoleValue); + if (isRoleSynced) + { + @group.Name + } + else + { + @group.Name + } + } + } + else + { + None + } + + @if (user.IsEnabled) + { + Yes + } + else + { + No + } + + @if (user.CanLoginToUI) + { + Yes + } + else + { + No + } + @user.CreatedAtUtc.ToString("yyyy-MM-dd") +
      + @Html.AntiForgeryToken() + + + +
      +
      + @Html.AntiForgeryToken() + + + +
      + @if (!user.IsEnabled) + { +
      + @Html.AntiForgeryToken() + + +
      + } +
      + } +
      diff --git a/src/BaGetter.Web/Pages/Admin/Accounts.cshtml.cs b/src/BaGetter.Web/Pages/Admin/Accounts.cshtml.cs new file mode 100644 index 000000000..d24f8fbb9 --- /dev/null +++ b/src/BaGetter.Web/Pages/Admin/Accounts.cshtml.cs @@ -0,0 +1,188 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Security.Claims; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Authentication; +using BaGetter.Core.Entities; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace BaGetter.Web.Pages.Admin; + +[Authorize(AuthenticationSchemes = Core.Authentication.AuthenticationConstants.CookieScheme)] +public class AccountsModel : PageModel +{ + private readonly IUserService _userService; + private readonly IGroupService _groupService; + + public AccountsModel(IUserService userService, IGroupService groupService) + { + _userService = userService ?? throw new ArgumentNullException(nameof(userService)); + _groupService = groupService ?? throw new ArgumentNullException(nameof(groupService)); + } + + public List Users { get; set; } = new(); + public Dictionary> UserGroupMemberships { get; set; } = new(); + + [BindProperty] + [Required(ErrorMessage = "Username is required.")] + [MaxLength(256)] + public string NewUsername { get; set; } + + [BindProperty] + [MaxLength(256)] + public string NewDisplayName { get; set; } + + + [BindProperty] + [Required(ErrorMessage = "Password is required.")] + [MinLength(12, ErrorMessage = "Password must be at least 12 characters.")] + [DataType(DataType.Password)] + public string NewPassword { get; set; } + + [BindProperty] + public bool NewCanLoginToUI { get; set; } + + public string SuccessMessage { get; set; } + public string ErrorMessage { get; set; } + + private Guid GetUserId() + { + var claim = User.FindFirst(ClaimTypes.NameIdentifier); + return claim != null && Guid.TryParse(claim.Value, out var id) ? id : Guid.Empty; + } + + private async Task IsCurrentUserAdminAsync(CancellationToken cancellationToken) + { + var userId = GetUserId(); + if (userId == Guid.Empty) return false; + return await _userService.IsAdminAsync(userId, cancellationToken); + } + + private async Task LoadUsersAndGroupsAsync(CancellationToken cancellationToken) + { + Users = await _userService.GetAllUsersAsync(cancellationToken); + var allGroups = await _groupService.GetAllGroupsAsync(cancellationToken); + UserGroupMemberships = allGroups + .Where(g => g.UserGroups != null) + .SelectMany(g => g.UserGroups.Select(ug => new { ug.UserId, Group = g })) + .GroupBy(x => x.UserId) + .ToDictionary(g => g.Key, g => g.Select(x => x.Group).ToList()); + } + + public async Task OnGetAsync(CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + await LoadUsersAndGroupsAsync(cancellationToken); + return Page(); + } + + public async Task OnPostCreateAsync(CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + if (!ModelState.IsValid) + { + await LoadUsersAndGroupsAsync(cancellationToken); + return Page(); + } + + var existing = await _userService.FindByUsernameAsync(NewUsername, cancellationToken); + if (existing != null) + { + ErrorMessage = $"Username '{NewUsername}' already exists."; + await LoadUsersAndGroupsAsync(cancellationToken); + return Page(); + } + + await _userService.CreateLocalUserAsync( + NewUsername, + NewDisplayName ?? NewUsername, + NewPassword, + NewCanLoginToUI, + GetUserId(), + cancellationToken); + + SuccessMessage = $"Account '{NewUsername}' created successfully."; + await LoadUsersAndGroupsAsync(cancellationToken); + return Page(); + } + + public async Task OnPostToggleEnabledAsync( + Guid userId, bool isEnabled, CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + await _userService.SetEnabledAsync(userId, !isEnabled, cancellationToken); + + return RedirectToPage(); + } + + public async Task OnPostToggleCanLoginToUIAsync( + Guid userId, bool canLoginToUI, CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + await _userService.SetCanLoginToUIAsync(userId, !canLoginToUI, cancellationToken); + + return RedirectToPage(); + } + + public async Task OnPostResetPasswordAsync( + Guid userId, string newPassword, CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + if (string.IsNullOrEmpty(newPassword) || newPassword.Length < 12) + { + ErrorMessage = "Password must be at least 12 characters."; + await LoadUsersAndGroupsAsync(cancellationToken); + return Page(); + } + + await _userService.SetPasswordAsync(userId, newPassword, cancellationToken); + + SuccessMessage = "Password reset successfully."; + await LoadUsersAndGroupsAsync(cancellationToken); + return Page(); + } + + public async Task OnPostDeleteAsync( + Guid userId, CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + var user = await _userService.FindByIdAsync(userId, cancellationToken); + if (user == null) + { + ErrorMessage = "User not found."; + await LoadUsersAndGroupsAsync(cancellationToken); + return Page(); + } + + if (user.IsEnabled) + { + ErrorMessage = "Cannot delete an enabled account. Disable the account first."; + await LoadUsersAndGroupsAsync(cancellationToken); + return Page(); + } + + var username = user.Username; + await _userService.DeleteUserAsync(userId, cancellationToken); + + SuccessMessage = $"Account '{username}' has been deleted."; + await LoadUsersAndGroupsAsync(cancellationToken); + return Page(); + } +} diff --git a/src/BaGetter.Web/Pages/Admin/Groups.cshtml b/src/BaGetter.Web/Pages/Admin/Groups.cshtml new file mode 100644 index 000000000..6fb89f9f8 --- /dev/null +++ b/src/BaGetter.Web/Pages/Admin/Groups.cshtml @@ -0,0 +1,178 @@ +@page +@using System.Linq +@model BaGetter.Web.Pages.Admin.GroupsModel + +@{ + ViewData["Title"] = "Groups & Permissions"; +} + +
      +

      Groups & Permissions

      +
      + + @if (!string.IsNullOrEmpty(Model.SuccessMessage)) + { + + } + + @if (!string.IsNullOrEmpty(Model.ErrorMessage)) + { + + } + +

      Create group

      +
      + @Html.AntiForgeryToken() +
      +
      +
      + + + +
      +
      + + + Enter an Azure App Role value to automatically sync members. Leave empty for manual membership management. +
      +
      + + +
      + +
      +
      +
      + +

      Existing groups

      + @if (Model.Groups.Count == 0) + { +

      No groups found.

      + } + else + { + @foreach (var group in Model.Groups) + { +
      +
      +

      + @group.Name + @if (!string.IsNullOrEmpty(group.AppRoleValue)) + { + (Role: @group.AppRoleValue) + Role-synced + } + else + { + Manual + } +
      + @Html.AntiForgeryToken() + + +
      +

      + @if (!string.IsNullOrEmpty(group.Description)) + { +

      @group.Description

      + } +
      +
      + @{ + var isRoleLinked = !string.IsNullOrEmpty(group.AppRoleValue); + } +
      Members
      + @if (isRoleLinked) + { +

      Membership for Entra users is managed by Azure AD App Roles. Local users can be added manually.

      + } + @if (group.UserGroups != null && group.UserGroups.Count > 0) + { + + + + + + + + + + @foreach (var ug in group.UserGroups.OrderBy(u => u.User?.Username)) + { + var isEntraUser = ug.User?.AuthProvider == BaGetter.Core.Entities.AuthProvider.Entra; + var canRemove = !isRoleLinked || !isEntraUser; + + + + + + } + +
      UsernameProvider
      @ug.User?.Username + @ug.User?.AuthProvider + @if (isEntraUser && isRoleLinked) + { + Synced + } + + @if (canRemove) + { +
      + @Html.AntiForgeryToken() + + + +
      + } +
      + } + else + { +

      No members

      + } + + @{ + var addableUsers = isRoleLinked + ? Model.AllUsers.Where(u => u.AuthProvider != BaGetter.Core.Entities.AuthProvider.Entra).ToList() + : Model.AllUsers; + } + @if (addableUsers.Any()) + { +
      + @Html.AntiForgeryToken() + +
      + +
      + +
      + } + +
      Feed Permissions
      + @{ + Model.GroupPermissions.TryGetValue(group.Id, out var groupPerm); + } +
      + @Html.AntiForgeryToken() + + + + + + + @if (Model.SavedGroupId == group.Id) + { + ✓ + } +
      +
      +
      + } + } +
      diff --git a/src/BaGetter.Web/Pages/Admin/Groups.cshtml.cs b/src/BaGetter.Web/Pages/Admin/Groups.cshtml.cs new file mode 100644 index 000000000..14ca50a29 --- /dev/null +++ b/src/BaGetter.Web/Pages/Admin/Groups.cshtml.cs @@ -0,0 +1,211 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Security.Claims; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Authentication; +using BaGetter.Core.Entities; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace BaGetter.Web.Pages.Admin; + +[Authorize(AuthenticationSchemes = Core.Authentication.AuthenticationConstants.CookieScheme)] +public class GroupsModel : PageModel +{ + private readonly IGroupService _groupService; + private readonly IUserService _userService; + private readonly IPermissionService _permissionService; + + public GroupsModel( + IGroupService groupService, + IUserService userService, + IPermissionService permissionService) + { + _groupService = groupService ?? throw new ArgumentNullException(nameof(groupService)); + _userService = userService ?? throw new ArgumentNullException(nameof(userService)); + _permissionService = permissionService ?? throw new ArgumentNullException(nameof(permissionService)); + } + + public List Groups { get; set; } = new(); + public List AllUsers { get; set; } = new(); + public Dictionary GroupPermissions { get; set; } = new(); + + [FromQuery] + public Guid? SavedGroupId { get; set; } + + [BindProperty] + [Required(ErrorMessage = "Group name is required.")] + [MaxLength(256)] + public string NewGroupName { get; set; } + + [BindProperty] + [MaxLength(128)] + public string NewAppRoleValue { get; set; } + + [BindProperty] + [MaxLength(4000)] + public string NewDescription { get; set; } + + public string SuccessMessage { get; set; } + public string ErrorMessage { get; set; } + + private Guid GetUserId() + { + var claim = User.FindFirst(ClaimTypes.NameIdentifier); + return claim != null && Guid.TryParse(claim.Value, out var id) ? id : Guid.Empty; + } + + private async Task IsCurrentUserAdminAsync(CancellationToken cancellationToken) + { + var userId = GetUserId(); + if (userId == Guid.Empty) return false; + return await _userService.IsAdminAsync(userId, cancellationToken); + } + + private async Task LoadGroupPermissionsAsync(CancellationToken cancellationToken) + { + foreach (var group in Groups) + { + var permission = await _permissionService.GetPermissionAsync( + group.Id, PrincipalType.Group, "default", cancellationToken); + if (permission != null) + { + GroupPermissions[group.Id] = permission; + } + } + } + + public async Task OnGetAsync(CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + Groups = await _groupService.GetAllGroupsAsync(cancellationToken); + AllUsers = await _userService.GetAllUsersAsync(cancellationToken); + await LoadGroupPermissionsAsync(cancellationToken); + return Page(); + } + + public async Task OnPostCreateGroupAsync(CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + if (!ModelState.IsValid) + { + Groups = await _groupService.GetAllGroupsAsync(cancellationToken); + AllUsers = await _userService.GetAllUsersAsync(cancellationToken); + await LoadGroupPermissionsAsync(cancellationToken); + return Page(); + } + + var existing = await _groupService.FindByNameAsync(NewGroupName, cancellationToken); + if (existing != null) + { + ErrorMessage = $"Group '{NewGroupName}' already exists."; + Groups = await _groupService.GetAllGroupsAsync(cancellationToken); + AllUsers = await _userService.GetAllUsersAsync(cancellationToken); + await LoadGroupPermissionsAsync(cancellationToken); + return Page(); + } + + await _groupService.CreateGroupAsync( + NewGroupName, + string.IsNullOrWhiteSpace(NewAppRoleValue) ? null : NewAppRoleValue.Trim(), + NewDescription, + cancellationToken); + + SuccessMessage = $"Group '{NewGroupName}' created successfully."; + Groups = await _groupService.GetAllGroupsAsync(cancellationToken); + AllUsers = await _userService.GetAllUsersAsync(cancellationToken); + await LoadGroupPermissionsAsync(cancellationToken); + return Page(); + } + + public async Task OnPostAddUserAsync( + Guid groupId, Guid userId, CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + if (!await _groupService.CanManuallyModifyMembershipAsync(groupId, userId, cancellationToken)) + { + ErrorMessage = "Cannot manually add Entra users to role-linked groups. Membership is managed by Azure AD App Roles."; + Groups = await _groupService.GetAllGroupsAsync(cancellationToken); + AllUsers = await _userService.GetAllUsersAsync(cancellationToken); + await LoadGroupPermissionsAsync(cancellationToken); + return Page(); + } + + await _groupService.AddUserToGroupAsync(userId, groupId, cancellationToken); + + return RedirectToPage(); + } + + public async Task OnPostRemoveUserAsync( + Guid groupId, Guid userId, CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + if (!await _groupService.CanManuallyModifyMembershipAsync(groupId, userId, cancellationToken)) + { + ErrorMessage = "Cannot manually remove Entra users from role-linked groups. Membership is managed by Azure AD App Roles."; + Groups = await _groupService.GetAllGroupsAsync(cancellationToken); + AllUsers = await _userService.GetAllUsersAsync(cancellationToken); + await LoadGroupPermissionsAsync(cancellationToken); + return Page(); + } + + await _groupService.RemoveUserFromGroupAsync(userId, groupId, cancellationToken); + + return RedirectToPage(); + } + + public async Task OnPostGrantPermissionAsync( + Guid principalId, + PrincipalType principalType, + string feedId, + bool canPush, + bool canPull, + CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + await _permissionService.GrantPermissionAsync( + principalId, principalType, feedId ?? "default", + canPush, canPull, cancellationToken); + + return RedirectToPage(new { savedGroupId = principalId }); + } + + public async Task OnPostRevokePermissionAsync( + Guid permissionId, CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + await _permissionService.RevokePermissionAsync(permissionId, cancellationToken); + + return RedirectToPage(); + } + + public async Task OnPostDeleteGroupAsync( + Guid groupId, CancellationToken cancellationToken) + { + if (!await IsCurrentUserAdminAsync(cancellationToken)) + return RedirectToPage("/Index"); + + await _groupService.DeleteGroupAsync(groupId, cancellationToken); + SuccessMessage = "Group deleted successfully."; + + Groups = await _groupService.GetAllGroupsAsync(cancellationToken); + AllUsers = await _userService.GetAllUsersAsync(cancellationToken); + await LoadGroupPermissionsAsync(cancellationToken); + return Page(); + } +} diff --git a/src/BaGetter.Web/Pages/Index.cshtml b/src/BaGetter.Web/Pages/Index.cshtml index 23bba0d29..bcc7deba5 100644 --- a/src/BaGetter.Web/Pages/Index.cshtml +++ b/src/BaGetter.Web/Pages/Index.cshtml @@ -1,11 +1,25 @@ @page -@using BaGetter.Protocol.Models +@using BaGetter.Core.Configuration @using BaGetter.Web.Extensions +@using Microsoft.Extensions.Options @model IndexModel +@inject IOptions AuthOptions @{ ViewData["Title"] = "Packages"; ViewData["SearchQuery"] = Model.Query; + var requiresAuth = AuthOptions.Value.Mode != AuthenticationMode.Config; + var isAuthenticated = User.Identity?.IsAuthenticated == true; +} + +@if (requiresAuth && !isAuthenticated) +{ +
      +

      Sign in required

      +

      You need to sign in to browse packages.

      + Sign in +
      + return; } @section SearchForm @@ -39,7 +53,7 @@
        - @foreach (KeyValuePair packageType in PackageTypes) + @foreach (var packageType in PackageTypes) {
      • @packageType.Value
        • } @@ -58,7 +72,7 @@
          - @foreach (KeyValuePair framework in TargetFrameworks) + @foreach (var framework in TargetFrameworks) { @if (framework.Key.StartsWith("divider")) { @@ -103,7 +117,7 @@ } else { - @foreach (SearchResult package in Model.Packages) + @foreach (var package in Model.Packages) {
          } - bool showPreviousLink = Model.PageIndex > 1; - bool showNextLink = Model.Packages.Count >= IndexModel.ResultsPerPage; + var showPreviousLink = Model.PageIndex > 1; + var showNextLink = Model.Packages.Count >= IndexModel.ResultsPerPage; if (showPreviousLink || showNextLink) { diff --git a/src/BaGetter.Web/Pages/Login.cshtml b/src/BaGetter.Web/Pages/Login.cshtml new file mode 100644 index 000000000..2ada24125 --- /dev/null +++ b/src/BaGetter.Web/Pages/Login.cshtml @@ -0,0 +1,70 @@ +@page +@model LoginModel + +@{ + ViewData["Title"] = "Sign in"; +} + +
          +

          Sign in

          +
          + + @if (!string.IsNullOrEmpty(Model.ErrorMessage)) + { + + } + + @if (Model.IsEntraEnabled) + { + + + @if (Model.IsLocalEnabled) + { + + } + } + + @if (Model.IsLocalEnabled) + { +
          + @Html.AntiForgeryToken() + + +
          + + + +
          + +
          + + + +
          + + +
          + } + + @if (!Model.IsEntraEnabled && !Model.IsLocalEnabled) + { + + } +
          diff --git a/src/BaGetter.Web/Pages/Login.cshtml.cs b/src/BaGetter.Web/Pages/Login.cshtml.cs new file mode 100644 index 000000000..e387e9602 --- /dev/null +++ b/src/BaGetter.Web/Pages/Login.cshtml.cs @@ -0,0 +1,186 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Security.Claims; +using System.Threading; +using System.Threading.Tasks; +using BaGetter.Core.Authentication; +using BaGetter.Core.Configuration; +using BaGetter.Core.Entities; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; + +namespace BaGetter.Web.Pages; + +public class LoginModel : PageModel +{ + private readonly IUserService _userService; + private readonly IOptionsSnapshot _authOptions; + private readonly ILogger _logger; + + public LoginModel( + IUserService userService, + IOptionsSnapshot authOptions, + ILogger logger) + { + _userService = userService ?? throw new ArgumentNullException(nameof(userService)); + _authOptions = authOptions ?? throw new ArgumentNullException(nameof(authOptions)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + [BindProperty] + [Required(ErrorMessage = "Username is required.")] + public string Username { get; set; } + + [BindProperty] + [Required(ErrorMessage = "Password is required.")] + [DataType(DataType.Password)] + public string Password { get; set; } + + [BindProperty(SupportsGet = true)] + public string ReturnUrl { get; set; } + + public string ErrorMessage { get; set; } + + public bool IsEntraEnabled => + _authOptions.Value.Mode is AuthenticationMode.Entra or AuthenticationMode.Hybrid; + + public bool IsLocalEnabled => + _authOptions.Value.Mode is AuthenticationMode.Local or AuthenticationMode.Hybrid; + + [FromQuery(Name = "error")] + public string ExternalError { get; set; } + + public IActionResult OnGet() + { + if (_authOptions.Value.Mode == AuthenticationMode.Config) + { + return RedirectToPage("/Index"); + } + + if (User.Identity?.IsAuthenticated == true) + { + return RedirectToPage("/Index"); + } + + if (!string.IsNullOrEmpty(ExternalError)) + { + ErrorMessage = ExternalError; + } + + return Page(); + } + + public async Task OnPostAsync(CancellationToken cancellationToken) + { + if (_authOptions.Value.Mode == AuthenticationMode.Config) + { + return RedirectToPage("/Index"); + } + + if (!IsLocalEnabled) + { + return RedirectToPage("/Index"); + } + + if (!ModelState.IsValid) + { + return Page(); + } + + var user = await _userService.FindByUsernameAsync(Username, cancellationToken); + + if (user == null || user.AuthProvider != AuthProvider.Local) + { + ErrorMessage = "Invalid username or password."; + _logger.LogWarning("Login failed: user '{Username}' not found or not a local account", Username); + return Page(); + } + + if (!user.IsEnabled) + { + ErrorMessage = "This account has been disabled."; + _logger.LogWarning("Login failed: user '{Username}' is disabled", Username); + return Page(); + } + + if (!user.CanLoginToUI) + { + ErrorMessage = "This account is not permitted to sign in to the web UI."; + _logger.LogWarning("Login failed: user '{Username}' does not have UI login permission", Username); + return Page(); + } + + if (await _userService.IsLockedOutAsync(user)) + { + var minutesRemaining = user.LockedUntilUtc.HasValue + ? (int)Math.Ceiling((user.LockedUntilUtc.Value - DateTime.UtcNow).TotalMinutes) + : _authOptions.Value.LockoutMinutes; + + ErrorMessage = $"This account is locked due to too many failed attempts. Try again in {minutesRemaining} minute(s)."; + _logger.LogWarning("Login failed: user '{Username}' is locked out", Username); + return Page(); + } + + var passwordValid = await _userService.VerifyPasswordAsync(user, Password); + if (!passwordValid) + { + await _userService.RecordFailedLoginAsync(user.Id, cancellationToken); + ErrorMessage = "Invalid username or password."; + _logger.LogWarning("Login failed: invalid password for user '{Username}'", Username); + return Page(); + } + + await _userService.ResetFailedLoginCountAsync(user.Id, cancellationToken); + + var claims = new List + { + new(ClaimTypes.NameIdentifier, user.Id.ToString()), + new(ClaimTypes.Name, user.Username), + new("DisplayName", user.DisplayName ?? user.Username), + new("AuthProvider", AuthProvider.Local.ToString()), + new(Core.Authentication.AuthenticationConstants.IsAdminClaim, user.IsAdmin ? "true" : "false") + }; + + + var identity = new ClaimsIdentity(claims, Core.Authentication.AuthenticationConstants.CookieScheme); + var principal = new ClaimsPrincipal(identity); + + await HttpContext.SignInAsync( + Core.Authentication.AuthenticationConstants.CookieScheme, + principal, + new AuthenticationProperties + { + IsPersistent = false, + RedirectUri = ReturnUrl + }); + + _logger.LogInformation("User '{Username}' signed in successfully via local account", Username); + + if (!string.IsNullOrEmpty(ReturnUrl) && Url.IsLocalUrl(ReturnUrl)) + { + return LocalRedirect(ReturnUrl); + } + + return RedirectToPage("/Index"); + } + + public IActionResult OnGetEntraSignIn() + { + if (!IsEntraEnabled) + { + return RedirectToPage("/Index"); + } + + var redirectUrl = !string.IsNullOrEmpty(ReturnUrl) && Url.IsLocalUrl(ReturnUrl) + ? ReturnUrl + : Url.Page("/Index"); + + return Challenge( + new AuthenticationProperties { RedirectUri = redirectUrl }, + Core.Authentication.AuthenticationConstants.EntraOidcScheme); + } +} diff --git a/src/BaGetter.Web/Pages/Logout.cshtml b/src/BaGetter.Web/Pages/Logout.cshtml new file mode 100644 index 000000000..3eef0f026 --- /dev/null +++ b/src/BaGetter.Web/Pages/Logout.cshtml @@ -0,0 +1,6 @@ +@page +@model LogoutModel + +@{ + ViewData["Title"] = "Sign out"; +} diff --git a/src/BaGetter.Web/Pages/Logout.cshtml.cs b/src/BaGetter.Web/Pages/Logout.cshtml.cs new file mode 100644 index 000000000..bf958bde8 --- /dev/null +++ b/src/BaGetter.Web/Pages/Logout.cshtml.cs @@ -0,0 +1,29 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.Extensions.Logging; + +namespace BaGetter.Web.Pages; + +public class LogoutModel : PageModel +{ + private readonly ILogger _logger; + + public LogoutModel( + ILogger logger) + { + _logger = logger; + } + + public async Task OnPostAsync() + { + var username = User.Identity?.Name; + + await HttpContext.SignOutAsync(Core.Authentication.AuthenticationConstants.CookieScheme); + + _logger.LogInformation("User '{Username}' signed out", username); + + return RedirectToPage("/Index"); + } +} diff --git a/src/BaGetter.Web/Pages/Package.cshtml b/src/BaGetter.Web/Pages/Package.cshtml index 5f54075d5..a916e9d48 100644 --- a/src/BaGetter.Web/Pages/Package.cshtml +++ b/src/BaGetter.Web/Pages/Package.cshtml @@ -1,13 +1,27 @@ @page "/packages/{id}/{version?}" -@using BaGetter.Core.Search +@using BaGetter.Core.Configuration @using Humanizer @using Microsoft.AspNetCore.Html +@using Microsoft.Extensions.Options @model PackageModel +@inject IOptions AuthOptions @{ ViewData["Title"] = Model.Found ? Model.Package.Id + " " + Model.Package.NormalizedVersionString : Model.Package.Id; + var requiresAuth = AuthOptions.Value.Mode != AuthenticationMode.Config; + var isAuthenticated = User.Identity?.IsAuthenticated == true; +} + +@if (requiresAuth && !isAuthenticated) +{ +
          +

          Sign in required

          +

          You need to sign in to view package details.

          + Sign in +
          + return; } @if (!Model.Found) @@ -97,7 +111,7 @@ else - @foreach (PackageDependent package in Model.UsedBy) + @foreach (var package in Model.UsedBy) { @@ -131,7 +145,7 @@ else } else { - foreach (PackageModel.DependencyGroupModel group in Model.DependencyGroups) + foreach (var group in Model.DependencyGroups) {

          @group.Name @@ -144,7 +158,7 @@ else } else { - @foreach (PackageModel.DependencyModel dependency in group.Dependencies) + @foreach (var dependency in group.Dependencies) {
        • - @for (int i = 0; i < Model.Versions.Count; i++) + @for (var i = 0; i < Model.Versions.Count; i++) { - PackageModel.VersionModel version = Model.Versions[i]; - IHtmlContent alwaysShow = Json.Serialize(i < DefaultVisibleVersions); + var version = Model.Versions[i]; + var alwaysShow = Json.Serialize(i < DefaultVisibleVersions); @version.Version.ToNormalizedString() @@ -272,7 +286,7 @@ else

          Tags

          - @foreach(string tag in Model.Package.Tags) + @foreach(var tag in Model.Package.Tags) { @tag } diff --git a/src/BaGetter.Web/Pages/Shared/_Layout.cshtml b/src/BaGetter.Web/Pages/Shared/_Layout.cshtml index 7352df67b..19f379fbf 100644 --- a/src/BaGetter.Web/Pages/Shared/_Layout.cshtml +++ b/src/BaGetter.Web/Pages/Shared/_Layout.cshtml @@ -4,8 +4,15 @@ @using Microsoft.Extensions.Options @inject IOptions StatisticsOptions +@inject IOptions AuthOptions @inject ApplicationVersion Version +@{ + var requiresAuth = AuthOptions.Value.Mode != AuthenticationMode.Config; + var isAuthenticated = User.Identity?.IsAuthenticated == true; + var showContent = !requiresAuth || isAuthenticated; +} + @@ -30,11 +37,14 @@

          • -
          -
          -
          -
          - + @if (showContent) + { +
          +
          + +
          + - - - -
          + + + +
          - @await RenderSectionAsync("SearchForm", required: false) - + @await RenderSectionAsync("SearchForm", required: false) + +
          -
          + } diff --git a/src/BaGetter.Web/Pages/Shared/_LoginPartial.cshtml b/src/BaGetter.Web/Pages/Shared/_LoginPartial.cshtml new file mode 100644 index 000000000..c10c3c1b3 --- /dev/null +++ b/src/BaGetter.Web/Pages/Shared/_LoginPartial.cshtml @@ -0,0 +1,63 @@ +@using BaGetter.Core.Authentication +@using BaGetter.Core.Configuration +@using Microsoft.Extensions.Options + +@inject IOptionsSnapshot AuthOptions + +@{ + var authMode = AuthOptions.Value.Mode; + var isAuthenticated = User.Identity?.IsAuthenticated == true; + var authProvider = User.FindFirst("auth_provider")?.Value + ?? User.FindFirst("AuthProvider")?.Value; + var isEntraUser = string.Equals(authProvider, "Entra", StringComparison.OrdinalIgnoreCase); + var displayName = User.FindFirst("DisplayName")?.Value + ?? User.FindFirst("name")?.Value + ?? User.Identity?.Name + ?? "User"; + + var isAdmin = isAuthenticated && + string.Equals(User.FindFirst(AuthenticationConstants.IsAdminClaim)?.Value, "true", StringComparison.Ordinal); +} + +@if (authMode != AuthenticationMode.Config) +{ + if (isAuthenticated) + { + + } + else + { + + } +} diff --git a/src/BaGetter.Web/Pages/Statistics.cshtml b/src/BaGetter.Web/Pages/Statistics.cshtml index c4aec6774..c346c6cba 100644 --- a/src/BaGetter.Web/Pages/Statistics.cshtml +++ b/src/BaGetter.Web/Pages/Statistics.cshtml @@ -8,11 +8,24 @@ @using Microsoft.Extensions.Options @inject IOptionsSnapshot Options +@inject IOptionsSnapshot AuthOptions @inject IStatisticsService StatisticsService @inject ApplicationVersion Version @{ ViewData["Title"] = "Stats"; + var requiresAuth = AuthOptions.Value.Mode != AuthenticationMode.Config; + var isAuthenticated = User.Identity?.IsAuthenticated == true; +} + +@if (requiresAuth && !isAuthenticated) +{ +
          +

          Sign in required

          +

          You need to sign in to view statistics.

          + Sign in +
          + return; }
          diff --git a/src/BaGetter.Web/Pages/Upload.cshtml b/src/BaGetter.Web/Pages/Upload.cshtml index e6dd8d472..b04a9fc83 100644 --- a/src/BaGetter.Web/Pages/Upload.cshtml +++ b/src/BaGetter.Web/Pages/Upload.cshtml @@ -1,13 +1,32 @@ @page @using BaGetter.Core +@using BaGetter.Core.Configuration +@using Microsoft.Extensions.Options @inject IUrlGenerator URL +@inject IOptionsSnapshot AuthOptions @{ ViewData["Title"] = "Upload package"; - string baseUrl = Url.PageLink("/Index"); - string publishUrl = URL.GetPackagePublishResourceUrl(); - string serviceIndexUrl = URL.GetServiceIndexUrl(); + var baseUrl = Url.PageLink("/Index"); + var publishUrl = URL.GetPackagePublishResourceUrl(); + var serviceIndexUrl = URL.GetServiceIndexUrl(); + + var authMode = AuthOptions.Value.Mode; + var hasEntra = authMode is AuthenticationMode.Entra or AuthenticationMode.Hybrid; + var hasLocal = authMode is AuthenticationMode.Local or AuthenticationMode.Hybrid; + var requiresAuth = authMode != AuthenticationMode.Config; + var isAuthenticated = User.Identity?.IsAuthenticated == true; +} + +@if (requiresAuth && !isAuthenticated) +{ +
          +

          Sign in required

          +

          You need to sign in to view upload instructions.

          + Sign in +
          + return; }
          @@ -16,6 +35,36 @@
          You can push packages using the service index @serviceIndexUrl.
          + @if (hasEntra || hasLocal) + { +
          + Authentication required. +
          + @if (hasEntra && hasLocal) + { + + Entra (Microsoft) users: sign in to the web UI to generate a personal access token (PAT), then use it as the API key. + +
          + + Local accounts: use your username and password with basic authentication. + + } + else if (hasEntra) + { + + Sign in with your Microsoft account to generate a personal access token (PAT), then use it as the API key when pushing packages. + + } + else + { + + Use your local account username and password with basic authentication when pushing packages. + + } +
          + } +