Skip to content
Open
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 108 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<IdentityDependencyVersion>6.35.0</IdentityDependencyVersion>
</PropertyGroup>

<!-- Azure packages -->
<ItemGroup>
<PackageVersion Include="Azure.Core" Version="1.45.0" />
<PackageVersion Include="Azure.Data.Tables" Version="12.8.3" />
<PackageVersion Include="Azure.Identity" Version="1.11.4" />
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0-beta.2" />
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageVersion Include="Microsoft.Azure.AppService.Middleware.Functions" Version="1.5.5" />
<PackageVersion Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.3.20240307.67" />
<PackageVersion Include="Microsoft.Azure.Functions.Platform.Metrics.LinuxConsumption" Version="1.0.5" />
<PackageVersion Include="Microsoft.Azure.Storage.File" Version="11.1.7" />
<PackageVersion Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.91-alpha" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.1" />
</ItemGroup>

<!-- AspNetCore Packages -->
<ItemGroup>
<PackageVersion Include="Grpc.AspNetCore" Version="2.55.0" />
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.8" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
</ItemGroup>

<!-- Microsoft packages -->
<ItemGroup>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.3.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="$(IdentityDependencyVersion)" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityDependencyVersion)" />
<PackageVersion Include="Microsoft.Security.Utilities" Version="1.3.0" />
<PackageVersion Include="NuGet.ProjectModel" Version="5.11.6" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.0.1" />
</ItemGroup>

<!-- WebJobs packages -->
<ItemGroup>
<PackageVersion Include="Microsoft.Azure.WebJobs" Version="3.0.41" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Rpc.Core" Version="3.0.37" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions" Version="5.2.0-12287" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.2.0" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Timers.Storage" Version="1.0.0-beta.1" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Script.Abstractions" Version="1.0.4-preview" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.42-12121" />
</ItemGroup>

<!-- Telemetry packages -->
<ItemGroup>
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.22.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.22.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.7" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
</ItemGroup>

<!-- System packages -->
<ItemGroup>
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
<PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="$(IdentityDependencyVersion)" />
<PackageVersion Include="System.IO.Abstractions" Version="2.1.0.227" />
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageVersion Include="System.Memory.Data" Version="8.0.1" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
<PackageVersion Include="System.Reactive.Linq" Version="5.0.0" />
<PackageVersion Include="System.Reactive.Core" Version="5.0.0" />
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="4.7.1" />
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
</ItemGroup>

<!-- Other packages -->
<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
<PackageVersion Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<!-- Global packages -->
<ItemGroup>
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
</ItemGroup>

</Project>
27 changes: 14 additions & 13 deletions eng/build/Engineering.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,12 @@
<WorkersProps>$(EngBuildRoot)Workers.props</WorkersProps>
</PropertyGroup>

<PropertyGroup>
<!-- Nuget audit as warnings only, even in TreatWarningsAsErrors. -->
<!-- Except for in CI, critical will fail the build. -->
<WarningsNotAsErrors>$(WarningsNotAsErrors)NU1901;NU1902;NU1903;</WarningsNotAsErrors>
<WarningsNotAsErrors Condition="'$(CI)' == 'false'">$(WarningsNotAsErrors)NU1904;</WarningsNotAsErrors>
<WarningsAsErrors Condition="'$(CI)' == 'true'">$(WarningsAsErrors)NU1904;</WarningsAsErrors>
<NuGetAuditLevel>moderate</NuGetAuditLevel> <!-- warn on moderate severity only. -->
<NuGetAuditMode>all</NuGetAuditMode> <!-- audit transitive dependencies. -->
</PropertyGroup>

<PropertyGroup>
<LangVersion>latest</LangVersion>
<AssemblyOriginatorKeyFile>$(EngResourceRoot)key.snk</AssemblyOriginatorKeyFile>
<CodeAnalysisRuleSet>$(RepoRoot)src.ruleset</CodeAnalysisRuleSet>
<NoWarn>$(NoWarn);NU1701;NU5104</NoWarn>
<!-- TODO: add package source mapping and remove NU1507 suppression -->
<NoWarn>$(NoWarn);NU1701;NU5104;NU1507</NoWarn>
<DebugType>embedded</DebugType>
<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile><!-- https://github.com/dotnet/runtime/issues/54684 -->
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
Expand All @@ -30,12 +21,22 @@
<AdditionalFiles Include="$(RepoRoot)stylecop.json" Link="stylecop.json" />
</ItemGroup>

<Import Project="$(MSBuildThisFileDirectory)Release.props" />

<!-- To use PlaceholderSimulation:
1. Set env variable PlaceholderSimulation=true
2. OR build with -p:PlaceholderSimulation=true
-->
<Import Project="$(MSBuildThisFileDirectory)PlaceholderSimulation.props" Condition="'$(PlaceholderSimulation)' == 'true'"/>
<Import Project="$(MSBuildThisFileDirectory)Release.props" />

