Skip to content

Commit de4f35c

Browse files
yao-msftyao-msft
authored
Add Entra Id support in rest source (#258)
1 parent 05d4836 commit de4f35c

File tree

51 files changed

+1527
-535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1527
-535
lines changed

‎src/Microsoft.WindowsPackageManager.Rest/Utils/AzureFunctionHelper.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// -----------------------------------------------------------------------
1+
// -----------------------------------------------------------------------
22
// <copyright file="AzureFunctionHelper.cs" company="Microsoft Corporation">
33
// Copyright (c) Microsoft Corporation. Licensed under the MIT License.
44
// </copyright>
@@ -38,7 +38,7 @@ public static async Task<HttpResponseMessage> TriggerAzureFunctionAsync(
3838
string postRequestBody = null,
3939
Dictionary<string, string> headers = null)
4040
{
41-
// Create Post Request.
41+
// Create Request.
4242
HttpRequestMessage requestMessage = new HttpRequestMessage(httpMethod, azureFunctionURL);
4343
requestMessage.Headers.Add(FunctionKeyHeader, functionKey);
4444

‎src/WinGet.RestSource.AppConfig/WinGet.RestSource.AppConfig.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<!-- Component Governance fix Item Group. -->
5454
<ItemGroup>
5555
<!-- Remove when dependency resolving correctly picks up security fixed version-->
56-
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
5756
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
5857
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
5958
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />

‎src/WinGet.RestSource.Functions/Common/ActionResultHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static ApiObjectResult ProcessError(InternalRestError internalRestError)
5050
case ErrorConstants.ValidationFailureErrorCode:
5151
case ErrorConstants.HeadersAreNullErrorCode:
5252
case ErrorConstants.ServerVersionNotSupportedErrorCode:
53-
case ErrorConstants.ToManyContinuationTokensErrorCode:
53+
case ErrorConstants.TooManyContinuationTokensErrorCode:
5454
return CreateObjectResult(internalRestError, (int)HttpStatusCode.BadRequest);
5555

5656
case ErrorConstants.ForbiddenErrorCode:

‎src/WinGet.RestSource.Functions/Common/CertificateValidationHelper.cs

-188
This file was deleted.

‎src/WinGet.RestSource.Functions/InstallerFunctions.cs

+2-9
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace Microsoft.WinGet.RestSource.Functions
1212
using System.Threading.Tasks;
1313
using Microsoft.AspNetCore.Http;
1414
using Microsoft.AspNetCore.Mvc;
15+
using Microsoft.Azure.Cosmos.Linq;
1516
using Microsoft.Azure.WebJobs;
1617
using Microsoft.Azure.WebJobs.Extensions.Http;
1718
using Microsoft.Extensions.Logging;
@@ -69,8 +70,6 @@ public async Task<IActionResult> InstallerPostAsync(
6970
Dictionary<string, string> headers = null;
7071
try
7172
{
72-
CertificateValidationHelper.ValidateAuthentication(req, log);
73-
7473
// Parse Headers
7574
headers = HeaderProcessor.ToDictionary(req.Headers);
7675

@@ -133,8 +132,6 @@ public async Task<IActionResult> InstallerDeleteAsync(
133132

134133
try
135134
{
136-
CertificateValidationHelper.ValidateAuthentication(req, log);
137-
138135
// Parse Headers
139136
headers = HeaderProcessor.ToDictionary(req.Headers);
140137
await this.dataStore.DeleteInstaller(packageIdentifier, packageVersion, installerIdentifier);
@@ -192,8 +189,6 @@ public async Task<IActionResult> InstallerPutAsync(
192189

193190
try
194191
{
195-
CertificateValidationHelper.ValidateAuthentication(req, log);
196-
197192
// Parse Headers
198193
headers = HeaderProcessor.ToDictionary(req.Headers);
199194

@@ -251,7 +246,7 @@ public async Task<IActionResult> InstallerPutAsync(
251246
[FunctionName(FunctionConstants.InstallerGet)]
252247
public async Task<IActionResult> InstallerGetAsync(
253248
[HttpTrigger(
254-
AuthorizationLevel.Anonymous,
249+
AuthorizationLevel.Function,
255250
FunctionConstants.FunctionGet,
256251
Route = "packages/{packageIdentifier}/versions/{packageVersion}/installers/{installerIdentifier?}")]
257252
HttpRequest req,
@@ -265,8 +260,6 @@ public async Task<IActionResult> InstallerGetAsync(
265260

266261
try
267262
{
268-
CertificateValidationHelper.ValidateAuthentication(req, log);
269-
270263
// Parse Headers
271264
headers = HeaderProcessor.ToDictionary(req.Headers);
272265

‎src/WinGet.RestSource.Functions/LocaleFunctions.cs

+1-9
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ public async Task<IActionResult> LocalePostAsync(
6767

6868
try
6969
{
70-
CertificateValidationHelper.ValidateAuthentication(req, log);
71-
7270
// Parse Headers
7371
headers = HeaderProcessor.ToDictionary(req.Headers);
7472

@@ -131,8 +129,6 @@ public async Task<IActionResult> LocaleDeleteAsync(
131129

132130
try
133131
{
134-
CertificateValidationHelper.ValidateAuthentication(req, log);
135-
136132
// Parse Headers
137133
headers = HeaderProcessor.ToDictionary(req.Headers);
138134
await this.dataStore.DeleteLocale(packageIdentifier, packageVersion, packageLocale);
@@ -190,8 +186,6 @@ public async Task<IActionResult> LocalePutAsync(
190186

191187
try
192188
{
193-
CertificateValidationHelper.ValidateAuthentication(req, log);
194-
195189
// Parse Headers
196190
headers = HeaderProcessor.ToDictionary(req.Headers);
197191

@@ -249,7 +243,7 @@ public async Task<IActionResult> LocalePutAsync(
249243
[FunctionName(FunctionConstants.LocaleGet)]
250244
public async Task<IActionResult> LocaleGetAsync(
251245
[HttpTrigger(
252-
AuthorizationLevel.Anonymous,
246+
AuthorizationLevel.Function,
253247
FunctionConstants.FunctionGet,
254248
Route = "packages/{packageIdentifier}/versions/{packageVersion}/locales/{packageLocale?}")]
255249
HttpRequest req,
@@ -263,8 +257,6 @@ public async Task<IActionResult> LocaleGetAsync(
263257

264258
try
265259
{
266-
CertificateValidationHelper.ValidateAuthentication(req, log);
267-
268260
// Parse Headers
269261
headers = HeaderProcessor.ToDictionary(req.Headers);
270262

‎src/WinGet.RestSource.Functions/ManifestSearchFunctions.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// -----------------------------------------------------------------------
1+
// -----------------------------------------------------------------------
22
// <copyright file="ManifestSearchFunctions.cs" company="Microsoft Corporation">
33
// Copyright (c) Microsoft Corporation. Licensed under the MIT License.
44
// </copyright>
@@ -53,7 +53,7 @@ public ManifestSearchFunctions(IApiDataStore dataStore, IWinGetAppConfig appConf
5353
/// <returns>IActionResult.</returns>
5454
[FunctionName(FunctionConstants.ManifestSearchPost)]
5555
public async Task<IActionResult> ManifestSearchPostAsync(
56-
[HttpTrigger(AuthorizationLevel.Anonymous, FunctionConstants.FunctionPost, Route = "manifestSearch")]
56+
[HttpTrigger(AuthorizationLevel.Function, FunctionConstants.FunctionPost, Route = "manifestSearch")]
5757
HttpRequest req,
5858
ILogger log)
5959
{
@@ -65,8 +65,6 @@ public async Task<IActionResult> ManifestSearchPostAsync(
6565

6666
try
6767
{
68-
CertificateValidationHelper.ValidateAuthentication(req, log);
69-
7068
// Parse Headers
7169
headers = HeaderProcessor.ToDictionary(req.Headers);
7270
string continuationToken = headers.GetValueOrDefault(HeaderConstants.ContinuationToken);

‎src/WinGet.RestSource.Functions/PackageFunctions.cs

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// -----------------------------------------------------------------------
1+
// -----------------------------------------------------------------------
22
// <copyright file="PackageFunctions.cs" company="Microsoft Corporation">
33
// Copyright (c) Microsoft Corporation. Licensed under the MIT License.
44
// </copyright>
@@ -63,8 +63,6 @@ public async Task<IActionResult> PackagesPostAsync(
6363

6464
try
6565
{
66-
CertificateValidationHelper.ValidateAuthentication(req, log);
67-
6866
// Parse Headers
6967
headers = HeaderProcessor.ToDictionary(req.Headers);
7068

@@ -122,8 +120,6 @@ public async Task<IActionResult> PackageDeleteAsync(
122120

123121
try
124122
{
125-
CertificateValidationHelper.ValidateAuthentication(req, log);
126-
127123
// Parse Headers
128124
headers = HeaderProcessor.ToDictionary(req.Headers);
129125
await this.dataStore.DeletePackage(packageIdentifier);
@@ -174,8 +170,6 @@ public async Task<IActionResult> PackagesPutAsync(
174170

175171
try
176172
{
177-
CertificateValidationHelper.ValidateAuthentication(req, log);
178-
179173
// Parse Headers
180174
headers = HeaderProcessor.ToDictionary(req.Headers);
181175

@@ -232,7 +226,7 @@ public async Task<IActionResult> PackagesPutAsync(
232226
/// <returns>IActionResult.</returns>
233227
[FunctionName(FunctionConstants.PackageGet)]
234228
public async Task<IActionResult> PackagesGetAsync(
235-
[HttpTrigger(AuthorizationLevel.Anonymous, FunctionConstants.FunctionGet, Route = "packages/{packageIdentifier?}")]
229+
[HttpTrigger(AuthorizationLevel.Function, FunctionConstants.FunctionGet, Route = "packages/{packageIdentifier?}")]
236230
HttpRequest req,
237231
string packageIdentifier,
238232
ILogger log)
@@ -242,8 +236,6 @@ public async Task<IActionResult> PackagesGetAsync(
242236

243237
try
244238
{
245-
CertificateValidationHelper.ValidateAuthentication(req, log);
246-
247239
// Parse Headers
248240
headers = HeaderProcessor.ToDictionary(req.Headers);
249241

0 commit comments

Comments
 (0)