search

src/nuget-host/Controllers/HomeController.cs

@@ -48,7 +48,7 @@ namespace nuget_host.Controllers
         {
             ViewData["Message"] = "Your Privacy page.";
 
-            return Ok(ViewData);
+            return View(ViewData);
         }
 
         public IActionResult Error()

src/nuget-host/Controllers/PackageVersionController.cs

@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using nuget_host.Data;
 using nuget_host.ViewModels;

src/nuget-host/Controllers/PackagesController.Put.cs

@@ -0,0 +1,172 @@
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using NuGet.Packaging.Core;
+using NuGet.Versioning;
+using nuget_host.Data;
+using nuget_host.Helpers;
+
+namespace nuget_host.Controllers
+{
+
+    public partial class PackagesController 
+    {
+
+        [HttpPut("packages")]
+        public async Task<IActionResult> Put()
+        {
+            try
+            {
+                var clientVersionId = Request.Headers["X-NuGet-Client-Version"];
+                var apiKey = Request.Headers["X-NuGet-ApiKey"];
+                ViewData["versionId"] = typeof(PackagesController).Assembly.FullName;
+                var files = new List<string>();
+                ViewData["files"] = files;
+
+                var clearkey = protector.Unprotect(apiKey);
+                var apikey = dbContext.ApiKeys.SingleOrDefault(k => k.Id == clearkey);
+                if (apikey == null)
+                {
+                    logger.LogError("403 : no api-key");
+                    return Unauthorized();
+                }
+
+                foreach (var file in Request.Form.Files)
+                {
+                    string initpath = Path.Combine(Environment.GetEnvironmentVariable("TEMP") ??
+                    Environment.GetEnvironmentVariable("TMP") ?? "/tmp",
+                     $"nuget_host-{Guid.NewGuid()}.nupkg");
+
+                    using (FileStream fw = new FileStream(initpath, FileMode.Create))
+                    {
+                        file.CopyTo(fw);
+                    }
+
+                    using (FileStream fw = new FileStream(initpath, FileMode.Open))
+                    {
+                        var archive = new ZipArchive(fw);
+
+                        var nuspec = archive.Entries.FirstOrDefault(e => e.FullName.EndsWith(".nuspec"));
+                        if (nuspec == null) return BadRequest("no nuspec from archive");
+                        string pkgpath;
+                        NuGetVersion version;
+                        string pkgid;
+                        string fullpath;
+
+                        using (var specstr = nuspec.Open())
+                        {
+                            NuspecCoreReader reader = new NuspecCoreReader(specstr);
+
+                            string pkgdesc = reader.GetDescription();
+                            var types = reader.GetPackageTypes();
+                            pkgid = reader.GetId();
+                            version = reader.GetVersion();
+                            string pkgidpath = Path.Combine(nugetSettings.PackagesRootDir,
+                                pkgid);
+                            pkgpath = Path.Combine(pkgidpath, version.ToFullString());
+                            string name = $"{pkgid}-{version}.nupkg";
+                            fullpath = Path.Combine(pkgpath, name);
+
+                            var destpkgiddir = new DirectoryInfo(pkgidpath);
+                            Package package = dbContext.Packages.SingleOrDefault(p => p.Id == pkgid);
+                            if (package != null)
+                            {
+                                if (package.OwnerId != apikey.UserId)
+                                {
+                                    return new ForbidResult();
+                                }
+                                package.Description = pkgdesc;
+                            }
+                            else
+                            {
+                                package = new Package
+                                {
+                                    Id = pkgid,
+                                    Description = pkgdesc,
+                                    OwnerId = apikey.UserId
+                                };
+                                dbContext.Packages.Add(package);
+                            }
+                            if (!destpkgiddir.Exists) destpkgiddir.Create();
+
+                            var source = new FileInfo(initpath);
+                            var dest = new FileInfo(fullpath);
+                            var destdir = new DirectoryInfo(dest.DirectoryName);
+                            if (dest.Exists)
+                            {
+                                ViewData["msg"] = "existant";
+                                ViewData["ecode"] = 1;
+                                logger.LogWarning("400 : existant");
+                                return BadRequest(ViewData);
+                            }
+                            else
+                            {
+                                destdir.Create();
+                                source.MoveTo(fullpath);
+                                files.Add(name);
+                                string fullstringversion = version.ToFullString();
+                                var pkgvers = dbContext.PackageVersions.Where
+                                (v => v.PackageId == package.Id && v.FullString == fullstringversion);
+                                if (pkgvers.Count() > 0)
+                                {
+                                    foreach (var v in pkgvers.ToArray())
+                                        dbContext.PackageVersions.Remove(v);
+                                }
+                                foreach (var type in types)
+                                {
+                                    var pkgver = new PackageVersion
+                                    {
+                                        Package = package,
+                                        Major = version.Major,
+                                        Minor = version.Minor,
+                                        Patch = version.Patch,
+                                        IsPrerelease = version.IsPrerelease,
+                                        FullString = version.ToFullString(),
+                                        Type = type.Name
+                                    };
+                                    dbContext.PackageVersions.Add(pkgver);
+                                }
+                                await dbContext.SaveChangesAsync();
+
+                                logger.LogInformation($"new package : {nuspec.Name}");
+                            }
+                        }
+                        using (var shacrypto = System.Security.Cryptography.SHA512.Create())
+                        {
+                            using (var stream = System.IO.File.OpenRead(fullpath))
+                            {
+                                var hash = shacrypto.ComputeHash(stream);
+                                var shafullname = fullpath + ".sha512";
+                                var hashtext = Convert.ToBase64String(hash);
+                                var hashtextbytes = Encoding.ASCII.GetBytes(hashtext);
+
+                                using (var shafile = System.IO.File.OpenWrite(shafullname))
+                                {
+                                    shafile.Write(hashtextbytes, 0, hashtextbytes.Length);
+                                }
+                            }
+                        }
+                        nuspec.ExtractToFile(Path.Combine(pkgpath, pkgid + ".nuspec"));
+                    }
+
+                }
+                return Ok(ViewData);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex.Message);
+                logger.LogError("Stack Trace: " + ex.StackTrace);
+                return new ObjectResult(new { ViewData, ex.Message })
+                { StatusCode = 500 };
+            }
+        }
+    }
+}

