Fixed corrupted file name repair

Author: d2dyno1

src/Core/SecureFolderFS.Core.Cryptography/Cipher/AesSiv128.cs

@@ -42,19 +42,6 @@ public byte[] Decrypt(ReadOnlySpan<byte> bytes, ReadOnlySpan<byte> associatedDat
             return _aesCmacSiv.Open(bytes.ToArray(), data: associatedData.ToArray());
         }
 
-        [MethodImpl(MethodImplOptions.Synchronized)]
-        public byte[]? TryDecrypt(ReadOnlySpan<byte> bytes, ReadOnlySpan<byte> associatedData)
-        {
-            try
-            {
-                return Decrypt(bytes, associatedData);
-            }
-            catch (CryptographicException)
-            {
-                return null;
-            }
-        }
-
         /// <inheritdoc/>
         public void Dispose()
         {

src/Core/SecureFolderFS.Core.Cryptography/Extensions/HeaderCryptExtensions/XChaChaHeaderExtensions.cs

@@ -19,9 +19,15 @@ public static ReadOnlySpan<byte> GetHeaderContentKey(this ReadOnlySpan<byte> hea
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlySpan<byte> GetHeaderTag(this ReadOnlySpan<byte> header)
+        public static ReadOnlySpan<byte> SkipNonce(this ReadOnlySpan<byte> header)
         {
-            return header.Slice(0, HEADER_TAG_SIZE);
+            return header.Slice(HEADER_NONCE_SIZE);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Span<byte> SkipNonce(this Span<byte> header)
+        {
+            return header.Slice(HEADER_NONCE_SIZE);
         }
     }
 }

src/Core/SecureFolderFS.Core.Cryptography/HeaderCrypt/XChaChaHeaderCrypt.cs

@@ -41,7 +41,7 @@ public override void EncryptHeader(ReadOnlySpan<byte> plaintextHeader, Span<byte
                 plaintextHeader.GetHeaderContentKey(),
                 DekKey,
                 plaintextHeader.GetHeaderNonce(),
-                ciphertextHeader.Slice(HEADER_NONCE_SIZE),
+                ciphertextHeader.SkipNonce(),
                 default);
         }
 
@@ -53,10 +53,10 @@ public override bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byt
 
             // Decrypt
             return XChaCha20Poly1305.Decrypt(
-                ciphertextHeader.Slice(HEADER_NONCE_SIZE),
+                ciphertextHeader.SkipNonce(),
                 DekKey,
                 ciphertextHeader.GetHeaderNonce(),
-                plaintextHeader.Slice(HEADER_NONCE_SIZE),
+                plaintextHeader.SkipNonce(),
                 default);
         }
     }

src/Core/SecureFolderFS.Core.Cryptography/NameCrypt/BaseNameCrypt.cs

@@ -46,21 +46,28 @@ public virtual string EncryptName(ReadOnlySpan<char> plaintextName, ReadOnlySpan
         /// <inheritdoc/>
         public virtual string? DecryptName(ReadOnlySpan<char> ciphertextName, ReadOnlySpan<byte> directoryId)
         {
-            // Decode buffer
-            var ciphertextNameBuffer = fileNameEncodingId switch
+            try
             {
-                Constants.CipherId.ENCODING_BASE64URL => Base64Url.DecodeFromChars(ciphertextName),
-                Constants.CipherId.ENCODING_BASE4K => Base4K.DecodeChainToNewBuffer(ciphertextName),
-                _ => throw new ArgumentOutOfRangeException(nameof(fileNameEncodingId))
-            };
+                // Decode buffer
+                var ciphertextNameBuffer = fileNameEncodingId switch
+                {
+                    Constants.CipherId.ENCODING_BASE64URL => Base64Url.DecodeFromChars(ciphertextName),
+                    Constants.CipherId.ENCODING_BASE4K => Base4K.DecodeChainToNewBuffer(ciphertextName),
+                    _ => throw new ArgumentOutOfRangeException(nameof(fileNameEncodingId))
+                };
 
-            // Decrypt
-            var plaintextNameBuffer = DecryptFileName(ciphertextNameBuffer, directoryId);
-            if (plaintextNameBuffer is null)
-                return null;
+                // Decrypt
+                var plaintextNameBuffer = DecryptFileName(ciphertextNameBuffer, directoryId);
+                if (plaintextNameBuffer is null)
+                    return null;
 
-            // Get string from plaintext buffer
-            return Encoding.UTF8.GetString(plaintextNameBuffer);
+                // Get string from plaintext buffer
+                return Encoding.UTF8.GetString(plaintextNameBuffer);
+            }
+            catch (Exception)
+            {
+                return null;
+            }
         }
 
         protected abstract byte[] EncryptFileName(ReadOnlySpan<byte> plaintextFileNameBuffer, ReadOnlySpan<byte> directoryId);

