Fix nullref exception when a referenceproperty has broken targets and… (#2203)

kavics · web-flow · commit cf700f91c6d4 · 2025-05-12T15:37:47.000Z
* Fix nullref exception when a referenceproperty has broken targets and GetSingleValue called on NodeList.

* Raise prerelease versions.

* Refactor: AuditBlock
diff --git a/src/ContentRepository.InMemory/SenseNet.ContentRepository.InMemory.csproj b/src/ContentRepository.InMemory/SenseNet.ContentRepository.InMemory.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.1.1</Version>
+		<Version>1.1.2-alpha.1</Version>
 		<Authors>kavics,joe,tusmester</Authors>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Company>Sense/Net Inc.</Company>
diff --git a/src/ContentRepository.MsSql/SenseNet.ContentRepository.MsSql.csproj b/src/ContentRepository.MsSql/SenseNet.ContentRepository.MsSql.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.1.1</Version>
+		<Version>1.1.2-alpha.1</Version>
 		<Authors>kavics,tusmester</Authors>
 		<Company>Sense/Net Inc.</Company>
 		<Copyright>Copyright © Sense/Net Inc.</Copyright>
diff --git a/src/ContentRepository/SenseNet.ContentRepository.csproj b/src/ContentRepository/SenseNet.ContentRepository.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>7.8.1</Version>
+		<Version>7.8.2-alpha.1</Version>
 		<Authors>kavics,joe,tusmester,hashtagnulla</Authors>
 		<Company>Sense/Net Inc.</Company>
 		<Copyright>Copyright © Sense/Net Inc.</Copyright>
diff --git a/src/OData/SenseNet.OData.csproj b/src/OData/SenseNet.OData.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.1.1</Version>
+		<Version>1.1.2-alpha.1</Version>
 		<Authors>kavics,tusmester,hashtagnulla</Authors>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Company>Sense/Net Inc.</Company>
diff --git a/src/OpenApi/SenseNet.OpenApi.csproj b/src/OpenApi/SenseNet.OpenApi.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.1.1</Version>
+		<Version>1.1.2-alpha.1</Version>
 		<Authors>kavics,tusmester</Authors>
 		<Company>Sense/Net Inc.</Company>
 		<Copyright>Copyright © Sense/Net Inc.</Copyright>
diff --git a/src/Services.Core.Install/SenseNet.Services.Core.Install.csproj b/src/Services.Core.Install/SenseNet.Services.Core.Install.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Version>1.1.1</Version>
+		<Version>1.1.2-alpha.1</Version>
 		<Company>Sense/Net Inc.</Company>
 		<Copyright>Copyright © Sense/Net Inc.</Copyright>
 		<PackageLicenseUrl>https://github.com/SenseNet/sensenet/blob/master/LICENSE</PackageLicenseUrl>
diff --git a/src/Services.Core/SenseNet.Services.Core.csproj b/src/Services.Core/SenseNet.Services.Core.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.1.1</Version>
+		<Version>1.1.2-alpha.1</Version>
 		<Authors>kavics,joe,tusmester,hashtagnulla</Authors>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Company>Sense/Net Inc.</Company>
diff --git a/src/Services.Wopi/SenseNet.Services.Wopi.csproj b/src/Services.Wopi/SenseNet.Services.Wopi.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.0.1</Version>
+		<Version>1.0.2-alpha.1</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Company>Sense/Net Inc.</Company>
 		<Copyright>Copyright © Sense/Net Inc.</Copyright>
diff --git a/src/Storage/Diagnostics/AuditBlock.cs b/src/Storage/Diagnostics/AuditBlock.cs
@@ -1,40 +1,41 @@
-﻿using SenseNet.Diagnostics;
-using System;
+﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace SenseNet.Diagnostics
+// ReSharper disable once CheckNamespace
+namespace SenseNet.Diagnostics;
+
+/// <summary>
+/// Ensures that an audit event is logged when the block is disposed.
+/// WARNING: writes event only if the code exit unexpectedly from the using block (Successful == false).
+/// The successful block must be performed with explicit audit writing.
+/// </summary>
+public class AuditBlock : IDisposable
 {
-    public class AuditBlock : IDisposable
-    {
-        private AuditEvent _auditEvent;
-        private string _operationName;
-        private IDictionary<string, object> _properties;
-        private DateTime _startedAt;
+    private readonly AuditEvent _auditEvent;
+    private readonly string _operationName;
+    private readonly IDictionary<string, object> _properties;
+    private readonly DateTime _startedAt;
 
-        public bool Successful { get; set; }
+    public bool Successful { get; set; }
 
-        public AuditBlock(AuditEvent auditEvent, string operationName, IDictionary<string, object> properties)
-        {
-            _auditEvent = auditEvent;
-            _operationName = operationName ?? auditEvent.ToString();
-            _properties = properties ?? new Dictionary<string, object>();
-            _startedAt = DateTime.UtcNow;
-        }
+    public AuditBlock(AuditEvent auditEvent, string operationName, IDictionary<string, object> properties)
+    {
+        _auditEvent = auditEvent;
+        _operationName = operationName ?? auditEvent.ToString();
+        _properties = properties ?? new Dictionary<string, object>();
+        _startedAt = DateTime.UtcNow;
+    }
 
-        public void Dispose()
+    public void Dispose()
+    {
+        if (!Successful)
         {
-            if (!Successful)
-            {
-                _properties.Add("Execution", "UNSUCCESSFUL");
-                _properties.Add("OriginalEvent", _auditEvent);
-                _properties.Add("StartedAt", _startedAt);
+            _properties.Add("Execution", "UNSUCCESSFUL");
+            _properties.Add("OriginalEvent", _auditEvent);
+            _properties.Add("StartedAt", _startedAt);
 
-                var result = new AuditEvent(_auditEvent.AuditCategory, _auditEvent.EventId, "UNSUCCESSFUL " + _auditEvent.AuditCategory, _operationName);
-                SnLog.WriteAudit(result, _properties);
-            }
+            var result = new AuditEvent(_auditEvent.AuditCategory, _auditEvent.EventId, "UNSUCCESSFUL " + _auditEvent.AuditCategory, _operationName);
+            SnLog.WriteAudit(result, _properties);
         }
     }
-}
+}
diff --git a/src/Storage/NodeList.cs b/src/Storage/NodeList.cs
@@ -560,12 +560,18 @@ internal Q GetSingleValue<Q>() where Q : Node
         {
             if (RawData.Count < 1)
                 return null;
-            Node singleNode;
-            using(new SystemAccount())
-                singleNode = Node.Load<T>(RawData[0]);
-            if(!singleNode.Security.HasPermission(AccessProvider.Current.GetCurrentUser(), PermissionType.See))
-                return null;
-            return singleNode as Q;
+
+            using var systemAccount = new SystemAccount();
+
+            var user = AccessProvider.Current.GetCurrentUser();
+
+            var singleNode = RawData
+                .Select(id => Node.Load<T>(id))
+                .OfType<Q>()
+                .FirstOrDefault(node => 
+                    node.Security.HasPermission(user, PermissionType.See));
+
+            return singleNode;
         }
         internal void SetSingleValue<Q>(Q value) where Q : Node
         {
@@ -580,7 +586,7 @@ internal void SetSingleValue<Q>(Q value) where Q : Node
                     Modified();
                 }
             }