<!-- Run after Release.props, which sets the CI values-->
<PropertyGroup>
<!-- Nuget audit as warnings only, even in TreatWarningsAsErrors. -->
<!-- Except for in CI, critical will fail the build. -->
<WarningsNotAsErrors>$(WarningsNotAsErrors)NU1901;NU1902;NU1903;</WarningsNotAsErrors>
<WarningsNotAsErrors Condition="'$(CI)' == 'false'">$(WarningsNotAsErrors)NU1904;</WarningsNotAsErrors>
<WarningsAsErrors Condition="'$(CI)' == 'true'">$(WarningsAsErrors)NU1904;</WarningsAsErrors>
<NuGetAuditLevel>moderate</NuGetAuditLevel> <!-- warn on moderate severity only. -->
<NuGetAuditMode>all</NuGetAuditMode> <!-- audit transitive dependencies. -->
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion eng/build/Workers.Dotnet.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" Version="1.0.12" />
<PackageReference Include="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" VersionOverride="1.0.12" />
</ItemGroup>

<Target Name="CleanDotnetWorkerFiles" BeforeTargets="AssignTargetPaths" Condition="'$(RuntimeIdentifier)' != ''">
Expand Down
2 changes: 1 addition & 1 deletion eng/build/Workers.Java.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="2.19.2" />
<PackageReference Include="Microsoft.Azure.Functions.JavaWorker" VersionOverride="2.19.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion eng/build/Workers.Node.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="3.10.1" />
<PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" VersionOverride="3.10.1" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions eng/build/Workers.Powershell.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.0" Version="4.0.3148" />
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.2" Version="4.0.4025" />
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.4" Version="4.0.4206" />
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.0" VersionOverride="4.0.3148" />
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.2" VersionOverride="4.0.4025" />
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.4" VersionOverride="4.0.4206" />
</ItemGroup>

<Target Name="RemovePowershellWorkerRuntimes" BeforeTargets="AssignTargetPaths" Condition="'$(RuntimeIdentifier)' != ''">
Expand Down
2 changes: 1 addition & 1 deletion eng/build/Workers.Python.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<ItemGroup>
<!-- Python worker does not ship with the host for windows. -->
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="4.38.0" Condition="!$(RuntimeIdentifier.StartsWith('win'))" />
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" VersionOverride="4.38.0" Condition="!$(RuntimeIdentifier.StartsWith('win'))" />
</ItemGroup>

</Project>
26 changes: 13 additions & 13 deletions perf/WebJobs.Script.Benchmarks/AuthUtilityBenchmarks.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.

using BenchmarkDotNet.Attributes;
using Microsoft.Azure.WebJobs.Extensions.Http;
using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authentication;
using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authorization;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using BenchmarkDotNet.Attributes;
using Microsoft.Azure.WebJobs.Extensions.Http;
using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authentication;
using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authorization;

namespace Microsoft.Azure.WebJobs.Script.Benchmarks
{
public class AuthUtilityBenchmarks
{
private ClaimsPrincipal Principal;
private ClaimsPrincipal _principal;

private static List<Claim> TotallyRandomClaims { get; } = new List<Claim>()
{
new Claim(SecurityConstants.AuthLevelKeyNameClaimType, "test1"),
Expand All @@ -28,29 +29,29 @@ public class AuthUtilityBenchmarks
};

[Params(null, "code")]
public string KeyName;
public string KeyName { get; set; }

[Params(0, 4, 8)]
public int ClaimsCount;
public int ClaimsCount { get; set; }

[GlobalSetup]
public void Setup()
{
var identity = new ClaimsIdentity(TotallyRandomClaims.Take(ClaimsCount));
Principal = new ClaimsPrincipal(identity);
_principal = new ClaimsPrincipal(identity);
}

[Benchmark(Baseline = true)]
public bool PrincipalHasAuthLevelClaim() =>
AuthUtility.PrincipalHasAuthLevelClaim(Principal, AuthorizationLevel.Function);
AuthUtility.PrincipalHasAuthLevelClaim(_principal, AuthorizationLevel.Function);

[Benchmark]
public bool PrincipalHasAuthLevelClaimNoArray() =>
PrincipalHasAuthLevelClaimNoArray(Principal, AuthorizationLevel.Function);
PrincipalHasAuthLevelClaimNoArray(_principal, AuthorizationLevel.Function);

[Benchmark]
public bool PrincipalHasAuthLevelClaimHasClaim() =>
PrincipalHasAuthLevelClaimHasClaim(Principal, AuthorizationLevel.Function);
PrincipalHasAuthLevelClaimHasClaim(_principal, AuthorizationLevel.Function);

public static bool PrincipalHasAuthLevelClaimNoArray(ClaimsPrincipal principal, AuthorizationLevel requiredLevel, string keyName = null)
{
Expand Down Expand Up @@ -107,8 +108,7 @@ public static bool PrincipalHasAuthLevelClaimHasClaim(ClaimsPrincipal principal,

return principal.HasClaim(c => c.Type == SecurityConstants.AuthLevelClaimType
&& (c.Value == nameof(AuthorizationLevel.Admin)
|| (c.Value == levelString && (keyName == null || string.Equals(principal.FindFirstValue(SecurityConstants.AuthLevelKeyNameClaimType), keyName, StringComparison.OrdinalIgnoreCase)))
));
|| (c.Value == levelString && (keyName == null || string.Equals(principal.FindFirstValue(SecurityConstants.AuthLevelKeyNameClaimType), keyName, StringComparison.OrdinalIgnoreCase)))));
}
}
}
Loading
Loading