src/nuget-host/Controllers/PackagesController.cs

@@ -1,26 +1,19 @@
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using NuGet.Packaging.Core;
-using NuGet.Versioning;
 using nuget_host.Data;
 using nuget_host.Entities;
-using nuget_host.Helpers;
 
 namespace nuget_host.Controllers
 {
 
     [AllowAnonymous]
-    public class PackagesController : Controller
+    public partial class PackagesController : Controller
     {
         private readonly ILogger<PackagesController> logger;
         private readonly IDataProtector protector;
@@ -40,180 +33,67 @@ namespace nuget_host.Controllers
             this.dbContext = dbContext;
         }
 
-        [HttpPut("packages")]
-        public async Task<IActionResult> Put()
-        {
-            try
-            {
-                var clientVersionId = Request.Headers["X-NuGet-Client-Version"];
-                var apiKey = Request.Headers["X-NuGet-ApiKey"];
-                ViewData["versionId"] = typeof(PackagesController).Assembly.FullName;
-                var files = new List<string>();
-                ViewData["files"] = files;
 
-                var clearkey = protector.Unprotect(apiKey);
-                var apikey = dbContext.ApiKeys.SingleOrDefault(k => k.Id == clearkey);
-                if (apikey == null)
-                {
-                    logger.LogError("403 : no api-key");
-                    return Unauthorized();
-                }
-
-                foreach (var file in Request.Form.Files)
-                {
-                    string initpath = Path.Combine(Environment.GetEnvironmentVariable("TEMP") ??
-                    Environment.GetEnvironmentVariable("TMP") ?? "/tmp",
-                     $"nuget_host-{Guid.NewGuid()}.nupkg");
-
-                    using (FileStream fw = new FileStream(initpath, FileMode.Create))
-                    {
-                        file.CopyTo(fw);
-                    }
-
-                    using (FileStream fw = new FileStream(initpath, FileMode.Open))
-                    {
-                        var archive = new ZipArchive(fw);
-
-                        var nuspec = archive.Entries.FirstOrDefault(e => e.FullName.EndsWith(".nuspec"));
-                        if (nuspec==null) return BadRequest("no nuspec from archive");
-                        string pkgpath;
-                        NuGetVersion version;
-                        string pkgid;
-                        string fullpath;
-
-                        using (var specstr = nuspec.Open())
-                        {
-                            NuspecCoreReader reader = new NuspecCoreReader(specstr);
-
-                            string pkgdesc = reader.GetDescription();
-                            pkgid = reader.GetId();
-                            version = reader.GetVersion();
-                            string pkgidpath = Path.Combine(nugetSettings.PackagesRootDir,
-                                pkgid);
-                            pkgpath = Path.Combine(pkgidpath, version.ToFullString());
-                            string name = $"{pkgid}-{version}.nupkg";
-                            fullpath = Path.Combine(pkgpath, name);
-                            
-                            var destpkgiddir = new DirectoryInfo(pkgidpath);
-                            Package package = dbContext.Packages.SingleOrDefault(p => p.Id == pkgid);
-                            if (package != null) 
-                            {
-                                if (package.OwnerId != apikey.UserId)
-                                {
-                                    return new ForbidResult();
-                                }
-                                package.Description = pkgdesc;
-                            }
-                            else 
-                            {
-                                package = new Package
-                                {
-                                    Id = pkgid,
-                                    Description = pkgdesc,
-                                    OwnerId = apikey.UserId
-                                };
-                                dbContext.Packages.Add(package);
-                            }
-                            if (!destpkgiddir.Exists) destpkgiddir.Create();
-
-                            var source = new FileInfo(initpath);
-                            var dest = new FileInfo(fullpath);
-                            var destdir = new DirectoryInfo(dest.DirectoryName);
-                            if (dest.Exists)
-                            {
-                                ViewData["msg"] = "existant";
-                                ViewData["ecode"] = 1;
-                                logger.LogWarning("400 : existant");
-                                return BadRequest(ViewData);
-                            }
-                            else
-                            {
-                                destdir.Create();
-
-                                source.MoveTo(fullpath);
-                                files.Add(name);
-                                string fullstringversion = version.ToFullString();
-                                PackageVersion pkgver = dbContext.PackageVersions.FirstOrDefault
-                                (v => v.PackageId == package.Id && v.FullString == fullstringversion);
-                                if (pkgver == null)
-                                {
-                                    pkgver = new PackageVersion
-                                    {
-                                        Package = package,
-                                        Major = version.Major,
-                                        Minor = version.Minor,
-                                        Patch = version.Patch,
-                                        IsPrerelease = version.IsPrerelease,
-                                        FullString = version.ToFullString()
-                                    };
-                                    dbContext.PackageVersions.Add(pkgver);
-                                    await dbContext.SaveChangesAsync();
-                                }
-                                else 
-                                {
-                                    // existant en db mais pas sur le disque
-                                    // TODO prise en charge de ce cas anormal
-                                }
-
-                                logger.LogInformation($"new package : {nuspec.Name}");
-                            }
-                        }
-                        using (var shacrypto = System.Security.Cryptography.SHA512.Create())
-                        {
-                            using (var stream = System.IO.File.OpenRead(fullpath))
-                            {
-                                var hash = shacrypto.ComputeHash(stream);
-                                var shafullname = fullpath + ".sha512";
-                                var hashtext = Convert.ToBase64String(hash);
-                                var hashtextbytes = Encoding.ASCII.GetBytes(hashtext);
-
-                                using (var shafile = System.IO.File.OpenWrite(shafullname))
-                                {
-                                    shafile.Write(hashtextbytes, 0, hashtextbytes.Length);
-                                }
-                            }
-                        }
-                        nuspec.ExtractToFile(Path.Combine(pkgpath, pkgid + ".nuspec"));
-                    }
-
-                }
-                return Ok(ViewData);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex.Message);
-                logger.LogError("Stack Trace: "+ ex.StackTrace);
-                return new ObjectResult(new { ViewData, ex.Message})
-                { StatusCode = 500 };
-            }
-        }
         // dotnet add . package -s http://localhost:5000/packages nuget-cli
         // packages/FindPackagesById()?id='nuget-cli'&semVerLevel=2.0.0