-            // Insert or change if value is notn ull.
+            // Insert or change if value is not null.
             else
             {
                 CheckId(value);
diff --git a/src/Storage/SenseNet.Storage.csproj b/src/Storage/SenseNet.Storage.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>7.8.1</Version>
+		<Version>7.8.2-alpha.1</Version>
 		<Authors>kavics,tusmester</Authors>
 		<Company>Sense/Net Inc.</Company>
 		<Copyright>Copyright © Sense/Net Inc.</Copyright>
diff --git a/src/Tests/SenseNet.ContentRepository.Tests/NodeTests.cs b/src/Tests/SenseNet.ContentRepository.Tests/NodeTests.cs
@@ -14,6 +14,7 @@ namespace SenseNet.ContentRepository.Tests
     public class NodeTests : TestBase
     {
         private const string ManagerPropertyName = "Manager";
+        readonly CancellationToken _cancel = new CancellationTokenSource().Token;
 
         [TestMethod, TestCategory("NODE, REFERENCE")]
         public void Node_Reference_SetReference()
@@ -193,7 +194,116 @@ public void Node_Reference_SetReference_Simple_Invisible()
             });
         }
 
+        [TestMethod, TestCategory("NODE, REFERENCE")] //Fix2202 Deleted reference target can cause nullrefex in the nodelist
+        public async STT.Task Node_Reference_GetReference_Single_Deleted()
+        {
+            await Test(async () =>
+            {
+                var u1 = CreateUser("U1");
+                var u2 = CreateUser("U2");
+
+                u1.SetReference(ManagerPropertyName, u2);
+                await u1.SaveAsync(_cancel);
+
+                u1 = await Node.LoadAsync<User>(u1.Id, _cancel);
+
+                Assert.AreEqual(u2.Id, u1.GetReference<User>(ManagerPropertyName)?.Id ?? 0);
+
+                // ACT
+                await Node.ForceDeleteAsync(u2.Id, _cancel);
+
+                // ASSERT
+                var loaded = await Node.LoadAsync<User>(u1.Id, _cancel);
+                var manager = loaded.GetReference<User>(ManagerPropertyName);
+                Assert.IsNull(manager);
+
+            }).ConfigureAwait(false);
+        }
+        [TestMethod, TestCategory("NODE, REFERENCE")] //Fix2202 Deleted reference target can cause nullrefex in the nodelist
+        public async STT.Task Node_Reference_GetReference_Single_FromMultiple_Deleted()
+        {
+            await Test(async () =>
+            {
+                //var root = CreateTestRoot();
+                var u1 = CreateUser("U1");
+                var u2 = CreateUser("U2");
+                var u3 = CreateUser("U3");
+                var u4 = CreateUser("U4");
+                var u5 = CreateUser("U5");
+                var group = new Group(await Node.LoadNodeAsync("/Root/IMS/Public", _cancel)) { Name = "G1" };
+                group.AddReferences("Members", new[] { u1, u2, u3, u4, u5 });
+                await group.SaveAsync(_cancel);
+
+                group = await Node.LoadAsync<Group>(group.Id, _cancel);
+
+                var memberIds = group.GetReferences("Members").Select(x => x.Id).ToArray();
+                Assert.AreEqual($"{u1.Id}, {u2.Id}, {u3.Id}, {u4.Id}, {u5.Id}", string.Join(", ", memberIds));
+
+                // ACT
+                await Node.ForceDeleteAsync(u1.Id, _cancel);
+                await Node.ForceDeleteAsync(u2.Id, _cancel);
+                await Node.ForceDeleteAsync(u3.Id, _cancel);
+                var singleMember = group.GetReference<User>("Members");
+
+                // ASSERT
+                Assert.AreEqual(u4.Id, singleMember.Id);
+
+            }).ConfigureAwait(false);
+        }
+
+        [TestMethod, TestCategory("NODE, REFERENCE")] //Fix2202 Deleted reference target can cause nullrefex in the nodelist
+        public async STT.Task Node_Reference_GetReference_Multiple_Deleted()
+        {
+            await Test(async () =>
+            {
+                //var root = CreateTestRoot();
+                var u1 = CreateUser("U1");
+                var u2 = CreateUser("U2");
+                var u3 = CreateUser("U3");
+                var group = new Group(Node.LoadNode("/Root/IMS/Public")) { Name = "G1" };
+                group.AddReferences("Members", new[] { u1, u2, u3 });
+                await group.SaveAsync(_cancel);
+
+                group = await Node.LoadAsync<Group>(group.Id, _cancel);
+
+                var memberIds = group.GetReferences("Members").Select(x => x.Id).ToArray();
+                Assert.AreEqual($"{u1.Id}, {u2.Id}, {u3.Id}", string.Join(", ", memberIds));
+
+                // ACT
+                await Node.ForceDeleteAsync(u2.Id, _cancel);
+
+                // ASSERT
+                var loaded = await Node.LoadAsync<Group>(group.Id, _cancel);
+                memberIds = loaded.GetReferences("Members").Select(x => x.Id).ToArray();
+                Assert.AreEqual($"{u1.Id}, {u3.Id}", string.Join(", ", memberIds));
 
+            }).ConfigureAwait(false);
+        }
+        [TestMethod, TestCategory("NODE, REFERENCE")] //Fix2202 Deleted reference target can cause nullrefex in the nodelist
+        public async STT.Task Node_Reference_GetReference_Multiple_Deleted_WithoutReload()
+        {
+            await Test(async () =>
+            {
+                //var root = CreateTestRoot();
+                var u1 = CreateUser("U1");
+                var u2 = CreateUser("U2");
+                var u3 = CreateUser("U3");
+                var group = new Group(Node.LoadNode("/Root/IMS/Public")) { Name = "G1" };
+                group.AddReferences("Members", new[] { u1, u2, u3 });
+                await group.SaveAsync(_cancel);
+
+                var memberIds = group.GetReferences("Members").Select(x => x.Id).ToArray();
+                Assert.AreEqual($"{u1.Id}, {u2.Id}, {u3.Id}", string.Join(", ", memberIds));
+
+                // ACT
+                await Node.ForceDeleteAsync(u2.Id, _cancel);
+
+                // ASSERT
+                memberIds = group.GetReferences("Members").Select(x => x.Id).ToArray();
+                Assert.AreEqual($"{u1.Id}, {u3.Id}", string.Join(", ", memberIds));
+
+            }).ConfigureAwait(false);
+        }
 
         [TestMethod, TestCategory("NODE, LOAD")]
         public async STT.Task Node_Load()
