Skip to content

Commit 95886a5

Browse files
wtgodbewtgodbe
committed
Merge from internal
2 parents 33d9332 + 2e51a0b commit 95886a5

File tree

14 files changed

+452
-216
lines changed

14 files changed

+452
-216
lines changed

‎NuGet.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7+
<add key="darc-int-dotnet-efcore-a29a7e5" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-a29a7e57/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-efcore -->
89
<!-- Begin: Package sources from dotnet-extensions -->
10+
<add key="darc-int-dotnet-extensions-c62ee3d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-c62ee3d0/nuget/v3/index.json" />
911
<!-- Begin: Package sources from dotnet-razor-tooling -->
12+
<add key="darc-int-dotnet-razor-tooling-ff510da" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-razor-tooling-ff510daf/nuget/v3/index.json" />
1013
<!-- End: Package sources from dotnet-razor-tooling -->
1114
<!-- Begin: Package sources from dotnet-corefx -->
1215
<!-- End: Package sources from dotnet-corefx -->
1316
<!-- Begin: Package sources from dotnet-core-setup -->
17+
<add key="darc-int-dotnet-core-setup-6ea7191" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-6ea71919/nuget/v3/index.json" />
1418
<!-- End: Package sources from dotnet-core-setup -->
1519
<!-- End: Package sources from dotnet-extensions -->
1620
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -23,11 +27,15 @@
2327
<clear />
2428
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2529
<!-- Begin: Package sources from dotnet-core-setup -->
30+
<add key="darc-int-dotnet-core-setup-6ea7191" value="true" />
2631
<!-- Begin: Package sources from dotnet-efcore -->
32+
<add key="darc-int-dotnet-efcore-a29a7e5" value="true" />
2733
<!-- End: Package sources from dotnet-efcore -->
2834
<!-- Begin: Package sources from dotnet-extensions -->
35+
<add key="darc-int-dotnet-extensions-c62ee3d" value="true" />
2936
<!-- End: Package sources from dotnet-extensions -->
3037
<!-- Begin: Package sources from dotnet-razor-tooling -->
38+
<add key="darc-int-dotnet-razor-tooling-ff510da" value="true" />
3139
<!-- End: Package sources from dotnet-razor-tooling -->
3240
<!-- End: Package sources from dotnet-core-setup -->
3341
<!-- Begin: Package sources from dotnet-corefx -->

‎eng/Version.Details.xml

Lines changed: 144 additions & 144 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 72 additions & 72 deletions
Large diffs are not rendered by default.

‎src/DataProtection/DataProtection/src/Repositories/FileSystemXmlRepository.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Collections.Generic;
66
using System.IO;
77
using System.Linq;
8+
using System.Runtime.InteropServices;
89
using System.Xml.Linq;
910
using Microsoft.AspNetCore.DataProtection.Internal;
1011
using Microsoft.Extensions.Logging;
@@ -129,9 +130,17 @@ private void StoreElementCore(XElement element, string filename)
129130
// crashes mid-write, we won't end up with a corrupt .xml file.
130131

131132
Directory.Create(); // won't throw if the directory already exists
133+
132134
var tempFilename = Path.Combine(Directory.FullName, Guid.NewGuid().ToString() + ".tmp");
133135
var finalFilename = Path.Combine(Directory.FullName, filename + ".xml");
134136

137+
// Create a temp file with the correct Unix file mode before moving it to the expected finalFilename.
138+
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
139+
{
140+
var tempTempFilename = Path.GetTempFileName();
141+
File.Move(tempTempFilename, tempFilename);
142+
}
143+
135144
try
136145
{
137146
using (var tempFileStream = File.OpenWrite(tempFilename))

‎src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.Diagnostics;
56
using System.IO;
67
using System.Linq;
78
using System.Runtime.InteropServices;
@@ -158,6 +159,39 @@ public void Logs_DockerEphemeralFolders()
158159
});
159160
}
160161

