The OAuth2 client editor at /Client/Edit/{id} previously exposed 8
fields out of ~30 scalars and 10 collections on the IdentityServer8
Client entity. Editing the collections (RedirectUris, Scopes, Grant
Types, Cors Origins, IdP Restrictions, Claims, Properties, Secrets)
was either impossible or jammed into a single broken text input that
bound against an IEnumerable<string> property.
Restructure into per-collection subpages, each with its own
list/add/remove flow:
- RedirectUris /Client/EditRedirectUris/{id}
- PostLogoutRedirectUris /Client/EditPostLogoutRedirectUris/{id}
- Scopes /Client/EditScopes/{id}
- GrantTypes /Client/EditGrantTypes/{id}
- CorsOrigins /Client/EditCorsOrigins/{id}
- IdPRestrictions /Client/EditIdPRestrictions/{id}
- Claims /Client/EditClaims/{id}
- Properties /Client/EditProperties/{id}
- Secrets /Client/EditSecrets/{id}
Implementation:
- New partial class ClientController.Collections.cs with one
GET/Add/Remove trio per collection. Add/Remove dispatch through
generic helpers that handle the EF row + ClientId check.
- Shared _EditableStringList.cshtml partial consumed by the six
single-string-field collection pages. Uses reflection to pull
the value field and the row Id off the entity — avoids six
nearly-identical table+form copies.
- Claims / Properties / Secrets each have their own view because
they carry 2+ fields (Type+Value, Key+Value, or
Type+Value+Description+Expiration).
- Main Edit.cshtml enriched: ClientId/Id hidden, all scalar
fields split into fieldsets (Core, Security, Logout, Tokens,
Device flow, Tokens extra), nav links to the 9 subpages with
current row counts as badges.
- ClientController.Edit(int) GET now loads the client with all
navigations via LoadClientAsync so the Edit.cshtml nav badges
render real counts.
Field-correctness notes (verified by disassembling HigginsSoft
IdentityServer8.EntityFramework.Entities.Client 8.0.5-preview-net9):
- The property is PairWiseSubjectSalt, not PairwiseSubjectSalt
(capital W on 'Wise').
- CibaLifetime and PollingInterval do NOT exist on Client in this
IdentityServer8 version — those properties were a guess. The
Device flow fieldset contains DeviceCodeLifetime + UserCodeType
instead.
- AllowedIdentityTokenSigningAlgorithms and AllowAccessTokensViaBrowser
were missing from the original form and are now exposed.
- ConsentLifetime and UserSsoLifetime are int? (nullable); the form
binds them as plain int fields which accept empty strings.
Security:
- All new actions stay under [Authorize('AdministratorOnly')].
- Each Add/Remove takes an explicit id (Client.Id) and the row's
ClientId is checked on the server before any delete; a rowId
from another client returns NotFound.
Docs:
- doc/dev-tracking/client-editor-overhaul.md — inventory, status,
follow-up ideas (confirmation prompts, validation, MVC tests).
297 lines
10 KiB
C#
297 lines
10 KiB
C#
using IdentityServer8.EntityFramework.DbContexts;
|
|
using IdentityServer8.EntityFramework.Entities;
|
|
using IdentityServer8.EntityFramework.Stores;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.AspNetCore.Mvc.Rendering;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.Options;
|
|
using Yavsc.Models;
|
|
using Yavsc.Models.Auth;
|
|
using Yavsc.Server.Helpers;
|
|
|
|
namespace Yavsc.Controllers
|
|
{
|
|
[Authorize("AdministratorOnly")]
|
|
public partial class ClientController : Controller
|
|
{
|
|
private readonly ApplicationDbContext dbContext;
|
|
private readonly ClientStore clientStore;
|
|
private readonly SiteSettings siteSettings;
|
|
|
|
public ClientController(
|
|
ApplicationDbContext dbContext,
|
|
ClientStore clientStore, IOptions<SiteSettings> siteSettingsOptions
|
|
|
|
|
|
)
|
|
{
|
|
this.dbContext = dbContext;
|
|
this.clientStore = clientStore;
|
|
this.siteSettings = siteSettingsOptions.Value;
|
|
}
|
|
|
|
// GET: Client
|
|
public async Task<IActionResult> Index()
|
|
{
|
|
return View(await dbContext.Clients.Include(c => c.AllowedGrantTypes)
|
|
.Include(c => c.RedirectUris).ToListAsync());
|
|
}
|
|
|
|
// GET: Client/Details/5
|
|
public async Task<IActionResult> Details(int id)
|
|
{
|
|
|
|
Client client = await dbContext.Clients.Include(
|
|
c => c.ClientSecrets
|
|
).Include(c => c.AllowedGrantTypes)
|
|
.Include(c => c.RedirectUris)
|
|
.Include(c=>c.ClientSecrets)
|
|
.Include(c=>c.AllowedCorsOrigins)
|
|
.Include(c=>c.AllowedScopes)
|
|
.Include(c=>c.IdentityProviderRestrictions)
|
|
.Include(c=>c.PostLogoutRedirectUris)
|
|
.SingleAsync(m => m.Id == id);
|
|
if (client == null)
|
|
{
|
|
return NotFound();
|
|
}
|
|
return View(client);
|
|
}
|
|
|
|
// GET: Client/Create
|
|
public IActionResult Create()
|
|
{
|
|
SetAppTypesInputValues();
|
|
return View();
|
|
}
|
|
|
|
// POST: Client/Create
|
|
[HttpPost]
|
|
[ValidateAntiForgeryToken]
|
|
|
|
public async Task<IActionResult> Create(Client client)
|
|
{
|
|
if (ModelState.IsValid)
|
|
{
|
|
var model = await clientStore.FindClientByIdAsync(client.ClientId);
|
|
if (model != null)
|
|
{
|
|
ModelState.AddModelError("ClientId", "existent");
|
|
return BadRequest(ModelState);
|
|
}
|
|
|
|
dbContext.Clients.Add(client);
|
|
await dbContext.SaveChangesAsync(User.GetUserId());
|
|
|
|
dbContext.ClientRedirectUris.Add(new ClientRedirectUri
|
|
{
|
|
ClientId = client.Id,
|
|
RedirectUri = siteSettings.ExternalUrl
|
|
|
|
});
|
|
dbContext.ClientCorsOrigins.Add(new ClientCorsOrigin
|
|
{
|
|
ClientId = client.Id,
|
|
Origin = siteSettings.ExternalUrl
|
|
|
|
});
|
|
foreach (String credType in new String[] { "code", "client_credentials", "password" })
|
|
{
|
|
dbContext.ClientGrantTypes.Add(new ClientGrantType
|
|
{
|
|
ClientId = client.Id,
|
|
GrantType = credType
|
|
});
|
|
}
|
|
foreach (String scope in new String[] { "openid", "profile" })
|
|
{
|
|
dbContext.ClientScopes.Add(new ClientScope
|
|
{
|
|
ClientId = client.Id,
|
|
Scope = scope
|
|
});
|
|
}
|
|
|
|
await dbContext.SaveChangesAsync(User.GetUserId());
|
|
|
|
return RedirectToAction("Index");
|
|
}
|
|
SetAppTypesInputValues();
|
|
return View(client);
|
|
}
|
|
|
|
private void SetAppTypesInputValues()
|
|
{
|
|
IEnumerable<SelectListItem> types = new SelectListItem[] {
|
|
new SelectListItem {
|
|
Text = ApplicationTypes.JavaScript.ToString(),
|
|
Value = ((int) ApplicationTypes.JavaScript).ToString() },
|
|
new SelectListItem {
|
|
Text = ApplicationTypes.NativeConfidential.ToString(),
|
|
Value = ((int) ApplicationTypes.NativeConfidential).ToString()
|
|
}
|
|
};
|
|
ViewBag.AccessTokenType = types;
|
|
}
|
|
// GET: Client/Edit/5
|
|
public async Task<IActionResult> Edit(int id)
|
|
{
|
|
Client? client = await LoadClientAsync(id);
|
|
if (client is null)
|
|
{
|
|
return NotFound();
|
|
}
|
|
SetAppTypesInputValues();
|
|
return View(client);
|
|
}
|
|
|
|
// POST: Client/Edit/5
|
|
[HttpPost]
|
|
[ValidateAntiForgeryToken]
|
|
public async Task<IActionResult> Edit(Client client)
|
|
{
|
|
if (ModelState.IsValid)
|
|
{
|
|
|
|
if (client.ClientSecrets != null)
|
|
{
|
|
foreach (var secret in client.ClientSecrets)
|
|
{
|
|
dbContext.Update(secret);
|
|
}
|
|
}
|
|
dbContext.Update(client);
|
|
await dbContext.SaveChangesAsync();
|
|
return RedirectToAction("Index");
|
|
}
|
|
return View(client);
|
|
}
|
|
|
|
// GET: Client/Delete/5
|
|
[ActionName("Delete")]
|
|
public async Task<IActionResult> Delete(int id)
|
|
{
|
|
|
|
Client client = await dbContext.Clients.SingleOrDefaultAsync(m => m.Id == id);
|
|
if (client == null)
|
|
{
|
|
return NotFound();
|
|
}
|
|
|
|
return View(client);
|
|
}
|
|
|
|
// POST: Client/Delete/5
|
|
[HttpPost, ActionName("Delete")]
|
|
[ValidateAntiForgeryToken]
|
|
public async Task<IActionResult> DeleteConfirmed(int id)
|
|
{
|
|
Client client = await dbContext.Clients
|
|
.Include(client => client.ClientSecrets)
|
|
.SingleAsync(m => m.Id == id);
|
|
dbContext.Clients.Remove(client);
|
|
await dbContext.SaveChangesAsync();
|
|
return RedirectToAction("Index");
|
|
}
|
|
|
|
// GET: Client/RegenerateSecret/5
|
|
[ActionName("RegenerateSecret")]
|
|
public async Task<IActionResult> RegenerateSecretGet(int id)
|
|
{
|
|
Client client = await dbContext.Clients
|
|
.Include(c => c.ClientSecrets)
|
|
.SingleOrDefaultAsync(m => m.Id == id);
|
|
if (client == null)
|
|
{
|
|
return NotFound();
|
|
}
|
|
return View("RegenerateSecret", client);
|
|
}
|
|
|
|
// POST: Client/RegenerateSecret/5
|
|
[HttpPost, ActionName("RegenerateSecret")]
|
|
[ValidateAntiForgeryToken]
|
|
public async Task<IActionResult> RegenerateSecretConfirmed(int id)
|
|
{
|
|
Client client = await dbContext.Clients
|
|
.Include(c => c.ClientSecrets)
|
|
.SingleOrDefaultAsync(m => m.Id == id);
|
|
if (client == null)
|
|
{
|
|
return NotFound();
|
|
}
|
|
|
|
// Generate a fresh secret in clear text. We display it to the admin
|
|
// once, then IdentityServer will hash it on SaveChanges.
|
|
var newSecret = GenerateRawClientSecret();
|
|
var now = DateTime.UtcNow;
|
|
var expiration = now.AddDays(90);
|
|
|
|
// Replace: drop existing secrets and add the freshly generated one.
|
|
if (client.ClientSecrets != null && client.ClientSecrets.Count > 0)
|
|
{
|
|
dbContext.ClientSecrets.RemoveRange(client.ClientSecrets);
|
|
}
|
|
|
|
client.ClientSecrets = new List<ClientSecret>
|
|
{
|
|
new ClientSecret
|
|
{
|
|
ClientId = client.Id,
|
|
Client = client,
|
|
Type = "SharedSecret",
|
|
Value = newSecret,
|
|
Description = $"Regenerated on {now:yyyy-MM-dd HH:mm:ss} UTC",
|
|
Created = now,
|
|
Expiration = expiration
|
|
}
|
|
};
|
|
|
|
dbContext.Update(client);
|
|
await dbContext.SaveChangesAsync(User.GetUserId());
|
|
|
|
// Flash the secret through TempData so the next request can render
|
|
// it exactly once, then it is gone forever (IdentityServer stores
|
|
// it hashed).
|
|
TempData["NewClientSecret"] = newSecret;
|
|
TempData["NewClientSecretExpiresAt"] = expiration.ToString("u");
|
|
TempData["NewClientSecretClientName"] = client.ClientName ?? client.ClientId;
|
|
|
|
return RedirectToAction("ShowSecret", new { id = client.Id });
|
|
}
|
|
|
|
// GET: Client/ShowSecret/5
|
|
public IActionResult ShowSecret(int id)
|
|
{
|
|
var secret = TempData["NewClientSecret"] as string;
|
|
if (string.IsNullOrEmpty(secret))
|
|
{
|
|
// The one-shot window is closed. Refuse to render anything
|
|
// sensitive and bounce back to the details page.
|
|
return RedirectToAction("Details", new { id });
|
|
}
|
|
|
|
// TempData.Keep would persist to the next request; we deliberately
|
|
// do NOT keep it so the value cannot be replayed.
|
|
|
|
ViewBag.NewClientSecret = secret;
|
|
ViewBag.NewClientSecretExpiresAt = TempData["NewClientSecretExpiresAt"] as string;
|
|
ViewBag.NewClientSecretClientName = TempData["NewClientSecretClientName"] as string;
|
|
ViewBag.ClientId = id;
|
|
return View();
|
|
}
|
|
|
|
private static string GenerateRawClientSecret()
|
|
{
|
|
// 32 bytes => 43 url-safe base64 chars without padding. Enough entropy
|
|
// for a client secret; readable enough to copy/paste once.
|
|
var bytes = new byte[32];
|
|
System.Security.Cryptography.RandomNumberGenerator.Fill(bytes);
|
|
return Convert.ToBase64String(bytes)
|
|
.TrimEnd('=')
|
|
.Replace('+', '-')
|
|
.Replace('/', '_');
|
|
}
|
|
}
|
|
}
|