src/Core/SecureFolderFS.Core.Dokany/Callbacks/OnDeviceDokany.cs

@@ -357,9 +357,7 @@ public override NtStatus FindFilesWithPattern(string fileName, string searchPatt
                         continue;
 
                     var plaintextName = NativePathHelpers.GetPlaintextPath(item.FullName, Specifics, directoryId);
-                    plaintextName = plaintextName is not null
-                        ? Path.GetFileName(plaintextName)
-                        : item.Name;
+                    plaintextName = plaintextName is not null ? Path.GetFileName(plaintextName) : null;
 
                     if (string.IsNullOrEmpty(plaintextName))
                         continue;

src/Core/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Directory.cs

@@ -1,5 +1,6 @@
 using OwlCore.Storage;
 using SecureFolderFS.Core.Cryptography;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
 using SecureFolderFS.Storage.Extensions;
@@ -8,7 +9,6 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using SecureFolderFS.Core.FileSystem.Helpers.Paths;
 
 namespace SecureFolderFS.Core.FileSystem.Helpers.Health
 {

src/Core/SecureFolderFS.Core.FileSystem/Validators/StructureValidator.cs

@@ -24,8 +24,7 @@ public StructureValidator(FileSystemSpecifics specifics, IAsyncValidator<IFile,
         /// <inheritdoc/>
         public override Task ValidateAsync((IFolder, IProgress<IResult>?) value, CancellationToken cancellationToken = default)
         {
-            // TODO: Implement
-            throw new NotImplementedException();
+            throw new NotSupportedException();
         }
 
         /// <inheritdoc/>
@@ -55,7 +54,6 @@ public override async Task<IResult> ValidateResultAsync((IFolder, IProgress<IRes
                 }
             }
 
-            // TODO: Return appropriate result
             return Result.Success;
         }
     }

src/Core/SecureFolderFS.Core.MobileFS/Constants.cs

@@ -17,6 +17,7 @@ public static class FileSystem
             {
                 public const string FS_ID = "ANDROID_DOCUMENTS_PROVIDER";
                 public const string FS_NAME = "Android SAF";
+                public const string AUTHORITY = "org.securefolderfs.securefolderfs.provider";
             }
 
             internal static class Saf

src/Core/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Main.cs

@@ -20,7 +20,7 @@
 namespace SecureFolderFS.Core.MobileFS.Platforms.Android.FileSystem
 {
     [ContentProvider(["${applicationId}.provider"],
-        Name = "org.securefolderfs.securefolderfs.provider",
+        Name = Constants.Android.FileSystem.AUTHORITY,
         Permission = "android.permission.MANAGE_DOCUMENTS",
         Enabled = true,
         Exported = true,

src/Core/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/RootCollection.cs

@@ -69,9 +69,7 @@ private void FileSystemManager_CollectionChanged(object? sender, NotifyCollectio
 
             void NotifySafChange()
             {
-                // TODO: Make the authority change resistant to avoid unexpected errors
-                // Authority taken from ContentProviderAttribute on FileSystemProvider
-                var rootsUri = DocumentsContract.BuildRootsUri("org.securefolderfs.securefolderfs.provider");
+                var rootsUri = DocumentsContract.BuildRootsUri(Constants.Android.FileSystem.AUTHORITY);
                 if (rootsUri is not null)
                     _context.ContentResolver?.NotifyChange(rootsUri, null);
             }