162+
[ConditionalFact]
163+
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")]
164+
public void StoreElement_CreatesFileWithUserOnlyUnixFileMode()
165+
{
166+
WithUniqueTempDirectory(dirInfo =>
167+
{
168+
// Arrange
169+
var element = XElement.Parse("<element1 />");
170+
var repository = new FileSystemXmlRepository(dirInfo, NullLoggerFactory.Instance);
171+
172+
// Act
173+
repository.StoreElement(element, "friendly-name");
174+
175+
// Assert
176+
var fileInfo = Assert.Single(dirInfo.GetFiles());
177+
178+
//Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, fileInfo.UnixFileMode);
179+
var processStartInfo = new ProcessStartInfo
180+
{
181+
FileName = "ls",
182+
Arguments = $"-l {fileInfo.FullName}",
183+
RedirectStandardOutput = true,
184+
UseShellExecute = false
185+
};
186+
var process = Process.Start(processStartInfo);
187+
188+
Assert.NotNull(process);
189+
var output = process!.StandardOutput.ReadToEnd();
190+
process.WaitForExit();
191+
Assert.StartsWith("-rw-------", output);
192+
});
193+
}
194+
161195
/// <summary>
162196
/// Runs a test and cleans up the temp directory afterward.
163197
/// </summary>

‎src/Http/WebUtilities/src/FileBufferingReadStream.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Buffers;
66
using System.Diagnostics;
77
using System.IO;
8+
using System.Runtime.InteropServices;
89
using System.Threading;
910
using System.Threading.Tasks;
1011
using Microsoft.AspNetCore.Internal;
@@ -204,6 +205,14 @@ private Stream CreateTempFile()
204205
}
205206

206207
_tempFileName = Path.Combine(_tempFileDirectory, "ASPNETCORE_" + Guid.NewGuid().ToString() + ".tmp");
208+
209+
// Create a temp file with the correct Unix file mode before moving it to the assigned _tempFileName in the _tempFileDirectory.
210+
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
211+
{
212+
var tempTempFileName = Path.GetTempFileName();
213+
File.Move(tempTempFileName, _tempFileName);
214+
}
215+
207216
return new FileStream(_tempFileName, FileMode.Create, FileAccess.ReadWrite, FileShare.Delete, 1024 * 16,
208217
FileOptions.Asynchronous | FileOptions.DeleteOnClose | FileOptions.SequentialScan);
209218
}

