libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Show expiration date for certificates in Admin Console (#23025)

Browse source 
Closes #17743
This commit is contained in:
Thomas Darimont 2023-09-12 13:56:09 +02:00 committed by GitHub
parent b7d91eeaf5
commit 3908537254
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/org/keycloak/representations/idm/KeysMetadataRepresentation.java
View file

@ -61,6 +61,7 @@ public class KeysMetadataRepresentation {
private String publicKey;
private String certificate;
private KeyUse use;
private Long validTo;
public String getProviderId() {
return providerId;
@ -133,5 +134,13 @@ public class KeysMetadataRepresentation {
public void setUse(KeyUse use) {
this.use = use;
}
public Long getValidTo() {
return validTo;
}
public void setValidTo(Long validTo) {
this.validTo = validTo;
}
}
}

1
js/apps/admin-ui/public/locales/en/translation.json
View file

@ -1455,6 +1455,7 @@
"providerDescription": "Provider description",
"addProvider": "Add provider",
"publicKeys": "Public keys",
"validTo": "Valid to",
"keysFilter": {
"ACTIVE": "Active keys",
"PASSIVE": "Passive keys",

11
js/apps/admin-ui/src/realm-settings/keys/KeysListTab.tsx
View file

@ -27,6 +27,8 @@ import { toKeysTab } from "../routes/KeysTab";
import "../realm-settings-section.css";
import useFormatDate from "../../utils/useFormatDate";
const FILTER_OPTIONS = ["ACTIVE", "PASSIVE", "DISABLED"] as const;
type FilterType = (typeof FILTER_OPTIONS)[number];
@ -82,6 +84,7 @@ const SelectFilter = ({ onFilter }: SelectFilterProps) => {
export const KeysListTab = ({ realmComponents }: KeysListTabProps) => {
const { t } = useTranslation();
const navigate = useNavigate();
const formatDate = useFormatDate();
const [publicKey, setPublicKey] = useState("");
const [certificate, setCertificate] = useState("");
@ -180,6 +183,14 @@ export const KeysListTab = ({ realmComponents }: KeysListTabProps) => {
cellFormatters: [emptyFormatter()],
transforms: [cellWidth(10)],
},
{
name: "validTo",
displayKey: "validTo",
cellRenderer: ({ validTo }: KeyData) =>
validTo ? formatDate(new Date(validTo)) : "",
cellFormatters: [emptyFormatter()],
transforms: [cellWidth(10)],
},
{
name: "publicKeys",
displayKey: "realm-settings:publicKeys",

1
js/libs/keycloak-admin-client/src/defs/keyMetadataRepresentation.ts
View file

@ -15,4 +15,5 @@ export interface KeyMetadataRepresentation {
algorithm?: string;
publicKey?: string;
certificate?: string;
validTo?: string;
}

10
services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java
View file

@ -32,6 +32,8 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluato
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@ -88,8 +90,14 @@ public class KeyResource {
r.setType(key.getType());
r.setAlgorithm(key.getAlgorithmOrDefault());
r.setPublicKey(key.getPublicKey() != null ? PemUtils.encodeKey(key.getPublicKey()) : null);
r.setCertificate(key.getCertificate() != null ? PemUtils.encodeCertificate(key.getCertificate()) : null);
r.setUse(key.getUse());
X509Certificate cert = key.getCertificate();
if (cert != null) {
r.setCertificate(PemUtils.encodeCertificate(cert));
r.setValidTo(cert.getNotAfter() != null ? cert.getNotAfter().getTime() : null);
}
return r;
}
}