From 59136ab32f01a333c14d95abc4e3bdbb5ba63c54 Mon Sep 17 00:00:00 2001 From: ase-101 <> Date: Mon, 6 Mar 2023 21:10:35 +0530 Subject: [PATCH 1/5] esignet wrapper zip creation logic added --- artifacts/Dockerfile | 42 +++++++++++++++++++++++++++--------------- artifacts/configure.sh | 5 +++++ artifacts/pom.xml | 31 +++++++++++++++++++++---------- 3 files changed, 53 insertions(+), 25 deletions(-) diff --git a/artifacts/Dockerfile b/artifacts/Dockerfile index 7c530f98..a6e8617c 100644 --- a/artifacts/Dockerfile +++ b/artifacts/Dockerfile @@ -17,13 +17,12 @@ RUN apt-get -y update &&\ apt-get install -y --no-install-recommends unzip wget zip tree openjdk-11-jdk &&\ groupadd -g ${container_user_gid} ${container_user_group} &&\ rm -rf /var/lib/apt/lists/* &&\ -wget https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz &&\ -tar -xzf apache-maven-3.8.8-bin.tar.gz && mv apache-maven-3.8.8 /usr/local/maven && rm apache-maven-3.8.8-bin.tar.gz &&\ +wget https://dlcdn.apache.org/maven/maven-3/3.8.7/binaries/apache-maven-3.8.7-bin.tar.gz &&\ +tar -xzf apache-maven-3.8.7-bin.tar.gz && mv apache-maven-3.8.7 /usr/local/maven && rm apache-maven-3.8.7-bin.tar.gz &&\ useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \ && mkdir -p /var/run/nginx /var/tmp/nginx \ && chown -R ${container_user}:${container_user} /usr/share/nginx /var/run/nginx /var/tmp/nginx - COPY ./nginx.conf /etc/nginx/nginx.conf ENV MAVEN_HOME /usr/local/maven @@ -74,33 +73,40 @@ ENV test_jar_path=${base_path}/libs-release-local/io/mosip/testing/ # environment variable for ref-idobjectvalidator jar ENV idobject_jar_path=${base_path}/libs-release-local/io/mosip/kernel/kernel-ref-idobjectvalidator +# environment variable for regproc auth jar +ENV regproc_jar_path=${base_path}/libs-release-local/io/mosip/kernel/kernel-auth-adapter + # environment variable for prereg transliteration jar path ENV icu4j_jar_path=${base_path}/libs-release-local/icu4j # environment variable for i18n zip path ENV i18n_zip_path=${base_path}/libs-release-local/i18n -# environment variable for idp auth wrapper jar path -ENV idp_auth_wrapper_jar_path=${base_path}/libs-release-local/idp/idp-auth-wrapper +# environment variable for idp auth wrapper zip path +ENV idp_auth_wrapper_lib_zip_path=${base_path}/libs-release-local/idp/idp-auth-wrapper -# environment variable for esignet auth wrapper jar path -ENV esignet_auth_wrapper_jar_path=${base_path}/libs-release-local/esignet/esignet-auth-wrapper +# environment variable for esignet wrappers zip path +ENV esignet_wrapper_lib_zip_path=${base_path}/libs-release-local/esignet/esignet-wrapper # environment variable for Clamav dependency ENV clamav_path=${base_path}/libs-release-local/clamav ENV regclient_jar_path=${base_path}/libs-release-local +ENV master_template_path=${base_path}/libs-release-local/master-templates + # environment variable for child auth filter jar path ENV child_auth_filter_jar_path=${base_path}/libs-release-local/io/mosip/authentication/authentication-ref-impl -ENV master_template_path=${base_path}/libs-release-local/master-templates - # environment variable for script path ENV scripts_path=/home/mosip/scripts -# Create all the Jar paths -RUN mkdir -p ${biosdk_client_zip_path}/biosdk-client ${demosdk_zip_path}/demosdk ${biosdk_lib_zip_path}/biosdk-lib ${cache_path} ${ida_sh_path} ${hsm_client_path} ${kernel_jar_path} ${test_jar_path} ${idobject_jar_path} ${sdk_path} ${icu4j_jar_path} ${clamav_path} ${i18n_zip_path} ${child_auth_filter_jar_path} ${jpeg_sdk_path} ${jpegsdk_lib_zip_path}/jpeg-sdk-lib ${base_path}/libs-release-local/reg-client ${master_template_path} ${idp_auth_wrapper_jar_path} ${esignet_auth_wrapper_jar_path} +# environment variable for jar version to be downloaed, this needed to be passed buildtime +ENV version=1.2.1-SNAPSHOT +ENV idp_auth_wrapper_version=0.0.1-SNAPSHOT + +# Create all the jar paths. +RUN mkdir -p ${biosdk_client_zip_path}/biosdk-client ${demosdk_zip_path}/demosdk ${biosdk_lib_zip_path}/biosdk-lib ${cache_path} ${ida_sh_path} ${hsm_client_path} ${kernel_jar_path} ${test_jar_path} ${idobject_jar_path} ${regproc_jar_path} ${sdk_path} ${icu4j_jar_path} ${clamav_path} ${i18n_zip_path} ${child_auth_filter_jar_path} ${base_path}/libs-release-local/reg-client ${scripts_path} ${master_template_path} ${jpeg_sdk_path} ${jpegsdk_lib_zip_path}/jpeg-sdk-lib/ ${idp_auth_wrapper_lib_zip_path} ${esignet_wrapper_lib_zip_path}/esignet-wrapper # Copy all the respective jars to the location @@ -126,20 +132,24 @@ COPY /src/i18n/pmp-entity-spec-bundle/* ${work_dir}/pmp-entity-spec-bundle/ COPY /src/i18n/pmp-i18n-bundle/* ${work_dir}/pmp-i18n-bundle/ -COPY /src/i18n/idp-i18n-bundle/* ${work_dir}/idp-i18n-bundle/ +COPY /src/i18n/pre-registration-i18n-bundle/* ${work_dir}/pre-registration-i18n-bundle/ + +COPY /src/master-templates/* ${work_dir}/master-templates/ + +COPY /src/i18n/idp-i18n-bundle/* ${work_dir}/idp-i18n-bundle/ COPY /src/i18n/oidc-demo-i18n-bundle/* ${work_dir}/oidc-demo-i18n-bundle/ COPY /src/i18n/mock-relying-party-i18n-bundle/* ${work_dir}/mock-relying-party-i18n-bundle/ -COPY /src/i18n/pre-registration-i18n-bundle/* ${work_dir}/pre-registration-i18n-bundle/ - -COPY /src/master-templates/* ${work_dir}/master-templates/ +COPY /src/i18n/esignet-i18n-bundle/* ${work_dir}/esignet-i18n-bundle/ COPY /src/jre/zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip ${regclient_jar_path}/zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip COPY /src/icu4j/* ${icu4j_jar_path}/ +COPY /src/auth/* ${regproc_jar_path}/ + COPY ./configure.sh ${work_dir}/ COPY pom.xml ${work_dir}/ @@ -156,3 +166,5 @@ USER ${container_user_uid}:${container_user_gid} EXPOSE 8080 CMD ["nginx", "-g", "daemon off;"] + + diff --git a/artifacts/configure.sh b/artifacts/configure.sh index f81a0956..3fb7ca79 100755 --- a/artifacts/configure.sh +++ b/artifacts/configure.sh @@ -31,6 +31,11 @@ zip -r -j ${demosdk_zip_path}/demosdk.zip ${demosdk_zip_path}/demosdk/* rm -rf ${demosdk_zip_path}/demosdk echo demosdk-client zip creation completed +echo esignet-wrappers zip creation started +zip -r -j ${esignet_wrapper_lib_zip_path}/esignet-wrapper.zip ${esignet_wrapper_lib_zip_path}/esignet-wrapper/* +rm -rf ${esignet_wrapper_lib_zip_path}/esignet-wrapper +echo esignet-wrapper zip creation completed + echo Creating resources.zip file for all the resources provided zip -r -j ${base_path}/libs-release-local/reg-client/resources.zip ${work_dir}/resources rm -rf ${work_dir}/resources diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 57acc5e0..ffad954d 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -117,10 +117,13 @@ 0.9.0 /usr/share/nginx/html/artifactory/libs-release-local/idp/idp-auth-wrapper authentication-wrapper.jar - - 1.0.0-SNAPSHOT - /usr/share/nginx/html/artifactory/libs-release-local/esignet/esignet-auth-wrapper - esignet-authentication-wrapper.jar + + /usr/share/nginx/html/artifactory/libs-release-local/esignet/esignet-wrapper + 0.0.1-SNAPSHOT + esignet-mock-wrapper.jar + + 1.2.1-SNAPSHOT + esignet-ida-wrapper.jar @@ -279,7 +282,7 @@ ${hazelcast.fileName} jar - + io.mosip.idp authentication-wrapper @@ -290,13 +293,21 @@ - io.mosip.idp - authentication-wrapper - ${esignet-authentication-wrapper.version} - ${esignet-authentication-wrapper.location} - ${esignet-authentication-wrapper.fileName} + io.mosip.esignet.mock + mock-esignet-integration-impl + ${esignet-mock-wrapper.version} + ${esignet-wrapper.location} + ${esignet-mock-wrapper.fileName} jar + + io.mosip.authentication + esignet-integration-impl + ${esignet-ida-wrapper.version} + ${esignet-wrapper.location} + ${esignet-ida-wrapper.fileName} + jar + true true From fe11cab948e8f1d3fbf02a2abc8ecb104038a2f8 Mon Sep 17 00:00:00 2001 From: ase-101 <> Date: Tue, 28 Mar 2023 23:38:59 +0530 Subject: [PATCH 2/5] esignet wrapper zip creation logic updated --- artifacts/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifacts/Dockerfile b/artifacts/Dockerfile index a6e8617c..72d3b184 100644 --- a/artifacts/Dockerfile +++ b/artifacts/Dockerfile @@ -86,7 +86,7 @@ ENV i18n_zip_path=${base_path}/libs-release-local/i18n ENV idp_auth_wrapper_lib_zip_path=${base_path}/libs-release-local/idp/idp-auth-wrapper # environment variable for esignet wrappers zip path -ENV esignet_wrapper_lib_zip_path=${base_path}/libs-release-local/esignet/esignet-wrapper +ENV esignet_wrapper_lib_zip_path=${base_path}/libs-release-local/esignet # environment variable for Clamav dependency ENV clamav_path=${base_path}/libs-release-local/clamav From a2055bffe6316ea6c15a05db9b4e523c3017982d Mon Sep 17 00:00:00 2001 From: ase-101 <> Date: Tue, 28 Mar 2023 23:43:10 +0530 Subject: [PATCH 3/5] release version changes --- artifacts/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index ffad954d..3b8951bb 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -119,10 +119,10 @@ authentication-wrapper.jar /usr/share/nginx/html/artifactory/libs-release-local/esignet/esignet-wrapper - 0.0.1-SNAPSHOT + 0.9.0-SNAPSHOT esignet-mock-wrapper.jar - 1.2.1-SNAPSHOT + 0.9.0-SNAPSHOT esignet-ida-wrapper.jar From 0673b17abd577e7c23cd32aba0f0026b2c9c9a69 Mon Sep 17 00:00:00 2001 From: ase-101 <> Date: Wed, 29 Mar 2023 23:10:09 +0530 Subject: [PATCH 4/5] Added binding messages --- artifacts/src/i18n/esignet-i18n-bundle/ar.json | 5 ++++- artifacts/src/i18n/esignet-i18n-bundle/en.json | 5 ++++- artifacts/src/i18n/esignet-i18n-bundle/hi.json | 5 ++++- artifacts/src/i18n/esignet-i18n-bundle/kn.json | 5 ++++- artifacts/src/i18n/esignet-i18n-bundle/ta.json | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/artifacts/src/i18n/esignet-i18n-bundle/ar.json b/artifacts/src/i18n/esignet-i18n-bundle/ar.json index fb1171de..a49e05bb 100644 --- a/artifacts/src/i18n/esignet-i18n-bundle/ar.json +++ b/artifacts/src/i18n/esignet-i18n-bundle/ar.json @@ -332,6 +332,9 @@ "IDA-RST-005": "المهلة غير صالحة", "IDA-RST-006": "4XX - حدث خطأ في العميل", "IDA-RST-007": "5XX - حدث خطأ في الخادم", - "IDA-RST-008": "انتهت مدة الاتصال" + "IDA-RST-008": "انتهت مدة الاتصال", + "IDA-KBT-001": "لم يتم العثور على الشهادة المنضمة", + "IDA-KBT-002": "الرمز المميز الموقع الصادر في (iat) ليس في النطاق الزمني المسموح به.", + "IDA-KBT-003": "خطأ في التحقق من الرمز المميز المرتبط بالمفتاح." } } diff --git a/artifacts/src/i18n/esignet-i18n-bundle/en.json b/artifacts/src/i18n/esignet-i18n-bundle/en.json index 5b3b68d4..20bb31fd 100644 --- a/artifacts/src/i18n/esignet-i18n-bundle/en.json +++ b/artifacts/src/i18n/esignet-i18n-bundle/en.json @@ -332,6 +332,9 @@ "IDA-RST-005": "Timeout is invalid", "IDA-RST-006": "4XX - Client Error occurred", "IDA-RST-007": "5XX - Server Error occurred", - "IDA-RST-008": "Connection timed out" + "IDA-RST-008": "Connection timed out", + "IDA-KBT-001": "Bound certificate not found", + "IDA-KBT-002": "Signed token issued at (iat) is not in allowed time range.", + "IDA-KBT-003": "Error verifying key binded token." } } diff --git a/artifacts/src/i18n/esignet-i18n-bundle/hi.json b/artifacts/src/i18n/esignet-i18n-bundle/hi.json index 8839b1e6..dfa3f880 100644 --- a/artifacts/src/i18n/esignet-i18n-bundle/hi.json +++ b/artifacts/src/i18n/esignet-i18n-bundle/hi.json @@ -332,6 +332,9 @@ "IDA-RST-005": "समय समाप्त अमान्य है", "IDA-RST-006": "4XX - क्लाइंट त्रुटि हुई", "IDA-RST-007": "5XX - सर्वर त्रुटि हुई", - "IDA-RST-008": "कनेक्शन का समय समाप्त" + "IDA-RST-008": "कनेक्शन का समय समाप्त", + "IDA-KBT-001": "बाध्य प्रमाण पत्र नहीं मिला", + "IDA-KBT-002": "टोकन (iat) पर जारी हस्ताक्षरित अनुमत समय सीमा में नहीं है", + "IDA-KBT-003": "टोकन की जाँच करने में त्रुटि" } } diff --git a/artifacts/src/i18n/esignet-i18n-bundle/kn.json b/artifacts/src/i18n/esignet-i18n-bundle/kn.json index db897828..d4f28866 100644 --- a/artifacts/src/i18n/esignet-i18n-bundle/kn.json +++ b/artifacts/src/i18n/esignet-i18n-bundle/kn.json @@ -332,6 +332,9 @@ "IDA-RST-005": "ಅವಧಿ ಮೀರಿದ್ದು ಅಮಾನ್ಯವಾಗಿದೆ", "IDA-RST-006": "4XX - ಕ್ಲೈಂಟ್ ದೋಷ ಸಂಭವಿಸಿದೆ", "IDA-RST-007": "5XX - ಸರ್ವರ್ ದೋಷ ಸಂಭವಿಸಿದೆ", - "IDA-RST-008": "ಸಂಪರ್ಕ ಸಮಯ ಮೀರಿದೆ" + "IDA-RST-008": "ಸಂಪರ್ಕ ಸಮಯ ಮೀರಿದೆ", + "IDA-KBT-001": "ಬೌಂಡ್ ಪ್ರಮಾಣಪತ್ರ ದೊರೆಯಲಿಲ್ಲ", + "IDA-KBT-002": "ಟೋಕನ್ (iat) ನಲ್ಲಿ ನೀಡಲಾದ ಸಹಿ ಮಾಡಿದ ಟೋಕನ್ ಅನುಮತಿಸಲಾದ ಸಮಯ ವ್ಯಾಪ್ತಿಯಲ್ಲಿಲ್ಲ.", + "IDA-KBT-003": "ಟೋಕನ್ ಪರಿಶೀಲಿಸುವಲ್ಲಿ ದೋಷ." } } diff --git a/artifacts/src/i18n/esignet-i18n-bundle/ta.json b/artifacts/src/i18n/esignet-i18n-bundle/ta.json index d701b8eb..11338255 100644 --- a/artifacts/src/i18n/esignet-i18n-bundle/ta.json +++ b/artifacts/src/i18n/esignet-i18n-bundle/ta.json @@ -332,6 +332,9 @@ "IDA-RST-005": "நேரம் முடிந்தது தவறானது", "IDA-RST-006": "4XX - கிளையண்ட் பிழை ஏற்பட்டது", "IDA-RST-007": "5XX - சர்வர் பிழை ஏற்பட்டது", - "IDA-RST-008": "இணைப்பின் நேரம் முடிந்தது" + "IDA-RST-008": "இணைப்பின் நேரம் முடிந்தது", + "IDA-KBT-001": "வரையறுக்கப்பட்ட சான்றிதழ் காணப்படவில்லை", + "IDA-KBT-002": "(iat)யில் வழங்கப்பட்ட கையொப்பமிடப்பட்ட டோக்கன் அனுமதிக்கப்பட்ட கால வரம்பில் இல்லை.", + "IDA-KBT-003": "விசை இணைக்கப்பட்ட டோக்கனை சரிபார்ப்பதில் பிழை." } } From aeca6a28a3794fc5f2ac8dbaba686d5a287dc16e Mon Sep 17 00:00:00 2001 From: ase-101 <> Date: Wed, 29 Mar 2023 23:27:27 +0530 Subject: [PATCH 5/5] Updated the esignet-integration-impl version --- artifacts/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 3b8951bb..2d7ecc85 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -122,7 +122,7 @@ 0.9.0-SNAPSHOT esignet-mock-wrapper.jar - 0.9.0-SNAPSHOT + 1.2.0.1-B3-SNAPSHOT esignet-ida-wrapper.jar