From 6b187dda3961f8f05cdcf99c7d7d0aadb3995014 Mon Sep 17 00:00:00 2001 From: ase-101 Date: Wed, 31 Jan 2024 21:07:09 +0530 Subject: [PATCH 1/3] Update esignet-default.properties Signed-off-by: ase-101 --- esignet-default.properties | 161 +++++++++++++++++++++++++------------ 1 file changed, 109 insertions(+), 52 deletions(-) diff --git a/esignet-default.properties b/esignet-default.properties index bbe162abeae..cbb4d895d43 100644 --- a/esignet-default.properties +++ b/esignet-default.properties @@ -398,7 +398,7 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': ## ---------------------------------------------- VCI ------------------------------------------------------------------ # Used to verify audience in the PoP JWT -mosip.esignet.vci.identifier=${mosip.esignet.domain.url}${server.servlet.path} +mosip.esignet.vci.identifier=${mosip.esignet.domain.url} mosip.esignet.vci.authn.filter-urls={ '${server.servlet.path}/vci/credential' } # Change this if the VCI is used with different OAUTH2.0 server mosip.esignet.vci.authn.issuer-uri=${mosip.esignet.discovery.issuer-id} @@ -407,57 +407,114 @@ mosip.esignet.vci.authn.jwk-set-uri=${mosip.esignet.jwks-uri} mosip.esignet.vci.authn.allowed-audiences={ '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential' } mosip.esignet.cnonce-expire-seconds=40 -mosip.esignet.vci.supported.jwt-proof-alg={'RS256'} -mosip.esignet.vci.key-values={ 'credential_issuer': '${mosip.esignet.domain.url}', \ - 'credential_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', \ - 'credentials_supported': {{\ - 'format': 'ldp_vc',\ - 'id': 'MockVerifiableCredential', \ - 'scope' : 'mock_identity_vc_ldp',\ - 'cryptographic_binding_methods_supported': {'did:jwk'},\ - 'cryptographic_suites_supported': {'RsaSignature2018'},\ - 'proof_types_supported': {'jwt'},\ - 'credential_definition': {\ - 'type': {'VerifiableCredential'},\ - 'credentialSubject': {\ - 'name': { 'display': {{'name': 'Given Name', 'locale': 'en' }}}, \ - 'age': { 'display': {{ 'name': 'Age', 'locale': 'en'}}}\ - }},\ - 'display': {{'name': 'Mock Verifiable Credential by e-Signet', \ - 'locale': 'en', \ - 'logo': {'url': '${mosip.esignet.domain.url}/logo.png',\ - 'alt_text': 'a square logo of a MOSIP'},\ - 'background_color': '#12107c',\ - 'text_color': '#FFFFFF'}}\ - \ },{\ - 'format': 'ldp_vc',\ - 'id': 'MOSIPVerifiableCredential', \ - 'scope' : 'mosip_identity_vc_ldp',\ - 'cryptographic_binding_methods_supported': {'did:jwk'},\ - 'cryptographic_suites_supported': {'RsaSignature2018'},\ - 'proof_types_supported': {'jwt'},\ - 'credential_definition': {\ - 'type': {'VerifiableCredential'},\ - 'credentialSubject': {\ - 'fullName': { 'display': {{'name': 'Full Name', 'locale': 'en' }}},\ - 'phone': { 'display': {{'name': 'Phone Number', 'locale': 'en' }}},\ - 'dateOfBirth': { 'display': {{'name': 'DOB', 'locale': 'en' }}},\ - 'gender': { 'display': {{'name': 'Gender', 'locale': 'en' }}},\ - 'residenceStatus': { 'display': {{'name': 'Residence Status', 'locale': 'en' }}},\ - 'email': { 'display': {{'name': 'Email Id', 'locale': 'en' }}},\ - 'region': { 'display': {{'name': 'Region', 'locale': 'en' }}},\ - 'province': { 'display': {{'name': 'Province', 'locale': 'en' }}},\ - 'city': { 'display': {{'name': 'City', 'locale': 'en' }}},\ - 'postalCode': { 'display': {{'name': 'Postal Code', 'locale': 'en' }}}\ - }},\ - 'display': {{'name': 'MOSIP Identity Verifiable Credential', \ - 'locale': 'en', \ - 'logo': {'url': '${mosip.esignet.domain.url}/logo.png',\ - 'alt_text': 'a square logo of a MOSIP'},\ - 'background_color': '#12107c',\ - 'text_color': '#FFFFFF'}}\ - \ }},\ - 'display': {{'name': 'MOSIP', 'locale': 'en'}}\ +mosip.esignet.vci.supported.jwt-proof-alg={'RS256','PS256'} +mosip.esignet.vci.key-values={\ + 'v11' : { \ + 'credential_issuer': '${mosip.esignet.vci.identifier}', \ + 'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/vci/credential', \ + 'credentials_supported': {\ + {\ + 'format': 'ldp_vc',\ + 'id': 'MockVerifiableCredential_ldp', \ + 'scope' : 'mock_identity_vc_ldp',\ + 'cryptographic_binding_methods_supported': {'did:jwk'},\ + 'cryptographic_suites_supported': {'RsaSignature2018'},\ + 'proof_types_supported': {'jwt'},\ + 'credential_definition': {\ + 'type': {'VerifiableCredential','MockVerifiableCredential'},\ + 'credentialSubject': {\ + 'name': { 'display': {{'name': 'Given Name', 'locale': 'en' }}}, \ + 'age': { 'display': {{ 'name': 'Age', 'locale': 'en'}}}\ + }\ + },\ + 'display': {{'name': 'Mock Verifiable Credential by e-Signet', \ + 'locale': 'en', \ + 'logo': {'url': '${mosipbox.public.url}/logo.png', 'alt_text': 'a square logo of a MOSIP'},\ + 'background_color': '#12107c',\ + 'text_color': '#FFFFFF'}}\ + },\ + {\ + 'format': 'ldp_vc',\ + 'id': 'MOSIPVerifiableCredential', \ + 'scope' : 'mosip_identity_vc_ldp',\ + 'cryptographic_binding_methods_supported': {'did:jwk'},\ + 'cryptographic_suites_supported': {'RsaSignature2018'},\ + 'proof_types_supported': {'jwt'},\ + 'credential_definition': {\ + 'type': {'VerifiableCredential','MOSIPVerifiableCredential'},\ + 'credentialSubject': {\ + 'fullName': { 'display': {{'name': 'Full Name', 'locale': 'en' }}},\ + 'phone': { 'display': {{'name': 'Phone Number', 'locale': 'en' }}},\ + 'dateOfBirth': { 'display': {{'name': 'DOB', 'locale': 'en' }}},\ + 'gender': { 'display': {{'name': 'Gender', 'locale': 'en' }}},\ + 'residenceStatus': { 'display': {{'name': 'Residence Status', 'locale': 'en' }}},\ + 'email': { 'display': {{'name': 'Email Id', 'locale': 'en' }}},\ + 'region': { 'display': {{'name': 'Region', 'locale': 'en' }}},\ + 'province': { 'display': {{'name': 'Province', 'locale': 'en' }}},\ + 'city': { 'display': {{'name': 'City', 'locale': 'en' }}},\ + 'postalCode': { 'display': {{'name': 'Postal Code', 'locale': 'en' }}}\ + }\ + },\ + 'display': {{'name': 'MOSIP Verifiable Credential by e-Signet', \ + 'locale': 'en', \ + 'logo': {'url': '${mosipbox.public.url}/logo.png','alt_text': 'a square logo of a MOSIP'},\ + 'background_color': '#12107c',\ + 'text_color': '#FFFFFF'}}\ + }\ + }\ + },\ + 'latest' : {\ + 'credential_issuer': '${mosip.esignet.vci.identifier}', \ + 'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/vci/credential', \ + 'display': {{'name': 'e-Signet', 'locale': 'en'}},\ + 'credentials_supported' : { \ + "MockVerifiableCredential_ldp" : {\ + 'format': 'ldp_vc',\ + 'scope' : 'mock_identity_vc_ldp',\ + 'cryptographic_binding_methods_supported': {'did:jwk'},\ + 'cryptographic_suites_supported': {'RsaSignature2018'},\ + 'proof_types_supported': {'jwt'},\ + 'credential_definition': {\ + 'type': {'VerifiableCredential','MockVerifiableCredential'},\ + 'credentialSubject': {\ + 'name': { 'display': {{'name': 'Given Name', 'locale': 'en' }}}, \ + 'age': { 'display': {{ 'name': 'Age', 'locale': 'en'}}}\ + }},\ + 'display': {{'name': 'Mock Verifiable Credential by e-Signet', \ + 'locale': 'en', \ + 'logo': {'url': '${mosipbox.public.url}/logo.png',\ + 'alt_text': 'a square logo of a MOSIP'},\ + 'background_color': '#12107c',\ + 'text_color': '#FFFFFF'}}\ + }, \ + 'MOSIPVerifiableCredential_ldp' : {\ + 'format': 'ldp_vc',\ + 'scope' : 'mosip_identity_vc_ldp',\ + 'cryptographic_binding_methods_supported': {'did:jwk'},\ + 'cryptographic_suites_supported': {'RsaSignature2018'},\ + 'proof_types_supported': {'jwt'},\ + 'credential_definition': {\ + 'type': {'VerifiableCredential','MOSIPVerifiableCredential'},\ + 'credentialSubject': {\ + 'fullName': { 'display': {{'name': 'Full Name', 'locale': 'en' }}},\ + 'phone': { 'display': {{'name': 'Phone Number', 'locale': 'en' }}},\ + 'dateOfBirth': { 'display': {{'name': 'DOB', 'locale': 'en' }}},\ + 'gender': { 'display': {{'name': 'Gender', 'locale': 'en' }}},\ + 'residenceStatus': { 'display': {{'name': 'Residence Status', 'locale': 'en' }}},\ + 'email': { 'display': {{'name': 'Email Id', 'locale': 'en' }}},\ + 'region': { 'display': {{'name': 'Region', 'locale': 'en' }}},\ + 'province': { 'display': {{'name': 'Province', 'locale': 'en' }}},\ + 'city': { 'display': {{'name': 'City', 'locale': 'en' }}},\ + 'postalCode': { 'display': {{'name': 'Postal Code', 'locale': 'en' }}}\ + }},\ + 'display': {{'name': 'MOSIP Verifiable Credential by e-Signet', \ + 'locale': 'en', \ + 'logo': {'url': '${mosipbox.public.url}/logo.png','alt_text': 'a square logo of a MOSIP'},\ + 'background_color': '#12107c',\ + 'text_color': '#FFFFFF'}}\ + }\ + }\ + }\ } ## -------------------------------------------- Others ---------------------------------------------------------- From 35a8c3dc42a46fcb026aa26f350491f68dcbadb9 Mon Sep 17 00:00:00 2001 From: ase-101 Date: Wed, 31 Jan 2024 21:15:46 +0530 Subject: [PATCH 2/3] Update signup-default.properties Signed-off-by: ase-101 --- signup-default.properties | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/signup-default.properties b/signup-default.properties index 3e91891fbcf..f70dfafe6d0 100644 --- a/signup-default.properties +++ b/signup-default.properties @@ -14,9 +14,10 @@ mosip.signup.fullname.pattern=^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u ## Time given to generate and verify the challenge in seconds. ## Default resend delay is 60 seconds, with 3 attempts, so 60*3=180 seconds. -## Adding 10 seconds buffer to default 180 seconds = 190 seconds. -## so 190 seconds is the Generate and verify cookie max age. -mosip.signup.unauthenticated.txn.timeout=190 +## Adding 60 seconds for the default generate challenge 180+60=240 +## Adding 10 seconds buffer to default 240 seconds = 250 seconds. +## so 250 seconds is the Generate and verify cookie max age. +mosip.signup.unauthenticated.txn.timeout=250 mosip.signup.challenge.resend-attempt=3 mosip.signup.challenge.resend-delay=${mosip.signup.challenge.timeout} @@ -105,7 +106,7 @@ mosip.signup.update-identity.request.id=mosip.id.update mosip.signup.identity.request.version=v1 ## --------------------------------- captcha validator------------------------------------------------------------------ -mosip.signup.send-challenge.captcha-required=false +mosip.signup.send-challenge.captcha-required=true mosip.signup.integration.captcha-validator=GoogleRecaptchaValidatorService mosip.signup.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify mosip.signup.captcha-validator.site-key=${signup.captcha.site.key} @@ -152,4 +153,4 @@ mosip.signup.sms-notification-template.forgot-password.eng=You successfully chan #------------------------------------------ Others --------------------------------------------------------------------- logging.level.io.mosip.signup=INFO -logging.level.org.springframework.web.client.RestTemplate=INFO \ No newline at end of file +logging.level.org.springframework.web.client.RestTemplate=INFO From 392a692221f80bb0ebdf312c42368b74909239ba Mon Sep 17 00:00:00 2001 From: ase-101 Date: Wed, 31 Jan 2024 21:18:17 +0530 Subject: [PATCH 3/3] Update esignet-default.properties Signed-off-by: ase-101 --- esignet-default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esignet-default.properties b/esignet-default.properties index cbb4d895d43..01aaeadb7d3 100644 --- a/esignet-default.properties +++ b/esignet-default.properties @@ -101,7 +101,7 @@ mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService mosip.esignet.integration.vci-plugin=IdaVCIssuancePluginImpl # captcha validator -mosip.esignet.send-otp.captcha-required=false +mosip.esignet.send-otp.captcha-required=true mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key} mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}