-        [HttpGet("packages/FindPackagesById()")]
+
-        public IActionResult Index(string id, string semVerLevel)
+        // Search
+        // GET {@id}?q={QUERY}&skip={SKIP}&take={TAKE}&prerelease={PRERELEASE}&semVerLevel={SEMVERLEVEL}&packageType={PACKAGETYPE}
+
+        [HttpGet("~/search/index.json")]
+        public IActionResult Index(
+            string q,
+            bool prerelease = false,
+            string packageType = null,
+            int skip = 0,
+            int take = 25,
+            string semVerLevel = "2.0.0")
         {
-            if (string.IsNullOrEmpty(id))
+            if (string.IsNullOrEmpty(q))
             {
-                ViewData["msg"] = "no id";
+                ModelState.AddModelError("q", "no value");
+                return NotFound(ModelState);
             }
             else
             {
-                ViewData["id"] = id;
+                var scope =  dbContext.Packages
-                // TODO Assert valid sem ver spec
+                .Include(p => p.Versions)
-                var filelst = new DirectoryInfo(nugetSettings.PackagesRootDir);
+                .Where(
-                var lst = filelst.GetDirectories(id);
+                    p => (CamelCaseMatch(p.Id, q) || SeparatedByMinusMatch(p.Id, q))
-                ViewData["lst"] = lst.Select(entry => entry.Name);
+                    && (prerelease || p.Versions.Any(v => !v.IsPrerelease))
+                    && (packageType == null || p.Versions.Any(v => v.Type == packageType))
+                );
+                var result = new {
+                    totalHits = scope.Count(),
+                    data = scope.Skip(skip).Take(take).ToArray()
+                };
+                return Ok(result);
             }
-            return Ok(ViewData);
         }
 
