CircleAuthorizationToFile EF migration

src/Yavsc.Abstract/Identity/Security/FileAccessControlRulePayload.cs

@@ -0,0 +1,12 @@
+
+namespace Yavsc.Models.Access
+{
+    using Yavsc.Abstract.Identity.Security;
+
+    public class FileAccessControlRulePayload : CircleAuthorization
+    {
+        public virtual string Path { get; set; }
+
+
+    }
+}

src/Yavsc.Org/Migrations/20260907100133_fileACL.cs

@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class fileACL : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "CircleAuthorizationToFile",
+                columns: table => new
+                {
+                    CircleId = table.Column<long>(type: "bigint", nullable: false),
+                    Path = table.Column<string>(type: "text", nullable: false),
+                    OwnerId = table.Column<string>(type: "text", nullable: false),
+                    Access = table.Column<byte>(type: "smallint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CircleAuthorizationToFile", x => new { x.CircleId, x.Path, x.OwnerId });
+                    table.ForeignKey(
+                        name: "FK_CircleAuthorizationToFile_AspNetUsers_OwnerId",
+                        column: x => x.OwnerId,
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_CircleAuthorizationToFile_Circle_CircleId",
+                        column: x => x.CircleId,
+                        principalTable: "Circle",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CircleAuthorizationToFile_OwnerId",
+                table: "CircleAuthorizationToFile",
+                column: "OwnerId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "CircleAuthorizationToFile");
+        }
+    }
+}

src/Yavsc.Org/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -1088,6 +1088,27 @@ namespace Yavsc.Migrations
                     b.ToTable("CircleAuthorizationToBlogPost");
                 });
 
+            modelBuilder.Entity("Yavsc.Models.Access.CircleAuthorizationToFile", b =>
+                {
+                    b.Property<long>("CircleId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OwnerId")
+                        .HasColumnType("text");
+
+                    b.Property<byte>("Access")
+                        .HasColumnType("smallint");
+
+                    b.HasKey("CircleId", "Path", "OwnerId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("CircleAuthorizationToFile");
+                });
+
             modelBuilder.Entity("Yavsc.Models.AccountBalance", b =>
                 {
                     b.Property<string>("UserId")
@@ -3767,6 +3788,25 @@ namespace Yavsc.Migrations
                     b.Navigation("Target");
                 });
 
+            modelBuilder.Entity("Yavsc.Models.Access.CircleAuthorizationToFile", b =>
+                {
+                    b.HasOne("Yavsc.Models.Relationship.Circle", "Allowed")
+                        .WithMany()
+                        .HasForeignKey("CircleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Yavsc.Models.ApplicationUser", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Allowed");
+
+                    b.Navigation("Owner");
+                });
+
             modelBuilder.Entity("Yavsc.Models.AccountBalance", b =>
                 {
                     b.HasOne("Yavsc.Models.ApplicationUser", "Owner")

src/Yavsc.Server/Models/Access/Circles/CircleAuthorizationToFile.cs

@@ -2,7 +2,7 @@
 namespace Yavsc.Models.Access
 {
     using System.ComponentModel.DataAnnotations.Schema;
-    using Yavsc.Abstract.Identity.Security;
+    using System.Text.Json.Serialization;
     using Models.Relationship;
     using Yavsc.Services;
 
@@ -10,14 +10,15 @@ namespace Yavsc.Models.Access
     {
         public FileAccessRight Access { get; set; }
 
-    }
-
-    public class FileAccessControlRulePayload : CircleAuthorization
-    {
-        public virtual string FileId { get; set; }
-
+        [JsonIgnore]
         [ForeignKey("CircleId")]
         public virtual Circle Allowed { get; set; }
 
+        public string OwnerId { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("OwnerId")]
+        public virtual ApplicationUser Owner { get; set; }
+
     }
 }

src/Yavsc.Server/Models/ApplicationDbContext.cs

@@ -96,12 +96,19 @@ namespace Yavsc.Models
             builder.Entity<UserActivity>().HasKey(u => new { u.DoesCode, u.UserId });
             builder.Entity<Instrumentation>().HasKey(u => new { u.InstrumentId, u.UserId });
             builder.Entity<CircleAuthorizationToBlogPost>().HasKey(a => new { a.CircleId, a.BlogPostId });
-            builder.Entity<CircleAuthorizationToFile>().HasKey(a => new { a.CircleId, a.FileId });
+            builder.Entity<CircleAuthorizationToFile>().HasKey(a => new { a.CircleId, a.Path, a.OwnerId });
             builder.Entity<CircleAuthorizationToFile>()
                 .HasOne(a => a.Allowed)
                 .WithMany()
                 .HasForeignKey(a => a.CircleId)
-                .OnDelete(DeleteBehavior.Cascade);
+                .OnDelete(DeleteBehavior.Cascade)
+                ;
+            builder.Entity<CircleAuthorizationToFile>()
+                .HasOne(a => a.Owner)
+                .WithMany()
+                .HasForeignKey(a => a.OwnerId)
+                .OnDelete(DeleteBehavior.Cascade)
+                ;
             builder.Entity<CircleAuthorizationToFile>()
                 .Property(a => a.Access)
                 .HasConversion<byte>();

src/Yavsc.Server/Services/FileSystemAuthManager.cs

@@ -99,8 +99,16 @@ namespace Yavsc.Services
 
         public void SetAccess(long circleId, string normalizedFullPath, FileAccessRight access)
         {
+            var providerUserName = normalizedFullPath.Split('/')[0];
+            var providerUserId = _dbContext.Users.SingleOrDefault(u => u.UserName == providerUserName)?.Id;
+
+            if (string.IsNullOrEmpty(providerUserId))
+            {
+                return;
+            }
+
             var acl = _dbContext.CircleAuthorizationToFile.SingleOrDefault(a =>
-                a.CircleId == circleId && a.FileId == normalizedFullPath);
+                a.CircleId == circleId && a.Path == normalizedFullPath && a.OwnerId == providerUserId);
 
             if (access == FileAccessRight.None)
             {
@@ -118,7 +126,8 @@ namespace Yavsc.Services
                 _dbContext.CircleAuthorizationToFile.Add(new CircleAuthorizationToFile
                 {
                     CircleId = circleId,
-                    FileId = normalizedFullPath,
+                    Path = normalizedFullPath,
+                    OwnerId = providerUserId,
                     Access = access
                 });
             }