‎src/Http/WebUtilities/src/FileBufferingWriteStream.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Buffers;
66
using System.Diagnostics;
77
using System.IO;
8+
using System.Runtime.InteropServices;
89
using System.Threading;
910
using System.Threading.Tasks;
1011
using Microsoft.AspNetCore.Internal;
@@ -224,6 +225,14 @@ private void EnsureFileStream()
224225
{
225226
var tempFileDirectory = _tempFileDirectoryAccessor();
226227
var tempFileName = Path.Combine(tempFileDirectory, "ASPNETCORE_" + Guid.NewGuid() + ".tmp");
228+
229+
// Create a temp file with the correct Unix file mode before moving it to the assigned tempFileName in the _tempFileDirectory.
230+
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
231+
{
232+
var tempTempFileName = Path.GetTempFileName();
233+
File.Move(tempTempFileName, tempFileName);
234+
}
235+
227236
FileStream = new FileStream(
228237
tempFileName,
229238
FileMode.Create,

‎src/Http/WebUtilities/test/FileBufferingReadStreamTests.cs

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33

44
using System;
55
using System.Buffers;
6+
using System.Diagnostics;
67
using System.IO;
78
using System.Text;
89
using System.Threading.Tasks;
10+
using Microsoft.AspNetCore.Testing;
911
using Moq;
1012
using Xunit;
1113

@@ -351,6 +353,47 @@ public async Task FileBufferingReadStream_UsingMemoryStream_RentsAndReturnsRente
351353
Assert.False(File.Exists(tempFileName));
352354
}
353355

356+
[ConditionalFact]
357+
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")]
358+
public void Read_BufferingContentToDisk_CreatesFileWithUserOnlyUnixFileMode()
359+
{
360+
var inner = MakeStream(1024 * 2);
361+
string tempFileName;
362+
using (var stream = new FileBufferingReadStream(inner, 1024, null, GetCurrentDirectory()))
363+
{
364+
var bytes = new byte[1024 * 2];
365+
var read0 = stream.Read(bytes, 0, bytes.Length);
366+
Assert.Equal(bytes.Length, read0);
367+
Assert.Equal(read0, stream.Length);
368+
Assert.Equal(read0, stream.Position);
369+
Assert.False(stream.InMemory);
370+
Assert.NotNull(stream.TempFileName);
371+
372+
var read1 = stream.Read(bytes, 0, bytes.Length);
373+
Assert.Equal(0, read1);
374+
375+
tempFileName = stream.TempFileName!;
376+
Assert.True(File.Exists(tempFileName));
377+
378+
//Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, File.GetUnixFileMode(tempFileName));
379+
var processStartInfo = new ProcessStartInfo
380+
{
381+
FileName = "ls",
382+
Arguments = $"-l {tempFileName}",
383+
RedirectStandardOutput = true,
384+
UseShellExecute = false
385+
};
386+
var process = Process.Start(processStartInfo);
387+
388+
Assert.NotNull(process);
389+
var output = process!.StandardOutput.ReadToEnd();
390+
process.WaitForExit();
391+
Assert.StartsWith("-rw-------", output);
392+
}
393+
394+
Assert.False(File.Exists(tempFileName));
395+
}
396+
354397
private static string GetCurrentDirectory()
355398
{
356399
return AppContext.BaseDirectory;

‎src/Http/WebUtilities/test/FileBufferingWriteStreamTests.cs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
using System.Linq;
88
using System.Text;
99
using System.Threading.Tasks;
10+
using Microsoft.AspNetCore.Testing;
1011
using Xunit;
12+
using System.Diagnostics;
1113

1214
namespace Microsoft.AspNetCore.WebUtilities
1315
{
@@ -370,6 +372,37 @@ public async Task DrainBufferAsync_WithContentInDisk_CopiesContentFromMemoryStre
370372
Assert.Equal(0, bufferingStream.Length);
371373
}
372374

375+
[ConditionalFact]
376+
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")]
377+
public void Write_BufferingContentToDisk_CreatesFileWithUserOnlyUnixFileMode()
378+
{
379+
// Arrange
380+
var input = new byte[] { 1, 2, 3, };
381+
using var bufferingStream = new FileBufferingWriteStream(memoryThreshold: 2, tempFileDirectoryAccessor: () => TempDirectory);
382+
bufferingStream.Write(input, 0, 2);
383+
384+
// Act
385+
bufferingStream.Write(input, 2, 1);
386+
387+
// Assert
388+
Assert.NotNull(bufferingStream.FileStream);
389+
390+
//Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, File.GetUnixFileMode(bufferingStream.FileStream.SafeFileHandle));
391+
var processStartInfo = new ProcessStartInfo
392+
{
393+
FileName = "ls",
394+
Arguments = $"-l {bufferingStream.FileStream!.Name}",
395+
RedirectStandardOutput = true,
396+
UseShellExecute = false
397+
};
398+
var process = Process.Start(processStartInfo);
399+
400+
Assert.NotNull(process);
401+
var output = process!.StandardOutput.ReadToEnd();
402+
process.WaitForExit();
403+
Assert.StartsWith("-rw-------", output);
404+
}
405+
373406
public void Dispose()
374407
{
375408
try

‎src/Shared/CertificateGeneration/CertificateManager.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,14 @@ public void ExportCertificate(X509Certificate2 certificate, string path, bool in
383383
throw;
384384
}
385385
}
386+
387+
// Create a temp file with the correct Unix file mode before moving it to the expected path.
388+
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
389+
{
390+
var tempFilename = Path.GetTempFileName();
391+
File.Move(tempFilename, path, overwrite: true);
392+
}
393+
386394
try
387395
{
388396
diagnostics?.Debug($"Writing exported certificate to path '{path}'.");
@@ -668,6 +676,7 @@ private static void RemoveCertificateTrustRule(X509Certificate2 certificate)
668676
try
669677
{
670678
var certBytes = certificate.Export(X509ContentType.Cert);
679+
671680
File.WriteAllBytes(certificatePath, certBytes);
672681
var processInfo = new ProcessStartInfo(
673682
MacOSRemoveCertificateTrustCommandLine,

0 commit comments

Comments
 (0)