Skip to content

Commit 26775b3

Browse files
author
Hanzhang Zeng (Roger)
committed
Remove x-ms-site-restricted-token generation endpoint
1 parent 398f826 commit 26775b3

File tree

2 files changed

+0
-65
lines changed

2 files changed

+0
-65
lines changed

src/WebJobs.Script.WebHost/Controllers/HostController.cs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
using Microsoft.Azure.WebJobs.Script.WebHost.Filters;
2323
using Microsoft.Azure.WebJobs.Script.WebHost.Management;
2424
using Microsoft.Azure.WebJobs.Script.WebHost.Models;
25-
using Microsoft.Azure.WebJobs.Script.WebHost.Security;
2625
using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authorization;
2726
using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authorization.Policies;
2827
using Microsoft.Extensions.DependencyInjection;
@@ -268,28 +267,6 @@ public async Task<IActionResult> SetState([FromBody] string state)
268267
return Accepted();
269268
}
270269

271-
/// <summary>
272-
/// This endpoint generates a temporary x-ms-site-restricted-token for core tool
273-
/// to access KuduLite zipdeploy endpoint in Linux Consumption
274-
/// </summary>
275-
/// <returns>
276-
/// 200 on token generated
277-
/// 400 on non-Linux container environment
278-
/// </returns>
279-
[HttpGet]
280-
[Route("admin/host/token")]
281-
[Authorize(Policy = PolicyNames.AdminAuthLevel)]
282-
public IActionResult GetAdminToken()
283-
{
284-
if (!_environment.IsLinuxConsumption())
285-
{
286-
return BadRequest("Endpoint is only available when running in Linux Container");
287-
}
288-
289-
string requestHeaderToken = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(5));
290-
return Ok(requestHeaderToken);
291-
}
292-
293270
[HttpGet]
294271
[HttpPost]
295272
[Route("admin/warmup")]

test/WebJobs.Script.Tests/Controllers/Admin/HostControllerTests.cs

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Net;
99
using System.Threading;
1010
using System.Threading.Tasks;
11-
using Microsoft.AspNetCore.Authentication;
1211
using Microsoft.AspNetCore.Authorization;
1312
using Microsoft.AspNetCore.Mvc;
1413
using Microsoft.Azure.WebJobs.Host.Scale;
@@ -17,7 +16,6 @@
1716
using Microsoft.Azure.WebJobs.Script.Scale;
1817
using Microsoft.Azure.WebJobs.Script.WebHost.Controllers;
1918
using Microsoft.Azure.WebJobs.Script.WebHost.Management;
20-
using Microsoft.Azure.WebJobs.Script.WebHost.Security;
2119
using Microsoft.Extensions.Logging;
2220
using Microsoft.Extensions.Options;
2321
using Microsoft.WebJobs.Script.Tests;
@@ -103,46 +101,6 @@ public async Task SetState_Succeeds(string desiredState, ScriptHostState current
103101
}
104102
}
105103

106-
[Fact]
107-
public void GetAdminToken_Succeeds()
108-
{
109-
// Arrange
110-
_mockEnvironment.Setup(p => p.GetEnvironmentVariable(It.Is<string>(k => k == EnvironmentSettingNames.ContainerName))).Returns<string>(v => v = "ContainerName");
111-
112-
var key = TestHelpers.GenerateKeyBytes();
113-
var stringKey = TestHelpers.GenerateKeyHexString(key);
114-
using (new TestScopedEnvironmentVariable(EnvironmentSettingNames.WebSiteAuthEncryptionKey, stringKey))
115-
{
116-
// Act
117-
ObjectResult result = (ObjectResult)_hostController.GetAdminToken();
118-
HttpStatusCode resultStatus = (HttpStatusCode)result.StatusCode;
119-
string token = (string)result.Value;
120-
121-
// Assert
122-
Assert.Equal(HttpStatusCode.OK, resultStatus);
123-
Assert.True(SimpleWebTokenHelper.ValidateToken(token, new SystemClock()));
124-
}
125-
}
126-
127-
[Fact]
128-
public void GetAdminToken_Fails_NotLinuxContainer()
129-
{
130-
// Arrange
131-
_mockEnvironment.Setup(p => p.GetEnvironmentVariable(It.Is<string>(k => k == EnvironmentSettingNames.ContainerName))).Returns<string>(v => v = null);
132-
133-
var key = TestHelpers.GenerateKeyBytes();
134-
var stringKey = TestHelpers.GenerateKeyHexString(key);
135-
using (new TestScopedEnvironmentVariable(EnvironmentSettingNames.WebSiteAuthEncryptionKey, stringKey))
136-
{
137-
// Act
138-
ObjectResult result = (ObjectResult)_hostController.GetAdminToken();
139-
HttpStatusCode resultStatus = (HttpStatusCode)result.StatusCode;
140-
141-
// Assert
142-
Assert.Equal(HttpStatusCode.BadRequest, resultStatus);
143-
}
144-
}
145-
146104
[Fact]
147105
public async Task GetScaleStatus_RuntimeScaleModeEnabled_Succeeds()
148106
{

0 commit comments

Comments
 (0)