Skip to content

Commit 32564dc

Browse files
v-imohammadkhkh-ms
andauthored
Updated core tools to 3.22.0 (#3628)
* Updated core tools to 3.22.0 * Same fixes that we have done in v4.x branch. --------- Co-authored-by: [email protected] <[email protected]>
1 parent c21339d commit 32564dc

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

src/Azure.Functions.Cli/Actions/HostActions/Startup.cs

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Azure.Functions.Cli.Diagnostics;
44
using Azure.Functions.Cli.ExtensionBundle;
55
using Azure.Functions.Cli.Helpers;
6+
using Microsoft.AspNetCore.Authorization;
67
using Microsoft.AspNetCore.Builder;
78
using Microsoft.AspNetCore.Hosting;
89
using Microsoft.Azure.WebJobs.Script;
@@ -73,6 +74,8 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
7374
.AddScheme<ArmAuthenticationOptions, CliAuthenticationHandler<ArmAuthenticationOptions>>(ArmAuthenticationDefaults.AuthenticationScheme, _ => { });
7475
}
7576

77+
services.AddSingleton<IAuthorizationHandler, CoreToolsAuthorizationHandler>();
78+
7679
services.AddWebJobsScriptHostAuthorization();
7780

7881
services.AddMvc()

src/Azure.Functions.Cli/Actions/HostActions/WebHost/Security/CliAuthenticationHandler.cs

+13
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
using System.Security.Claims;
99
using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authentication;
1010
using Microsoft.Azure.WebJobs.Extensions.Http;
11+
using Microsoft.AspNetCore.Authorization;
12+
using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authorization;
13+
using Microsoft.Azure.WebJobs.Script.Description;
1114

1215
namespace Azure.Functions.Cli.Actions.HostActions.WebHost.Security
1316
{
@@ -33,4 +36,14 @@ protected override Task<AuthenticateResult> HandleAuthenticateAsync()
3336
return Task.FromResult(result);
3437
}
3538
}
39+
40+
public class CoreToolsAuthorizationHandler : AuthorizationHandler<FunctionAuthorizationRequirement, FunctionDescriptor>
41+
{
42+
protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, FunctionAuthorizationRequirement requirement, FunctionDescriptor resource)
43+
{
44+
context.Succeed(requirement);
45+
46+
return Task.CompletedTask;
47+
}
48+
}
3649
}

src/Azure.Functions.Cli/Azure.Functions.Cli.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<PackageReference Include="DotNetZip" Version="1.13.3" />
150150
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="2.2.0" />
151151
<PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage.Internal" Version="1.4.0" />
152-
<PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="3.21.1" />
152+
<PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="3.22.0" />
153153
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
154154
<PackageReference Include="YamlDotNet" Version="6.0.0" />
155155
</ItemGroup>

test/Azure.Functions.Cli.Tests/E2E/StartTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ await CliTester.Run(new RunConfiguration
531531
}, _output);
532532
}
533533

534-
[Theory]
534+
[Theory(Skip = "https://github.com/Azure/azure-functions-core-tools/issues/3644")]
535535
[InlineData("dotnet")]
536536
[InlineData("dotnet-isolated")]
537537
public async Task start_with_user_secrets(string language)

0 commit comments

Comments
 (0)