diff --git a/src/Tests/SenseNet.Tests.Core/SenseNet.Tests.Core.csproj b/src/Tests/SenseNet.Tests.Core/SenseNet.Tests.Core.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<IsPackable>true</IsPackable>
-		<Version>1.2.1</Version>
+		<Version>1.2.2-alpha.1</Version>
 		<Authors>kavics,tusmester</Authors>
 		<Company>Sense/Net Inc.</Company>
 		<Copyright>Copyright © Sense/Net Inc.</Copyright>
diff --git a/src/Tools/SnConsoleInstaller/SnConsoleInstaller.csproj b/src/Tools/SnConsoleInstaller/SnConsoleInstaller.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-	  <Version>1.0.1-alpha.2</Version>
+	  <Version>1.0.1-alpha.3</Version>
     <UserSecretsId>99b845c3-2ecb-4630-99c8-f99d7515dae3</UserSecretsId>
   </PropertyGroup>
 
diff --git a/src/WebHooks/SenseNet.WebHooks.csproj b/src/WebHooks/SenseNet.WebHooks.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.1.1</Version>
+		<Version>1.1.2-alpha.1</Version>
 		<Authors>kavics,aniko,tusmester</Authors>
 		<Company>Sense/Net Inc.</Company>
 		<Copyright>Copyright © Sense/Net Inc.</Copyright>