-
+        protected static bool CamelCaseMatch(string id, string q)
-
-        [Authorize]
-        [HttpGet("api/get-key/{*apikey}")]
-        public IActionResult GetApiKey(string apiKey)
         {
-            return Ok(protector.Protect(apiKey));
+            // Assert.False (q==null);
+            string query = q;
+            if (query.Length==0) return false;
+
+            while (id.Length > 0)
+            {
+                int i = 0;
+                while (id.Length > i && char.IsLower(id[i])) i++;
+                if (i==0) break;
+                id = id.Substring(i);
+                if (id.StartsWith(q, System.StringComparison.OrdinalIgnoreCase)) return true;
+            }
+            return false;
+        }
+        protected static bool SeparatedByMinusMatch(string id, string q)
+        {
+            foreach (var part in id.Split('-'))
+            {
+                if (part.StartsWith(q, System.StringComparison.OrdinalIgnoreCase)) return true;
+            }
+            return false;
         }
     }
 }

src/nuget-host/Data/ApplicationDbContext.cs

@@ -21,7 +21,8 @@ namespace nuget_host.Data
             modelBuilder.Entity<PackageVersion>().HasKey(v => new
             { 
                 v.PackageId,
-                v.FullString 
+                v.FullString,
+                v.Type
             });
         }
         public DbSet<ApiKey> ApiKeys { get; set; }

src/nuget-host/Data/Package.cs

@@ -1,5 +1,7 @@
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
 
 namespace nuget_host.Data
 {
@@ -12,7 +14,14 @@ namespace nuget_host.Data
         [ForeignKey("Owner")]
         public string OwnerId { get; set; }
 
+        [StringLength(1024)]
         public string Description { get; set; }
+
+        [JsonIgnore]
         virtual public ApplicationUser Owner { get; set; }
+
+        [JsonIgnore]
+
+        public virtual List<PackageVersion> Versions { get; set; }
     }
 }

src/nuget-host/Data/PackageVersion.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
 
 namespace nuget_host.Data
 {
@@ -23,8 +24,11 @@ namespace nuget_host.Data
         public string FullString { get; set; }
         public bool IsPrerelease { get; set; }
 
-        public virtual Package Package { get; set; }
+        [StringLength(256)]
+        public string Type { get; set; }
 
+        [JsonIgnore]
+        public virtual Package Package { get; set; }
 
     }
 }

src/nuget-host/Migrations/20210621214109_version-types.Designer.cs

