From abf468b295e2d3387e2674d74ee5ff29f3218e8a Mon Sep 17 00:00:00 2001 From: Peter Sorotokin Date: Fri, 22 Nov 2024 16:18:25 -0800 Subject: [PATCH] Added German PID VCT. Signed-off-by: Peter Sorotokin --- .../knowntypes/GermanPersonalID.kt | 289 ++++++++++++++++++ .../documenttype/knowntypes/SampleData.kt | 1 + .../funke/FunkeIssuingAuthorityState.kt | 2 + .../hardcoded/IssuingAuthorityState.kt | 2 + .../identity/wallet/server/VerifierServlet.kt | 2 + .../wallet/WalletApplication.kt | 2 + 6 files changed, 298 insertions(+) create mode 100644 identity-doctypes/src/commonMain/kotlin/com/android/identity/documenttype/knowntypes/GermanPersonalID.kt diff --git a/identity-doctypes/src/commonMain/kotlin/com/android/identity/documenttype/knowntypes/GermanPersonalID.kt b/identity-doctypes/src/commonMain/kotlin/com/android/identity/documenttype/knowntypes/GermanPersonalID.kt new file mode 100644 index 000000000..f8845bb09 --- /dev/null +++ b/identity-doctypes/src/commonMain/kotlin/com/android/identity/documenttype/knowntypes/GermanPersonalID.kt @@ -0,0 +1,289 @@ +package com.android.identity.documenttype.knowntypes + +import com.android.identity.cbor.CborArray +import com.android.identity.cbor.toDataItem +import com.android.identity.cbor.toDataItemFullDate +import com.android.identity.documenttype.DocumentAttributeType +import com.android.identity.documenttype.DocumentType +import com.android.identity.documenttype.Icon + +/** + * Object containing the metadata of the German ID Document Type. + * + * For now, this is a copy of EUPersonaID. + * + * TODO: read this (and other) VCTs for their URLs. + */ +object GermanPersonalID { + const val EUPID_VCT = "https://example.bmi.bund.de/credential/pid/1.0" + + /** + * Build the EU Personal ID Document Type. + */ + fun getDocumentType(): DocumentType { + return DocumentType.Builder("German Personal ID") + .addVcDocumentType(EUPID_VCT) + .addVcAttribute( + DocumentAttributeType.String, + "family_name", + "Family Name", + "Current last name(s), surname(s), or primary identifier of the PID holder", + Icon.PERSON, + SampleData.FAMILY_NAME.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "given_name", + "Given Names", + "Current first name(s), other name(s), or secondary identifier of the PID holder", + Icon.PERSON, + SampleData.GIVEN_NAME.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.Date, + "birthdate", + "Date of Birth", + "Day, month, and year on which the PID holder was born. If unknown, approximate date of birth.", + Icon.TODAY, + SampleData.birthDate.toDataItemFullDate() + ) + .addVcAttribute( + DocumentAttributeType.Number, + "age_in_years", + "Age in Years", + "The age of the PID holder in years", + Icon.TODAY, + SampleData.AGE_IN_YEARS.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.Number, + "age_birth_year", + "Year of Birth", + "The year when the PID holder was born", + Icon.TODAY, + SampleData.AGE_BIRTH_YEAR.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.Boolean, + "12", + "Older Than 12", + "Age over 12?", + Icon.TODAY, + SampleData.AGE_OVER.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.Boolean, + "14", + "Older Than 14", + "Age over 14?", + Icon.TODAY, + SampleData.AGE_OVER.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.Boolean, + "16", + "Older Than 16", + "Age over 16?", + Icon.TODAY, + SampleData.AGE_OVER_16.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.Boolean, + "18", + "Older Than 18", + "Age over 18?", + Icon.TODAY, + SampleData.AGE_OVER_18.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.Boolean, + "21", + "Older Than 21", + "Age over 21?", + Icon.TODAY, + SampleData.AGE_OVER_21.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.Boolean, + "65", + "Older Than 65", + "Age over 65?", + Icon.TODAY, + SampleData.AGE_OVER.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "birth_family_name", + "Family Name at Birth", + "Last name(s), surname(s), or primary identifier of the PID holder at birth", + Icon.PERSON, + SampleData.FAMILY_NAME_BIRTH.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "birth_place", + "Place of Birth", + "Country and municipality or state/province where the PID holder was born", + Icon.PLACE, + SampleData.BIRTH_PLACE.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.StringOptions(Options.COUNTRY_ISO_3166_1_ALPHA_2), + "birth_country", + "Country of Birth", + "The country where the PID User was born, as an Alpha-2 country code as specified in ISO 3166-1", + Icon.PLACE, + SampleData.BIRTH_COUNTRY.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "birth_state", + "State of Birth", + "The state, province, district, or local area where the PID User was born", + Icon.PLACE, + SampleData.BIRTH_STATE.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "birth_city", + "City of Birth", + "The municipality, city, town, or village where the PID User was born", + Icon.PLACE, + SampleData.BIRTH_CITY.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "street_address", + "Resident Address", + "The full address of the place where the PID holder currently resides and/or may be contacted (street/house number, municipality etc.)", + Icon.PLACE, + SampleData.RESIDENT_ADDRESS.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "locality", + "Resident City", + "The city where the PID holder currently resides", + Icon.PLACE, + SampleData.RESIDENT_CITY.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.StringOptions(Options.COUNTRY_ISO_3166_1_ALPHA_2), + "country", + "Resident Country", + "The country where the PID User currently resides, as an Alpha-2 country code as specified in ISO 3166-1", + Icon.PLACE, + SampleData.RESIDENT_COUNTRY.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "postal_code", + "Resident Postal Code", + "The postal code of the place where the PID holder currently resides", + Icon.PLACE, + SampleData.RESIDENT_POSTAL_CODE.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.IntegerOptions(Options.SEX_ISO_IEC_5218), + "gender", + "Gender", + "PID holder’s gender", + Icon.EMERGENCY, + SampleData.SEX_ISO218.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.ComplexType, + "nationalities", + "Nationality", + "List of Alpha-2 country codes as specified in ISO 3166-1, representing the nationality of the PID User.", + Icon.LANGUAGE, + CborArray.builder().add(SampleData.NATIONALITY.toDataItem()).end().build() + ) + .addVcAttribute( + DocumentAttributeType.Date, + "issuance_date", + "Date of Issue", + "Date (and possibly time) when the PID was issued.", + Icon.DATE_RANGE, + SampleData.issueDate.toDataItemFullDate() + ) + .addVcAttribute( + DocumentAttributeType.Date, + "expiry_date", + "Date of Expiry", + "Date (and possibly time) when the PID will expire.", + Icon.CALENDAR_CLOCK, + SampleData.expiryDate.toDataItemFullDate() + ) + .addVcAttribute( + DocumentAttributeType.String, + "issuing_authority", + "Issuing Authority", + "Name of the administrative authority that has issued this PID instance, or the " + + "ISO 3166 Alpha-2 country code of the respective Member State if there is" + + "no separate authority authorized to issue PIDs.", + Icon.ACCOUNT_BALANCE, + SampleData.ISSUING_AUTHORITY_EU_PID.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "document_number", + "Document Number", + "A number for the PID, assigned by the PID Provider.", + Icon.NUMBERS, + SampleData.DOCUMENT_NUMBER.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "administrative_number", + "Administrative Number", + "A number assigned by the PID Provider for audit control or other purposes.", + Icon.NUMBERS, + SampleData.ADMINISTRATIVE_NUMBER.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.String, + "issuing_jurisdiction", + "Issuing Jurisdiction", + "Country subdivision code of the jurisdiction that issued the PID, as defined in " + + "ISO 3166-2:2020, Clause 8. The first part of the code SHALL be the same " + + "as the value for issuing_country.", + Icon.ACCOUNT_BALANCE, + SampleData.ISSUING_JURISDICTION.toDataItem() + ) + .addVcAttribute( + DocumentAttributeType.StringOptions(Options.COUNTRY_ISO_3166_1_ALPHA_2), + "issuing_country", + "Issuing Country", + "Alpha-2 country code, as defined in ISO 3166-1, of the issuing authority’s " + + "country or territory", + Icon.ACCOUNT_BALANCE, + SampleData.ISSUING_COUNTRY.toDataItem() + ) + .addSampleRequest( + id = "age_over_18", + displayName = "Age Over 18", + vcClaims = listOf("18") + ) + .addSampleRequest( + id = "mandatory", + displayName = "Mandatory Data Elements", + vcClaims = listOf( + "family_name", + "given_name", + "birthdate", + "18", + "issuance_date", + "expiry_date", + "issuing_authority", + "issuing_country" + ) + ) + .addSampleRequest( + id = "full", + displayName = "All Data Elements", + vcClaims = listOf() + ) + .build() + } +} \ No newline at end of file diff --git a/identity-doctypes/src/commonMain/kotlin/com/android/identity/documenttype/knowntypes/SampleData.kt b/identity-doctypes/src/commonMain/kotlin/com/android/identity/documenttype/knowntypes/SampleData.kt index 76a14f6ea..f17a423e2 100644 --- a/identity-doctypes/src/commonMain/kotlin/com/android/identity/documenttype/knowntypes/SampleData.kt +++ b/identity-doctypes/src/commonMain/kotlin/com/android/identity/documenttype/knowntypes/SampleData.kt @@ -44,6 +44,7 @@ internal object SampleData { val portraitCaptureDate = LocalDate.parse("2020-03-14") const val AGE_IN_YEARS = 53 const val AGE_BIRTH_YEAR = 1971 + const val AGE_OVER = true // Generic "age over" value const val AGE_OVER_13 = true const val AGE_OVER_16 = true const val AGE_OVER_18 = true diff --git a/identity-issuance/src/main/java/com/android/identity/issuance/funke/FunkeIssuingAuthorityState.kt b/identity-issuance/src/main/java/com/android/identity/issuance/funke/FunkeIssuingAuthorityState.kt index dcee45b2d..539ba4d82 100644 --- a/identity-issuance/src/main/java/com/android/identity/issuance/funke/FunkeIssuingAuthorityState.kt +++ b/identity-issuance/src/main/java/com/android/identity/issuance/funke/FunkeIssuingAuthorityState.kt @@ -13,6 +13,7 @@ import com.android.identity.documenttype.DocumentTypeRepository import com.android.identity.documenttype.knowntypes.DrivingLicense import com.android.identity.documenttype.knowntypes.EUCertificateOfResidence import com.android.identity.documenttype.knowntypes.EUPersonalID +import com.android.identity.documenttype.knowntypes.GermanPersonalID import com.android.identity.documenttype.knowntypes.PhotoID import com.android.identity.documenttype.knowntypes.UtopiaNaturalization import com.android.identity.flow.annotation.FlowJoin @@ -183,6 +184,7 @@ class FunkeIssuingAuthorityState( val documentTypeRepository = DocumentTypeRepository().apply { addDocumentType(EUPersonalID.getDocumentType()) + addDocumentType(GermanPersonalID.getDocumentType()) addDocumentType(DrivingLicense.getDocumentType()) addDocumentType(PhotoID.getDocumentType()) addDocumentType(EUCertificateOfResidence.getDocumentType()) diff --git a/identity-issuance/src/main/java/com/android/identity/issuance/hardcoded/IssuingAuthorityState.kt b/identity-issuance/src/main/java/com/android/identity/issuance/hardcoded/IssuingAuthorityState.kt index 894b122ef..b0ba4c7c8 100644 --- a/identity-issuance/src/main/java/com/android/identity/issuance/hardcoded/IssuingAuthorityState.kt +++ b/identity-issuance/src/main/java/com/android/identity/issuance/hardcoded/IssuingAuthorityState.kt @@ -26,6 +26,7 @@ import com.android.identity.documenttype.DocumentType import com.android.identity.documenttype.DocumentTypeRepository import com.android.identity.documenttype.knowntypes.DrivingLicense import com.android.identity.documenttype.knowntypes.EUPersonalID +import com.android.identity.documenttype.knowntypes.GermanPersonalID import com.android.identity.documenttype.knowntypes.PhotoID import com.android.identity.flow.annotation.FlowJoin import com.android.identity.flow.annotation.FlowMethod @@ -158,6 +159,7 @@ class IssuingAuthorityState( // TODO: calling app should pass in DocumentTypeRepository, we shouldn't create it here val documentTypeRepository = DocumentTypeRepository().apply { addDocumentType(DrivingLicense.getDocumentType()) + addDocumentType(GermanPersonalID.getDocumentType()) addDocumentType(EUPersonalID.getDocumentType()) addDocumentType(PhotoID.getDocumentType()) } diff --git a/server/src/main/java/com/android/identity/wallet/server/VerifierServlet.kt b/server/src/main/java/com/android/identity/wallet/server/VerifierServlet.kt index 9ef3ec042..18c0840f0 100644 --- a/server/src/main/java/com/android/identity/wallet/server/VerifierServlet.kt +++ b/server/src/main/java/com/android/identity/wallet/server/VerifierServlet.kt @@ -26,6 +26,7 @@ import com.android.identity.documenttype.DocumentWellKnownRequest import com.android.identity.documenttype.knowntypes.DrivingLicense import com.android.identity.documenttype.knowntypes.EUCertificateOfResidence import com.android.identity.documenttype.knowntypes.EUPersonalID +import com.android.identity.documenttype.knowntypes.GermanPersonalID import com.android.identity.documenttype.knowntypes.PhotoID import com.android.identity.documenttype.knowntypes.UtopiaNaturalization import com.android.identity.flow.handler.FlowNotifications @@ -312,6 +313,7 @@ class VerifierServlet : BaseHttpServlet() { val repo = DocumentTypeRepository() repo.addDocumentType(DrivingLicense.getDocumentType()) repo.addDocumentType(EUPersonalID.getDocumentType()) + repo.addDocumentType(GermanPersonalID.getDocumentType()) repo.addDocumentType(PhotoID.getDocumentType()) repo.addDocumentType(EUCertificateOfResidence.getDocumentType()) repo.addDocumentType(UtopiaNaturalization.getDocumentType()) diff --git a/wallet/src/main/java/com/android/identity_credential/wallet/WalletApplication.kt b/wallet/src/main/java/com/android/identity_credential/wallet/WalletApplication.kt index a65351cfc..ca5dc35df 100644 --- a/wallet/src/main/java/com/android/identity_credential/wallet/WalletApplication.kt +++ b/wallet/src/main/java/com/android/identity_credential/wallet/WalletApplication.kt @@ -36,6 +36,7 @@ import com.android.identity.documenttype.knowntypes.DrivingLicense import com.android.identity.documenttype.knowntypes.EUPersonalID import com.android.identity.crypto.X509Cert import com.android.identity.documenttype.knowntypes.EUCertificateOfResidence +import com.android.identity.documenttype.knowntypes.GermanPersonalID import com.android.identity.documenttype.knowntypes.PhotoID import com.android.identity.documenttype.knowntypes.UtopiaNaturalization import com.android.identity.issuance.DocumentExtensions.documentConfiguration @@ -132,6 +133,7 @@ class WalletApplication : Application() { documentTypeRepository = DocumentTypeRepository() documentTypeRepository.addDocumentType(DrivingLicense.getDocumentType()) documentTypeRepository.addDocumentType(EUPersonalID.getDocumentType()) + documentTypeRepository.addDocumentType(GermanPersonalID.getDocumentType()) documentTypeRepository.addDocumentType(PhotoID.getDocumentType()) documentTypeRepository.addDocumentType(EUCertificateOfResidence.getDocumentType()) documentTypeRepository.addDocumentType(UtopiaNaturalization.getDocumentType())