Original file line number	Diff line number	Diff line change
`@@ -560,12 +560,18 @@ internal Q GetSingleValue<Q>() where Q : Node`
`560`	`560`	`{`
`561`	`561`	`if (RawData.Count < 1)`
`562`	`562`	`return null;`
`563`		`- Node singleNode;`
`564`		`- using(new SystemAccount())`
`565`		`- singleNode = Node.Load<T>(RawData[0]);`
`566`		`- if(!singleNode.Security.HasPermission(AccessProvider.Current.GetCurrentUser(), PermissionType.See))`
`567`		`- return null;`
`568`		`- return singleNode as Q;`
	`563`	`+`
	`564`	`+ using var systemAccount = new SystemAccount();`
	`565`	`+`
	`566`	`+ var user = AccessProvider.Current.GetCurrentUser();`
	`567`	`+`
	`568`	`+ var singleNode = RawData`
	`569`	`+ .Select(id => Node.Load<T>(id))`
	`570`	`+ .OfType<Q>()`
	`571`	`+ .FirstOrDefault(node =>`
	`572`	`+ node.Security.HasPermission(user, PermissionType.See));`
	`573`	`+`
	`574`	`+ return singleNode;`
`569`	`575`	`}`
`570`	`576`	`internal void SetSingleValue<Q>(Q value) where Q : Node`
`571`	`577`	`{`
`@@ -580,7 +586,7 @@ internal void SetSingleValue<Q>(Q value) where Q : Node`
`580`	`586`	`Modified();`
`581`	`587`	`}`
`582`	`588`	`}`
`583`		`- // Insert or change if value is notn ull.`
	`589`	`+ // Insert or change if value is not null.`
`584`	`590`	`else`
`585`	`591`	`{`
`586`	`592`	`CheckId(value);`