@@ -0,0 +1,316 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using nuget_host.Data;
+
+namespace nugethost.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20210621214109_version-types")]
+    partial class versiontypes
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("ProviderKey");
+
+                    b.Property<string>("ProviderDisplayName");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("RoleId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("nuget_host.Data.ApiKeys.ApiKey", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("CreationDate");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.Property<int>("ValidityPeriodInDays");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ApiKeys");
+                });
+
+            modelBuilder.Entity("nuget_host.Data.ApplicationUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AccessFailedCount");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed");
+
+                    b.Property<string>("FullName");
+
+                    b.Property<bool>("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed");
+
+                    b.Property<string>("SecurityStamp");
+
+                    b.Property<bool>("TwoFactorEnabled");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("nuget_host.Data.Package", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1024);
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Packages");
+                });
+
+            modelBuilder.Entity("nuget_host.Data.PackageVersion", b =>
+                {
+                    b.Property<string>("PackageId");
+
+                    b.Property<string>("FullString")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("IsPrerelease");
+
+                    b.Property<int>("Major");
+
+                    b.Property<int>("Minor");
+
+                    b.Property<int>("Patch");
+
+                    b.HasKey("PackageId", "FullString", "Type");
+
+                    b.ToTable("PackageVersions");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("nuget_host.Data.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("nuget_host.Data.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("nuget_host.Data.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("nuget_host.Data.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("nuget_host.Data.ApiKeys.ApiKey", b =>
+                {
+                    b.HasOne("nuget_host.Data.ApplicationUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("nuget_host.Data.Package", b =>
+                {
+                    b.HasOne("nuget_host.Data.ApplicationUser", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("nuget_host.Data.PackageVersion", b =>
+                {
+                    b.HasOne("nuget_host.Data.Package", "Package")
+                        .WithMany("Versions")
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/nuget-host/Migrations/20210621214109_version-types.cs

@@ -0,0 +1,58 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace nugethost.Migrations
+{
+    public partial class versiontypes : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_PackageVersions",
+                table: "PackageVersions");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Type",
+                table: "PackageVersions",
+                maxLength: 256,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Description",
+                table: "Packages",
+                maxLength: 1024,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldNullable: true);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_PackageVersions",
+                table: "PackageVersions",
+                columns: new[] { "PackageId", "FullString", "Type" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_PackageVersions",
+                table: "PackageVersions");
+
+            migrationBuilder.DropColumn(
+                name: "Type",
+                table: "PackageVersions");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Description",
+                table: "Packages",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldMaxLength: 1024,
+                oldNullable: true);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_PackageVersions",
+                table: "PackageVersions",
+                columns: new[] { "PackageId", "FullString" });
+        }
+    }
+}

src/nuget-host/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -204,7 +204,8 @@ namespace nugethost.Migrations
                     b.Property<string>("Id")
                         .ValueGeneratedOnAdd();
 
-                    b.Property<string>("Description");
+                    b.Property<string>("Description")
+                        .HasMaxLength(1024);
 
                     b.Property<string>("OwnerId")
                         .IsRequired();
@@ -223,6 +224,9 @@ namespace nugethost.Migrations
                     b.Property<string>("FullString")
                         .HasMaxLength(256);
 
+                    b.Property<string>("Type")
+                        .HasMaxLength(256);
+
                     b.Property<bool>("IsPrerelease");
 
                     b.Property<int>("Major");
@@ -231,7 +235,7 @@ namespace nugethost.Migrations
 
                     b.Property<int>("Patch");
 
-                    b.HasKey("PackageId", "FullString");
+                    b.HasKey("PackageId", "FullString", "Type");
 
                     b.ToTable("PackageVersions");
                 });
@@ -300,7 +304,7 @@ namespace nugethost.Migrations
             modelBuilder.Entity("nuget_host.Data.PackageVersion", b =>
                 {
                     b.HasOne("nuget_host.Data.Package", "Package")
-                        .WithMany()
+                        .WithMany("Versions")
                         .HasForeignKey("PackageId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });

src/nuget-host/Startup.cs

@@ -64,6 +64,7 @@ namespace nuget_host
             services.Configure<NugetSettings>(nugetSettingsconf);
             var adminStartupListConf = Configuration.GetSection("AdminList");
             services.Configure<AdminStartupList>(adminStartupListConf);
+            services.Configure<MigrationsEndPointOptions>(o => o.Path = "~/migrate");
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

src/nuget-host/nuget-host.csproj

@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="2.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.All" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="NuGet.Packaging.Core" Version="5.9.0"/>
@@ -22,10 +21,12 @@
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.1" IncludeAssets="All"  />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" IncludeAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" IncludeAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1" />
 
   </ItemGroup>
 
   <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1" />
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.1.0-preview1-final" />   
   </ItemGroup>