diff --git a/.github/workflows/db-test.yml b/.github/workflows/db-test.yml new file mode 100644 index 00000000000..262b7c24eea --- /dev/null +++ b/.github/workflows/db-test.yml @@ -0,0 +1,37 @@ +name: PostgreSQL Test + +on: + release: + types: [published] + pull_request: + types: [opened, reopened, synchronize] + workflow_dispatch: + inputs: + message: + description: 'Message for manually triggering' + required: false + default: 'Triggered for Updates' + type: string + push: + branches: + - '!release-branch' + - release* + - master + - 1.* + - develop* + - MOSIP* + paths: + - 'db_scripts/**' + +jobs: + build-db-test: + strategy: + matrix: + include: + - DB_LOCATION: 'db_scripts/mosip_ida' + DB_NAME: 'mosip_ida' + fail-fast: false + name: ${{ matrix.DB_NAME }} + uses: mosip/kattu/.github/workflows/db-test.yml@master + with: + DB_LOCATION: ${{ matrix.DB_LOCATION}} diff --git a/.github/workflows/postgres-init_trigger.yml b/.github/workflows/postgres-init_trigger.yml deleted file mode 100644 index 3de4c6f32c5..00000000000 --- a/.github/workflows/postgres-init_trigger.yml +++ /dev/null @@ -1,83 +0,0 @@ -name: Trigger postgres-init repo upon db scripts updates - -on: - push: - branches: - - master - - 1.* - - develop - - release* - paths: - - db_release_scripts/** - - db_scripts/** - -jobs: - paths-filter: - runs-on: ubuntu-latest - outputs: - db_release_scripts: ${{ steps.filter.outputs.db_release_scripts }} - db_scripts: ${{ steps.filter.outputs.db_scripts }} - steps: - - uses: actions/checkout@v2 - - uses: dorny/paths-filter@v2 - id: filter - with: - base: ${{ github.ref }} - filters: | - db_release_scripts: - - 'db_release_scripts/**' - db_scripts: - - 'db_scripts/**' - - # run only if 'db_release_scripts' files were changed - db_release_scripts_updates: - needs: paths-filter - if: needs.paths-filter.outputs.db_release_scripts == 'true' - runs-on: ubuntu-latest - steps: - - name: Check for updates - run: echo "Updates are present in db_release_scripts directory, Triggering postgres-init repo" - - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,author,job,took,ref # selectable (default: repo,message) - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_DEVOPS }} # required - if: success() # Pick up events when the job is successful. - - # run only if not 'db_release_scripts' files were changed - - name: Check for no updates - if: needs.paths-filter.outputs.db_release_scripts != 'true' - run: echo "Updates are not present in db_release_scripts directory" - - # run only if 'db_scripts' files were changed - db_scripts_updates: - needs: paths-filter - if: needs.paths-filter.outputs.db_scripts == 'true' - runs-on: ubuntu-latest - steps: - - name: Check for updates - run: echo "Updates are present in db_scripts directory, Triggering postgres-init repo" - - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,author,job,took,ref # selectable (default: repo,message) - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_DEVOPS }} # required - if: success() # Pick up events when the job is successful. - - # run only if not 'db_scripts' files were changed - - name: Check for no updates - if: needs.paths-filter.outputs.db_scripts != 'true' - run: echo "Updates are not present in db_scripts directory" - - # This job is to trigger postgres-init repo. - trigger-postgres_init_repo: - runs-on: ubuntu-latest - steps: - - uses: peter-evans/repository-dispatch@v2 - with: - token: ${{ secrets.ACTION_PAT }} - repository: mosip/postgres-init - base: ${{ github.ref }} - event-type: db-event diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml new file mode 100644 index 00000000000..da2a570e147 --- /dev/null +++ b/.github/workflows/push-trigger.yml @@ -0,0 +1,91 @@ +name: Maven Package upon a push + +on: + release: + types: [published] + pull_request: + types: [opened, reopened, synchronize] + workflow_dispatch: + inputs: + message: + description: 'Message for manually triggering' + required: false + default: 'Triggered for Updates' + type: string + push: + branches: + - '!release-branch' + - release* + - master + - 1.* + - develop + - MOSIP* + +jobs: + build-maven-authentication: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: ./authentication + BUILD_ARTIFACT: authentication + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + publish_to_nexus: + if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" + needs: build-maven-authentication + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + with: + SERVICE_LOCATION: ./authentication + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_URL: ${{ secrets.RELEASE_URL }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-dockers: + needs: build-maven-authentication + strategy: + matrix: + include: + - SERVICE_LOCATION: 'authentication/authentication-otp-service' + SERVICE_NAME: 'authentication-otp-service' + BUILD_ARTIFACT: 'authentication' + - SERVICE_LOCATION: 'authentication/authentication-internal-service' + SERVICE_NAME: 'authentication-internal-service' + BUILD_ARTIFACT: 'authentication' + - SERVICE_LOCATION: 'authentication/authentication-service' + SERVICE_NAME: 'authentication-service' + BUILD_ARTIFACT: 'authentication' + fail-fast: false + name: ${{ matrix.SERVICE_NAME }} + uses: mosip/kattu/.github/workflows/docker-build.yml@master + with: + SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} + SERVICE_NAME: ${{ matrix.SERVICE_NAME }} + BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} + secrets: + DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} + ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} + RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + sonar_analysis: + needs: build-maven-authentication + if: "${{ github.event_name != 'pull_request' }}" + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + with: + SERVICE_LOCATION: ./authentication + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + ORG_KEY: ${{ secrets.ORG_KEY }} + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml deleted file mode 100644 index 106b5158e8a..00000000000 --- a/.github/workflows/push_trigger.yml +++ /dev/null @@ -1,377 +0,0 @@ - -name: Maven Package upon a push - -on: - push: - branches: - - '!release-branch' - - release-1* - - master - - 1.* - - develop - -jobs: - build: - - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - ref: ${{ github.ref }} - java-version: 11 - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Setup branch and env - run: | - # Strip git ref prefix from version - echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV - echo "GPG_TTY=$(tty)" >> $GITHUB_ENV - - - name: Setup branch and GPG public key - run: | - # Strip git ref prefix from version - echo ${{ env.BRANCH_NAME }} - echo ${{ env.GPG_TTY }} - sudo apt-get --yes install gnupg2 - gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg - gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg - - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven-${{ env.BRANCH_NAME }} - - - name: Setup the settings file for ossrh server - run: echo " ossrh ${{secrets.ossrh_user}} ${{secrets.ossrh_secret}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml - - - name: Build with Maven - run: | - cd authentication - mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml -e - - - name: Ready the springboot artifacts - run: find -name '*.jar' -executable -type f -exec zip release.zip {} + - - - name: Upload the springboot jars - uses: actions/upload-artifact@v1 - with: - name: release - path: ./release.zip - - - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,workflow,job # selectable (default: repo,message) - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} # required - if: failure() # Pick up events even if the job fails or is canceled. - - publish_to_nexus: - if: "!contains(github.ref, 'master')" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - ref: ${{ github.ref }} - java-version: 11 - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Setup branch and env - run: | - # Strip git ref prefix from version - echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV - echo "GPG_TTY=$(tty)" >> $GITHUB_ENV - - - name: Setup branch and GPG public key - run: | - # Strip git ref prefix from version - echo ${{ env.BRANCH_NAME }} - echo ${{ env.GPG_TTY }} - sudo apt-get --yes install gnupg2 - gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg - gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --always-trust --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg - - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven-${{ env.BRANCH_NAME }} - - - name: Install xmllint - run: | - sudo apt-get update - sudo apt-get install libxml2-utils - - - name: Setup the settings file for ossrh server - run: echo " ossrh ${{secrets.RELEASE_USER}} ${{secrets.RELEASE_TOKEN}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml - - - name: Build with Maven - run: | - cd authentication - mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml - - - name: Publish the maven package - run: | - cd authentication && mvn deploy -DaltDeploymentRepository=ossrh::default::${{ secrets.OSSRH_SNAPSHOT_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml - env: - GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} - GPG_TTY: $(tty) - # - uses: 8398a7/action-slack@v3 - # with: - # status: ${{ job.status }} - # fields: repo,message,commit,workflow,job # selectable (default: repo,message) - # env: - # SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DEVOPS_WEBHOOK }} # required - # if: failure() # Pick up events even if the job fails or is canceled. - - docker-authentication-otp-service: - needs: build - - runs-on: ubuntu-latest - env: - NAMESPACE: ${{ secrets.dev_namespace_docker_hub }} - SERVICE_NAME: authentication-otp-service - SERVICE_LOCATION: authentication/authentication-otp-service - - steps: - - uses: actions/checkout@v2 - - uses: actions/download-artifact@v1 - with: - name: release - path: ./ - - - name: Setup branch name - run: | - # Strip git ref prefix from version - echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV - - - name: Get version info from pom - id: getPomVersion - uses: mavrosxristoforos/get-xml-info@1.0 - with: - xml-file: ./${{ env.SERVICE_LOCATION }}/pom.xml - xpath: /*[local-name()="project"]/*[local-name()="version"] - - - name: Unzip and extract the authentication-otp-service - run: unzip -uj "release.zip" "${{ env.SERVICE_LOCATION }}/target/*" -d "./${{ env.SERVICE_LOCATION }}/target" - - name: Get current date - id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%d')" - - - name: Build image - run: | - cd "./${{env.SERVICE_LOCATION}}" - docker build . --file Dockerfile --build-arg SOURCE=mosip --build-arg COMMIT_HASH=$(git rev-parse HEAD) --build-arg COMMIT_ID=$(git rev-parse --short HEAD) --build-arg BUILD_TIME=${{steps.date.outputs.date}} --tag ${{ env.SERVICE_NAME }} - - name: Log into registry - run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=$NAMESPACE/$SERVICE_NAME - - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - echo "push version ${{steps.getPomVersion.outputs.info}}" - if [[ $BRANCH_NAME == master ]]; then - VERSION=latest - else - VERSION=$BRANCH_NAME - fi - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $SERVICE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION - - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,workflow,job # selectable (default: repo,message) - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DEVOPS_WEBHOOK }} # required - if: failure() # Pick up events even if the job fails or is canceled. - - docker-authentication-internal-service: - needs: build - - runs-on: ubuntu-latest - env: - NAMESPACE: ${{ secrets.dev_namespace_docker_hub }} - SERVICE_NAME: authentication-internal-service - SERVICE_LOCATION: authentication/authentication-internal-service - - steps: - - uses: actions/checkout@v2 - - uses: actions/download-artifact@v1 - with: - name: release - path: ./ - - - name: Setup branch name - run: | - # Strip git ref prefix from version - echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV - - - name: Get version info from pom - id: getPomVersion - uses: mavrosxristoforos/get-xml-info@1.0 - with: - xml-file: ./${{ env.SERVICE_LOCATION }}/pom.xml - xpath: /*[local-name()="project"]/*[local-name()="version"] - - - name: Unzip and extract the authentication-internal-service - run: unzip -uj "release.zip" "${{ env.SERVICE_LOCATION }}/target/*" -d "./${{ env.SERVICE_LOCATION }}/target" - - name: Get current date - id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%d')" - - - name: Build image - run: | - cd "./${{env.SERVICE_LOCATION}}" - docker build . --file Dockerfile --build-arg SOURCE=mosip --build-arg COMMIT_HASH=$(git rev-parse HEAD) --build-arg COMMIT_ID=$(git rev-parse --short HEAD) --build-arg BUILD_TIME=${{steps.date.outputs.date}} --tag ${{ env.SERVICE_NAME }} - - name: Log into registry - run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=$NAMESPACE/$SERVICE_NAME - - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - echo "push version ${{steps.getPomVersion.outputs.info}}" - if [[ $BRANCH_NAME == master ]]; then - VERSION=latest - else - VERSION=$BRANCH_NAME - fi - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $SERVICE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION - - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,workflow,job # selectable (default: repo,message) - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DEVOPS_WEBHOOK }} # required - if: failure() # Pick up events even if the job fails or is canceled. - - docker-authentication-service: - needs: build - - runs-on: ubuntu-latest - env: - NAMESPACE: ${{ secrets.dev_namespace_docker_hub }} - SERVICE_NAME: authentication-service - SERVICE_LOCATION: authentication/authentication-service - - steps: - - uses: actions/checkout@v2 - - uses: actions/download-artifact@v1 - with: - name: release - path: ./ - - - name: Setup branch name - run: | - # Strip git ref prefix from version - echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV - - - name: Get version info from pom - id: getPomVersion - uses: mavrosxristoforos/get-xml-info@1.0 - with: - xml-file: ./${{ env.SERVICE_LOCATION }}/pom.xml - xpath: /*[local-name()="project"]/*[local-name()="version"] - - - name: Unzip and extract the authentication-service - run: unzip -uj "release.zip" "${{ env.SERVICE_LOCATION }}/target/*" -d "./${{ env.SERVICE_LOCATION }}/target" - - name: Get current date - id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%d')" - - - name: Build image - run: | - cd "./${{env.SERVICE_LOCATION}}" - docker build . --file Dockerfile --build-arg SOURCE=mosip --build-arg COMMIT_HASH=$(git rev-parse HEAD) --build-arg COMMIT_ID=$(git rev-parse --short HEAD) --build-arg BUILD_TIME=${{steps.date.outputs.date}} --tag ${{ env.SERVICE_NAME }} - - name: Log into registry - run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=$NAMESPACE/$SERVICE_NAME - - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - echo "push version ${{steps.getPomVersion.outputs.info}}" - if [[ $BRANCH_NAME == master ]]; then - VERSION=latest - else - VERSION=$BRANCH_NAME - fi - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $SERVICE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION - - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,workflow,job # selectable (default: repo,message) - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DEVOPS_WEBHOOK }} # required - if: failure() # Pick up events even if the job fails or is canceled. - - sonar_analysis: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - ref: ${{ github.ref }} - java-version: 11 - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Setup branch and env - run: | - # Strip git ref prefix from version - echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV - echo "GPG_TTY=$(tty)" >> $GITHUB_ENV - - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven-${{ env.BRANCH_NAME }} - - - name: Setup the settings file for ossrh server - run: echo " ossrh ${{secrets.ossrh_user}} ${{secrets.ossrh_secret}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml - - - name: Build with Maven - run: | - cd authentication - mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml - - - name: Analyze with SonarCloud - run: | - cd authentication - mvn -B -Dgpg.skip verify sonar:sonar -Dsonar.projectKey=mosip_${{ github.event.repository.name }} -Dsonar.organization=${{ secrets.ORG_KEY }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,workflow,job # selectable (default: repo,message) - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DEVOPS_WEBHOOK }} # required - if: failure() # Pick up events even if the job fails or is canceled. diff --git a/.github/workflows/release-changes.yml b/.github/workflows/release-changes.yml new file mode 100644 index 00000000000..783d4896a2a --- /dev/null +++ b/.github/workflows/release-changes.yml @@ -0,0 +1,29 @@ +name: Release/pre-release Preparation. + +on: + workflow_dispatch: + inputs: + MESSAGE: + description: 'Triggered for release or pe-release' + required: false + default: 'Release Preparation' + RELEASE_TAG: + description: 'tag to update' + required: true + SNAPSHOT_TAG: + description: 'tag to be replaced' + required: true + BASE: + description: 'base branch for PR' + required: true +jobs: + maven-release-preparation: + uses: mosip/kattu/.github/workflows/release-changes.yml@master + with: + MESSAGE: ${{ inputs.MESSAGE }} + RELEASE_TAG: ${{ inputs.RELEASE_TAG }} + SNAPSHOT_TAG: ${{ inputs.SNAPSHOT_TAG }} + BASE: ${{ inputs.BASE }} + secrets: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + ACTION_PAT: ${{ secrets.ACTION_PAT }} \ No newline at end of file diff --git a/.github/workflows/release_changes.yml b/.github/workflows/release_changes.yml deleted file mode 100644 index 5d8e1a32989..00000000000 --- a/.github/workflows/release_changes.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Release/pre-release Preparation. - -on: - workflow_dispatch: - inputs: - message: - description: 'Triggered for release or pe-release' - required: false - default: 'Release Preparation' - releaseTags: - description: 'tag to update' - required: true - snapshotTags: - description: 'tag to be replaced' - required: true - base: - description: 'base branch for PR' - required: true -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup branch and env - run: | - # Strip git ref prefix from version - echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV - echo "GPG_TTY=$(tty)" >> $GITHUB_ENV - - - name: update Branch name in badges - run: | - sed -i 's/branch=.*)]/branch=${{ env.BRANCH_NAME }}\)]/g' README.md - sed -i 's/branch=.*\&/branch=${{ env.BRANCH_NAME }}\&/g' README.md - - - name: Mannualy changing the pom versions - run: find . -type f -name "*pom.xml" -print0 | xargs -0 sed -i "s/${{ github.event.inputs.snapshotTags }}/${{ github.event.inputs.releaseTags }}/g" - - - name: Updating the Release URL in POM - run: | - cd .github/workflows - sed -i 's/OSSRH_SNAPSHOT_URL/RELEASE_URL/g' push_trigger.yml - - - name: Updating libs-snapshot-local to libs-release local for artifactory URL's. - run: find . -type f -name "*Dockerfile" -print0 | xargs -0 sed -i "s/libs-snapshot-local/libs-release-local/g" - - - name: removing -DskipTests - run: find . -type f -name "*push_trigger.yml" -print0 | xargs -0 sed -i "s/"-DskipTests"//g" - -# - name: removing --Dgpg.skip -# run: find . -type f -name "*push_trigger.yml" -print0 | xargs -0 sed -i "s/"-Dgpg.skip"//g" - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ secrets.ACTION_PAT }} - commit-message: Release Bot Pre-release changes - title: Release changes - body: Automated PR for ${{ github.event.inputs.releaseTags }} release. - branch: release-branch - delete-branch: true - base: ${{ github.event.inputs.base }} diff --git a/.github/workflows/release_trigger.yml b/.github/workflows/release_trigger.yml deleted file mode 100644 index d0f9da8d439..00000000000 --- a/.github/workflows/release_trigger.yml +++ /dev/null @@ -1,267 +0,0 @@ -name: Release maven packages and docker upon a release - -on: - release: - types: [published] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - ref: ${{ github.ref }} - java-version: 11 - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Setup branch and GPG public key - run: | - # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - echo "::set-env name=GPG_TTY::$(tty)" - echo ${{ env.GPG_TTY }} - sudo apt-get --yes install gnupg2 - gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg - gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg - - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven-${{ env.BRANCH_NAME }} - - - name: Setup the settings file for ossrh server - run: echo " ossrh ${{secrets.ossrh_user}} ${{secrets.ossrh_secret}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml - - - - name: Build with Maven - run: | - cd authentication - mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml - - - name: Ready the springboot artifacts - run: find -name '*.jar' -executable -type f -exec zip release.zip {} + - - - name: Upload the springboot jars - uses: actions/upload-artifact@v1 - with: - name: release - path: ./release.zip - - publish_to_nexus: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - ref: ${{ github.ref }} - java-version: 11 - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Setup branch and GPG public key - run: | - # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - echo "::set-env name=GPG_TTY::$(tty)" - echo ${{ env.GPG_TTY }} - sudo apt-get --yes install gnupg2 - gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg - gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg - - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven-${{ env.BRANCH_NAME }} - - - name: Install xmllint - run: | - sudo apt-get update - sudo apt-get install libxml2-utils - - - name: Setup the settings file for ossrh server - run: echo " ossrh ${{secrets.ossrh_user}} ${{secrets.ossrh_secret}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml - - - name: Build with Maven - run: | - cd authentication - mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml - - - name: Publish the maven package - run: | - chmod +x ./deploy.sh - ./deploy.sh authentication $GITHUB_WORKSPACE/settings.xml .* - env: - GPG_TTY: $(tty) - - name: Analyze with SonarCloud - run: | - cd authentication - mvn -B verify sonar:sonar -Dsonar.projectKey=${{ secrets.PROJECT_KEY }} -Dsonar.organization=${{ secrets.ORG_KEY }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - docker-authentication-otp-service: - needs: build - - runs-on: ubuntu-latest - env: - NAMESPACE: ${{ secrets.dev_namespace_docker_hub }} - SERVICE_NAME: authentication-otp-service - SERVICE_LOCATION: authentication/authentication-otp-service - - steps: - - uses: actions/checkout@v2 - - uses: actions/download-artifact@v1 - with: - name: release - path: ./ - - - name: Setup branch name - run: | - # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - - - name: Get version info from pom - id: getPomVersion - uses: mavrosxristoforos/get-xml-info@1.0 - with: - xml-file: ./${{ env.SERVICE_LOCATION }}/pom.xml - xpath: /*[local-name()="project"]/*[local-name()="version"] - - - name: Unzip and extract the authentication-otp-service - run: unzip -uj "release.zip" "${{ env.SERVICE_LOCATION }}/target/*" -d "./${{ env.SERVICE_LOCATION }}/target" - - - name: Build image - run: | - cd "./${{env.SERVICE_LOCATION}}" - docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }} - - name: Log into registry - run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=$NAMESPACE/$SERVICE_NAME - - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - echo "push version ${{steps.getPomVersion.outputs.info}}" - VERSION=$BRANCH_NAME - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $SERVICE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION - docker-authentication-internal-service: - needs: build - - runs-on: ubuntu-latest - env: - NAMESPACE: ${{ secrets.dev_namespace_docker_hub }} - SERVICE_NAME: authentication-internal-service - SERVICE_LOCATION: authentication/authentication-internal-service - - steps: - - uses: actions/checkout@v2 - - uses: actions/download-artifact@v1 - with: - name: release - path: ./ - - - name: Setup branch name - run: | - # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - - - name: Get version info from pom - id: getPomVersion - uses: mavrosxristoforos/get-xml-info@1.0 - with: - xml-file: ./${{ env.SERVICE_LOCATION }}/pom.xml - xpath: /*[local-name()="project"]/*[local-name()="version"] - - - name: Unzip and extract the authentication-internal-service - run: unzip -uj "release.zip" "${{ env.SERVICE_LOCATION }}/target/*" -d "./${{ env.SERVICE_LOCATION }}/target" - - - name: Build image - run: | - cd "./${{env.SERVICE_LOCATION}}" - docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }} - - name: Log into registry - run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=$NAMESPACE/$SERVICE_NAME - - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - echo "push version ${{steps.getPomVersion.outputs.info}}" - VERSION=$BRANCH_NAME - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $SERVICE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION - docker-authentication-service: - needs: build - - runs-on: ubuntu-latest - env: - NAMESPACE: ${{ secrets.dev_namespace_docker_hub }} - SERVICE_NAME: authentication-service - SERVICE_LOCATION: authentication/authentication-service - - steps: - - uses: actions/checkout@v2 - - uses: actions/download-artifact@v1 - with: - name: release - path: ./ - - - name: Setup branch name - run: | - # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - - - name: Get version info from pom - id: getPomVersion - uses: mavrosxristoforos/get-xml-info@1.0 - with: - xml-file: ./${{ env.SERVICE_LOCATION }}/pom.xml - xpath: /*[local-name()="project"]/*[local-name()="version"] - - - name: Unzip and extract the authentication-service - run: unzip -uj "release.zip" "${{ env.SERVICE_LOCATION }}/target/*" -d "./${{ env.SERVICE_LOCATION }}/target" - - - name: Build image - run: | - cd "./${{env.SERVICE_LOCATION}}" - docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }} - - name: Log into registry - run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=$NAMESPACE/$SERVICE_NAME - - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - echo "push version ${{steps.getPomVersion.outputs.info}}" - VERSION=$BRANCH_NAME - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $SERVICE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml index e9bba0e65a0..9a5b079ffdf 100644 --- a/.github/workflows/tag.yaml +++ b/.github/workflows/tag.yaml @@ -1,43 +1,35 @@ name: Tagging of repos -env: - tag: v1.2.3 - on: workflow_dispatch: inputs: - tag: + TAG: description: 'Tag to be published' required: true - default: 'v1.2.3' type: string - body: + BODY: description: 'Release body message' required: true default: 'Changes in this Release' type: string - pre-release: + PRE_RELEASE: description: 'Pre-release? True/False' required: true default: False type: string + DRAFT: + description: 'Draft? True/False' + required: false + default: False + type: string jobs: - build: - name: Create Release - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: ${{ github.event.inputs.tag }} - release_name: ${{ github.event.inputs.tag }} - body: | - ${{ github.event.inputs.body }} - draft: false - prerelease: ${{fromJSON(github.event.inputs.pre-release)}} + tag-branch: + uses: mosip/kattu/.github/workflows/tag.yml@master + with: + TAG: ${{ inputs.TAG }} + BODY: ${{ inputs.BODY }} + PRE_RELEASE: ${{ inputs.PRE_RELEASE }} + DRAFT: ${{ inputs.DRAFT }} + secrets: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file diff --git a/README.md b/README.md index 948c2591e96..9bcd1127f07 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Maven Package upon a push](https://github.com/mosip/id-authentication/actions/workflows/push_trigger.yml/badge.svg?branch=master)](https://github.com/mosip/id-authentication/actions/workflows/push_trigger.yml) +[![Maven Package upon a push](https://github.com/mosip/id-authentication/actions/workflows/push-trigger.yml/badge.svg?branch=master)](https://github.com/mosip/id-authentication/actions/workflows/push-trigger.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=mosip_id-authentication&id=mosip_id-authentication&branch=master&metric=alert_status)](https://sonarcloud.io/dashboard?id=mosip_id-authentication&branch=master) # ID-Authentication @@ -13,7 +13,7 @@ Refer to [SQL scripts](db_scripts). The project requires JDK 1.11. 1. Build and install: ``` - $ cd kernel + $ cd authentication $ mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true ``` 1. Build Docker for a service: diff --git a/authentication/authentication-authtypelockfilter-impl/pom.xml b/authentication/authentication-authtypelockfilter-impl/pom.xml index 6c8e9f0653d..21915677850 100644 --- a/authentication/authentication-authtypelockfilter-impl/pom.xml +++ b/authentication/authentication-authtypelockfilter-impl/pom.xml @@ -4,9 +4,9 @@ io.mosip.authentication authentication-parent - 1.2.1-SNAPSHOT + 1.2.1.0 - 1.2.1-SNAPSHOT + 1.2.1.0 authentication-authtypelockfilter-impl authentication-authtypelockfilter-impl ID Authentication Filter Implementation for Auth Type Lock validation @@ -74,8 +74,6 @@ 1.7.25 - 2.9.5 - 2.9.8 20180130 2.2.10 20180813 @@ -244,6 +242,14 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + @@ -260,6 +266,16 @@ io.mosip.authentication authentication-common ${authentication-common.version} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + org.springdoc @@ -270,6 +286,14 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + @@ -281,6 +305,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + @@ -300,6 +328,55 @@ + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + + + io.mosip.kernel + kernel-openid-bridge-api + ${kernel-openid-bridge-api.version} + + + com.fasterxml.jackson.core + jackson-databind + + + diff --git a/authentication/authentication-common/pom.xml b/authentication/authentication-common/pom.xml index d5f12f33836..fd2558c2cb8 100644 --- a/authentication/authentication-common/pom.xml +++ b/authentication/authentication-common/pom.xml @@ -6,9 +6,9 @@ io.mosip.authentication authentication-parent - 1.2.1-SNAPSHOT + 1.2.1.0 - 1.2.1-SNAPSHOT + 1.2.1.0 authentication-common authentication-common @@ -95,6 +95,12 @@ + + + org.springframework.kafka + spring-kafka + 2.1.7.RELEASE + io.mosip.kernel diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/builder/AuthResponseBuilder.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/builder/AuthResponseBuilder.java index 65fdb07d549..4bd2a2930d9 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/builder/AuthResponseBuilder.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/builder/AuthResponseBuilder.java @@ -119,7 +119,9 @@ public AuthResponseDTO build(String tokenID) { boolean status = !authStatusInfos.isEmpty() && authStatusInfos.stream().allMatch(AuthStatusInfo::isStatus); ResponseDTO res = new ResponseDTO(); res.setAuthStatus(status); - res.setAuthToken(tokenID); + if (status) { + res.setAuthToken(tokenID); + } responseDTO.setResponse(res); responseDTO.setResponseTime(DateUtils.getUTCCurrentDateTimeString(IdAuthCommonConstants.UTC_DATETIME_PATTERN)); AuthError[] authErrors = authStatusInfos.stream().flatMap(statusInfo -> Optional.ofNullable(statusInfo.getErr()) diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/builder/AuthStatusInfoBuilder.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/builder/AuthStatusInfoBuilder.java index ee69a663cdd..3c3ae83fe42 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/builder/AuthStatusInfoBuilder.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/builder/AuthStatusInfoBuilder.java @@ -1,288 +1,318 @@ -package io.mosip.authentication.common.service.builder; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Optional; - -import io.mosip.authentication.common.service.config.IDAMappingConfig; -import io.mosip.authentication.common.service.impl.match.BioAuthType; -import io.mosip.authentication.common.service.impl.match.DemoAuthType; -import io.mosip.authentication.common.service.impl.match.DemoMatchType; -import io.mosip.authentication.common.service.impl.match.IdaIdMapping; -import io.mosip.authentication.common.service.impl.match.PinAuthType; -import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; -import io.mosip.authentication.core.indauth.dto.ActionableAuthError; -import io.mosip.authentication.core.indauth.dto.AuthError; -import io.mosip.authentication.core.indauth.dto.AuthStatusInfo; -import io.mosip.authentication.core.spi.indauth.match.AuthType; -import io.mosip.authentication.core.spi.indauth.match.MatchInput; -import io.mosip.authentication.core.spi.indauth.match.MatchOutput; -import io.mosip.authentication.core.spi.indauth.match.MatchType.Category; - -/** - * The builder class of AuthStatusInfo. - * - * @author Loganathan Sekar - */ - -public class AuthStatusInfoBuilder { - - private static final String ADDRESS_LINE_ITEMS = "address line item(s)"; - - /** The built flag. */ - private boolean built; - - /** The auth status info. */ - private AuthStatusInfo authStatusInfo; - - /** - * Instantiates a new AuthStatusInfoBuilder. - */ - private AuthStatusInfoBuilder() { - authStatusInfo = new AuthStatusInfo(); - } - - /** - * Gets new instance of AuthStatusInfo. - * - * @return the auth status info builder - */ - public static AuthStatusInfoBuilder newInstance() { - return new AuthStatusInfoBuilder(); - } - - /** - * Sets the status. - * - * @param status the status - * @return the auth status info builder - */ - public AuthStatusInfoBuilder setStatus(boolean status) { - assertNotBuilt(); - authStatusInfo.setStatus(status); - return this; - } - - /** - * Builds the status info. - * - * @param matched the demo matched - * @param listMatchInputs the list match inputs - * @param listMatchOutputs the list match outputs - * @param authTypes the auth types - * @param idMappingConfig the id mapping config - * @return the auth status info - */ - public static AuthStatusInfo buildStatusInfo(boolean matched, List listMatchInputs, - List listMatchOutputs, AuthType[] authTypes, IDAMappingConfig idMappingConfig) { - AuthStatusInfoBuilder statusInfoBuilder = AuthStatusInfoBuilder.newInstance(); - statusInfoBuilder.setStatus(matched); - prepareErrorList(listMatchOutputs, statusInfoBuilder, idMappingConfig); - return statusInfoBuilder.build(); - } - - /** - * Builds the usage data bits. - * - * @param listMatchOutputs the list match outputs - * @param statusInfoBuilder the status info builder - * @param idaMappingConfig the ida mapping config - */ - /** - * prepares the list of errors if the authentication status got failed - * - * @param listMatchOutputs the list match outputs - * @param statusInfoBuilder the status info builder - */ - private static void prepareErrorList(List listMatchOutputs, AuthStatusInfoBuilder statusInfoBuilder, - IDAMappingConfig idaMappingConfig) { - listMatchOutputs.forEach((MatchOutput matchOutput) -> { - if (!matchOutput.isMatched()) { - prepareErrorList(matchOutput, statusInfoBuilder, idaMappingConfig); - } - }); - } - - /** - * @param matchOutput - * @param statusInfoBuilder - */ - private static void prepareErrorList(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder, - IDAMappingConfig idMappingConfig) { - - if (matchOutput != null && !matchOutput.isMatched()) { - String category = matchOutput.getMatchType().getCategory().getType(); - if (category.equalsIgnoreCase(Category.BIO.getType())) { - constructBioError(matchOutput, statusInfoBuilder); - } else if (category.equalsIgnoreCase(Category.SPIN.getType())) { - constructPinError(matchOutput, statusInfoBuilder); - } else if (category.equalsIgnoreCase(Category.DEMO.getType())) { - constructDemoError(matchOutput, statusInfoBuilder, idMappingConfig); - } else if (category.equalsIgnoreCase(Category.OTP.getType())) { - constructOTPError(matchOutput, statusInfoBuilder); - } - } - } - - private static void constructDemoError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder, - IDAMappingConfig idMappingConfig) { - boolean multiLanguage = matchOutput.getMatchType().isMultiLanguage() && matchOutput.getLanguage() != null; - - Optional authTypeForMatchType; - AuthType[] authTypes; - authTypes = DemoAuthType.values(); - authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); - if (authTypeForMatchType.isPresent()) { - AuthError errors = null; - String idName = matchOutput.getIdName(); - - //If name mapping contains the id Name the error message will not be checked for full address mapping condition - List nameMapping = IdaIdMapping.NAME.getMappingFunction().apply(idMappingConfig, - matchOutput.getMatchType()); - String idNameForErrorMessage; - if(nameMapping.contains(idName)) { - idNameForErrorMessage = idName; - } else { - // For Address line items, check if Full address mapping contains the id Name - // the error message will be called as address line item(s) - List fullAddressMappings = IdaIdMapping.FULLADDRESS.getMappingFunction().apply(idMappingConfig, - matchOutput.getMatchType()); - if (fullAddressMappings.contains(idName)) { - idNameForErrorMessage = ADDRESS_LINE_ITEMS; - } else { - idNameForErrorMessage = idName; - } - } - //Need special handling for age since it is mapped to Date of Birth , but error should say about age only. - if(matchOutput.getMatchType().equals(DemoMatchType.AGE)) { - idNameForErrorMessage = IdaIdMapping.AGE.getIdname(); - } - - if (!multiLanguage) { - errors = createActionableAuthError(IdAuthenticationErrorConstants.DEMO_DATA_MISMATCH, idNameForErrorMessage); - } else { - errors = createActionableAuthError(IdAuthenticationErrorConstants.DEMOGRAPHIC_DATA_MISMATCH_LANG, idNameForErrorMessage, - matchOutput.getLanguage()); - } - - statusInfoBuilder.addErrors(errors); - } - } - - private static void constructOTPError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder) { - Optional authTypeForMatchType; - AuthType[] authTypes; - authTypes = PinAuthType.values(); - authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); - - if (authTypeForMatchType.isPresent()) { - AuthError errors = createActionableAuthError(IdAuthenticationErrorConstants.INVALID_OTP, ""); - statusInfoBuilder.addErrors(errors); - } - } - - /** - * Construct pin error. - * - * @param matchOutput the match output - * @param statusInfoBuilder the status info builder - */ - private static void constructPinError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder) { - Optional authTypeForMatchType; - AuthType authType; - AuthType[] authTypes; - authTypes = PinAuthType.values(); - authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); - - if (authTypeForMatchType.isPresent()) { - authType = authTypeForMatchType.get(); - if (authType.getDisplayName().equals(PinAuthType.SPIN.getDisplayName())) { - AuthError errors = createActionableAuthError(IdAuthenticationErrorConstants.PIN_MISMATCH, ""); - statusInfoBuilder.addErrors(errors); - } - } - } - - /** - * Construct bio error. - * - * @param matchOutput the match output - * @param statusInfoBuilder the status info builder - */ - private static void constructBioError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder) { - Optional authTypeForMatchType; - AuthType[] authTypes; - authTypes = BioAuthType.values(); - authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); - if (authTypeForMatchType.isPresent()) { - AuthType authType = authTypeForMatchType.get(); - String type; - if(!authType.equals(BioAuthType.MULTI_MODAL)){ - type = " - " + authType.getType(); - } else { - type = ""; - } - - AuthError errors = createActionableAuthError(IdAuthenticationErrorConstants.BIO_MISMATCH, - type); - statusInfoBuilder.addErrors(errors); - } - } - - /** - * Construct Actionable Auth errors. - * - * @param idAuthenticationErrorConstants - * @param paramName - * @return - */ - private static AuthError createActionableAuthError(IdAuthenticationErrorConstants idAuthenticationErrorConstants, - Object... params) { - String errorCode = idAuthenticationErrorConstants.getErrorCode(); - String errorMessage = String.format(idAuthenticationErrorConstants.getErrorMessage(), params); - String actionMessage; - if (idAuthenticationErrorConstants.getActionMessage() != null) { - actionMessage = String.format(idAuthenticationErrorConstants.getActionMessage(), params); - } else { - actionMessage = null; - } - return new ActionableAuthError(errorCode, errorMessage, actionMessage); - } - - /** - * Adds the errors to the AuthStatusInfo. - * - * @param errors the errors - * @return the auth status info builder - */ - public AuthStatusInfoBuilder addErrors(AuthError... errors) { - assertNotBuilt(); - if (authStatusInfo.getErr() == null) { - authStatusInfo.setErr(new ArrayList<>()); - } - - authStatusInfo.getErr().addAll(Arrays.asList(errors)); - return this; - } - - /** - * Builds the AuthStatusInfo. - * - * @return the AuthStatusInfo instance - */ - public AuthStatusInfo build() { - assertNotBuilt(); - built = true; - return authStatusInfo; - } - - /** - * Assert that AuthStatusInfo is not built. - */ - private void assertNotBuilt() { - if (built) { - throw new IllegalStateException(); - } - } -} +package io.mosip.authentication.common.service.builder; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + +import io.mosip.authentication.common.service.config.IDAMappingConfig; +import io.mosip.authentication.common.service.impl.match.BioAuthType; +import io.mosip.authentication.common.service.impl.match.DemoAuthType; +import io.mosip.authentication.common.service.impl.match.DemoMatchType; +import io.mosip.authentication.common.service.impl.match.IdaIdMapping; +import io.mosip.authentication.common.service.impl.match.KeyBindedTokenAuthType; +import io.mosip.authentication.common.service.impl.match.PasswordAuthType; +import io.mosip.authentication.common.service.impl.match.PinAuthType; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.indauth.dto.ActionableAuthError; +import io.mosip.authentication.core.indauth.dto.AuthError; +import io.mosip.authentication.core.indauth.dto.AuthStatusInfo; +import io.mosip.authentication.core.spi.indauth.match.AuthType; +import io.mosip.authentication.core.spi.indauth.match.MatchInput; +import io.mosip.authentication.core.spi.indauth.match.MatchOutput; +import io.mosip.authentication.core.spi.indauth.match.MatchType.Category; + +/** + * The builder class of AuthStatusInfo. + * + * @author Loganathan Sekar + */ + +public class AuthStatusInfoBuilder { + + private static final String ADDRESS_LINE_ITEMS = "address line item(s)"; + + /** The built flag. */ + private boolean built; + + /** The auth status info. */ + private AuthStatusInfo authStatusInfo; + + /** + * Instantiates a new AuthStatusInfoBuilder. + */ + private AuthStatusInfoBuilder() { + authStatusInfo = new AuthStatusInfo(); + } + + /** + * Gets new instance of AuthStatusInfo. + * + * @return the auth status info builder + */ + public static AuthStatusInfoBuilder newInstance() { + return new AuthStatusInfoBuilder(); + } + + /** + * Sets the status. + * + * @param status the status + * @return the auth status info builder + */ + public AuthStatusInfoBuilder setStatus(boolean status) { + assertNotBuilt(); + authStatusInfo.setStatus(status); + return this; + } + + /** + * Builds the status info. + * + * @param matched the demo matched + * @param listMatchInputs the list match inputs + * @param listMatchOutputs the list match outputs + * @param authTypes the auth types + * @param idMappingConfig the id mapping config + * @return the auth status info + */ + public static AuthStatusInfo buildStatusInfo(boolean matched, List listMatchInputs, + List listMatchOutputs, AuthType[] authTypes, IDAMappingConfig idMappingConfig) { + AuthStatusInfoBuilder statusInfoBuilder = AuthStatusInfoBuilder.newInstance(); + statusInfoBuilder.setStatus(matched); + prepareErrorList(listMatchOutputs, statusInfoBuilder, idMappingConfig); + return statusInfoBuilder.build(); + } + + /** + * Builds the usage data bits. + * + * @param listMatchOutputs the list match outputs + * @param statusInfoBuilder the status info builder + * @param idaMappingConfig the ida mapping config + */ + /** + * prepares the list of errors if the authentication status got failed + * + * @param listMatchOutputs the list match outputs + * @param statusInfoBuilder the status info builder + */ + private static void prepareErrorList(List listMatchOutputs, AuthStatusInfoBuilder statusInfoBuilder, + IDAMappingConfig idaMappingConfig) { + listMatchOutputs.forEach((MatchOutput matchOutput) -> { + if (!matchOutput.isMatched()) { + prepareErrorList(matchOutput, statusInfoBuilder, idaMappingConfig); + } + }); + } + + /** + * @param matchOutput + * @param statusInfoBuilder + */ + private static void prepareErrorList(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder, + IDAMappingConfig idMappingConfig) { + + if (matchOutput != null && !matchOutput.isMatched()) { + String category = matchOutput.getMatchType().getCategory().getType(); + if (category.equalsIgnoreCase(Category.BIO.getType())) { + constructBioError(matchOutput, statusInfoBuilder); + } else if (category.equalsIgnoreCase(Category.SPIN.getType())) { + constructPinError(matchOutput, statusInfoBuilder); + } else if (category.equalsIgnoreCase(Category.DEMO.getType())) { + constructDemoError(matchOutput, statusInfoBuilder, idMappingConfig); + } else if (category.equalsIgnoreCase(Category.OTP.getType())) { + constructOTPError(matchOutput, statusInfoBuilder); + } else if (category.equalsIgnoreCase(Category.PWD.getType())) { + constructPWDError(matchOutput, statusInfoBuilder); + } else if (category.equalsIgnoreCase(Category.KBT.getType())) { + constructKBTError(matchOutput, statusInfoBuilder); + } + } + } + + private static void constructDemoError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder, + IDAMappingConfig idMappingConfig) { + boolean multiLanguage = matchOutput.getMatchType().isMultiLanguage() && matchOutput.getLanguage() != null; + + Optional authTypeForMatchType; + AuthType[] authTypes; + authTypes = DemoAuthType.values(); + authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); + if (authTypeForMatchType.isPresent()) { + AuthError errors = null; + String idName = matchOutput.getIdName(); + + //If name mapping contains the id Name the error message will not be checked for full address mapping condition + List nameMapping = IdaIdMapping.NAME.getMappingFunction().apply(idMappingConfig, + matchOutput.getMatchType()); + String idNameForErrorMessage; + if(nameMapping.contains(idName)) { + idNameForErrorMessage = idName; + } else { + // For Address line items, check if Full address mapping contains the id Name + // the error message will be called as address line item(s) + List fullAddressMappings = IdaIdMapping.FULLADDRESS.getMappingFunction().apply(idMappingConfig, + matchOutput.getMatchType()); + if (fullAddressMappings.contains(idName)) { + idNameForErrorMessage = ADDRESS_LINE_ITEMS; + } else { + idNameForErrorMessage = idName; + } + } + //Need special handling for age since it is mapped to Date of Birth , but error should say about age only. + if(matchOutput.getMatchType().equals(DemoMatchType.AGE)) { + idNameForErrorMessage = IdaIdMapping.AGE.getIdname(); + } + + if (!multiLanguage) { + errors = createActionableAuthError(IdAuthenticationErrorConstants.DEMO_DATA_MISMATCH, idNameForErrorMessage); + } else { + errors = createActionableAuthError(IdAuthenticationErrorConstants.DEMOGRAPHIC_DATA_MISMATCH_LANG, idNameForErrorMessage, + matchOutput.getLanguage()); + } + + statusInfoBuilder.addErrors(errors); + } + } + + private static void constructOTPError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder) { + Optional authTypeForMatchType; + AuthType[] authTypes; + authTypes = PinAuthType.values(); + authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); + + if (authTypeForMatchType.isPresent()) { + AuthError errors = createActionableAuthError(IdAuthenticationErrorConstants.INVALID_OTP, ""); + statusInfoBuilder.addErrors(errors); + } + } + + private static void constructPWDError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder) { + Optional authTypeForMatchType; + AuthType[] authTypes; + authTypes = PasswordAuthType.values(); + authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); + + if (authTypeForMatchType.isPresent()) { + AuthError errors = createActionableAuthError(IdAuthenticationErrorConstants.PASSWORD_MISMATCH, ""); + statusInfoBuilder.addErrors(errors); + } + } + + private static void constructKBTError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder) { + Optional authTypeForMatchType; + AuthType[] authTypes; + authTypes = KeyBindedTokenAuthType.values(); + authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); + + if (authTypeForMatchType.isPresent()) { + AuthError errors = createActionableAuthError(IdAuthenticationErrorConstants.ERROR_TOKEN_VERIFICATION, ""); + statusInfoBuilder.addErrors(errors); + } + } + + /** + * Construct pin error. + * + * @param matchOutput the match output + * @param statusInfoBuilder the status info builder + */ + private static void constructPinError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder) { + Optional authTypeForMatchType; + AuthType authType; + AuthType[] authTypes; + authTypes = PinAuthType.values(); + authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); + + if (authTypeForMatchType.isPresent()) { + authType = authTypeForMatchType.get(); + if (authType.getDisplayName().equals(PinAuthType.SPIN.getDisplayName())) { + AuthError errors = createActionableAuthError(IdAuthenticationErrorConstants.PIN_MISMATCH, ""); + statusInfoBuilder.addErrors(errors); + } + } + } + + /** + * Construct bio error. + * + * @param matchOutput the match output + * @param statusInfoBuilder the status info builder + */ + private static void constructBioError(MatchOutput matchOutput, AuthStatusInfoBuilder statusInfoBuilder) { + Optional authTypeForMatchType; + AuthType[] authTypes; + authTypes = BioAuthType.values(); + authTypeForMatchType = AuthType.getAuthTypeForMatchType(matchOutput.getMatchType(), authTypes); + if (authTypeForMatchType.isPresent()) { + AuthType authType = authTypeForMatchType.get(); + String type; + if(!authType.equals(BioAuthType.MULTI_MODAL)){ + type = " - " + authType.getType(); + } else { + type = ""; + } + + AuthError errors = createActionableAuthError(IdAuthenticationErrorConstants.BIO_MISMATCH, + type); + statusInfoBuilder.addErrors(errors); + } + } + + /** + * Construct Actionable Auth errors. + * + * @param idAuthenticationErrorConstants + * @param paramName + * @return + */ + private static AuthError createActionableAuthError(IdAuthenticationErrorConstants idAuthenticationErrorConstants, + Object... params) { + String errorCode = idAuthenticationErrorConstants.getErrorCode(); + String errorMessage = String.format(idAuthenticationErrorConstants.getErrorMessage(), params); + String actionMessage; + if (idAuthenticationErrorConstants.getActionMessage() != null) { + actionMessage = String.format(idAuthenticationErrorConstants.getActionMessage(), params); + } else { + actionMessage = null; + } + return new ActionableAuthError(errorCode, errorMessage, actionMessage); + } + + /** + * Adds the errors to the AuthStatusInfo. + * + * @param errors the errors + * @return the auth status info builder + */ + public AuthStatusInfoBuilder addErrors(AuthError... errors) { + assertNotBuilt(); + if (authStatusInfo.getErr() == null) { + authStatusInfo.setErr(new ArrayList<>()); + } + + authStatusInfo.getErr().addAll(Arrays.asList(errors)); + return this; + } + + /** + * Builds the AuthStatusInfo. + * + * @return the AuthStatusInfo instance + */ + public AuthStatusInfo build() { + assertNotBuilt(); + built = true; + return authStatusInfo; + } + + /** + * Assert that AuthStatusInfo is not built. + */ + private void assertNotBuilt() { + if (built) { + throw new IllegalStateException(); + } + } +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/config/IDAMappingConfig.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/config/IDAMappingConfig.java index b2f00b47101..59d3ca494a9 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/config/IDAMappingConfig.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/config/IDAMappingConfig.java @@ -8,6 +8,7 @@ import org.springframework.context.annotation.PropertySource; import io.mosip.authentication.common.service.factory.IDAMappingFactory; +import io.mosip.authentication.core.indauth.dto.KeyBindedTokenDTO; import io.mosip.authentication.core.spi.indauth.match.MappingConfig; import lombok.Data; @@ -126,4 +127,6 @@ public class IDAMappingConfig implements MappingConfig { /** The dynamic attributes. */ private Map> dynamicAttributes; + /** The password. */ + private List password; } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/config/KafkaProducerConfig.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/config/KafkaProducerConfig.java new file mode 100644 index 00000000000..7612dc557d1 --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/config/KafkaProducerConfig.java @@ -0,0 +1,44 @@ +package io.mosip.authentication.common.service.config; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.serialization.StringSerializer; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.kafka.core.DefaultKafkaProducerFactory; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.kafka.core.ProducerFactory; +import org.springframework.kafka.support.serializer.JsonSerializer; +import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED; + +/** + * The Class KafkaProducerConfig. + * + * @author Neha + */ + +@Configuration +@ConditionalOnProperty(value = AUTHENTICATION_ERROR_EVENTING_ENABLED, havingValue = "true", matchIfMissing = false) +public class KafkaProducerConfig { + + @Value(value = "${mosip.ida.kafka.bootstrap.servers}") + private String bootstrapAddress; + + @Bean + public ProducerFactory producerFactory() { + Map configProps = new HashMap<>(); + configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress); + configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class); + configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, JsonSerializer.class); + return new DefaultKafkaProducerFactory<>(configProps); + } + + @Bean + public KafkaTemplate kafkaTemplate() { + return new KafkaTemplate<>(producerFactory()); + } +} \ No newline at end of file diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/CredSubjectIdStore.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/CredSubjectIdStore.java new file mode 100644 index 00000000000..d0a8a9eab82 --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/CredSubjectIdStore.java @@ -0,0 +1,68 @@ +package io.mosip.authentication.common.service.entity; + +import java.time.LocalDateTime; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; + +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +@Table(name = "cred_subject_id_store", schema = "ida") +@Entity +public class CredSubjectIdStore { + + @Id + @NotNull + @Column(name = "id") + private String id; + + @NotNull + @Column(name = "id_vid_hash") + private String idVidHash; + + @NotNull + @Column(name = "token_id") + private String tokenId; + + @NotNull + @Column(name = "cred_subject_id") + private String credSubjectId; + + @NotNull + @Column(name = "csid_key_hash") + private String csidKeyHash; + + @NotNull + @Column(name = "oidc_client_id") + private String oidcClientId; + + @NotNull + @Column(name = "csid_status") + private String csidStatus; + + @NotNull + @Column(name = "cr_by") + private String createdBy; + + @NotNull + @Column(name = "cr_dtimes") + private LocalDateTime crDTimes; + + @Column(name = "upd_by") + private String updatedBy; + + @Column(name = "upd_dtimes") + private LocalDateTime updDTimes; + + @Column(name = "is_deleted") + private boolean isDeleted; + + @Column(name = "del_dtimes") + private LocalDateTime delDTimes; +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/PolicyData.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/PolicyData.java index 5898b958ecb..358b121a066 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/PolicyData.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/PolicyData.java @@ -97,7 +97,7 @@ public JSONObject getPolicy() { return OBJECT_MAPPER.readValue(CryptoUtil.decodeBase64Url(new String(this.policy)), JSONObject.class); } catch (IOException e) { // This block will never be executed - e.printStackTrace(); + //e.printStackTrace(); return null; } } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/exception/IdAuthExceptionHandler.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/exception/IdAuthExceptionHandler.java index c98bd7d787e..6a01b5a226a 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/exception/IdAuthExceptionHandler.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/exception/IdAuthExceptionHandler.java @@ -46,6 +46,8 @@ import io.mosip.authentication.core.indauth.dto.EncryptedKycRespDTO; import io.mosip.authentication.core.indauth.dto.KycExchangeResponseDTO; import io.mosip.authentication.core.indauth.dto.ResponseDTO; +import io.mosip.authentication.core.indauth.dto.VCResponseDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeResponseDTO; import io.mosip.authentication.core.logger.IdaLogger; import io.mosip.authentication.core.otp.dto.OtpResponseDTO; import io.mosip.idrepository.core.exception.RestServiceException; @@ -382,6 +384,13 @@ private static Object frameErrorResponse(String requestReceived, String type, Li EncryptedKycRespDTO encryptedKycRespDTO = new EncryptedKycRespDTO(); kycExchangeResponseDTO.setResponse(encryptedKycRespDTO); return kycExchangeResponseDTO; + case "vci-exchange": + VciExchangeResponseDTO vciExchangeResponseDTO = new VciExchangeResponseDTO(); + vciExchangeResponseDTO.setErrors(errors); + vciExchangeResponseDTO.setResponseTime(responseTime); + VCResponseDTO vcResponseDTO = null; + vciExchangeResponseDTO.setResponse(vcResponseDTO); + return vciExchangeResponseDTO; case "internal": if (Objects.nonNull(type) && type.equalsIgnoreCase(IdAuthCommonConstants.OTP)) { OtpResponseDTO internalotpresponsedto = new OtpResponseDTO(); diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/facade/AuthFacadeImpl.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/facade/AuthFacadeImpl.java index e215a10e3a8..3a3b27878cf 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/facade/AuthFacadeImpl.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/facade/AuthFacadeImpl.java @@ -29,6 +29,7 @@ import io.mosip.authentication.common.service.helper.AuditHelper; import io.mosip.authentication.common.service.helper.AuthTransactionHelper; import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.impl.match.IdaIdMapping; import io.mosip.authentication.common.service.integration.TokenIdManager; import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; import io.mosip.authentication.common.service.util.AuthTypeUtil; @@ -47,6 +48,7 @@ import io.mosip.authentication.core.indauth.dto.AuthStatusInfo; import io.mosip.authentication.core.indauth.dto.IdType; import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO; import io.mosip.authentication.core.indauth.dto.EkycAuthRequestDTO; import io.mosip.authentication.core.logger.IdaLogger; import io.mosip.authentication.core.partner.dto.PartnerPolicyResponseDTO; @@ -58,6 +60,7 @@ import io.mosip.authentication.core.spi.indauth.service.BioAuthService; import io.mosip.authentication.core.spi.indauth.service.DemoAuthService; import io.mosip.authentication.core.spi.indauth.service.OTPAuthService; +import io.mosip.authentication.core.spi.indauth.service.PasswordAuthService; import io.mosip.authentication.core.spi.notification.service.NotificationService; import io.mosip.authentication.core.spi.partner.service.PartnerService; import io.mosip.kernel.core.logger.spi.Logger; @@ -129,6 +132,9 @@ public class AuthFacadeImpl implements AuthFacade { @Autowired private KeyBindedTokenAuthService keyBindedTokenAuthService; + + @Autowired + private PasswordAuthService passwordAuthService; /* * (non-Javadoc) @@ -161,6 +167,14 @@ public AuthResponseDTO authenticateIndividual(AuthRequestDTO authRequestDTO, boo addKycPolicyAttributes(filterAttributes, kycAuthRequestDTO); } + + if(authRequestDTO instanceof KycAuthRequestDTO) { + KycAuthRequestDTO kycAuthRequestDTO = (KycAuthRequestDTO) authRequestDTO; + // In case of kyc-auth request and password auth is requested + if(AuthTypeUtil.isPassword(kycAuthRequestDTO)) { + filterAttributes.add(IdaIdMapping.PASSWORD.getIdname()); + } + } Map idResDTO = idService.processIdType(idvIdType, idvid, idInfoHelper.isBiometricDataNeeded(authRequestDTO), markVidConsumed, filterAttributes); @@ -312,6 +326,11 @@ private List processAuthType(AuthRequestDTO authRequestDTO, authTxnBuilder, idvidHash); } + if (!isMatchFailed(authStatusList)) { + processPasswordAuth(authRequestDTO, idInfo, token, isAuth, authStatusList, idType, authTokenId, partnerId, + authTxnBuilder, idvidHash); + } + return authStatusList; } @@ -383,7 +402,7 @@ private void processDemoAuth(AuthRequestDTO authRequestDTO, Map> idInfo, String token, + boolean isAuth, List authStatusList, IdType idType, String authTokenId, String partnerId, + AuthTransactionBuilder authTxnBuilder, String idvidHash) throws IdAuthenticationBusinessException { + if (AuthTypeUtil.isPassword(authRequestDTO)) { + AuthStatusInfo passwordMatchStatus = null; + try { + passwordMatchStatus = passwordAuthService.authenticate(authRequestDTO, token, idInfo, partnerId); + authStatusList.add(passwordMatchStatus); + + boolean isStatus = passwordMatchStatus != null && passwordMatchStatus.isStatus(); + auditHelper.audit(AuditModules.PASSWORD_AUTH, AuditEvents.PASSWORD_BASED_AUTH_REQUEST, authRequestDTO.getTransactionID(), + idType, "authenticateApplicant status(Password) : " + isStatus); + } finally { + boolean isStatus = passwordMatchStatus != null && passwordMatchStatus.isStatus(); + logger.info(IdAuthCommonConstants.SESSION_ID, EnvUtil.getAppId(), + AUTH_FACADE, "Password Authentication status : " + isStatus); + authTxnBuilder.addRequestType(RequestType.PASSWORD_AUTH); + } + } + } } \ No newline at end of file diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/filter/BaseIDAFilter.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/filter/BaseIDAFilter.java index 55bf6f085b6..f74ad9f18d8 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/filter/BaseIDAFilter.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/filter/BaseIDAFilter.java @@ -465,6 +465,12 @@ protected String consumeResponse(ResettableStreamHttpServletRequest requestWrapp String requestSignature = requestWrapper.getHeader(SIGNATURE); String responseSignature = null; if(isSigningRequired()) { + if (Objects.isNull(responseAsString) || responseAsString.trim().length() == 0) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, EVENT_FILTER, BASE_IDA_FILTER, + " Response String is null or empty for response (JWT) signing"); + throw new IdAuthenticationAppException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorCode(), + IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorMessage()); + } responseSignature = keyManager.signResponse(responseAsString); responseWrapper.setHeader(EnvUtil.getSignResponse(), responseSignature); } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/filter/IdAuthFilter.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/filter/IdAuthFilter.java index 10b4c712394..e9a162fac2c 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/filter/IdAuthFilter.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/filter/IdAuthFilter.java @@ -28,6 +28,8 @@ import javax.servlet.ServletException; import io.mosip.authentication.core.indauth.dto.KeyBindedTokenDTO; +import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -843,6 +845,7 @@ protected void checkAllowedAuthTypeForKeyBindedToken(Map request Object value = Optional.ofNullable(requestBody.get(IdAuthCommonConstants.REQUEST)) .filter(obj -> obj instanceof Map).map(obj -> ((Map) obj).get(KEY_BINDED_TOKEN)) .filter(obj -> obj instanceof List).orElse(Collections.emptyMap()); + List list = mapper.readValue(mapper.writeValueAsBytes(value), new TypeReference>() { }); @@ -861,6 +864,19 @@ protected void checkAllowedAuthTypeForKeyBindedToken(Map request } } + protected void checkAllowedAuthTypeForPassword(Map requestBody, List authPolicies) + throws IdAuthenticationAppException, IOException { + KycAuthRequestDTO authRequestDTO = mapper.readValue(mapper.writeValueAsBytes(requestBody), + KycAuthRequestDTO.class); + + if (AuthTypeUtil.isPassword(authRequestDTO) && !isAllowedAuthType(MatchType.Category.PWD.getType(), authPolicies)) { + throw new IdAuthenticationAppException( + IdAuthenticationErrorConstants.AUTHTYPE_NOT_ALLOWED.getErrorCode(), + String.format(IdAuthenticationErrorConstants.AUTHTYPE_NOT_ALLOWED.getErrorMessage(), + MatchType.Category.PWD.name())); + } + } + /** * Check allowed auth type for bio. * @@ -1042,16 +1058,25 @@ private void checkAllowedAMRBasedOnClientConfig(Map requestBody, if (AuthTypeUtil.isPin(authRequestDTO) && !allowedAMRs.contains(MatchType.Category.SPIN.getType())) { throw new IdAuthenticationAppException( - IdAuthenticationErrorConstants.AUTHTYPE_NOT_ALLOWED.getErrorCode(), - String.format(IdAuthenticationErrorConstants.AUTHTYPE_NOT_ALLOWED.getErrorMessage(), + IdAuthenticationErrorConstants.OIDC_CLIENT_AUTHTYPE_NOT_ALLOWED.getErrorCode(), + String.format(IdAuthenticationErrorConstants.OIDC_CLIENT_AUTHTYPE_NOT_ALLOWED.getErrorMessage(), MatchType.Category.SPIN.name())); } if (AuthTypeUtil.isOtp(authRequestDTO) && !allowedAMRs.contains(MatchType.Category.OTP.getType())) { throw new IdAuthenticationAppException( - IdAuthenticationErrorConstants.AUTHTYPE_NOT_ALLOWED.getErrorCode(), - String.format(IdAuthenticationErrorConstants.AUTHTYPE_NOT_ALLOWED.getErrorMessage(), + IdAuthenticationErrorConstants.OIDC_CLIENT_AUTHTYPE_NOT_ALLOWED.getErrorCode(), + String.format(IdAuthenticationErrorConstants.OIDC_CLIENT_AUTHTYPE_NOT_ALLOWED.getErrorMessage(), MatchType.Category.OTP.name())); } + + KycAuthRequestDTO kycAuthRequestDTO = mapper.readValue(mapper.writeValueAsBytes(requestBody), + KycAuthRequestDTO.class); + if (AuthTypeUtil.isPassword(kycAuthRequestDTO) && !allowedAMRs.contains(MatchType.Category.PWD.getType())) { + throw new IdAuthenticationAppException( + IdAuthenticationErrorConstants.OIDC_CLIENT_AUTHTYPE_NOT_ALLOWED.getErrorCode(), + String.format(IdAuthenticationErrorConstants.OIDC_CLIENT_AUTHTYPE_NOT_ALLOWED.getErrorMessage(), + MatchType.Category.PWD.name())); + } checkAllowedAMRForKBT(requestBody, allowedAMRs); } } catch (IOException e) { @@ -1119,19 +1144,28 @@ private Set getAuthenticationFactors(PartnerPolicyResponseDTO partnerPol * @param requestWrapper the request wrapper * @return the auth part */ - protected Map getAuthPart(ResettableStreamHttpServletRequest requestWrapper) { + protected Map getAuthPart(ResettableStreamHttpServletRequest requestWrapper) throws IdAuthenticationAppException{ Map params = new HashMap<>(); String url = requestWrapper.getRequestURL().toString(); String contextPath = requestWrapper.getContextPath(); if ((Objects.nonNull(url) && !url.isEmpty()) && (Objects.nonNull(contextPath) && !contextPath.isEmpty())) { String[] splitedUrlByContext = url.split(contextPath); String[] paramsArray = Stream.of(splitedUrlByContext[1].split("/")).filter(str -> !str.isEmpty()) - .toArray(size -> new String[size]); + .toArray(size -> new String[size]); + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getCanonicalName(), "getAuthPart", + "List of Path Parameters received in url: " + Stream.of(paramsArray).collect(Collectors.joining(", "))); if (paramsArray.length >= 3) { params.put(MISPLICENSE_KEY, paramsArray[paramsArray.length - 3]); params.put(PARTNER_ID, paramsArray[paramsArray.length - 2]); params.put(API_KEY, paramsArray[paramsArray.length - 1]); + } else { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getCanonicalName(), "getAuthPart", + "Required Number of Path Parameters are not available in URL."); + throw new IdAuthenticationAppException( + IdAuthenticationErrorConstants.URI_PATH_PARAMS_MISSING.getErrorCode(), + IdAuthenticationErrorConstants.URI_PATH_PARAMS_MISSING.getErrorMessage()); + } } return params; diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/AuditHelper.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/AuditHelper.java index 55c9edc9189..bb22b52a9db 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/AuditHelper.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/AuditHelper.java @@ -1,188 +1,196 @@ -package io.mosip.authentication.common.service.helper; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Component; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.mosip.authentication.common.service.exception.IdAuthExceptionHandler; -import io.mosip.authentication.common.service.factory.AuditRequestFactory; -import io.mosip.authentication.common.service.factory.RestRequestFactory; -import io.mosip.authentication.common.service.impl.match.BioAuthType; -import io.mosip.authentication.common.service.util.AuthTypeUtil; -import io.mosip.authentication.common.service.util.EnvUtil; -import io.mosip.authentication.core.constant.AuditEvents; -import io.mosip.authentication.core.constant.AuditModules; -import io.mosip.authentication.core.constant.RestServicesConstants; -import io.mosip.authentication.core.dto.AuditRequestDto; -import io.mosip.authentication.core.exception.IDDataValidationException; -import io.mosip.authentication.core.exception.IdAuthenticationBaseException; -import io.mosip.authentication.core.indauth.dto.AuthError; -import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; -import io.mosip.authentication.core.indauth.dto.BioIdentityInfoDTO; -import io.mosip.authentication.core.indauth.dto.IdType; -import io.mosip.idrepository.core.dto.RestRequestDTO; -import io.mosip.idrepository.core.helper.RestHelper; -import io.mosip.kernel.core.http.RequestWrapper; - -/** - * The Class AuditHelper - build audit requests and send it to audit service. - * - * @author Manoj SP - */ -@Component -public class AuditHelper { - - /** The rest helper. */ - @Autowired - @Qualifier("withSelfTokenWebclient") - private RestHelper restHelper; - - /** The audit factory. */ - @Autowired - private AuditRequestFactory auditFactory; - - /** The rest factory. */ - @Autowired - private RestRequestFactory restFactory; - - @Autowired - private ObjectMapper mapper; - - /** The EnvPropertyResolver */ - @Autowired - private EnvUtil env; - - - /** - * Method to build audit requests and send it to audit service. - * - * @param module {@link AuditModules} - * @param event {@link AuditEvents} - * @param id UIN/VID - * @param idType {@link IdType} enum - * @param desc the desc - * @throws IDDataValidationException the ID data validation exception - */ - public void audit(AuditModules module, AuditEvents event, String id, IdType idType, String desc) - throws IDDataValidationException { - audit(module, event, id, idType.name(), desc); - } - - /** - * Method to build audit requests and send it to audit service. - * - * @param module {@link AuditModules} - * @param event {@link AuditEvents} - * @param id UIN/VID - * @param idType {@link IdType} name - * @param desc the desc - * @throws IDDataValidationException the ID data validation exception - */ - public void audit(AuditModules module, AuditEvents event, String id, String idType, String desc) - throws IDDataValidationException { - RequestWrapper auditRequest = auditFactory.buildRequest(module, event, id, idType, desc); - RestRequestDTO restRequest = restFactory.buildRequest(RestServicesConstants.AUDIT_MANAGER_SERVICE, auditRequest, - Map.class); - restHelper.requestAsync(restRequest); - } - - /** - * Method to build audit error scenarios and send it to audit service. - * - * @param module {@link AuditModules} - * @param event {@link AuditEvents} - * @param id UIN/VID - * @param idType {@link IdType} enum - * @param desc the desc - * @throws IDDataValidationException the ID data validation exception - */ - public void audit(AuditModules module, AuditEvents event, String id, IdType idType, IdAuthenticationBaseException e) - throws IDDataValidationException { - audit(module, event, id, idType.name(), e); - } - - /** - * Method to build audit error scenarios and send it to audit service. - * - * @param module {@link AuditModules} - * @param event {@link AuditEvents} - * @param id UIN/VID - * @param idType {@link IdType} name - * @param desc the desc - * @throws IDDataValidationException the ID data validation exception - */ - public void audit(AuditModules module, AuditEvents event, String id, String idType, IdAuthenticationBaseException e) - throws IDDataValidationException { - List errorList = IdAuthExceptionHandler.getAuthErrors(e); - String error; - try { - error = mapper.writeValueAsString(errorList); - } catch (JsonProcessingException e1) { - //Probably will not occur - error = "Error : " + e.getErrorCode() + " - " + e.getErrorText(); - } - audit(module, event, id, idType, error); - } - - public void auditExceptionForAuthRequestedModules(AuditEvents authAuditEvent, AuthRequestDTO authRequestDTO, - IdAuthenticationBaseException e) throws IDDataValidationException { - List auditModules = getAuditModules(authRequestDTO); - for (AuditModules auditModule : auditModules) { - audit(auditModule, authAuditEvent, authRequestDTO.getIndividualId(), authRequestDTO.getIndividualIdType(), - e); - } - } - - public void auditStatusForAuthRequestedModules(AuditEvents authAuditEvent, AuthRequestDTO authRequestDTO, - String status) throws IDDataValidationException { - List auditModules = getAuditModules(authRequestDTO); - for (AuditModules auditModule : auditModules) { - audit(auditModule, authAuditEvent, authRequestDTO.getIndividualId(), authRequestDTO.getIndividualIdType(), - status); - } - } - - private List getAuditModules(AuthRequestDTO authRequestDTO) { - List auditModules = new ArrayList<>(5); - if (AuthTypeUtil.isOtp(authRequestDTO)) { - auditModules.add(AuditModules.OTP_AUTH); - } - - if (AuthTypeUtil.isDemo(authRequestDTO)) { - auditModules.add(AuditModules.DEMO_AUTH); - } - - if (AuthTypeUtil.isPin(authRequestDTO)) { - auditModules.add(AuditModules.PIN_AUTH); - } - - if (AuthTypeUtil.isBio(authRequestDTO)) { - if (authRequestDTO.getRequest() != null && authRequestDTO.getRequest().getBiometrics() != null) { - if ((authRequestDTO.getRequest().getBiometrics().stream().map(BioIdentityInfoDTO::getData).anyMatch( - bioInfo -> BioAuthType.FGR_IMG.getType().equals(bioInfo.getBioType()) || (EnvUtil.getIsFmrEnabled() - && BioAuthType.FGR_MIN.getType().equals(bioInfo.getBioType()))))) { - auditModules.add(AuditModules.FINGERPRINT_AUTH); - } - - if (authRequestDTO.getRequest().getBiometrics().stream().map(BioIdentityInfoDTO::getData) - .anyMatch(bioInfo -> BioAuthType.IRIS_IMG.getType().equals(bioInfo.getBioType()))) { - auditModules.add(AuditModules.IRIS_AUTH); - } - - if (authRequestDTO.getRequest().getBiometrics().stream().map(BioIdentityInfoDTO::getData) - .anyMatch(bioInfo -> BioAuthType.FACE_IMG.getType().equals(bioInfo.getBioType()))) { - auditModules.add(AuditModules.FACE_AUTH); - } - } - } - return auditModules; - } - -} +package io.mosip.authentication.common.service.helper; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.mosip.authentication.common.service.exception.IdAuthExceptionHandler; +import io.mosip.authentication.common.service.factory.AuditRequestFactory; +import io.mosip.authentication.common.service.factory.RestRequestFactory; +import io.mosip.authentication.common.service.impl.match.BioAuthType; +import io.mosip.authentication.common.service.util.AuthTypeUtil; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.constant.AuditEvents; +import io.mosip.authentication.core.constant.AuditModules; +import io.mosip.authentication.core.constant.RestServicesConstants; +import io.mosip.authentication.core.dto.AuditRequestDto; +import io.mosip.authentication.core.exception.IDDataValidationException; +import io.mosip.authentication.core.exception.IdAuthenticationBaseException; +import io.mosip.authentication.core.indauth.dto.AuthError; +import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.BioIdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.IdType; +import io.mosip.idrepository.core.dto.RestRequestDTO; +import io.mosip.idrepository.core.helper.RestHelper; +import io.mosip.kernel.core.http.RequestWrapper; + +/** + * The Class AuditHelper - build audit requests and send it to audit service. + * + * @author Manoj SP + */ +@Component +public class AuditHelper { + + /** The rest helper. */ + @Autowired + @Qualifier("withSelfTokenWebclient") + private RestHelper restHelper; + + /** The audit factory. */ + @Autowired + private AuditRequestFactory auditFactory; + + /** The rest factory. */ + @Autowired + private RestRequestFactory restFactory; + + @Autowired + private ObjectMapper mapper; + + /** The EnvPropertyResolver */ + @Autowired + private EnvUtil env; + + + /** + * Method to build audit requests and send it to audit service. + * + * @param module {@link AuditModules} + * @param event {@link AuditEvents} + * @param id UIN/VID + * @param idType {@link IdType} enum + * @param desc the desc + * @throws IDDataValidationException the ID data validation exception + */ + public void audit(AuditModules module, AuditEvents event, String id, IdType idType, String desc) + throws IDDataValidationException { + audit(module, event, id, idType.name(), desc); + } + + /** + * Method to build audit requests and send it to audit service. + * + * @param module {@link AuditModules} + * @param event {@link AuditEvents} + * @param id UIN/VID + * @param idType {@link IdType} name + * @param desc the desc + * @throws IDDataValidationException the ID data validation exception + */ + public void audit(AuditModules module, AuditEvents event, String id, String idType, String desc) + throws IDDataValidationException { + RequestWrapper auditRequest = auditFactory.buildRequest(module, event, id, idType, desc); + RestRequestDTO restRequest = restFactory.buildRequest(RestServicesConstants.AUDIT_MANAGER_SERVICE, auditRequest, + Map.class); + restHelper.requestAsync(restRequest); + } + + /** + * Method to build audit error scenarios and send it to audit service. + * + * @param module {@link AuditModules} + * @param event {@link AuditEvents} + * @param id UIN/VID + * @param idType {@link IdType} enum + * @param desc the desc + * @throws IDDataValidationException the ID data validation exception + */ + public void audit(AuditModules module, AuditEvents event, String id, IdType idType, IdAuthenticationBaseException e) + throws IDDataValidationException { + audit(module, event, id, idType.name(), e); + } + + /** + * Method to build audit error scenarios and send it to audit service. + * + * @param module {@link AuditModules} + * @param event {@link AuditEvents} + * @param id UIN/VID + * @param idType {@link IdType} name + * @param desc the desc + * @throws IDDataValidationException the ID data validation exception + */ + public void audit(AuditModules module, AuditEvents event, String id, String idType, IdAuthenticationBaseException e) + throws IDDataValidationException { + List errorList = IdAuthExceptionHandler.getAuthErrors(e); + String error; + try { + error = mapper.writeValueAsString(errorList); + } catch (JsonProcessingException e1) { + //Probably will not occur + error = "Error : " + e.getErrorCode() + " - " + e.getErrorText(); + } + audit(module, event, id, idType, error); + } + + public void auditExceptionForAuthRequestedModules(AuditEvents authAuditEvent, AuthRequestDTO authRequestDTO, + IdAuthenticationBaseException e) throws IDDataValidationException { + List auditModules = getAuditModules(authRequestDTO); + for (AuditModules auditModule : auditModules) { + audit(auditModule, authAuditEvent, authRequestDTO.getTransactionID(), authRequestDTO.getIndividualIdType(), + e); + } + } + + public void auditStatusForAuthRequestedModules(AuditEvents authAuditEvent, AuthRequestDTO authRequestDTO, + String status) throws IDDataValidationException { + List auditModules = getAuditModules(authRequestDTO); + for (AuditModules auditModule : auditModules) { + audit(auditModule, authAuditEvent, authRequestDTO.getTransactionID(), authRequestDTO.getIndividualIdType(), + status); + } + } + + private List getAuditModules(AuthRequestDTO authRequestDTO) { + List auditModules = new ArrayList<>(5); + if (AuthTypeUtil.isOtp(authRequestDTO)) { + auditModules.add(AuditModules.OTP_AUTH); + } + + if (AuthTypeUtil.isDemo(authRequestDTO)) { + auditModules.add(AuditModules.DEMO_AUTH); + } + + if (AuthTypeUtil.isPin(authRequestDTO)) { + auditModules.add(AuditModules.PIN_AUTH); + } + + if (AuthTypeUtil.isBio(authRequestDTO)) { + if (authRequestDTO.getRequest() != null && authRequestDTO.getRequest().getBiometrics() != null) { + if ((authRequestDTO.getRequest().getBiometrics().stream().map(BioIdentityInfoDTO::getData).anyMatch( + bioInfo -> BioAuthType.FGR_IMG.getType().equals(bioInfo.getBioType()) || (EnvUtil.getIsFmrEnabled() + && BioAuthType.FGR_MIN.getType().equals(bioInfo.getBioType()))))) { + auditModules.add(AuditModules.FINGERPRINT_AUTH); + } + + if (authRequestDTO.getRequest().getBiometrics().stream().map(BioIdentityInfoDTO::getData) + .anyMatch(bioInfo -> BioAuthType.IRIS_IMG.getType().equals(bioInfo.getBioType()))) { + auditModules.add(AuditModules.IRIS_AUTH); + } + + if (authRequestDTO.getRequest().getBiometrics().stream().map(BioIdentityInfoDTO::getData) + .anyMatch(bioInfo -> BioAuthType.FACE_IMG.getType().equals(bioInfo.getBioType()))) { + auditModules.add(AuditModules.FACE_AUTH); + } + } + } + + if (AuthTypeUtil.isKeyBindedToken(authRequestDTO)) { + auditModules.add(AuditModules.TOKEN_AUTH); + } + + if (AuthTypeUtil.isPassword(authRequestDTO)) { + auditModules.add(AuditModules.PASSWORD_AUTH); + } + return auditModules; + } + +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/AuthTransactionHelper.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/AuthTransactionHelper.java index e5572cd6ee2..99e2b2675ba 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/AuthTransactionHelper.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/AuthTransactionHelper.java @@ -36,6 +36,7 @@ import io.mosip.authentication.core.indauth.dto.IdType; import io.mosip.authentication.core.indauth.dto.IdentityKeyBindingRequestDTO; import io.mosip.authentication.core.indauth.dto.KycExchangeRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; import io.mosip.authentication.core.logger.IdaLogger; import io.mosip.authentication.core.otp.dto.OtpRequestDTO; import io.mosip.authentication.core.partner.dto.PartnerDTO; @@ -268,7 +269,12 @@ private AuthTransactionBuilder createAuthTxnBuilder(ObjectWithMetadata requestDT IdentityKeyBindingRequestDTO keyBindingRequestDTO = (IdentityKeyBindingRequestDTO) requestDTO; authTransactionBuilder.withRequest(keyBindingRequestDTO); authTransactionBuilder.addRequestType(RequestType.IDENTITY_KEY_BINDING); - } + } else if(requestDTO instanceof VciExchangeRequestDTO) { + VciExchangeRequestDTO vciExchangeRequestDTO = (VciExchangeRequestDTO) requestDTO; + authTransactionBuilder.withRequest(vciExchangeRequestDTO); + authTransactionBuilder.addRequestType(RequestType.VCI_EXCHANGE_REQUEST); + } + return authTransactionBuilder; } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/IdInfoHelper.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/IdInfoHelper.java index c7293860059..21fdcda6afa 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/IdInfoHelper.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/IdInfoHelper.java @@ -535,6 +535,12 @@ private Map getEntityInfo(Map> idE IdAuthenticationErrorConstants.KEY_BINDING_MISSING.getErrorCode(), String.format(IdAuthenticationErrorConstants.KEY_BINDING_MISSING.getErrorMessage(), input.getAuthType().getType())); + + case PWD: + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.PASSWORD_MISSING.getErrorCode(), + String.format(IdAuthenticationErrorConstants.PASSWORD_MISSING.getErrorMessage(), + input.getAuthType().getType())); } } return entityInfo; diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/TokenValidationHelper.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/TokenValidationHelper.java new file mode 100644 index 00000000000..49cf16533ac --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/helper/TokenValidationHelper.java @@ -0,0 +1,115 @@ +package io.mosip.authentication.common.service.helper; + +import java.time.LocalDateTime; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import io.mosip.authentication.common.service.entity.KycTokenData; +import io.mosip.authentication.common.service.repository.KycTokenDataRepository; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.constant.KycTokenStatusType; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.spi.indauth.service.KycService; +import io.mosip.kernel.core.logger.spi.Logger; + +/** + * Helper class to Validate Token returned in kyc-auth. + * + * @author Mahammed Taheer + */ + +@Component +public class TokenValidationHelper { + + /** The mosip logger. */ + private static Logger mosipLogger = IdaLogger.getLogger(TokenValidationHelper.class); + + /** The Kyc Service */ + @Autowired + private KycService kycService; + + @Autowired + private KycTokenDataRepository kycTokenDataRepo; + + public KycTokenData findAndValidateIssuedToken(String tokenData, String oidcClientId, String reqTransactionId, + String idvidHash) throws IdAuthenticationBusinessException { + + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "findAndValidateIssuedToken", + "Check Token Exists or not, associated with oidc client and active status."); + + Optional tokenDataOpt = kycTokenDataRepo.findByKycToken(tokenData); + if (!tokenDataOpt.isPresent()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "findAndValidateIssuedToken", + "KYC Token not found: " + tokenData); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.KYC_TOKEN_NOT_FOUND.getErrorCode(), + IdAuthenticationErrorConstants.KYC_TOKEN_NOT_FOUND.getErrorMessage()); + } + KycTokenData tokenDataObj = tokenDataOpt.get(); + validateToken(tokenDataObj, oidcClientId, reqTransactionId, idvidHash); + return tokenDataObj; + } + + private void validateToken(KycTokenData kycTokenData, String oidcClientId, String reqTransactionId, String idvidHash) + throws IdAuthenticationBusinessException { + String kycToken = kycTokenData.getKycToken(); + if (kycTokenData.getKycTokenStatus().equals(KycTokenStatusType.PROCESSED.getStatus())) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "findAndValidateIssuedToken", + "KYC Token already processed: " + kycToken); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.KYC_TOKEN_ALREADY_PROCESSED.getErrorCode(), + IdAuthenticationErrorConstants.KYC_TOKEN_ALREADY_PROCESSED.getErrorMessage()); + } + + if (kycTokenData.getKycTokenStatus().equals(KycTokenStatusType.EXPIRED.getStatus())) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "findAndValidateIssuedToken", + "KYC Token expired: " + kycToken); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.KYC_TOKEN_EXPIRED.getErrorCode(), + IdAuthenticationErrorConstants.KYC_TOKEN_EXPIRED.getErrorMessage()); + } + + if (!kycTokenData.getOidcClientId().equals(oidcClientId)) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "findAndValidateIssuedToken", + "KYC Token does not belongs to the provided OIDC Client Id: " + kycToken); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_OIDC_CLIENT_ID.getErrorCode(), + IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_OIDC_CLIENT_ID.getErrorMessage()); + } + + if (!kycTokenData.getIdVidHash().equals(idvidHash)) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "findAndValidateIssuedToken", + "KYC Token does not belongs to the provided UIN/VID: " + kycToken); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_UIN_VID.getErrorCode(), + IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_UIN_VID.getErrorMessage()); + } + + if (!kycTokenData.getRequestTransactionId().equals(reqTransactionId)) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "findAndValidateIssuedToken", + "KYC Auth & KYC Exchange Transaction Ids are not same: " + kycToken); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_TRANSACTION_ID.getErrorCode(), + IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_TRANSACTION_ID.getErrorMessage()); + } + + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "findAndValidateIssuedToken", + "KYC Token found, Check Token expire."); + LocalDateTime tokenIssuedDateTime = kycTokenData.getTokenIssuedDateTime(); + boolean isExpired = kycService.isKycTokenExpire(tokenIssuedDateTime, kycToken); + + if (isExpired) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "findAndValidateIssuedToken", + "KYC Token expired."); + kycTokenData.setKycTokenStatus(KycTokenStatusType.EXPIRED.getStatus()); + kycTokenDataRepo.saveAndFlush(kycTokenData); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.KYC_TOKEN_EXPIRED.getErrorCode(), + IdAuthenticationErrorConstants.KYC_TOKEN_EXPIRED.getErrorMessage()); + } + } +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/AuthContextClazzRefProvider.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/AuthContextClazzRefProvider.java index d7927ba0b3a..dde443ae234 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/AuthContextClazzRefProvider.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/AuthContextClazzRefProvider.java @@ -80,7 +80,7 @@ private AuthMethodsRefValues createAuthMethodsRefValuesObject() throws IdAuthent logger.error(IdAuthCommonConstants.IDA, this.getClass().getSimpleName(), "createAuthMethodsRefValuesObject", "Not able to download the AMR-ACR Json config file. URI: " + amracrMappingUri, e); throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.DOWNLOAD_ERROR.getErrorCode(), - IdAuthenticationErrorConstants.DOWNLOAD_ERROR.getErrorMessage()); + IdAuthenticationErrorConstants.DOWNLOAD_ERROR.getErrorMessage()); } /* ClientResponse clientResponse = webClient.get().uri(amracrMappingUri).accept(MediaType.APPLICATION_JSON).exchange().block(); diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/IdInfoFetcherImpl.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/IdInfoFetcherImpl.java index be8c0aa7aea..89ecc0d8b1c 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/IdInfoFetcherImpl.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/IdInfoFetcherImpl.java @@ -26,6 +26,7 @@ import io.mosip.authentication.common.service.impl.match.IdaIdMapping; import io.mosip.authentication.common.service.integration.MasterDataManager; import io.mosip.authentication.common.service.integration.OTPManager; +import io.mosip.authentication.common.service.integration.PasswordComparator; import io.mosip.authentication.common.service.util.BioMatcherUtil; import io.mosip.authentication.common.service.util.EnvUtil; import io.mosip.authentication.core.constant.IdAuthCommonConstants; @@ -37,6 +38,7 @@ import io.mosip.authentication.core.indauth.dto.RequestDTO; import io.mosip.authentication.core.spi.bioauth.CbeffDocType; import io.mosip.authentication.core.spi.indauth.match.AuthType; +import io.mosip.authentication.core.spi.indauth.match.ComparePasswordFunction; import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; import io.mosip.authentication.core.spi.indauth.match.IdMapping; import io.mosip.authentication.core.spi.indauth.match.MappingConfig; @@ -96,6 +98,9 @@ public class IdInfoFetcherImpl implements IdInfoFetcher { @Autowired(required = false) private KeyBindedTokenMatcherUtil keyBindedTokenMatcherUtil; + + @Autowired(required = false) + private PasswordComparator passwordComparator; /** * Gets the demo normalizer. @@ -566,10 +571,23 @@ public List getUserPreferredLanguages(Map> if (userPreferredLangAttribute != null) { List identityInfoList = idInfo.get(userPreferredLangAttribute); if (identityInfoList != null) { - return identityInfoList.stream().map(IdentityInfoDTO::getValue).collect(Collectors.toList()); + return identityInfoList.stream().map(info -> info.getValue().split(",")) + .flatMap(java.util.Arrays::stream) + .collect(Collectors.toList()); } return Collections.emptyList(); } return Collections.emptyList(); } + + /* + * Get Match password Function + * + * @see io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher# + * getMatchPasswordFunction() + */ + @Override + public ComparePasswordFunction getMatchPasswordFunction() { + return passwordComparator::matchPasswordFunction; + } } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/IdServiceImpl.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/IdServiceImpl.java index fb5949bcd68..452a1c30d14 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/IdServiceImpl.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/IdServiceImpl.java @@ -118,7 +118,7 @@ public Map getIdByVid(String vid, boolean isBio, Set fil public Map processIdType(String idvIdType, String idvId, boolean isBio, boolean markVidConsumed, Set filterAttributes) throws IdAuthenticationBusinessException { Map idResDTO = null; - if (idvIdType.equals(IdType.UIN.getType())) { + if (idvIdType.equals(IdType.UIN.getType()) || idvIdType.equals(IdType.HANDLE.getType())) { try { idResDTO = getIdByUin(idvId, isBio, filterAttributes); } catch (IdAuthenticationBusinessException e) { @@ -205,6 +205,9 @@ public Map getIdentity(String id, boolean isBio, IdType idType, idType.getType())); } + logger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "getIdentity", + "Generated HASHID >> " + hashedId); + if (isBio) { entity = identityRepo.getOne(hashedId); } else { @@ -254,6 +257,8 @@ public Map getIdentity(String id, boolean isBio, IdType idType, } responseMap.put(TOKEN, entity.getToken()); responseMap.put(ID_HASH, hashedId); + logger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "getIdentity", + "TOKEN in responseMap >> " + entity.getToken()); return responseMap; } catch (IOException | DataAccessException | TransactionException | JDBCConnectionException e) { logger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "getIdentity", diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/OTPServiceImpl.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/OTPServiceImpl.java index 905d2b5371c..345367b2ee1 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/OTPServiceImpl.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/OTPServiceImpl.java @@ -1,377 +1,414 @@ -package io.mosip.authentication.common.service.impl; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import io.mosip.authentication.authfilter.exception.IdAuthenticationFilterException; -import io.mosip.authentication.common.service.entity.AuthtypeLock; -import io.mosip.authentication.common.service.repository.AuthLockRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; - -import io.mosip.authentication.common.manager.IdAuthFraudAnalysisEventManager; -import io.mosip.authentication.common.service.builder.AuthTransactionBuilder; -import io.mosip.authentication.common.service.entity.AutnTxn; -import io.mosip.authentication.common.service.helper.IdInfoHelper; -import io.mosip.authentication.common.service.impl.match.DemoMatchType; -import io.mosip.authentication.common.service.integration.OTPManager; -import io.mosip.authentication.common.service.integration.TokenIdManager; -import io.mosip.authentication.common.service.repository.AutnTxnRepository; -import io.mosip.authentication.common.service.repository.IdaUinHashSaltRepo; -import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; -import io.mosip.authentication.common.service.util.EnvUtil; -import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; -import io.mosip.authentication.core.constant.IdAuthCommonConstants; -import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; -import io.mosip.authentication.core.constant.RequestType; -import io.mosip.authentication.core.dto.ObjectWithMetadata; -import io.mosip.authentication.core.exception.IDDataValidationException; -import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; -import io.mosip.authentication.core.indauth.dto.IdType; -import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; -import io.mosip.authentication.core.indauth.dto.NotificationType; -import io.mosip.authentication.core.logger.IdaLogger; -import io.mosip.authentication.core.otp.dto.MaskedResponseDTO; -import io.mosip.authentication.core.otp.dto.OtpRequestDTO; -import io.mosip.authentication.core.otp.dto.OtpResponseDTO; -import io.mosip.authentication.core.partner.dto.PartnerDTO; -import io.mosip.authentication.core.spi.id.service.IdService; -import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; -import io.mosip.authentication.core.spi.otp.service.OTPService; -import io.mosip.authentication.core.spi.partner.service.PartnerService; -import io.mosip.authentication.core.util.LanguageComparator; -import io.mosip.authentication.core.util.MaskUtil; -import io.mosip.kernel.core.exception.ParseException; -import io.mosip.kernel.core.logger.spi.Logger; -import io.mosip.kernel.core.util.DateUtils; - -/** - * Service implementation of OtpTriggerService. - * - * @author Rakesh Roshan - * @author Dinesh Karuppiah.T - */ -@Service -public class OTPServiceImpl implements OTPService { - - /** The Constant NAME. */ - private static final String NAME = "name"; - private static final String OTP = "otp"; - private static final String PHONE = "PHONE"; - private static final String EMAIL = "EMAIL"; - private static final String OTP_SMS = "otp-sms"; - private static final String OTP_EMAIL = "otp-email"; - - - /** The id auth service. */ - @Autowired - private IdService idAuthService; - - /** The autntxnrepository. */ - @Autowired - private AutnTxnRepository autntxnrepository; - - /** The auth lock repository. */ - @Autowired - AuthLockRepository authLockRepository; - - /** The env. */ - @Autowired - private EnvUtil env; - - @Autowired - private IdInfoHelper idInfoHelper; - - @Autowired - private IdInfoFetcher idInfoFetcher; - - /** The otp manager. */ - @Autowired - private OTPManager otpManager; - - /** The TokenId manager */ - @Autowired - private TokenIdManager tokenIdManager; - - @Autowired - private IdaUinHashSaltRepo uinHashSaltRepo; - - @Autowired - private IdAuthSecurityManager securityManager; - - @Autowired - private PartnerService partnerService; - - @Autowired - private IdAuthFraudAnalysisEventManager fraudEventManager; - - @Autowired - @Qualifier("NotificationLangComparator") - private LanguageComparator languageComparator; - - /** The mosip logger. */ - private static Logger mosipLogger = IdaLogger.getLogger(OTPServiceImpl.class); - - /** - * Generate OTP, store the OTP request details for success/failure. And send OTP - * notification by sms(on mobile)/mail(on email-id). - * - * @param otpRequestDto the otp request dto - * @return otpResponseDTO - * @throws IdAuthenticationBusinessException the id authentication business - * exception - */ - @Override - public OtpResponseDTO generateOtp(OtpRequestDTO otpRequestDto, String partnerId, ObjectWithMetadata requestWithMetadata) - throws IdAuthenticationBusinessException { - boolean isInternal = partnerId != null && partnerId.equalsIgnoreCase(IdAuthCommonConstants.INTERNAL); - boolean status; - String token = null; - try { - String individualIdType = IdType.getIDTypeStrOrDefault(otpRequestDto.getIndividualIdType()); - String individualId = otpRequestDto.getIndividualId(); - - Map idResDTO = idAuthService.processIdType(individualIdType, individualId, false, false, - idInfoHelper.getDefaultFilterAttributes()); - - token = idAuthService.getToken(idResDTO); - - validateAllowedOtpChannles(token, otpRequestDto.getOtpChannel()); - - OtpResponseDTO otpResponseDTO = doGenerateOTP(otpRequestDto, partnerId, isInternal, token, individualIdType, idResDTO); - IdaRequestResponsConsumerUtil.setIdVersionToResponse(requestWithMetadata, otpResponseDTO); - - status = otpResponseDTO.getErrors() == null || otpResponseDTO.getErrors().isEmpty(); - saveToTxnTable(otpRequestDto, isInternal, status, partnerId, token, otpResponseDTO, requestWithMetadata); - - return otpResponseDTO; - - } catch(IdAuthenticationBusinessException e) { - status = false; - //FIXME check if for this condition auth transaction is stored, then remove below code - //saveToTxnTable(otpRequestDto, isInternal, status, partnerId, token, null, null); - throw e; - } - - - } - - private void validateAllowedOtpChannles(String token, List otpChannel) throws IdAuthenticationFilterException { - - if(otpChannel.stream().anyMatch(channel -> OTP.equalsIgnoreCase(channel))) { - checkAuthLock(token, OTP); - } - else if(otpChannel.stream().anyMatch(channel -> PHONE.equalsIgnoreCase(channel))) { - checkAuthLock(token, OTP_SMS); - } - else if(otpChannel.stream().anyMatch(channel -> EMAIL.equalsIgnoreCase(channel))) { - checkAuthLock(token, OTP_EMAIL); - } - } - - private void checkAuthLock(String token, String authTypeCode) throws IdAuthenticationFilterException { - List authTypeLocks = authLockRepository.findByTokenAndAuthtypecode(token, authTypeCode); - for(AuthtypeLock authtypeLock : authTypeLocks) { - if(authtypeLock.getStatuscode().equalsIgnoreCase("true")){ - throw new IdAuthenticationFilterException( - IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorCode(), - String.format(IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorMessage(), - authTypeCode)); - } - } - } - - private void saveToTxnTable(OtpRequestDTO otpRequestDto, boolean isInternal, boolean status, String partnerId, String token, OtpResponseDTO otpResponseDTO, ObjectWithMetadata requestWithMetadata) - throws IdAuthenticationBusinessException { - if (token != null) { - boolean authTokenRequired = !isInternal - && EnvUtil.getAuthTokenRequired(); - String authTokenId = authTokenRequired ? tokenIdManager.generateTokenId(token, partnerId) : null; - saveTxn(otpRequestDto, token, authTokenId, status, partnerId, isInternal, otpResponseDTO, requestWithMetadata); - } - } - - private OtpResponseDTO doGenerateOTP(OtpRequestDTO otpRequestDto, String partnerId, boolean isInternal, String token, String individualIdType, Map idResDTO) - throws IdAuthenticationBusinessException, IDDataValidationException { - String individualId = otpRequestDto.getIndividualId(); - String requestTime = otpRequestDto.getRequestTime(); - OtpResponseDTO otpResponseDTO = new OtpResponseDTO(); - - if (isOtpFlooded(token, requestTime)) { - throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.OTP_REQUEST_FLOODED); - } else { - String transactionId = otpRequestDto.getTransactionID(); - otpResponseDTO.setId(otpRequestDto.getId()); - otpResponseDTO.setTransactionID(transactionId); - - Map> idInfo = IdInfoFetcher.getIdInfo(idResDTO); - Map valueMap = new HashMap<>(); - - List templateLanguages = getTemplateLanguages(idInfo); - for (String lang : templateLanguages) { - valueMap.put(NAME + "_" + lang, getName(lang, idInfo)); - } - - String email = getEmail(idInfo); - String phoneNumber = getPhoneNumber(idInfo); - valueMap.put(IdAuthCommonConstants.PHONE_NUMBER, phoneNumber); - valueMap.put(IdAuthCommonConstants.EMAIL, email); - - boolean isOtpGenerated = otpManager.sendOtp(otpRequestDto, individualId, individualIdType, valueMap, - templateLanguages); - - if (isOtpGenerated) { - otpResponseDTO.setErrors(null); - String responseTime = IdaRequestResponsConsumerUtil.getResponseTime(otpRequestDto.getRequestTime(), - EnvUtil.getDateTimePattern()); - otpResponseDTO.setResponseTime(responseTime); - MaskedResponseDTO maskedResponseDTO = new MaskedResponseDTO(); - List otpChannels = otpRequestDto.getOtpChannel(); - for (String channel : otpChannels) { - processChannel(channel, phoneNumber, email, maskedResponseDTO); - } - otpResponseDTO.setResponse(maskedResponseDTO); - - mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getName(), this.getClass().getName(), - " is OTP generated: " + isOtpGenerated); - } else { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getName(), - this.getClass().getName(), "OTP Generation failed"); - throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED); - } - - } - return otpResponseDTO; - } - - /** - * Audit txn. - * - * @param otpRequestDto the otp request dto - * @param token the uin - * @param authTokenId the auth token id - * @param status the status - * @param otpResponseDTO - * @param requestWithMetadata - * @throws IdAuthenticationBusinessException the id authentication business - * exception - */ - private void saveTxn(OtpRequestDTO otpRequestDto, String token, String authTokenId, boolean status, String partnerId, boolean isInternal, OtpResponseDTO otpResponseDTO, ObjectWithMetadata requestWithMetadata) - throws IdAuthenticationBusinessException { - Optional partner = isInternal ? Optional.empty() : partnerService.getPartner(partnerId, otpRequestDto.getMetadata()); - AutnTxn authTxn = AuthTransactionBuilder.newInstance() - .withRequest(otpRequestDto) - .addRequestType(RequestType.OTP_REQUEST) - .withAuthToken(authTokenId) - .withStatus(status) - .withToken(token) - .withPartner(partner) - .withInternal(isInternal) - .build(env,uinHashSaltRepo,securityManager); - fraudEventManager.analyseEvent(authTxn); - if(requestWithMetadata != null) { - requestWithMetadata.setMetadata(Map.of(AutnTxn.class.getSimpleName(), authTxn)); - } else { - idAuthService.saveAutnTxn(authTxn); - } - } - - private String getName(String language, Map> idInfo) - throws IdAuthenticationBusinessException { - return idInfoHelper.getEntityInfoAsString(DemoMatchType.NAME, language, idInfo); - - } - - /** - * Validate the number of request for OTP generation. Limit for the number of - * request for OTP is should not exceed 3 in 60sec. - * - * @return true, if is otp flooded - * @throws IdAuthenticationBusinessException - */ - private boolean isOtpFlooded(String token, String requestTime) throws IdAuthenticationBusinessException { - boolean isOtpFlooded = false; - LocalDateTime reqTime; - try { - String strUTCDate = DateUtils.getUTCTimeFromDate( - DateUtils.parseToDate(requestTime, EnvUtil.getDateTimePattern())); - reqTime = LocalDateTime.parse(strUTCDate, - DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())); - - } catch (ParseException e) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getName(), e.getClass().getName(), - e.getMessage()); - throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS, e); - } - int addMinutes = EnvUtil.getOtpRequestFloodingDuration(); - LocalDateTime addMinutesInOtpRequestDTimes = reqTime.minus(addMinutes, ChronoUnit.MINUTES); - int maxCount = EnvUtil.getOtpRequestFloodingMaxCount(); - if (autntxnrepository.countRequestDTime(reqTime, addMinutesInOtpRequestDTimes, token) > maxCount) { - isOtpFlooded = true; - } - return isOtpFlooded; - } - - private void processChannel(String value, String phone, String email, MaskedResponseDTO maskedResponseDTO) throws IdAuthenticationBusinessException { - if (value.equalsIgnoreCase(NotificationType.SMS.getChannel())) { - maskedResponseDTO.setMaskedMobile(MaskUtil.maskMobile(phone)); - } else if (value.equalsIgnoreCase(NotificationType.EMAIL.getChannel())) { - maskedResponseDTO.setMaskedEmail(MaskUtil.maskEmail(email)); - } - - } - - /** - * Get Mail. - * - * @param idInfo List of IdentityInfoDTO - * @return mail - * @throws IdAuthenticationBusinessException - */ - private String getEmail(Map> idInfo) throws IdAuthenticationBusinessException { - return idInfoHelper.getEntityInfoAsString(DemoMatchType.EMAIL, idInfo); - } - - /** - * Get Mobile number. - * - * @param idInfo List of IdentityInfoDTO - * @return Mobile number - * @throws IdAuthenticationBusinessException - */ - private String getPhoneNumber(Map> idInfo) throws IdAuthenticationBusinessException { - return idInfoHelper.getEntityInfoAsString(DemoMatchType.PHONE, idInfo); - } - - /** - * This method gets the template languages in following order. - * 1. Gets user preferred languages if not - * 2. Gets default template languages from configuration if not - * 3. Gets the data capture languages - * @param idInfo - * @return - * @throws IdAuthenticationBusinessException - */ - private List getTemplateLanguages(Map> idInfo) - throws IdAuthenticationBusinessException { - List userPreferredLangs = idInfoFetcher.getUserPreferredLanguages(idInfo); - List defaultTemplateLanguges = userPreferredLangs.isEmpty() - ? idInfoFetcher.getTemplatesDefaultLanguageCodes() - : userPreferredLangs; - if (defaultTemplateLanguges.isEmpty()) { - List dataCaptureLanguages = idInfoHelper.getDataCapturedLanguages(DemoMatchType.NAME, idInfo); - Collections.sort(dataCaptureLanguages, languageComparator); - return dataCaptureLanguages; - } - - return defaultTemplateLanguges; - - } +package io.mosip.authentication.common.service.impl; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import io.mosip.authentication.authfilter.exception.IdAuthenticationFilterException; +import io.mosip.authentication.common.service.entity.AuthtypeLock; +import io.mosip.authentication.common.service.repository.AuthLockRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; + +import io.mosip.authentication.common.manager.IdAuthFraudAnalysisEventManager; +import io.mosip.authentication.common.service.builder.AuthTransactionBuilder; +import io.mosip.authentication.common.service.entity.AutnTxn; +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.impl.match.DemoMatchType; +import io.mosip.authentication.common.service.integration.OTPManager; +import io.mosip.authentication.common.service.integration.TokenIdManager; +import io.mosip.authentication.common.service.repository.AutnTxnRepository; +import io.mosip.authentication.common.service.repository.IdaUinHashSaltRepo; +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.constant.RequestType; +import io.mosip.authentication.core.dto.ObjectWithMetadata; +import io.mosip.authentication.core.exception.IDDataValidationException; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.IdType; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.NotificationType; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.otp.dto.MaskedResponseDTO; +import io.mosip.authentication.core.otp.dto.OtpRequestDTO; +import io.mosip.authentication.core.otp.dto.OtpResponseDTO; +import io.mosip.authentication.core.partner.dto.PartnerDTO; +import io.mosip.authentication.core.spi.id.service.IdService; +import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; +import io.mosip.authentication.core.spi.otp.service.OTPService; +import io.mosip.authentication.core.spi.partner.service.PartnerService; +import io.mosip.authentication.core.util.LanguageComparator; +import io.mosip.authentication.core.util.MaskUtil; +import io.mosip.kernel.core.exception.ParseException; +import io.mosip.kernel.core.logger.spi.Logger; +import io.mosip.kernel.core.util.DateUtils; +import io.mosip.kernel.core.util.StringUtils; + +/** + * Service implementation of OtpTriggerService. + * + * @author Rakesh Roshan + * @author Dinesh Karuppiah.T + */ +@Service +public class OTPServiceImpl implements OTPService { + + /** The Constant NAME. */ + private static final String NAME = "name"; + private static final String OTP = "otp"; + private static final String PHONE = "PHONE"; + private static final String EMAIL = "EMAIL"; + private static final String OTP_SMS = "otp-sms"; + private static final String OTP_EMAIL = "otp-email"; + + + /** The id auth service. */ + @Autowired + private IdService idAuthService; + + /** The autntxnrepository. */ + @Autowired + private AutnTxnRepository autntxnrepository; + + /** The auth lock repository. */ + @Autowired + AuthLockRepository authLockRepository; + + /** The env. */ + @Autowired + private EnvUtil env; + + @Autowired + private IdInfoHelper idInfoHelper; + + @Autowired + private IdInfoFetcher idInfoFetcher; + + /** The otp manager. */ + @Autowired + private OTPManager otpManager; + + /** The TokenId manager */ + @Autowired + private TokenIdManager tokenIdManager; + + @Autowired + private IdaUinHashSaltRepo uinHashSaltRepo; + + @Autowired + private IdAuthSecurityManager securityManager; + + @Autowired + private PartnerService partnerService; + + @Autowired + private IdAuthFraudAnalysisEventManager fraudEventManager; + + @Autowired + @Qualifier("NotificationLangComparator") + private LanguageComparator languageComparator; + + /** The mosip logger. */ + private static Logger mosipLogger = IdaLogger.getLogger(OTPServiceImpl.class); + + /** + * Generate OTP, store the OTP request details for success/failure. And send OTP + * notification by sms(on mobile)/mail(on email-id). + * + * @param otpRequestDto the otp request dto + * @return otpResponseDTO + * @throws IdAuthenticationBusinessException the id authentication business + * exception + */ + @Override + public OtpResponseDTO generateOtp(OtpRequestDTO otpRequestDto, String partnerId, ObjectWithMetadata requestWithMetadata) + throws IdAuthenticationBusinessException { + boolean isInternal = partnerId != null && partnerId.equalsIgnoreCase(IdAuthCommonConstants.INTERNAL); + boolean status; + String token = null; + try { + String individualIdType = IdType.getIDTypeStrOrDefault(otpRequestDto.getIndividualIdType()); + String individualId = otpRequestDto.getIndividualId(); + + Map idResDTO = idAuthService.processIdType(individualIdType, individualId, false, false, + idInfoHelper.getDefaultFilterAttributes()); + + token = idAuthService.getToken(idResDTO); + + validateAllowedOtpChannles(token, otpRequestDto.getOtpChannel()); + + OtpResponseDTO otpResponseDTO = doGenerateOTP(otpRequestDto, partnerId, isInternal, token, individualIdType, idResDTO); + IdaRequestResponsConsumerUtil.setIdVersionToResponse(requestWithMetadata, otpResponseDTO); + + status = otpResponseDTO.getErrors() == null || otpResponseDTO.getErrors().isEmpty(); + saveToTxnTable(otpRequestDto, isInternal, status, partnerId, token, otpResponseDTO, requestWithMetadata); + + return otpResponseDTO; + + } catch(IdAuthenticationBusinessException e) { + status = false; + //FIXME check if for this condition auth transaction is stored, then remove below code + //saveToTxnTable(otpRequestDto, isInternal, status, partnerId, token, null, null); + throw e; + } + + + } + + private void validateAllowedOtpChannles(String token, List otpChannel) throws IdAuthenticationFilterException { + + if(containsChannel(otpChannel, OTP)) { + checkAuthLock(token, OTP); + } + else if(containsChannel(otpChannel, PHONE)) { + checkAuthLock(token, OTP_SMS); + } + else if(containsChannel(otpChannel, EMAIL)) { + checkAuthLock(token, OTP_EMAIL); + } + } + + private static boolean containsChannel(List otpChannel, String channel) { + return otpChannel.stream().anyMatch(channelItem -> channel.equalsIgnoreCase(channelItem)); + } + + private void checkAuthLock(String token, String authTypeCode) throws IdAuthenticationFilterException { + List authTypeLocks = authLockRepository.findByTokenAndAuthtypecode(token, authTypeCode); + for(AuthtypeLock authtypeLock : authTypeLocks) { + if(authtypeLock.getStatuscode().equalsIgnoreCase("true")){ + throw new IdAuthenticationFilterException( + IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorCode(), + String.format(IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorMessage(), + authTypeCode)); + } + } + } + + private void saveToTxnTable(OtpRequestDTO otpRequestDto, boolean isInternal, boolean status, String partnerId, String token, OtpResponseDTO otpResponseDTO, ObjectWithMetadata requestWithMetadata) + throws IdAuthenticationBusinessException { + if (token != null) { + boolean authTokenRequired = !isInternal + && EnvUtil.getAuthTokenRequired(); + String authTokenId = authTokenRequired ? tokenIdManager.generateTokenId(token, partnerId) : null; + saveTxn(otpRequestDto, token, authTokenId, status, partnerId, isInternal, otpResponseDTO, requestWithMetadata); + } + } + + private OtpResponseDTO doGenerateOTP(OtpRequestDTO otpRequestDto, String partnerId, boolean isInternal, String token, String individualIdType, Map idResDTO) + throws IdAuthenticationBusinessException, IDDataValidationException { + String individualId = otpRequestDto.getIndividualId(); + String requestTime = otpRequestDto.getRequestTime(); + OtpResponseDTO otpResponseDTO = new OtpResponseDTO(); + + if (isOtpFlooded(token, requestTime)) { + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.OTP_REQUEST_FLOODED); + } else { + String transactionId = otpRequestDto.getTransactionID(); + otpResponseDTO.setId(otpRequestDto.getId()); + otpResponseDTO.setTransactionID(transactionId); + + Map> idInfo = IdInfoFetcher.getIdInfo(idResDTO); + Map valueMap = new HashMap<>(); + + List templateLanguages = getTemplateLanguages(idInfo); + for (String lang : templateLanguages) { + valueMap.put(NAME + "_" + lang, getName(lang, idInfo)); + } + + String email = getEmail(idInfo); + String phoneNumber = getPhoneNumber(idInfo); + valueMap.put(IdAuthCommonConstants.PHONE_NUMBER, phoneNumber); + valueMap.put(IdAuthCommonConstants.EMAIL, email); + + List otpChannel = otpRequestDto.getOtpChannel(); + if (StringUtils.isBlank(phoneNumber) && containsChannel(otpChannel, PHONE) && !containsChannel(otpChannel, EMAIL)) { + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorCode(), + IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage() + + ". Phone Number is not found in identity data."); + } + + if (StringUtils.isBlank(email) && containsChannel(otpChannel, EMAIL) && !containsChannel(otpChannel, PHONE)) { + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorCode(), + IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage() + + ". Email ID is not found in identity data."); + } + + if(StringUtils.isBlank(phoneNumber) && StringUtils.isBlank(email) && (containsChannel(otpChannel, PHONE) && containsChannel(otpChannel, EMAIL))) { + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorCode(), + IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage() + + ". Both Phone Number and Email ID are not found in identity data."); + } + + boolean isOtpGenerated = otpManager.sendOtp(otpRequestDto, individualId, individualIdType, valueMap, + templateLanguages); + + if (isOtpGenerated) { + otpResponseDTO.setErrors(null); + String responseTime = IdaRequestResponsConsumerUtil.getResponseTime(otpRequestDto.getRequestTime(), + EnvUtil.getDateTimePattern()); + otpResponseDTO.setResponseTime(responseTime); + MaskedResponseDTO maskedResponseDTO = new MaskedResponseDTO(); + List otpChannels = otpRequestDto.getOtpChannel(); + for (String channel : otpChannels) { + processChannel(channel, phoneNumber, email, maskedResponseDTO); + } + otpResponseDTO.setResponse(maskedResponseDTO); + + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getName(), this.getClass().getName(), + " is OTP generated: " + isOtpGenerated); + } else { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getName(), + this.getClass().getName(), "OTP Generation failed"); + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED); + } + + } + return otpResponseDTO; + } + + /** + * Audit txn. + * + * @param otpRequestDto the otp request dto + * @param token the uin + * @param authTokenId the auth token id + * @param status the status + * @param otpResponseDTO + * @param requestWithMetadata + * @throws IdAuthenticationBusinessException the id authentication business + * exception + */ + private void saveTxn(OtpRequestDTO otpRequestDto, String token, String authTokenId, boolean status, String partnerId, boolean isInternal, OtpResponseDTO otpResponseDTO, ObjectWithMetadata requestWithMetadata) + throws IdAuthenticationBusinessException { + Optional partner = isInternal ? Optional.empty() : partnerService.getPartner(partnerId, otpRequestDto.getMetadata()); + AutnTxn authTxn = AuthTransactionBuilder.newInstance() + .withRequest(otpRequestDto) + .addRequestType(RequestType.OTP_REQUEST) + .withAuthToken(authTokenId) + .withStatus(status) + .withToken(token) + .withPartner(partner) + .withInternal(isInternal) + .build(env,uinHashSaltRepo,securityManager); + fraudEventManager.analyseEvent(authTxn); + if(requestWithMetadata != null) { + requestWithMetadata.setMetadata(Map.of(AutnTxn.class.getSimpleName(), authTxn)); + } else { + idAuthService.saveAutnTxn(authTxn); + } + } + + private String getName(String language, Map> idInfo) + throws IdAuthenticationBusinessException { + return idInfoHelper.getEntityInfoAsString(DemoMatchType.NAME, language, idInfo); + + } + + /** + * Validate the number of request for OTP generation. Limit for the number of + * request for OTP is should not exceed 3 in 60sec. + * + * @return true, if is otp flooded + * @throws IdAuthenticationBusinessException + */ + private boolean isOtpFlooded(String token, String requestTime) throws IdAuthenticationBusinessException { + boolean isOtpFlooded = false; + LocalDateTime reqTime; + try { + String strUTCDate = DateUtils.getUTCTimeFromDate( + DateUtils.parseToDate(requestTime, EnvUtil.getDateTimePattern())); + reqTime = LocalDateTime.parse(strUTCDate, + DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())); + + } catch (ParseException e) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getName(), e.getClass().getName(), + e.getMessage()); + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS, e); + } + int addMinutes = EnvUtil.getOtpRequestFloodingDuration(); + LocalDateTime addMinutesInOtpRequestDTimes = reqTime.minus(addMinutes, ChronoUnit.MINUTES); + int maxCount = EnvUtil.getOtpRequestFloodingMaxCount(); + if (autntxnrepository.countRequestDTime(reqTime, addMinutesInOtpRequestDTimes, token) >= maxCount) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getName(), this.getClass().getName(), + " OTP requested Flooded: " + reqTime + "," + addMinutesInOtpRequestDTimes + "," + maxCount); + isOtpFlooded = true; + } + return isOtpFlooded; + } + + private void processChannel(String value, String phone, String email, MaskedResponseDTO maskedResponseDTO) throws IdAuthenticationBusinessException { + if (value.equalsIgnoreCase(NotificationType.SMS.getChannel())) { + if(phone != null && !phone.isEmpty()) { + maskedResponseDTO.setMaskedMobile(MaskUtil.maskMobile(phone)); + } else { + mosipLogger.warn("Phone Number is not available in identity data. But PHONE channel is requested for OTP."); + } + } else if (value.equalsIgnoreCase(NotificationType.EMAIL.getChannel())) { + if(email != null && !email.isEmpty()) { + maskedResponseDTO.setMaskedEmail(MaskUtil.maskEmail(email)); + } else { + mosipLogger.warn("Email ID is not available in identity data. But email channel is requested for OTP."); + } + } + + } + + /** + * Get Mail. + * + * @param idInfo List of IdentityInfoDTO + * @return mail + * @throws IdAuthenticationBusinessException + */ + private String getEmail(Map> idInfo) throws IdAuthenticationBusinessException { + return idInfoHelper.getEntityInfoAsString(DemoMatchType.EMAIL, idInfo); + } + + /** + * Get Mobile number. + * + * @param idInfo List of IdentityInfoDTO + * @return Mobile number + * @throws IdAuthenticationBusinessException + */ + private String getPhoneNumber(Map> idInfo) throws IdAuthenticationBusinessException { + return idInfoHelper.getEntityInfoAsString(DemoMatchType.PHONE, idInfo); + } + + /** + * This method gets the template languages in following order. + * 1. Gets user preferred languages if not + * 2. Gets default template languages from configuration if not + * 3. Gets the data capture languages + * @param idInfo + * @return + * @throws IdAuthenticationBusinessException + */ + private List getTemplateLanguages(Map> idInfo) + throws IdAuthenticationBusinessException { + List userPreferredLangs = idInfoFetcher.getUserPreferredLanguages(idInfo); + List defaultTemplateLanguges = userPreferredLangs.isEmpty() + ? idInfoFetcher.getTemplatesDefaultLanguageCodes() + : userPreferredLangs; + if (defaultTemplateLanguges.isEmpty()) { + List dataCaptureLanguages = idInfoHelper.getDataCapturedLanguages(DemoMatchType.NAME, idInfo); + Collections.sort(dataCaptureLanguages, languageComparator); + return dataCaptureLanguages; + } + + return defaultTemplateLanguges; + + } } \ No newline at end of file diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/PasswordAuthServiceImpl.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/PasswordAuthServiceImpl.java new file mode 100644 index 00000000000..d337d55c482 --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/PasswordAuthServiceImpl.java @@ -0,0 +1,70 @@ +package io.mosip.authentication.common.service.impl; + +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import io.mosip.authentication.common.service.builder.AuthStatusInfoBuilder; +import io.mosip.authentication.common.service.builder.MatchInputBuilder; +import io.mosip.authentication.common.service.config.IDAMappingConfig; +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.impl.match.PasswordAuthType; +import io.mosip.authentication.common.service.impl.match.PasswordMatchType; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.AuthStatusInfo; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.spi.indauth.match.MatchInput; +import io.mosip.authentication.core.spi.indauth.match.MatchOutput; +import io.mosip.authentication.core.spi.indauth.service.PasswordAuthService; +import lombok.NoArgsConstructor; + +@Service +@NoArgsConstructor +public class PasswordAuthServiceImpl implements PasswordAuthService { + + @Autowired + private IdInfoHelper idInfoHelper; + + /** The id info helper. */ + @Autowired + private MatchInputBuilder matchInputBuilder; + + /** The ida mapping config. */ + @Autowired + private IDAMappingConfig idaMappingConfig; + + public AuthStatusInfo authenticate(AuthRequestDTO authRequestDTO,String individualId, + Map> idInfo,String partnerId) + throws IdAuthenticationBusinessException { + + if (idInfo == null || idInfo.isEmpty()) { + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.SERVER_ERROR); + } + + List listMatchInputs = constructMatchInput(authRequestDTO, idInfo); + + List listMatchOutputs = constructMatchOutput(authRequestDTO, listMatchInputs, idInfo, + partnerId); + // Using AND condition on the match output for Bio auth. + boolean isMatched = !listMatchOutputs.isEmpty() && listMatchOutputs.stream().allMatch(MatchOutput::isMatched); + return AuthStatusInfoBuilder.buildStatusInfo(isMatched, listMatchInputs, listMatchOutputs, + PasswordAuthType.values(), idaMappingConfig); + + } + + public List constructMatchInput(AuthRequestDTO authRequestDTO, + Map> idInfo) { + return matchInputBuilder.buildMatchInput(authRequestDTO, PasswordAuthType.values(), PasswordMatchType.values(), + idInfo); + } + + private List constructMatchOutput(AuthRequestDTO authRequestDTO, List listMatchInputs, + Map> idInfo, String partnerId) + throws IdAuthenticationBusinessException { + return idInfoHelper.matchIdentityData(authRequestDTO, idInfo, listMatchInputs, partnerId); + } +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/IdaIdMapping.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/IdaIdMapping.java index 789171e659b..4e3ccd80650 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/IdaIdMapping.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/IdaIdMapping.java @@ -177,13 +177,14 @@ public String getSubType() { RIGHTIRIS, LEFTIRIS, UNKNOWN_IRIS, FACE,UNKNOWN_FACE), "DummyType"), - KEY_BINDED_TOKENS("keyBindedTokens"){ public BiFunction> getMappingFunction() { return (mappingConfig, matchType) -> { return Collections.emptyList(); }; } }, + PASSWORD("password", MappingConfig::getPassword), + /** The dynamic demographics ID Mapping. */ DYNAMIC("demographics") { diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/OtpMatchingStrategy.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/OtpMatchingStrategy.java index 68bfb3401ef..ae35ea3615e 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/OtpMatchingStrategy.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/OtpMatchingStrategy.java @@ -21,11 +21,12 @@ public enum OtpMatchingStrategy implements TextMatchingStrategy { EXACT(MatchingStrategyType.EXACT, (Object reqInfo, Object entityInfo, Map props) -> { - if (reqInfo instanceof String && entityInfo instanceof String) { + Object idvidObj = props.get(IdAuthCommonConstants.IDVID); + if (reqInfo instanceof String && entityInfo instanceof String && idvidObj instanceof String) { Object object = props.get(ValidateOtpFunction.class.getSimpleName()); if (object instanceof ValidateOtpFunction) { ValidateOtpFunction func = (ValidateOtpFunction) object; - boolean otpValid = func.validateOtp((String) reqInfo, (String) entityInfo); + boolean otpValid = func.validateOtp((String) reqInfo, (String) entityInfo, (String) idvidObj); if (!otpValid) { return 0; } else { diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PasswordAuthType.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PasswordAuthType.java new file mode 100644 index 00000000000..5c301684adf --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PasswordAuthType.java @@ -0,0 +1,57 @@ +package io.mosip.authentication.common.service.impl.match; + +import io.mosip.authentication.common.service.impl.AuthTypeImpl; +import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO; +import io.mosip.authentication.core.spi.indauth.match.AuthType; +import io.mosip.authentication.core.spi.indauth.match.ComparePasswordFunction; +import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; +import io.mosip.authentication.core.spi.indauth.match.MatchType; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +public enum PasswordAuthType implements AuthType { + + PASSWORD(IdaIdMapping.PASSWORD.getIdname(), AuthType.setOf(PasswordMatchType.PASSWORD), "PASSWORD"); + + private AuthTypeImpl authTypeImpl; + + /** + * Instantiates a new demo auth type. + * + * @param type the type + * @param associatedMatchTypes the associated match types + */ + private PasswordAuthType(String type, Set associatedMatchTypes, String displayName) { + authTypeImpl = new AuthTypeImpl(type, associatedMatchTypes, displayName); + } + + + @Override + public boolean isAuthTypeInfoAvailable(AuthRequestDTO authRequestDTO) { + if(authRequestDTO instanceof KycAuthRequestDTO) { + KycAuthRequestDTO kycAuthRequestDTO = (KycAuthRequestDTO) authRequestDTO; + return Objects.nonNull(kycAuthRequestDTO.getRequest().getPassword()); + } + return false; + } + + @Override + public Map getMatchProperties(AuthRequestDTO authRequestDTO, IdInfoFetcher idInfoFetcher, + String language) { + Map valueMap = new HashMap<>(); + if(isAuthTypeInfoAvailable(authRequestDTO)) { + ComparePasswordFunction func = idInfoFetcher.getMatchPasswordFunction(); + valueMap.put(IdaIdMapping.PASSWORD.getIdname(), func); + } + return valueMap; + } + + @Override + public AuthType getAuthTypeImpl() { + return authTypeImpl; + } +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PasswordMatchType.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PasswordMatchType.java new file mode 100644 index 00000000000..6eee7370204 --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PasswordMatchType.java @@ -0,0 +1,131 @@ +package io.mosip.authentication.common.service.impl.match; + +import static io.mosip.authentication.core.spi.indauth.match.MatchType.setOf; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.BiFunction; +import java.util.function.Function; + +import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.RequestDTO; +import io.mosip.authentication.core.spi.indauth.match.IdMapping; +import io.mosip.authentication.core.spi.indauth.match.MatchType; +import io.mosip.authentication.core.spi.indauth.match.MatchingStrategy; +import io.mosip.authentication.core.spi.indauth.match.MatchingStrategyType; + +public enum PasswordMatchType implements MatchType { + + /** Primary password Match Type. */ + PASSWORD(IdaIdMapping.PASSWORD, Category.PWD, setOf(PasswordMatchingStrategy.EXACT), authReq -> { + KycAuthRequestDTO kycAuthRequestDTO = (KycAuthRequestDTO)authReq; + return (Objects.nonNull(kycAuthRequestDTO.getRequest()) && + Objects.nonNull(kycAuthRequestDTO.getRequest().getPassword()))? kycAuthRequestDTO.getRequest().getPassword() : ""; + }); + + /** The allowed matching strategy. */ + private Set allowedMatchingStrategy; + + /** The request info function. */ + private Function> requestInfoFunction; + + /** The id mapping. */ + private IdMapping idMapping; + + private Category category; + + /** + * Instantiates a new demo match type. + * + * @param idMapping the id mapping + * @param allowedMatchingStrategy the allowed matching strategy + * @param requestInfoFunction the request info function + * @param langType the lang type + * @param usedBit the used bit + * @param matchedBit the matched bit + */ + private PasswordMatchType(IdMapping idMapping, Category category, Set allowedMatchingStrategy, + Function requestInfoFunction) { + this.idMapping = idMapping; + this.category = category; + this.requestInfoFunction = (AuthRequestDTO authReq) -> { + Map map = new HashMap<>(); + map.put(idMapping.getIdname(), requestInfoFunction.apply(authReq)); + return map; + }; + this.allowedMatchingStrategy = Collections.unmodifiableSet(allowedMatchingStrategy); + } + + /** + * Gets the allowed matching strategy. + * + * @param matchStrategyType the match strategy type + * @return the allowed matching strategy + */ + public Optional getAllowedMatchingStrategy(MatchingStrategyType matchStrategyType) { + return allowedMatchingStrategy.stream().filter(ms -> ms.getType().equals(matchStrategyType)).findAny(); + } + + /** + * Gets the entity info. + * + * @return the entity info + */ + public BiFunction, Map, Map> getEntityInfoMapper() { + return (entity, props) -> entity; + } + + /* + * (non-Javadoc) + * + * @see io.mosip.authentication.service.impl.indauth.service.demo.MatchType# + * getIdMapping() + */ + public IdMapping getIdMapping() { + return idMapping; + } + + /* + * (non-Javadoc) + * + * @see io.mosip.authentication.service.impl.indauth.service.demo.MatchType# + * getIdentityInfoFunction() + */ + @Override + public Function>> getIdentityInfoFunction() { + return id -> Collections.emptyMap(); + } + + /* + * (non-Javadoc) + * + * @see io.mosip.authentication.core.spi.indauth.match.MatchType#getCategory() + */ + @Override + public Category getCategory() { + return category; + } + + @Override + public Function> getReqestInfoFunction() { + return requestInfoFunction; + } + + @Override + public boolean hasIdEntityInfo() { + return true; + } + + @Override + public boolean hasRequestEntityInfo() { + return false; + } + +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PasswordMatchingStrategy.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PasswordMatchingStrategy.java new file mode 100644 index 00000000000..a567dedf1fe --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PasswordMatchingStrategy.java @@ -0,0 +1,92 @@ +package io.mosip.authentication.common.service.impl.match; + +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.SEMI_COLON; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.COLON; + +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; + +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.spi.indauth.match.ComparePasswordFunction; +import io.mosip.authentication.core.spi.indauth.match.MatchFunction; +import io.mosip.authentication.core.spi.indauth.match.MatchingStrategy; +import io.mosip.authentication.core.spi.indauth.match.MatchingStrategyType; +import io.mosip.authentication.core.util.DemoMatcherUtil; +import io.mosip.kernel.core.logger.spi.Logger; + +public enum PasswordMatchingStrategy implements MatchingStrategy { + + EXACT(MatchingStrategyType.EXACT, (Object reqInfo, Object entityInfo, Map props) -> { + if (reqInfo instanceof Map && entityInfo instanceof Map) { + Object object = props.get(IdaIdMapping.PASSWORD.getIdname()); + if (object instanceof ComparePasswordFunction) { + ComparePasswordFunction func = (ComparePasswordFunction) object; + Map entityInfoMap = (Map) entityInfo; + Map reqInfoMap = (Map) reqInfo; + String hashSaltValue = entityInfoMap.get(IdaIdMapping.PASSWORD.getIdname()); + Map passwordMap = Arrays.stream(hashSaltValue.split(SEMI_COLON)) + .map(str -> str.split(String.valueOf(COLON), 2)) + .collect(Collectors.toMap(strArr -> strArr[0].trim(), strArr -> strArr[1].trim())); + + String passwordHashedValue = passwordMap.get(IdAuthCommonConstants.HASH); + String salt = passwordMap.get(IdAuthCommonConstants.SALT); + String reqInfoValue = reqInfoMap.get(IdaIdMapping.PASSWORD.getIdname()); + boolean matched = func.matchPasswordFunction(reqInfoValue, passwordHashedValue, salt); + return !matched ? 0 : 100; + } else { + logError(); + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.PASSWORD_MISMATCH.getErrorCode(), + IdAuthenticationErrorConstants.PASSWORD_MISMATCH.getErrorMessage()); + } + } + return 0; + }); + + private final MatchFunction matchFunction; + + /** The match strategy type. */ + private final MatchingStrategyType matchStrategyType; + + private static Logger mosipLogger = IdaLogger.getLogger(PasswordMatchingStrategy.class); + + /** + * Instantiates a new Token matching strategy. + * + * @param matchStrategyType the match strategy type + * @param matchFunction the match function + */ + private PasswordMatchingStrategy(MatchingStrategyType matchStrategyType, MatchFunction matchFunction) { + this.matchFunction = matchFunction; + this.matchStrategyType = matchStrategyType; + } + + /* (non-Javadoc) + * @see io.mosip.authentication.core.spi.indauth.match.MatchingStrategy#getType() + */ + @Override + public MatchingStrategyType getType() { + return matchStrategyType; + } + + /* (non-Javadoc) + * @see io.mosip.authentication.core.spi.indauth.match.MatchingStrategy#getMatchFunction() + */ + @Override + public MatchFunction getMatchFunction() { + return matchFunction; + } + + private static void logError() { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, IdAuthCommonConstants.PASSWORD_BASED_AUTH, + "Error in Passward Matching Strategy"); + } + + public static DemoMatcherUtil getDemoMatcherUtilObject(Map props) { + return (DemoMatcherUtil)props.get("demoMatcherUtil"); + } + +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PinAuthType.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PinAuthType.java index 118213b3135..719cecbe11a 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PinAuthType.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/match/PinAuthType.java @@ -5,6 +5,7 @@ import java.util.Set; import io.mosip.authentication.common.service.impl.AuthTypeImpl; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; import io.mosip.authentication.core.spi.indauth.match.AuthType; import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; @@ -29,6 +30,7 @@ public Map getMatchProperties(AuthRequestDTO authRequestDTO, IdI if (isAuthTypeInfoAvailable(authRequestDTO)) { ValidateOtpFunction func = idInfoFetcher.getValidateOTPFunction(); valueMap.put(ValidateOtpFunction.class.getSimpleName(), func); + valueMap.put(IdAuthCommonConstants.IDVID, authRequestDTO.getIndividualId()); } return valueMap; } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/notification/NotificationServiceImpl.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/notification/NotificationServiceImpl.java index d31efda3ff2..349a64e236c 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/notification/NotificationServiceImpl.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/notification/NotificationServiceImpl.java @@ -1,375 +1,378 @@ -package io.mosip.authentication.common.service.impl.notification; - -import java.io.IOException; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; - -import io.mosip.authentication.common.service.helper.IdInfoHelper; -import io.mosip.authentication.common.service.impl.match.BioAuthType; -import io.mosip.authentication.common.service.impl.match.DemoAuthType; -import io.mosip.authentication.common.service.impl.match.DemoMatchType; -import io.mosip.authentication.common.service.impl.match.PinAuthType; -import io.mosip.authentication.common.service.integration.IdTemplateManager; -import io.mosip.authentication.common.service.integration.NotificationManager; -import io.mosip.authentication.common.service.util.EnvUtil; -import io.mosip.authentication.core.constant.IdAuthCommonConstants; -import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; -import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; -import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; -import io.mosip.authentication.core.indauth.dto.AuthResponseDTO; -import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; -import io.mosip.authentication.core.indauth.dto.NotificationType; -import io.mosip.authentication.core.indauth.dto.SenderType; -import io.mosip.authentication.core.spi.indauth.match.AuthType; -import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; -import io.mosip.authentication.core.spi.notification.service.NotificationService; -import io.mosip.authentication.core.util.LanguageComparator; -import io.mosip.authentication.core.util.MaskUtil; -import io.mosip.kernel.core.util.DateUtils; -import reactor.util.function.Tuple2; -import reactor.util.function.Tuples; - -/*** - * - * Service class to notify users via SMS or Email notification. - * - * @author Dinesh Karuppiah.T - */ -@Service -public class NotificationServiceImpl implements NotificationService { - - /** The Constant AUTH_TYPE. */ - private static final String AUTH_TYPE = "authType"; - /** The Constant NAME. */ - private static final String NAME = "name"; - /** The Constant TIME. */ - private static final String TIME = "time"; - /** The Constant DATE. */ - private static final String DATE = "date"; - - /** The demo auth service. */ - @Autowired - private IdInfoHelper infoHelper; - - @Autowired - private IdInfoFetcher idInfoFetcher; - - /** ID Template manager */ - @Autowired - private IdTemplateManager idTemplateManager; - - @Autowired - private NotificationManager notificationManager; - - @Autowired - @Qualifier("NotificationLangComparator") - private LanguageComparator languageComparator; - - public void sendAuthNotification(AuthRequestDTO authRequestDTO, String idvid, AuthResponseDTO authResponseDTO, - Map> idInfo, boolean isAuth) throws IdAuthenticationBusinessException { - - Map values = new HashMap<>(); - List templateLanguages = getTemplateLanguages(idInfo); - - for (String lang : templateLanguages) { - values.put(NAME + "_" + lang, infoHelper.getEntityInfoAsString(DemoMatchType.NAME, lang, idInfo)); - } - Tuple2 dateAndTime = getDateAndTime(DateUtils.parseToLocalDateTime(authResponseDTO.getResponseTime())); - values.put(DATE, dateAndTime.getT1()); - values.put(TIME, dateAndTime.getT2()); - String maskedUin = ""; - String charCount = EnvUtil.getUinMaskingCharCount(); - if (charCount != null && !charCount.isEmpty()) { - maskedUin = MaskUtil.generateMaskValue(idvid, Integer.parseInt(charCount)); - } - values.put("idvid", maskedUin); - String idvidType = authRequestDTO.getIndividualIdType(); - values.put("idvidType", idvidType); - - // TODO add for all auth types - String authTypeStr = Stream - .of(Stream.of(DemoAuthType.values()), Stream.of(BioAuthType.values()), - Stream.of(PinAuthType.values())) - .flatMap(Function.identity()) - .filter(authType -> authType.isAuthTypeEnabled(authRequestDTO, idInfoFetcher)) - .peek(System.out::println) - .map(authType -> authType.getDisplayName(authRequestDTO, idInfoFetcher)).distinct().collect(Collectors.joining(",")); - values.put(AUTH_TYPE, authTypeStr); - if (authResponseDTO.getResponse().isAuthStatus()) { - values.put(IdAuthCommonConstants.STATUS, "Passed"); - } else { - values.put(IdAuthCommonConstants.STATUS, "Failed"); - } - - String phoneNumber = null; - String email = null; - phoneNumber = infoHelper.getEntityInfoAsString(DemoMatchType.PHONE, idInfo); - email = infoHelper.getEntityInfoAsString(DemoMatchType.EMAIL, idInfo); - String notificationType = null; - if (isAuth) { - notificationType = EnvUtil.getNotificationType(); - } else { - // For internal auth no notification is done - notificationType = NotificationType.NONE.getName(); - } - - sendNotification(values, email, phoneNumber, SenderType.AUTH, notificationType, templateLanguages); - } - - public void sendOTPNotification(String idvid, String idvidType, Map valueMap, - List templateLanguages, String otp, String notificationProperty, LocalDateTime otpGenerationTime) - throws IdAuthenticationBusinessException { - Map otpTemplateValues = getOtpTemplateValues(idvid, idvidType, valueMap, otpGenerationTime); - otpTemplateValues.put("otp", otp); - this.sendNotification(otpTemplateValues, valueMap.get(IdAuthCommonConstants.EMAIL), - valueMap.get(IdAuthCommonConstants.PHONE_NUMBER), SenderType.OTP, notificationProperty, - templateLanguages); - } - - /* - * Send Otp Notification - * - */ - private Map getOtpTemplateValues(String idvid, String idvidType, Map valueMap, - LocalDateTime otpGenerationTime) { - - Tuple2 dateAndTime = getDateAndTime(otpGenerationTime); - String date = dateAndTime.getT1(); - String time = dateAndTime.getT2(); - - String maskedUin = null; - Map values = new HashMap<>(); - String charCount = EnvUtil.getUinMaskingCharCount(); - if (charCount != null) { - maskedUin = MaskUtil.generateMaskValue(idvid, Integer.parseInt(charCount)); - } - values.put("idvid", maskedUin); - values.put("idvidType", idvidType); - Integer timeInSeconds = EnvUtil.getOtpExpiryTime(); - int timeInMinutes = (timeInSeconds % 3600) / 60; - values.put("validTime", String.valueOf(timeInMinutes)); - values.put(DATE, date); - values.put(TIME, time); - values.putAll(valueMap); - values.remove(IdAuthCommonConstants.PHONE_NUMBER); - values.remove(IdAuthCommonConstants.EMAIL); - return values; - } - - /** - * Gets the date and time. - * - * @param requestTime the request time - * @param pattern the pattern - * @return the date and time - */ - private Tuple2 getDateAndTime(LocalDateTime timestamp) { - ZonedDateTime dateTime = ZonedDateTime.of(timestamp, ZoneId.of("UTC")).withZoneSameInstant(getZone()); - String date = dateTime.format(DateTimeFormatter.ofPattern(EnvUtil.getNotificationDateFormat())); - String time = dateTime.format(DateTimeFormatter.ofPattern(EnvUtil.getNotificationTimeFormat())); - return Tuples.of(date, time); - } - - private ZoneId getZone() { - return ZoneId.of(EnvUtil.getNotificationTimeZone()); - } - - /** - * Method to Send Notification to the Individual via SMS / E-Mail - * - * @param notificationtype - specifies notification type - * @param values - list of values to send notification - * @param emailId - sender E-Mail ID - * @param phoneNumber - sender Phone Number - * @param sender - to specify the sender type - * @param notificationProperty - * @throws IdAuthenticationBusinessException - */ - - public void sendNotification(Map values, String emailId, String phoneNumber, SenderType sender, - String notificationProperty, List templateLanguages) throws IdAuthenticationBusinessException { - String notificationtypeconfig = notificationProperty; - String notificationMobileNo = phoneNumber; - Set notificationtype = new HashSet<>(); - - if (isNotNullorEmpty(notificationtypeconfig) - && !notificationtypeconfig.equalsIgnoreCase(NotificationType.NONE.getName())) { - if (notificationtypeconfig.contains("|")) { - String value[] = notificationtypeconfig.split("\\|"); - for (int i = 0; i < 2; i++) { - String nvalue = ""; - nvalue = value[i]; - processNotification(emailId, notificationMobileNo, notificationtype, nvalue); - } - } else { - processNotification(emailId, notificationMobileNo, notificationtype, notificationtypeconfig); - } - - } - - if (notificationtype.contains(NotificationType.SMS)) { - invokeSmsNotification(values, sender, notificationMobileNo, templateLanguages); - - } - if (notificationtype.contains(NotificationType.EMAIL)) { - invokeEmailNotification(values, emailId, sender, templateLanguages); - - } - - } - - /** - * Reads notification type from property and set the notification type - * - * @param emailId - email id of Individual - * @param phoneNumber - Phone Number of Individual - * @param notificationtype - Notification type - * @param notificationtypeconfig - Notification type from the configuration - */ - - private void processNotification(String emailId, String phoneNumber, Set notificationtype, - String notificationtypeconfig) { - String type = notificationtypeconfig; - if (type.equalsIgnoreCase(NotificationType.SMS.getName())) { - if (isNotNullorEmpty(phoneNumber)) { - notificationtype.add(NotificationType.SMS); - } else { - if (isNotNullorEmpty(emailId)) { - notificationtype.add(NotificationType.EMAIL); - } - } - } - - if (type.equalsIgnoreCase(NotificationType.EMAIL.getName())) { - if (isNotNullorEmpty(emailId)) { - notificationtype.add(NotificationType.EMAIL); - } else { - if (isNotNullorEmpty(phoneNumber)) { - notificationtype.add(NotificationType.SMS); - } - } - } - } - - private boolean isNotNullorEmpty(String value) { - return value != null && !value.isEmpty() && value.trim().length() > 0; - } - - /** - * To apply Templates for Email or SMS Notifications - * - * @param values - content for Template - * @param templateName - Template name to fetch - * @return - * @throws IdAuthenticationBusinessException - */ - private String applyTemplate(Map values, String templateName, List templateLanguages) - throws IdAuthenticationBusinessException { - try { - Objects.requireNonNull(templateName); - return idTemplateManager.applyTemplate(templateName, values, templateLanguages); - } catch (IOException e) { - // FIXME change the error code - throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS, e); - } - } - - /** - * Sms notification. - * - * @param values the values - * @param sender the sender - * @param contentTemplate the content template - * @param notificationMobileNo the notification mobile no - * @throws IdAuthenticationBusinessException the id authentication business - * exception - */ - private void invokeSmsNotification(Map values, SenderType sender, String notificationMobileNo, List templateLanguages) - throws IdAuthenticationBusinessException { - String authSmsTemplate = EnvUtil.getAuthSmsTemplate(); - String otpSmsTemplate = EnvUtil.getOtpSmsTemplate(); - String contentTemplate = ""; - if (sender == SenderType.AUTH && authSmsTemplate != null) { - contentTemplate = authSmsTemplate; - } else if (sender == SenderType.OTP && otpSmsTemplate != null) { - contentTemplate = otpSmsTemplate; - } - - String smsTemplate = applyTemplate(values, contentTemplate, templateLanguages); - notificationManager.sendSmsNotification(notificationMobileNo, smsTemplate); - } - - /** - * Email notification. - * - * @param values the values - * @param emailId the email id - * @param sender the sender - * @param contentTemplate the content template - * @param subjectTemplate the subject template - * @throws IdAuthenticationBusinessException the id authentication business - * exception - */ - private void invokeEmailNotification(Map values, String emailId, SenderType sender, List templateLanguages) - throws IdAuthenticationBusinessException { - String otpContentTemaplate = EnvUtil.getOtpContentTemplate(); - String authEmailSubjectTemplate = EnvUtil.getAuthEmailSubjectTemplate(); - String authEmailContentTemplate = EnvUtil.getAuthEmailContentTemplate(); - String otpSubjectTemplate = EnvUtil.getOtpSubjectTemplate(); - - String contentTemplate = ""; - String subjectTemplate = ""; - if (sender == SenderType.AUTH && authEmailSubjectTemplate != null && authEmailContentTemplate != null) { - subjectTemplate = authEmailSubjectTemplate; - contentTemplate = authEmailContentTemplate; - } else if (sender == SenderType.OTP && otpSubjectTemplate != null && otpContentTemaplate != null) { - subjectTemplate = otpSubjectTemplate; - contentTemplate = otpContentTemaplate; - } - - String mailSubject = applyTemplate(values, subjectTemplate, templateLanguages); - String mailContent = applyTemplate(values, contentTemplate, templateLanguages); - notificationManager.sendEmailNotification(emailId, mailSubject, mailContent); - } - - /** - * This method gets the template languages in following order. - * 1. Gets user preferred languages if not - * 2. Gets default template languages from configuration if not - * 3. Gets the data capture languages - * @param idInfo - * @return - * @throws IdAuthenticationBusinessException - */ - private List getTemplateLanguages(Map> idInfo) - throws IdAuthenticationBusinessException { - List userPreferredLangs = idInfoFetcher.getUserPreferredLanguages(idInfo); - List defaultTemplateLanguges = userPreferredLangs.isEmpty() - ? idInfoFetcher.getTemplatesDefaultLanguageCodes() - : userPreferredLangs; - if (defaultTemplateLanguges.isEmpty()) { - List dataCaptureLanguages = infoHelper.getDataCapturedLanguages(DemoMatchType.NAME, idInfo); - Collections.sort(dataCaptureLanguages, languageComparator); - return dataCaptureLanguages; - } - - return defaultTemplateLanguges; - - } +package io.mosip.authentication.common.service.impl.notification; + +import java.io.IOException; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; + +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.impl.match.BioAuthType; +import io.mosip.authentication.common.service.impl.match.DemoAuthType; +import io.mosip.authentication.common.service.impl.match.DemoMatchType; +import io.mosip.authentication.common.service.impl.match.KeyBindedTokenAuthType; +import io.mosip.authentication.common.service.impl.match.PasswordAuthType; +import io.mosip.authentication.common.service.impl.match.PinAuthType; +import io.mosip.authentication.common.service.integration.IdTemplateManager; +import io.mosip.authentication.common.service.integration.NotificationManager; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.AuthResponseDTO; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.NotificationType; +import io.mosip.authentication.core.indauth.dto.SenderType; +import io.mosip.authentication.core.spi.indauth.match.AuthType; +import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; +import io.mosip.authentication.core.spi.notification.service.NotificationService; +import io.mosip.authentication.core.util.LanguageComparator; +import io.mosip.authentication.core.util.MaskUtil; +import io.mosip.kernel.core.util.DateUtils; +import reactor.util.function.Tuple2; +import reactor.util.function.Tuples; + +/*** + * + * Service class to notify users via SMS or Email notification. + * + * @author Dinesh Karuppiah.T + */ +@Service +public class NotificationServiceImpl implements NotificationService { + + /** The Constant AUTH_TYPE. */ + private static final String AUTH_TYPE = "authType"; + /** The Constant NAME. */ + private static final String NAME = "name"; + /** The Constant TIME. */ + private static final String TIME = "time"; + /** The Constant DATE. */ + private static final String DATE = "date"; + + /** The demo auth service. */ + @Autowired + private IdInfoHelper infoHelper; + + @Autowired + private IdInfoFetcher idInfoFetcher; + + /** ID Template manager */ + @Autowired + private IdTemplateManager idTemplateManager; + + @Autowired + private NotificationManager notificationManager; + + @Autowired + @Qualifier("NotificationLangComparator") + private LanguageComparator languageComparator; + + public void sendAuthNotification(AuthRequestDTO authRequestDTO, String idvid, AuthResponseDTO authResponseDTO, + Map> idInfo, boolean isAuth) throws IdAuthenticationBusinessException { + + Map values = new HashMap<>(); + List templateLanguages = getTemplateLanguages(idInfo); + + for (String lang : templateLanguages) { + values.put(NAME + "_" + lang, infoHelper.getEntityInfoAsString(DemoMatchType.NAME, lang, idInfo)); + } + Tuple2 dateAndTime = getDateAndTime(DateUtils.parseToLocalDateTime(authResponseDTO.getResponseTime())); + values.put(DATE, dateAndTime.getT1()); + values.put(TIME, dateAndTime.getT2()); + String maskedUin = ""; + String charCount = EnvUtil.getUinMaskingCharCount(); + if (charCount != null && !charCount.isEmpty()) { + maskedUin = MaskUtil.generateMaskValue(idvid, Integer.parseInt(charCount)); + } + values.put("idvid", maskedUin); + String idvidType = authRequestDTO.getIndividualIdType(); + values.put("idvidType", idvidType); + + // TODO add for all auth types + String authTypeStr = Stream + .of(Stream.of(DemoAuthType.values()), Stream.of(BioAuthType.values()), + Stream.of(PinAuthType.values()), Stream.of(PasswordAuthType.values()), + Stream.of(KeyBindedTokenAuthType.values())) + .flatMap(Function.identity()) + .filter(authType -> authType.isAuthTypeEnabled(authRequestDTO, idInfoFetcher)) + .peek(System.out::println) + .map(authType -> authType.getDisplayName(authRequestDTO, idInfoFetcher)).distinct().collect(Collectors.joining(",")); + values.put(AUTH_TYPE, authTypeStr); + if (authResponseDTO.getResponse().isAuthStatus()) { + values.put(IdAuthCommonConstants.STATUS, "Passed"); + } else { + values.put(IdAuthCommonConstants.STATUS, "Failed"); + } + + String phoneNumber = null; + String email = null; + phoneNumber = infoHelper.getEntityInfoAsString(DemoMatchType.PHONE, idInfo); + email = infoHelper.getEntityInfoAsString(DemoMatchType.EMAIL, idInfo); + String notificationType = null; + if (isAuth) { + notificationType = EnvUtil.getNotificationType(); + } else { + // For internal auth no notification is done + notificationType = NotificationType.NONE.getName(); + } + + sendNotification(values, email, phoneNumber, SenderType.AUTH, notificationType, templateLanguages); + } + + public void sendOTPNotification(String idvid, String idvidType, Map valueMap, + List templateLanguages, String otp, String notificationProperty, LocalDateTime otpGenerationTime) + throws IdAuthenticationBusinessException { + Map otpTemplateValues = getOtpTemplateValues(idvid, idvidType, valueMap, otpGenerationTime); + otpTemplateValues.put("otp", otp); + this.sendNotification(otpTemplateValues, valueMap.get(IdAuthCommonConstants.EMAIL), + valueMap.get(IdAuthCommonConstants.PHONE_NUMBER), SenderType.OTP, notificationProperty, + templateLanguages); + } + + /* + * Send Otp Notification + * + */ + private Map getOtpTemplateValues(String idvid, String idvidType, Map valueMap, + LocalDateTime otpGenerationTime) { + + Tuple2 dateAndTime = getDateAndTime(otpGenerationTime); + String date = dateAndTime.getT1(); + String time = dateAndTime.getT2(); + + String maskedUin = null; + Map values = new HashMap<>(); + String charCount = EnvUtil.getUinMaskingCharCount(); + if (charCount != null) { + maskedUin = MaskUtil.generateMaskValue(idvid, Integer.parseInt(charCount)); + } + values.put("idvid", maskedUin); + values.put("idvidType", idvidType); + Integer timeInSeconds = EnvUtil.getOtpExpiryTime(); + int timeInMinutes = (timeInSeconds % 3600) / 60; + values.put("validTime", String.valueOf(timeInMinutes)); + values.put(DATE, date); + values.put(TIME, time); + values.putAll(valueMap); + values.remove(IdAuthCommonConstants.PHONE_NUMBER); + values.remove(IdAuthCommonConstants.EMAIL); + return values; + } + + /** + * Gets the date and time. + * + * @param requestTime the request time + * @param pattern the pattern + * @return the date and time + */ + private Tuple2 getDateAndTime(LocalDateTime timestamp) { + ZonedDateTime dateTime = ZonedDateTime.of(timestamp, ZoneId.of("UTC")).withZoneSameInstant(getZone()); + String date = dateTime.format(DateTimeFormatter.ofPattern(EnvUtil.getNotificationDateFormat())); + String time = dateTime.format(DateTimeFormatter.ofPattern(EnvUtil.getNotificationTimeFormat())); + return Tuples.of(date, time); + } + + private ZoneId getZone() { + return ZoneId.of(EnvUtil.getNotificationTimeZone()); + } + + /** + * Method to Send Notification to the Individual via SMS / E-Mail + * + * @param notificationtype - specifies notification type + * @param values - list of values to send notification + * @param emailId - sender E-Mail ID + * @param phoneNumber - sender Phone Number + * @param sender - to specify the sender type + * @param notificationProperty + * @throws IdAuthenticationBusinessException + */ + + public void sendNotification(Map values, String emailId, String phoneNumber, SenderType sender, + String notificationProperty, List templateLanguages) throws IdAuthenticationBusinessException { + String notificationtypeconfig = notificationProperty; + String notificationMobileNo = phoneNumber; + Set notificationtype = new HashSet<>(); + + if (isNotNullorEmpty(notificationtypeconfig) + && !notificationtypeconfig.equalsIgnoreCase(NotificationType.NONE.getName())) { + if (notificationtypeconfig.contains("|")) { + String value[] = notificationtypeconfig.split("\\|"); + for (int i = 0; i < 2; i++) { + String nvalue = ""; + nvalue = value[i]; + processNotification(emailId, notificationMobileNo, notificationtype, nvalue); + } + } else { + processNotification(emailId, notificationMobileNo, notificationtype, notificationtypeconfig); + } + + } + + if (notificationtype.contains(NotificationType.SMS)) { + invokeSmsNotification(values, sender, notificationMobileNo, templateLanguages); + + } + if (notificationtype.contains(NotificationType.EMAIL)) { + invokeEmailNotification(values, emailId, sender, templateLanguages); + + } + + } + + /** + * Reads notification type from property and set the notification type + * + * @param emailId - email id of Individual + * @param phoneNumber - Phone Number of Individual + * @param notificationtype - Notification type + * @param notificationtypeconfig - Notification type from the configuration + */ + + private void processNotification(String emailId, String phoneNumber, Set notificationtype, + String notificationtypeconfig) { + String type = notificationtypeconfig; + if (type.equalsIgnoreCase(NotificationType.SMS.getName())) { + if (isNotNullorEmpty(phoneNumber)) { + notificationtype.add(NotificationType.SMS); + } else { + if (isNotNullorEmpty(emailId)) { + notificationtype.add(NotificationType.EMAIL); + } + } + } + + if (type.equalsIgnoreCase(NotificationType.EMAIL.getName())) { + if (isNotNullorEmpty(emailId)) { + notificationtype.add(NotificationType.EMAIL); + } else { + if (isNotNullorEmpty(phoneNumber)) { + notificationtype.add(NotificationType.SMS); + } + } + } + } + + private boolean isNotNullorEmpty(String value) { + return value != null && !value.isEmpty() && value.trim().length() > 0; + } + + /** + * To apply Templates for Email or SMS Notifications + * + * @param values - content for Template + * @param templateName - Template name to fetch + * @return + * @throws IdAuthenticationBusinessException + */ + private String applyTemplate(Map values, String templateName, List templateLanguages) + throws IdAuthenticationBusinessException { + try { + Objects.requireNonNull(templateName); + return idTemplateManager.applyTemplate(templateName, values, templateLanguages); + } catch (IOException e) { + // FIXME change the error code + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS, e); + } + } + + /** + * Sms notification. + * + * @param values the values + * @param sender the sender + * @param contentTemplate the content template + * @param notificationMobileNo the notification mobile no + * @throws IdAuthenticationBusinessException the id authentication business + * exception + */ + private void invokeSmsNotification(Map values, SenderType sender, String notificationMobileNo, List templateLanguages) + throws IdAuthenticationBusinessException { + String authSmsTemplate = EnvUtil.getAuthSmsTemplate(); + String otpSmsTemplate = EnvUtil.getOtpSmsTemplate(); + String contentTemplate = ""; + if (sender == SenderType.AUTH && authSmsTemplate != null) { + contentTemplate = authSmsTemplate; + } else if (sender == SenderType.OTP && otpSmsTemplate != null) { + contentTemplate = otpSmsTemplate; + } + + String smsTemplate = applyTemplate(values, contentTemplate, templateLanguages); + notificationManager.sendSmsNotification(notificationMobileNo, smsTemplate); + } + + /** + * Email notification. + * + * @param values the values + * @param emailId the email id + * @param sender the sender + * @param contentTemplate the content template + * @param subjectTemplate the subject template + * @throws IdAuthenticationBusinessException the id authentication business + * exception + */ + private void invokeEmailNotification(Map values, String emailId, SenderType sender, List templateLanguages) + throws IdAuthenticationBusinessException { + String otpContentTemaplate = EnvUtil.getOtpContentTemplate(); + String authEmailSubjectTemplate = EnvUtil.getAuthEmailSubjectTemplate(); + String authEmailContentTemplate = EnvUtil.getAuthEmailContentTemplate(); + String otpSubjectTemplate = EnvUtil.getOtpSubjectTemplate(); + + String contentTemplate = ""; + String subjectTemplate = ""; + if (sender == SenderType.AUTH && authEmailSubjectTemplate != null && authEmailContentTemplate != null) { + subjectTemplate = authEmailSubjectTemplate; + contentTemplate = authEmailContentTemplate; + } else if (sender == SenderType.OTP && otpSubjectTemplate != null && otpContentTemaplate != null) { + subjectTemplate = otpSubjectTemplate; + contentTemplate = otpContentTemaplate; + } + + String mailSubject = applyTemplate(values, subjectTemplate, templateLanguages); + String mailContent = applyTemplate(values, contentTemplate, templateLanguages); + notificationManager.sendEmailNotification(emailId, mailSubject, mailContent); + } + + /** + * This method gets the template languages in following order. + * 1. Gets user preferred languages if not + * 2. Gets default template languages from configuration if not + * 3. Gets the data capture languages + * @param idInfo + * @return + * @throws IdAuthenticationBusinessException + */ + private List getTemplateLanguages(Map> idInfo) + throws IdAuthenticationBusinessException { + List userPreferredLangs = idInfoFetcher.getUserPreferredLanguages(idInfo); + List defaultTemplateLanguges = userPreferredLangs.isEmpty() + ? idInfoFetcher.getTemplatesDefaultLanguageCodes() + : userPreferredLangs; + if (defaultTemplateLanguges.isEmpty()) { + List dataCaptureLanguages = infoHelper.getDataCapturedLanguages(DemoMatchType.NAME, idInfo); + Collections.sort(dataCaptureLanguages, languageComparator); + return dataCaptureLanguages; + } + + return defaultTemplateLanguges; + + } } \ No newline at end of file diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/OTPManager.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/OTPManager.java index 9a403e4bcd8..e5e2b4787ad 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/OTPManager.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/OTPManager.java @@ -1,10 +1,15 @@ package io.mosip.authentication.common.service.integration; import java.time.LocalDateTime; -import java.util.*; +import java.time.temporal.ChronoUnit; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; @@ -34,14 +39,18 @@ /** * OTPManager handling with OTP-Generation and OTP-Validation. - * + * * @author Rakesh Roshan * @author Dinesh Karuppiah.T * @author Manoj SP + * @author Loganathan S */ @Component public class OTPManager { + /** The Constant QUERIED_STATUS_CODES. */ + private static final List QUERIED_STATUS_CODES = List.of(IdAuthCommonConstants.ACTIVE_STATUS, IdAuthCommonConstants.FROZEN); + /** The Constant OTP_EXPIRED. */ private static final String OTP_EXPIRED = "OTP_EXPIRED"; @@ -52,22 +61,30 @@ public class OTPManager { @Autowired private RestHelper restHelper; - @Autowired - private EnvUtil environment; - /** The rest request factory. */ @Autowired private RestRequestFactory restRequestFactory; + /** The security manager. */ @Autowired private IdAuthSecurityManager securityManager; + /** The otp transaction repo. */ @Autowired private OtpTxnRepository otpRepo; + /** The notification service. */ @Autowired private NotificationService notificationService; + /** The number of validation attempts allowed. */ + @Value("${mosip.ida.otp.validation.attempt.count.threshold:5}") + private int numberOfValidationAttemptsAllowed; + + /** The otp frozen time minutes. */ + @Value("${mosip.ida.otp.frozen.duration.minutes:30}") + private int otpFrozenTimeMinutes; + /** The logger. */ private static Logger logger = IdaLogger.getLogger(OTPManager.class); @@ -76,8 +93,10 @@ public class OTPManager { * time-out. * * @param otpRequestDTO the otp request DTO - * @param uin the uin + * @param idvid the idvid + * @param idvidType the idvid type * @param valueMap the value map + * @param templateLanguages the template languages * @return String(otp) * @throws IdAuthenticationBusinessException the id authentication business * exception @@ -85,20 +104,29 @@ public class OTPManager { public boolean sendOtp(OtpRequestDTO otpRequestDTO, String idvid, String idvidType, Map valueMap, List templateLanguages) throws IdAuthenticationBusinessException { + String refIdHash = securityManager.hash(idvid); + Optional otpEntityOpt = otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(refIdHash, QUERIED_STATUS_CODES); + + if(otpEntityOpt.isPresent()) { + OtpTransaction otpEntity = otpEntityOpt.get(); + requireOtpNotFrozen(otpEntity, false); + } + String otp = generateOTP(otpRequestDTO.getIndividualId()); LocalDateTime otpGenerationTime = DateUtils.getUTCCurrentDateTime(); String otpHash = IdAuthSecurityManager.digestAsPlainText((otpRequestDTO.getIndividualId() + EnvUtil.getKeySplitter() + otpRequestDTO.getTransactionID() + EnvUtil.getKeySplitter() + otp).getBytes()); - Optional otpTxnOpt = otpRepo.findByOtpHashAndStatusCode(otpHash, IdAuthCommonConstants.ACTIVE_STATUS); - if (otpTxnOpt.isPresent()) { - OtpTransaction otpTxn = otpTxnOpt.get(); + OtpTransaction otpTxn; + if (otpEntityOpt.isPresent() + && (otpTxn = otpEntityOpt.get()).getStatusCode().equals(IdAuthCommonConstants.ACTIVE_STATUS)) { otpTxn.setOtpHash(otpHash); otpTxn.setUpdBy(securityManager.getUser()); otpTxn.setUpdDTimes(otpGenerationTime); + otpTxn.setGeneratedDtimes(otpGenerationTime); + otpTxn.setValidationRetryCount(0); otpTxn.setExpiryDtimes(otpGenerationTime.plusSeconds(EnvUtil.getOtpExpiryTime())); - otpTxn.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); otpRepo.save(otpTxn); } else { OtpTransaction txn = new OtpTransaction(); @@ -107,11 +135,13 @@ public boolean sendOtp(OtpRequestDTO otpRequestDTO, String idvid, String idvidTy txn.setOtpHash(otpHash); txn.setCrBy(securityManager.getUser()); txn.setCrDtimes(otpGenerationTime); + txn.setGeneratedDtimes(otpGenerationTime); txn.setExpiryDtimes(otpGenerationTime.plusSeconds( EnvUtil.getOtpExpiryTime())); txn.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); otpRepo.save(txn); } + String notificationProperty = null; notificationProperty = otpRequestDTO .getOtpChannel().stream().map(channel -> NotificationType.getNotificationTypeForChannel(channel) @@ -123,6 +153,24 @@ public boolean sendOtp(OtpRequestDTO otpRequestDTO, String idvid, String idvidTy return true; } + /** + * Creates the OTP frozen exception. + * + * @return the id authentication business exception + */ + private IdAuthenticationBusinessException createOTPFrozenException() { + return new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), + String.format(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorMessage(), + otpFrozenTimeMinutes + " seconds", numberOfValidationAttemptsAllowed)); + } + + /** + * Generate OTP. + * + * @param uin the uin + * @return the string + * @throws IdAuthUncheckedException the id auth unchecked exception + */ private String generateOTP(String uin) throws IdAuthUncheckedException { try { OtpGenerateRequestDto otpGenerateRequestDto = new OtpGenerateRequestDto(uin); @@ -137,11 +185,10 @@ private String generateOTP(String uin) throws IdAuthUncheckedException { IdAuthenticationErrorConstants.BLOCKED_OTP_VALIDATE.getErrorCode(), USER_BLOCKED); throw new IdAuthUncheckedException(IdAuthenticationErrorConstants.BLOCKED_OTP_VALIDATE); } - if(response !=null && response.getResponse()!=null){ - return response.getResponse().get("otp"); - }else{ + if(response == null || response.getResponse() == null) { throw new IdAuthUncheckedException(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED); } + return response.getResponse().get("otp"); } catch (IDDataValidationException e) { logger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "generateOTP", @@ -160,29 +207,95 @@ private String generateOTP(String uin) throws IdAuthUncheckedException { * * @param pinValue the pin value * @param otpKey the otp key + * @param individualId the individual id * @return true, if successful * @throws IdAuthenticationBusinessException the id authentication business * exception */ - public boolean validateOtp(String pinValue, String otpKey) throws IdAuthenticationBusinessException { - String otpHash; - otpHash = IdAuthSecurityManager.digestAsPlainText( - (otpKey + EnvUtil.getKeySplitter() + pinValue).getBytes()); - Optional otpTxnOpt = otpRepo.findByOtpHashAndStatusCode(otpHash, IdAuthCommonConstants.ACTIVE_STATUS); - if (otpTxnOpt.isPresent()) { - OtpTransaction otpTxn = otpTxnOpt.get(); - //OtpTransaction otpTxn = otpRepo.findByOtpHashAndStatusCode(otpHash, IdAuthCommonConstants.ACTIVE_STATUS); - otpTxn.setStatusCode(IdAuthCommonConstants.USED_STATUS); - otpRepo.save(otpTxn); - if (otpTxn.getExpiryDtimes().isAfter(DateUtils.getUTCCurrentDateTime())) { - return true; - } else { + public boolean validateOtp(String pinValue, String otpKey, String individualId) throws IdAuthenticationBusinessException { + String refIdHash = securityManager.hash(individualId); + Optional otpEntityOpt = otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(refIdHash, QUERIED_STATUS_CODES); + + if (otpEntityOpt.isEmpty()) { + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.OTP_REQUEST_REQUIRED); + } + + OtpTransaction otpEntity = otpEntityOpt.get(); + requireOtpNotFrozen(otpEntity, true); + + if(otpEntity.getStatusCode().equals(IdAuthCommonConstants.UNFROZEN)) { + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.OTP_REQUEST_REQUIRED); + } + + // At this point it should be active status alone. + // Increment the validation attempt count. + int attemptCount = otpEntity.getValidationRetryCount() == null ? 1 : otpEntity.getValidationRetryCount() + 1; + + String otpHash = getOtpHash(pinValue, otpKey); + if (otpEntity.getOtpHash().equals(otpHash)) { + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime()); + otpEntity.setStatusCode(IdAuthCommonConstants.USED_STATUS); + otpRepo.save(otpEntity); + if (!otpEntity.getExpiryDtimes().isAfter(DateUtils.getUTCCurrentDateTime())) { logger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), IdAuthenticationErrorConstants.EXPIRED_OTP.getErrorCode(), OTP_EXPIRED); throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.EXPIRED_OTP); } + return true; } else { + //Set the incremented validation attempt count + otpEntity.setValidationRetryCount(attemptCount); + if (attemptCount >= numberOfValidationAttemptsAllowed) { + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime()); + otpRepo.save(otpEntity); + throw createOTPFrozenException(); + } + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime()); + otpRepo.save(otpEntity); return false; } } + + /** + * Require otp not frozen. + * + * @param otpEntity the otp entity + * @throws IdAuthenticationBusinessException the id authentication business exception + */ + private void requireOtpNotFrozen(OtpTransaction otpEntity, boolean saveEntity) throws IdAuthenticationBusinessException { + if(otpEntity.getStatusCode().equals(IdAuthCommonConstants.FROZEN)) { + if(!isAfterFrozenDuration(otpEntity)) { + throw createOTPFrozenException(); + } + logger.info("OTP Frozen wait time is over. Allowing further."); + otpEntity.setStatusCode(IdAuthCommonConstants.UNFROZEN); + if(saveEntity) { + otpRepo.save(otpEntity); + } + } + } + + /** + * Checks if the entity is after frozen duration. + * + * @param otpEntity the otp entity + * @return true, if is after frozen duration + */ + private boolean isAfterFrozenDuration(OtpTransaction otpEntity) { + return DateUtils.getUTCCurrentDateTime().isAfter(otpEntity.getUpdDTimes().plus(otpFrozenTimeMinutes, ChronoUnit.MINUTES)); + } + + /** + * Gets the otp hash. + * + * @param pinValue the pin value + * @param otpKey the otp key + * @return the otp hash + */ + private String getOtpHash(String pinValue, String otpKey) { + return IdAuthSecurityManager.digestAsPlainText( + (otpKey + EnvUtil.getKeySplitter() + pinValue).getBytes()); + } + } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/PartnerServiceManager.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/PartnerServiceManager.java index a08ca20be83..10f08d184b0 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/PartnerServiceManager.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/PartnerServiceManager.java @@ -209,8 +209,8 @@ private void validatePartnerMappingDetails(Optional partnerMappi if (partnerMapping.getApiKeyData().getApiKeyCommenceOn().isAfter(DateUtils.getUTCCurrentDateTime()) || partnerMapping.getApiKeyData().getApiKeyExpiresOn() .isBefore(DateUtils.getUTCCurrentDateTime())) { - throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.PARTNER_NOT_REGISTERED.getErrorCode(), - IdAuthenticationErrorConstants.PARTNER_NOT_REGISTERED.getErrorMessage()); + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.PARTNER_API_EXPIRED.getErrorCode(), + IdAuthenticationErrorConstants.PARTNER_API_EXPIRED.getErrorMessage()); } } else { logger.info(IdAuthCommonConstants.IDA, this.getClass().getSimpleName(), "OIDC_client_validation", diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/PasswordComparator.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/PasswordComparator.java new file mode 100644 index 00000000000..cafaa686935 --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/integration/PasswordComparator.java @@ -0,0 +1,39 @@ + package io.mosip.authentication.common.service.integration; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.kernel.core.logger.spi.Logger; + + +/** + * This Class will compare the input password value with the stored Hash value & salt + * + */ +@Component +public class PasswordComparator { + + @Autowired(required = false) + private IdAuthSecurityManager securityManager; + + /** + * Logger + */ + private static Logger logger = IdaLogger.getLogger(PasswordComparator.class); + + public boolean matchPasswordFunction(String passwordValue, String passwordHashValue, String salt) throws IdAuthenticationBusinessException { + + try { + String inputPasswordHash = securityManager.generateArgon2Hash(passwordValue, salt); + return inputPasswordHash.equals(passwordHashValue); + } catch (Exception e) { + logger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getName(), e.getLocalizedMessage(),e.getMessage()); + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.SERVER_ERROR, e); + } + } +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/kafka/impl/AuthenticationErrorEventingPublisher.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/kafka/impl/AuthenticationErrorEventingPublisher.java new file mode 100644 index 00000000000..52c7a422dc5 --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/kafka/impl/AuthenticationErrorEventingPublisher.java @@ -0,0 +1,145 @@ +package io.mosip.authentication.common.service.kafka.impl; + +import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_TOPIC; +import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED; + +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.stereotype.Component; + +import io.mosip.authentication.common.service.entity.PartnerData; +import io.mosip.authentication.common.service.repository.PartnerDataRepository; +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.BaseRequestDTO; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.partner.dto.PartnerDTO; +import io.mosip.idrepository.core.security.IdRepoSecurityManager; +import io.mosip.kernel.core.logger.spi.Logger; +import io.mosip.kernel.core.util.DateUtils; +import io.mosip.kernel.core.websub.model.Event; +import io.mosip.kernel.core.websub.model.EventModel; + +/** + * The Class AuthenticationErrorEventingPublisher. + * + * @author Neha + */ +@Component +@ConditionalOnProperty(value = AUTHENTICATION_ERROR_EVENTING_ENABLED, havingValue = "true", matchIfMissing = false) +public class AuthenticationErrorEventingPublisher { + + private static final String REQUEST_SIGNATURE = "requestSignature"; + + private static final String ENTITY_NAME = "entityName"; + + private static final String INDIVIDUAL_ID_TYPE = "individualIdType"; + + private static final String AUTH_PARTNER_ID = "authPartnerId"; + + private static final String INDIVIDUAL_ID = "individualId"; + + private static final String REQUESTDATETIME = "requestdatetime"; + + private static final String ERROR_MESSAGE = "error_message"; + + private static final String ERROR_CODE = "error_Code"; + + /** The Constant PUBLISHER_IDA. */ + private static final String PUBLISHER_IDA = "IDA"; + + /** The Constant logger. */ + + private static final Logger logger = IdaLogger.getLogger(AuthenticationErrorEventingPublisher.class); + + + /** The Authenticatrion error eventing topic. */ + @Value("${" + AUTHENTICATION_ERROR_EVENTING_TOPIC + "}") + private String authenticationErrorEventingTopic; + + @Value("${mosip.ida.authentication.error.eventing.encrypt.partner.id}") + private String partnerId; + + @Autowired + private KafkaTemplate kafkaTemplate; + + @Autowired + private IdAuthSecurityManager securityManager; + + @Autowired + private PartnerDataRepository partnerDataRepo; + + + + public void notify(BaseRequestDTO baserequestdto, String headerSignature, Optional partner, + IdAuthenticationBusinessException e, Map metadata) { + try { + sendEvents(baserequestdto, headerSignature, partner, e, metadata); + } catch (Exception exception) { + logger.error(IdRepoSecurityManager.getUser(), "Authentication error eventing", "notify", + exception.getMessage()); + } + } + + private void sendEvents(BaseRequestDTO baserequestdto, String headerSignature, Optional partner, + IdAuthenticationBusinessException e, Map metadata) { + logger.info("Inside sendEvents authentication error eventing"); + logger.info("Inside partner data to get certificate for authentication error eventing encryption"); + Optional partnerDataCert = partnerDataRepo.findByPartnerId(partnerId); + if (partnerDataCert.isEmpty()) { + logger.info("Partner is not configured for encrypting individual id."); + } else { + Map eventData = new HashMap<>(); + eventData.put(ERROR_CODE, e.getErrorCode()); + eventData.put(ERROR_MESSAGE, e.getErrorText()); + eventData.put(REQUESTDATETIME, DateUtils.formatToISOString(DateUtils.getUTCCurrentDateTime())); + eventData.put(INDIVIDUAL_ID, + encryptIndividualId(baserequestdto.getIndividualId(), partnerDataCert.get().getCertificateData())); + eventData.put(AUTH_PARTNER_ID, partner.map(PartnerDTO::getPartnerId).orElse(null)); + eventData.put(INDIVIDUAL_ID_TYPE, baserequestdto.getIndividualIdType()); + eventData.put(ENTITY_NAME, partner.map(PartnerDTO::getPartnerName).orElse(null)); + eventData.put(REQUEST_SIGNATURE, headerSignature); + EventModel eventModel = createEventModel(authenticationErrorEventingTopic, eventData); + publishEvent(eventModel); + } + } + + private EventModel createEventModel(String topic, Map eventData) { + EventModel model = new EventModel(); + model.setPublisher(PUBLISHER_IDA); + String dateTime = DateUtils.formatToISOString(DateUtils.getUTCCurrentDateTime()); + model.setPublishedOn(dateTime); + Event event = new Event(); + event.setTimestamp(dateTime); + String eventId = UUID.randomUUID().toString(); + event.setId(eventId); + event.setData(eventData); + model.setEvent(event); + model.setTopic(topic); + return model; + } + + public void publishEvent(EventModel eventModel) { + kafkaTemplate.send(authenticationErrorEventingTopic, eventModel); + } + + private String encryptIndividualId(String id, String partnerCertificate) { + try { + logger.info("Inside the method of encrypting IndividualId using partner certificate "); + return securityManager.asymmetricEncryption(id.getBytes(), partnerCertificate); + } catch (IdAuthenticationBusinessException e) { + // TODO Auto-generated catch block + logger.error("Error occurred during encryption of individual ID", e); + } + return null; + + } + +} \ No newline at end of file diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/CredSubjectIdStoreRepository.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/CredSubjectIdStoreRepository.java new file mode 100644 index 00000000000..31551916059 --- /dev/null +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/CredSubjectIdStoreRepository.java @@ -0,0 +1,21 @@ +package io.mosip.authentication.common.service.repository; + +import java.util.List; + + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import io.mosip.authentication.common.service.entity.CredSubjectIdStore; + +/** + * The Interface CredSubjectIdStoreRepository. + * + * @author Mahammed Taheer + */ + +@Repository +public interface CredSubjectIdStoreRepository extends JpaRepository { + + List findAllByCsidKeyHash(String keyHash); +} diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/IdaUinHashSaltRepo.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/IdaUinHashSaltRepo.java index 9147f60fc2f..360d086e4d8 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/IdaUinHashSaltRepo.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/IdaUinHashSaltRepo.java @@ -23,7 +23,8 @@ public interface IdaUinHashSaltRepo extends JpaRepository { - Optional findByLicenseKey(String licenseKey); + @Cacheable(value = MISP_LIC_DATA, unless ="#result == null") + @Query("select ml from MispLicenseData ml where ml.licenseKey = :licenseKey") + Optional findByLicenseKey(@Param("licenseKey") String licenseKey); } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/OIDCClientDataRepository.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/OIDCClientDataRepository.java index 22e2fc14412..8bb3e9bbe42 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/OIDCClientDataRepository.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/OIDCClientDataRepository.java @@ -1,8 +1,13 @@ package io.mosip.authentication.common.service.repository; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.OIDC_CLIENT_DATA; + import java.util.Optional; +import org.springframework.cache.annotation.Cacheable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import io.mosip.authentication.common.service.entity.OIDCClientData; @@ -16,5 +21,7 @@ @Repository public interface OIDCClientDataRepository extends JpaRepository { - Optional findByClientId(String clientId); + @Cacheable(value = OIDC_CLIENT_DATA, unless ="#result == null") + @Query("select oi from OIDCClientData oi where oi.clientId = :clientId") + Optional findByClientId(@Param("clientId") String clientId); } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/OtpTxnRepository.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/OtpTxnRepository.java index 9855fdb04c3..f5ef11c11a6 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/OtpTxnRepository.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/OtpTxnRepository.java @@ -1,5 +1,6 @@ package io.mosip.authentication.common.service.repository; +import java.util.List; import java.util.Optional; import io.mosip.authentication.common.service.entity.OtpTransaction; @@ -13,12 +14,11 @@ public interface OtpTxnRepository extends BaseRepository { /** - * Find by otp hash and status code. + * Find first element by ref_id ordered by generated_dtimes in descending order and for the given status codes. * - * @param otpHash the otp hash - * @param statusCode the status code + * @param refIdHash the ref id hash * @return the optional */ - Optional findByOtpHashAndStatusCode(String otpHash, String statusCode); + Optional findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(String refIdHash, List statusCodes); } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PartnerDataRepository.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PartnerDataRepository.java index 968ebfc97da..6823f120100 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PartnerDataRepository.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PartnerDataRepository.java @@ -1,12 +1,19 @@ package io.mosip.authentication.common.service.repository; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.PARTNER_DATA; + import java.util.Optional; +import org.springframework.cache.annotation.Cacheable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import io.mosip.authentication.common.service.entity.PartnerData; public interface PartnerDataRepository extends JpaRepository { - Optional findByPartnerId(String partnerId); + @Cacheable(value = PARTNER_DATA, unless ="#result == null") + @Query("select pd from PartnerData pd where pd.partnerId = :partnerId") + Optional findByPartnerId(@Param("partnerId") String partnerId); } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PartnerMappingRepository.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PartnerMappingRepository.java index 0484d26bf67..9a7afa81119 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PartnerMappingRepository.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PartnerMappingRepository.java @@ -1,16 +1,25 @@ package io.mosip.authentication.common.service.repository; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.PARTNER_API_KEY_DATA; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.PARTNER_API_KEY_POLICY_ID_DATA; + import java.util.Optional; +import org.springframework.cache.annotation.Cacheable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import io.mosip.authentication.common.service.entity.PartnerMapping; public interface PartnerMappingRepository extends JpaRepository { - Optional findByPartnerIdAndApiKeyId(String partnerId, String apiKeyId); - - Optional findByPartnerId(String partnerId); + @Cacheable(value = PARTNER_API_KEY_DATA, unless ="#result == null") + @Query("select pm from PartnerMapping pm where pm.partnerId = :partnerId and pm.apiKeyId = :apiKeyId") + Optional findByPartnerIdAndApiKeyId(@Param("partnerId") String partnerId, @Param("apiKeyId") String apiKeyId); - Optional findByPartnerIdAndApiKeyIdAndPolicyId(String partnerId, String apiKeyId, String policyId); + @Cacheable(value = PARTNER_API_KEY_POLICY_ID_DATA, unless ="#result == null") + @Query("select pm from PartnerMapping pm where pm.partnerId = :partnerId and pm.apiKeyId = :apiKeyId and pm.policyId = :policyId") + Optional findByPartnerIdAndApiKeyIdAndPolicyId(@Param("partnerId") String partnerId, @Param("apiKeyId") String apiKeyId, + @Param("policyId") String policyId); } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PolicyDataRepository.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PolicyDataRepository.java index 06dbdeac426..fd883390f4d 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PolicyDataRepository.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/repository/PolicyDataRepository.java @@ -1,13 +1,20 @@ package io.mosip.authentication.common.service.repository; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.POLICY_DATA; + import java.util.Optional; +import org.springframework.cache.annotation.Cacheable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import io.mosip.authentication.common.service.entity.PolicyData; public interface PolicyDataRepository extends JpaRepository { - Optional findByPolicyId(String policyId); + @Cacheable(value = POLICY_DATA, unless ="#result == null") + @Query("select pd from PolicyData pd where pd.policyId = :policyId") + Optional findByPolicyId(@Param("policyId") String policyId); } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/transaction/manager/IdAuthSecurityManager.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/transaction/manager/IdAuthSecurityManager.java index 47f77f880f5..d1767fedce5 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/transaction/manager/IdAuthSecurityManager.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/transaction/manager/IdAuthSecurityManager.java @@ -10,13 +10,13 @@ import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import java.util.AbstractMap.SimpleEntry; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; -import java.util.Map.Entry; -import java.util.AbstractMap.SimpleEntry; import javax.crypto.SecretKey; import javax.security.auth.x500.X500Principal; @@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import io.mosip.kernel.cryptomanager.dto.JWTEncryptRequestDto; import io.mosip.authentication.common.service.repository.IdaUinHashSaltRepo; import io.mosip.authentication.common.service.repository.IdentityCacheRepository; import io.mosip.authentication.common.service.util.EnvUtil; @@ -48,9 +49,10 @@ import io.mosip.kernel.core.util.DateUtils; import io.mosip.kernel.core.util.HMACUtils2; import io.mosip.kernel.crypto.jce.core.CryptoCore; +import io.mosip.kernel.cryptomanager.dto.Argon2GenerateHashRequestDto; +import io.mosip.kernel.cryptomanager.dto.Argon2GenerateHashResponseDto; import io.mosip.kernel.cryptomanager.dto.CryptomanagerRequestDto; import io.mosip.kernel.cryptomanager.dto.JWTCipherResponseDto; -import io.mosip.kernel.cryptomanager.dto.JWTEncryptRequestDto; import io.mosip.kernel.cryptomanager.service.CryptomanagerService; import io.mosip.kernel.cryptomanager.util.CryptomanagerUtils; import io.mosip.kernel.keygenerator.bouncycastle.KeyGenerator; @@ -62,6 +64,7 @@ import io.mosip.kernel.keymanagerservice.service.KeymanagerService; import io.mosip.kernel.keymanagerservice.util.KeymanagerUtil; import io.mosip.kernel.signature.constant.SignatureConstant; +import io.mosip.kernel.signature.dto.JWSSignatureRequestDto; import io.mosip.kernel.signature.dto.JWTSignatureRequestDto; import io.mosip.kernel.signature.dto.JWTSignatureVerifyRequestDto; import io.mosip.kernel.signature.dto.JWTSignatureVerifyResponseDto; @@ -147,6 +150,10 @@ public class IdAuthSecurityManager { @Value("${mosip.kernel.certificate.sign.algorithm:SHA256withRSA}") private String signAlgorithm; + /** The sign applicationid. */ + @Value("${mosip.ida.vci.exchange.sign.applicationid:IDA_VCI_EXCHANGE}") + private String vciExchSignApplicationId; + /** The uin hash salt repo. */ @Autowired private IdaUinHashSaltRepo uinHashSaltRepo; @@ -188,7 +195,7 @@ public class IdAuthSecurityManager { @Autowired private IdTypeUtil idTypeUtil; - + /** * Gets the user. * @@ -506,6 +513,14 @@ public Tuple3 encryptData(byte[] data, String partnerCer return Tuples.of(CryptoUtil.encodeBase64Url(encryptedData.getT1()), CryptoUtil.encodeBase64Url(encryptedData.getT2()), digestAsPlainText(certificateThumbprint)); } + public String asymmetricEncryption(byte[] dataToEncrypt, String partnerCertificate) + throws IdAuthenticationBusinessException { + X509Certificate x509Certificate = getX509Certificate(partnerCertificate); + PublicKey publicKey = x509Certificate.getPublicKey(); + byte[] encryptedData = cryptoCore.asymmetricEncrypt(publicKey, dataToEncrypt); + return CryptoUtil.encodeBase64(encryptedData); + } + /** * Encrypt. * @@ -657,6 +672,21 @@ public String signWithPayload(String data) { return signatureService.jwtSign(request).getJwtSignedData(); } + @WithRetry + public String jwsSignWithPayload(String data) { + JWSSignatureRequestDto request = new JWSSignatureRequestDto(); + request.setApplicationId(vciExchSignApplicationId); + //request.setDataToSign(CryptoUtil.encodeBase64Url(data.getBytes())); + request.setDataToSign(data); + request.setIncludeCertHash(false); + request.setIncludeCertificate(includeCertificate); + request.setIncludePayload(false); + request.setReferenceId(IdAuthCommonConstants.EMPTY); + request.setB64JWSHeaderParam(false); + request.setValidateJson(false); + return signatureService.jwsSign(request).getJwtSignedData(); + } + @WithRetry public Entry generateKeyBindingCertificate(PublicKey publicKey, CertificateParameters certParams) throws CertificateEncodingException { @@ -686,4 +716,12 @@ public String jwtEncrypt(String dataToEncrypt, String certificateData) { JWTCipherResponseDto cipherResponseDto = cryptomanagerService.jwtEncrypt(encryptRequestDto); return cipherResponseDto.getData(); } + + public String generateArgon2Hash(String anyString, String salt) { + Argon2GenerateHashRequestDto hashRequestDto = new Argon2GenerateHashRequestDto(); + hashRequestDto.setInputData(anyString); + hashRequestDto.setSalt(salt); + Argon2GenerateHashResponseDto hashResponseDto = cryptomanagerService.generateArgon2Hash(hashRequestDto); + return hashResponseDto.getHashValue(); + } } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/util/AuthTypeUtil.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/util/AuthTypeUtil.java index 4847e1e3d05..5c6ea119e84 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/util/AuthTypeUtil.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/util/AuthTypeUtil.java @@ -9,6 +9,7 @@ import io.mosip.authentication.common.service.impl.match.DemoAuthType; import io.mosip.authentication.common.service.impl.match.PinAuthType; import io.mosip.authentication.common.service.impl.match.KeyBindedTokenAuthType; +import io.mosip.authentication.common.service.impl.match.PasswordAuthType; import io.mosip.authentication.core.constant.RequestType; import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; import io.mosip.authentication.core.indauth.dto.EkycAuthRequestDTO; @@ -38,6 +39,10 @@ public static boolean isKeyBindedToken(AuthRequestDTO authReqDto) { return isAuthTypeInfoAvailable(authReqDto, new AuthType[] {KeyBindedTokenAuthType.KEYBINDEDTOKEN}); } + public static boolean isPassword(AuthRequestDTO authReqDto) { + return isAuthTypeInfoAvailable(authReqDto, new AuthType[] {PasswordAuthType.PASSWORD}); + } + private static boolean isAuthTypeInfoAvailable(AuthRequestDTO authReqDto, AuthType[] values) { return Stream.of(values).anyMatch(authType -> authType.isAuthTypeInfoAvailable(authReqDto)); } @@ -67,6 +72,10 @@ public static List findAutRequestTypes(AuthRequestDTO authRequestDT if(authRequestDTO instanceof EkycAuthRequestDTO) { requestTypes.add(RequestType.EKYC_AUTH_REQUEST); } + + if (AuthTypeUtil.isPassword(authRequestDTO)) { + requestTypes.add(RequestType.PASSWORD_AUTH); + } return requestTypes; } diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/util/KeyBindedTokenMatcherUtil.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/util/KeyBindedTokenMatcherUtil.java index 88629e1d311..41ee0afca45 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/util/KeyBindedTokenMatcherUtil.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/util/KeyBindedTokenMatcherUtil.java @@ -157,10 +157,11 @@ private boolean verifyWLAAsJWT(String individualId, JWT jwt, String certificateD return true; } catch (BadJOSEException | JOSEException e) { mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "", - "Failed to verify WLA token", e); - throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.ERROR_TOKEN_VERIFICATION.getErrorCode(), - String.format(IdAuthenticationErrorConstants.ERROR_TOKEN_VERIFICATION.getErrorMessage(), e.getMessage())); + "Failed to verify WLA token" + e.getMessage(), e); + /* throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.ERROR_TOKEN_VERIFICATION.getErrorCode(), + String.format(IdAuthenticationErrorConstants.ERROR_TOKEN_VERIFICATION.getErrorMessage())); */ } + return false; } private boolean isIatWithinAllowedTime(Date issuedDateTime) { @@ -169,7 +170,7 @@ private boolean isIatWithinAllowedTime(Date issuedDateTime) { LocalDateTime issuedLDT = DateUtils.parseDateToLocalDateTime(issuedDateTime); long diffSeconds = ChronoUnit.SECONDS.between(issuedLDT, currentTime); - if (issuedDateTime != null && diffSeconds > 0 && diffSeconds <= iatAdjSeconds) { + if (issuedDateTime != null && diffSeconds >= 0 && diffSeconds <= iatAdjSeconds) { return true; } return false; diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/validator/AuthRequestValidator.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/validator/AuthRequestValidator.java index e3e801d7b4a..02b630f5cca 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/validator/AuthRequestValidator.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/validator/AuthRequestValidator.java @@ -1,653 +1,654 @@ -package io.mosip.authentication.common.service.validator; - -import static io.mosip.authentication.core.constant.IdAuthCommonConstants.BIO_PATH; -import static io.mosip.authentication.core.constant.IdAuthCommonConstants.REQUEST; -import static io.mosip.authentication.core.constant.IdAuthCommonConstants.SESSION_ID; - -import java.time.Duration; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import java.util.stream.Stream; - -import javax.annotation.PostConstruct; - -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; -import org.springframework.validation.Errors; - -import io.mosip.authentication.common.service.util.AuthTypeUtil; -import io.mosip.authentication.common.service.util.EnvUtil; -import io.mosip.authentication.core.constant.IdAuthCommonConstants; -import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; -import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; -import io.mosip.authentication.core.indauth.dto.BioIdentityInfoDTO; -import io.mosip.authentication.core.indauth.dto.DataDTO; -import io.mosip.authentication.core.indauth.dto.DigitalId; -import io.mosip.authentication.core.indauth.dto.RequestDTO; -import io.mosip.authentication.core.logger.IdaLogger; -import io.mosip.kernel.core.exception.ParseException; -import io.mosip.kernel.core.function.FunctionWithThrowable; -import io.mosip.kernel.core.logger.spi.Logger; -import io.mosip.kernel.core.util.DateUtils; -import io.mosip.kernel.core.util.StringUtils; - -/** - * - * This class validates the parameters for Authorization Request. The class - * {@code AuthRequestValidator} validates AuthRequestDTO - * - * @author Manoj SP - * @author Rakesh Roshan - * - */ -@Component -@Primary -public class AuthRequestValidator extends BaseAuthRequestValidator { - - private static final String DATE_TIME = "dateTime"; - - private static final String DATA_TIMESTAMP = "data/timestamp"; - - /** The Constant DIGITAL_ID. */ - private static final String DIGITAL_ID = "data/digitalId/"; - - /** The Constant FINGERPRINT_COUNT. */ - private static final int FINGERPRINT_COUNT = 10; - - /** The Constant REQUEST_REQUEST_TIME. */ - private static final String REQUEST_REQUEST_TIME = "request/timestamp"; - - /** The mosip logger. */ - private static Logger mosipLogger = IdaLogger.getLogger(AuthRequestValidator.class); - - /** - * Allowed environments - */ - private List allowedEnvironments; - - /** - * Allowed domainUris - */ - private List allowedDomainUris; - - @PostConstruct - public void initialize() { - allowedEnvironments = Arrays.stream(EnvUtil.getAllowedEnv().split((","))) - .map(String::trim).collect(Collectors.toList()); - allowedDomainUris = Arrays.stream(EnvUtil.getAllowedDomainUri().split((","))) - .map(String::trim).collect(Collectors.toList()); - } - - /** - * Supports. - * - * @param clazz the clazz - * @return true, if successful - */ - /* - * (non-Javadoc) - * - * @see io.mosip.authentication.service.impl.indauth.validator. - * BaseAuthRequestValidator#supports(java.lang.Class) - */ - @Override - public boolean supports(Class clazz) { - return AuthRequestDTO.class.equals(clazz); - } - - /** - * Validate. - * - * @param target the target - * @param errors the errors - */ - /* - * (non-Javadoc) - * - * @see io.mosip.authentication.service.impl.indauth.validator. - * BaseAuthRequestValidator#validate(java.lang.Object, - * org.springframework.validation.Errors) - */ - @Override - public void validate(Object target, Errors errors) { - - AuthRequestDTO authRequestDto = (AuthRequestDTO) target; - - if (authRequestDto != null) { - if (!errors.hasErrors()) { - validateConsentReq(authRequestDto.isConsentObtained(), errors); - } - - if (!errors.hasErrors()) { - validateReqTime(authRequestDto.getRequestTime(), errors, IdAuthCommonConstants.REQ_TIME); - // Validation for Time Stamp in the RequestDTO. - validateReqTime(authRequestDto.getRequest().getTimestamp(), errors, REQUEST_REQUEST_TIME); - } - - if (!errors.hasErrors()) { - validateDomainURI(authRequestDto, errors); - } - - if (!errors.hasErrors()) { - validateEnv(authRequestDto, errors); - } - - if (!errors.hasErrors()) { - validateTxnId(authRequestDto.getTransactionID(), errors, IdAuthCommonConstants.TRANSACTION_ID); - } - if (!errors.hasErrors()) { - validateAllowedAuthTypes(authRequestDto, errors); - } - - if (!errors.hasErrors()) { - validateBiometrics(authRequestDto.getRequest().getBiometrics(), authRequestDto.getTransactionID(), errors); - } - - if (!errors.hasErrors()) { - super.validate(target, errors); - - if (!errors.hasErrors()) { - checkAuthRequest(authRequestDto, errors); - } - } - - if (!errors.hasErrors()) { - validateAuthType(authRequestDto, errors); - } - - } else { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), IdAuthCommonConstants.VALIDATE, - IdAuthCommonConstants.INVALID_INPUT_PARAMETER + REQUEST); - errors.rejectValue(REQUEST ,IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorCode(), - IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorMessage()); - } - } - - /** - * Validate biometric timestamps. - * - * @param biometrics the biometrics - * @param authTxnId - * @param errors the errors - */ - protected void validateBiometrics(List biometrics, String authTxnId, Errors errors) { - if (biometrics != null) { - for (int i = 0; i < biometrics.size(); i++) { - BioIdentityInfoDTO bioIdentityInfoDTO = biometrics.get(i); - if (bioIdentityInfoDTO.getData() == null) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, i, IdAuthCommonConstants.DATA) }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } else { - validateBioTxnId(authTxnId, errors, i, bioIdentityInfoDTO.getData().getTransactionId()); - validateBiometricTimestampAndDigitalIdTimestamp(biometrics.size() - 1, errors, i, - bioIdentityInfoDTO.getData()); - validateSuccessiveBioSegmentTimestamp(biometrics, errors, i, bioIdentityInfoDTO); - } - } - } - } - - private void validateSuccessiveBioSegmentTimestamp(List biometrics, Errors errors, int index, - BioIdentityInfoDTO bioIdentityInfoDTO) { - if (!errors.hasErrors() && index != 0) { - LocalDateTime currentIndexDateTime = DateUtils.parseDateToLocalDateTime( - this.biometricTimestampParser(bioIdentityInfoDTO.getData().getTimestamp())); - LocalDateTime previousIndexDateTime = DateUtils.parseDateToLocalDateTime( - this.biometricTimestampParser((biometrics.get(index - 1).getData().getTimestamp()))); - long bioTimestampDiffInSeconds = Duration.between(previousIndexDateTime, currentIndexDateTime).toSeconds(); - - Long allowedTimeDiffInSeconds = EnvUtil.getBioSegmentTimeDiffAllowed(); - if (bioTimestampDiffInSeconds < 0 || bioTimestampDiffInSeconds > allowedTimeDiffInSeconds) { - mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, - IdAuthenticationErrorConstants.INVALID_BIO_TIMESTAMP); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.INVALID_BIO_TIMESTAMP.getErrorCode(), new Object[] { allowedTimeDiffInSeconds }, - IdAuthenticationErrorConstants.INVALID_BIO_TIMESTAMP.getErrorMessage()); - } - validateSuccessiveDigitalIdTimestamp(biometrics, errors, index, bioIdentityInfoDTO, allowedTimeDiffInSeconds); - } - } - - protected void validateSuccessiveDigitalIdTimestamp(List biometrics, Errors errors, int index, - BioIdentityInfoDTO bioIdentityInfoDTO, Long allowedTimeDiffInSeconds) { - LocalDateTime currentIndexDateTime = DateUtils.parseDateToLocalDateTime( - this.biometricTimestampParser(bioIdentityInfoDTO.getData().getDigitalId().getDateTime())); - LocalDateTime previousIndexDateTime = DateUtils.parseDateToLocalDateTime( - this.biometricTimestampParser(biometrics.get(index - 1).getData().getDigitalId().getDateTime())); - long digitalIdTimestampDiffInSeconds = Duration.between(previousIndexDateTime, currentIndexDateTime).toSeconds(); - if (digitalIdTimestampDiffInSeconds < 0 || digitalIdTimestampDiffInSeconds > allowedTimeDiffInSeconds) { - mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, - IdAuthenticationErrorConstants.INVALID_BIO_DIGITALID_TIMESTAMP); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.INVALID_BIO_DIGITALID_TIMESTAMP.getErrorCode(), new Object[] { allowedTimeDiffInSeconds }, - IdAuthenticationErrorConstants.INVALID_BIO_DIGITALID_TIMESTAMP.getErrorMessage()); - } - } - - private void validateBioTxnId(String authTxnId, Errors errors, int index, String bioTxnId) { - // authTxnId validation is already done at this point - if (Objects.isNull(bioTxnId)) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, IdAuthCommonConstants.BIO_TXN_ID_PATH) }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - - } else - if(!authTxnId.contentEquals(bioTxnId)) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, IdAuthCommonConstants.BIO_TXN_ID_PATH) }, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); - } - } - - private void validateBiometricTimestampAndDigitalIdTimestamp(int biometricSize, Errors errors, int index, - DataDTO dataDTO) { - - String paramName = String.format(BIO_PATH, index, DATA_TIMESTAMP); - if (index == biometricSize) { - // validating future datetime check and other checks on last segment of bio and - // digitalId - validateReqTime(dataDTO.getTimestamp(), errors, paramName, this::biometricTimestampParser); - - if (!errors.hasErrors()) { - validateDigitalIdTimestamp(dataDTO.getDigitalId(), errors, String.format(BIO_PATH, index, DIGITAL_ID)); - } - } else { - // validating null check on bio timestamps and digitialId timestamps except last - // segment - nullCheckOnBioTimestampAndDigitalIdTimestamp(errors, index, dataDTO, paramName); - } - } - - private void nullCheckOnBioTimestampAndDigitalIdTimestamp(Errors errors, int i, DataDTO dataDTO, String paramName) { - if (StringUtils.isEmpty(dataDTO.getTimestamp())) { - mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, - MISSING_INPUT_PARAMETER + paramName); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), new Object[] { paramName }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - // null check only on digitalId and digitalId timestamp - nullCheckDigitalIdAndTimestamp(dataDTO.getDigitalId(), errors, String.format(BIO_PATH, i, DIGITAL_ID)); - } - - /** - * Validate digital id timestamp. - * - * @param digitalId the digital id - * @param errors the errors - * @param field the field - */ - protected void validateDigitalIdTimestamp(DigitalId digitalId, Errors errors, String field) { - final String dateTimeField = field + DATE_TIME; - if (nullCheckDigitalIdAndTimestamp(digitalId, errors, field)) { - validateReqTime(digitalId.getDateTime(), errors, dateTimeField, this::biometricTimestampParser); - } - - } - - protected boolean nullCheckDigitalIdAndTimestamp(DigitalId digitalId, Errors errors, String field) { - if (digitalId != null) { - if (digitalId.getDateTime() == null) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), new Object[] { field + DATE_TIME }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - return false; - } - } else { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), new Object[] { field }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - return false; - } - return true; - } - - /** - * Validate domain URI and env. - * - * @param authRequestDto the auth request dto - * @param errors the errors - */ - private void validateDomainURI(AuthRequestDTO authRequestDto, Errors errors) { - - // It is error if domain URI in request is not null but in biometrics it is null - if(authRequestDto.getDomainUri() != null) { - String nullBioDomainUris = ""; - if(authRequestDto.getRequest().getBiometrics() != null) { - nullBioDomainUris = IntStream.range(0, authRequestDto.getRequest().getBiometrics().size()) - .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) - && authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri() == null) - .mapToObj(String::valueOf).collect(Collectors.joining(",")); - } - - if (!nullBioDomainUris.isEmpty()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "bio domain uri is null"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), - "request/biometrics/" + nullBioDomainUris + "/data/domainUri")); - } - } - - // It is error if domain URI in biometrics is not null and null in the request - if (authRequestDto.getDomainUri() == null && (authRequestDto.getRequest().getBiometrics() != null && - authRequestDto.getRequest().getBiometrics().stream().filter(bio -> Objects.nonNull(bio.getData())) - .anyMatch(bio -> bio.getData().getDomainUri() != null))) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "request domainUri is null"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), - "request/domainUri")); - - } - - if(authRequestDto.getDomainUri() != null && authRequestDto.getRequest().getBiometrics() != null) { - // Both are not null and they both are not equal - String requestAndBioDomainUrisNotSame = IntStream - .range(0, authRequestDto.getRequest().getBiometrics().size()) - .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) - && authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri() != null - && !authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri() - .contentEquals(authRequestDto.getDomainUri())) - .mapToObj(String::valueOf).collect(Collectors.joining(",")); - if(!requestAndBioDomainUrisNotSame.isEmpty()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "request domainUri is no matching against bio domainUri"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INPUT_MISMATCH.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INPUT_MISMATCH.getErrorMessage(), - "request/biometrics/" + requestAndBioDomainUrisNotSame + "/data/domainUri", "request/domainUri")); - } - } - - if(authRequestDto.getRequest().getBiometrics() != null) { - // bio domain uri is not null and not matching with configurations - String notMatchingBioDomainsUris = IntStream.range(0, authRequestDto.getRequest().getBiometrics().size()) - .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) - && authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri() != null - && !isValuesContainsIgnoreCase(allowedDomainUris, - authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri())) - .mapToObj(String::valueOf).collect(Collectors.joining(",")); - if (!notMatchingBioDomainsUris.isEmpty()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "bio domain uri is not matching with configured domain uris"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), - "request/biometrics/" + notMatchingBioDomainsUris + "/data/domainUri")); - - } - } - - // request domain uri is not null and not matching with configurations - if (authRequestDto.getDomainUri() != null - && !isValuesContainsIgnoreCase(allowedDomainUris, authRequestDto.getDomainUri())) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, - "request domain uri is not matching with configured domain uris"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), - "request/domainUri")); - } - - } - - /** - * Validate domain URI and env. - * - * @param authRequestDto the auth request dto - * @param errors the errors - */ - private void validateEnv(AuthRequestDTO authRequestDto, Errors errors) { - - if(authRequestDto.getEnv() != null) { - String nullBioEnvUris = ""; - if(authRequestDto.getRequest().getBiometrics() != null) { - nullBioEnvUris = IntStream.range(0, authRequestDto.getRequest().getBiometrics().size()) - .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) - && authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv() == null) - .mapToObj(String::valueOf).collect(Collectors.joining(",")); - } - - if (!nullBioEnvUris.isEmpty()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "bio env is null"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), - "request/biometrics/" + nullBioEnvUris + "/data/env")); - } - } - - // It is error if env in biometrics is not null and null in the request - if (authRequestDto.getEnv() == null && (authRequestDto.getRequest().getBiometrics() != null && - authRequestDto.getRequest().getBiometrics().stream().filter(bio -> Objects.nonNull(bio.getData())) - .anyMatch(bio -> bio.getData().getEnv() != null))) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "request env is null"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), - "request/env")); - - } - - if(authRequestDto.getEnv() != null && authRequestDto.getRequest().getBiometrics() != null) { - // Both are not null and they both are not equal - String requestAndBioEnvNotSame = IntStream - .range(0, authRequestDto.getRequest().getBiometrics().size()) - .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) - && authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv() != null - && !authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv() - .contentEquals(authRequestDto.getEnv())) - .mapToObj(String::valueOf).collect(Collectors.joining(",")); - if(!requestAndBioEnvNotSame.isEmpty()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "request env is no matching against bio env"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INPUT_MISMATCH.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INPUT_MISMATCH.getErrorMessage(), - "request/biometrics/" + requestAndBioEnvNotSame + "/data/env", "request/env")); - } - } - - if(authRequestDto.getRequest().getBiometrics() != null) { - // bio env is not null and not matching with configurations - String notMatchingBioEnvss = IntStream.range(0, authRequestDto.getRequest().getBiometrics().size()) - .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) - && authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv() != null - && !isValuesContainsIgnoreCase(allowedEnvironments, - authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv())) - .mapToObj(String::valueOf).collect(Collectors.joining(",")); - if (!notMatchingBioEnvss.isEmpty()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "bio env is not matching with configured environments"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), - "request/biometrics/" + notMatchingBioEnvss + "/data/env")); - - } - } - - // request env is not null and not matching with configurations - if (authRequestDto.getEnv() != null - && !isValuesContainsIgnoreCase(allowedEnvironments, authRequestDto.getEnv())) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, - "request env is not matching with configured environments"); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), - "request/env")); - } - - } - - /** - * Validate req time. - * - * @param reqTime the req time - * @param errors the errors - * @param paramName the param name - */ - @Override - protected void validateReqTime(String reqTime, Errors errors, String paramName) { - super.validateReqTime(reqTime, errors, paramName); - if (!errors.hasErrors()) { - validateRequestTimedOut(reqTime, errors); - } - } - - /** - * Validate req time. - * - * @param reqTime the req time - * @param errors the errors - * @param paramName the param name - * @param dateTimeParser the date time parser - */ - protected void validateReqTime(String reqTime, Errors errors, String paramName, - FunctionWithThrowable dateTimeParser) { - super.validateReqTime(reqTime, errors, paramName, dateTimeParser); - if (!errors.hasErrors()) { - validateRequestTimedOut(reqTime, errors, dateTimeParser, paramName); - } - } - - /** - * Check auth request. - * - * @param authRequest the auth request - * @param errors the errors - */ - private void checkAuthRequest(AuthRequestDTO authRequest, Errors errors) { - if (AuthTypeUtil.isDemo(authRequest)) { - checkDemoAuth(authRequest, errors); - } - } - - /** - * Gets the max finger count. - * - * @return the max finger count - */ - @Override - protected int getMaxFingerCount() { - return FINGERPRINT_COUNT; - } - - /** - * Validate device details. - * - * @param authRequest the auth request - * @param errors the errors - */ - public void validateDeviceDetails(AuthRequestDTO authRequest, Errors errors) { - List bioData = Optional.ofNullable(authRequest.getRequest()).map(RequestDTO::getBiometrics) - .map(List::stream).orElseGet(Stream::empty).map(BioIdentityInfoDTO::getData) - .collect(Collectors.toList()); - - IntStream.range(0, bioData.size()).forEach(index -> { - if (StringUtils.isEmpty(bioData.get(index).getDeviceCode())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, "deviceCode") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - if (StringUtils.isEmpty(bioData.get(index).getDeviceServiceVersion())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, "deviceServiceVersion") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - if (Objects.isNull(bioData.get(index).getDigitalId())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, "digitalId") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } else { - if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getSerialNo())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, "digitalId/serialNo") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getMake())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "make") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getModel())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "model") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getType())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "type") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getDeviceSubType())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "deviceSubType") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getDp())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "deviceProvider") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getDpId())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "deviceProviderId") }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - - } - }); - } - - /** - * Biometric timestamp parser. - * - * @param timestamp the timestamp - * @return the date - * @throws ParseException the parse exception - */ - private Date biometricTimestampParser(String timestamp) throws ParseException { - try { - // First try parsing with biometric timestamp format - return DateUtils.parseToDate(timestamp, EnvUtil.getBiometricDateTimePattern()); - } catch (ParseException e) { - mosipLogger.debug( - "error parsing timestamp with biomerics date time pattern: {}, so paring with request time pattern", - e.getMessage()); - // Try parsing with request time stamp format - return this.requestTimeParser(timestamp); - } - } - - /** - * Checks the list of Strings contains given string or not by ignoring the case - * - * @param values - * @param value - * @return - */ - private boolean isValuesContainsIgnoreCase(List values, String value) { - if (value != null) { - return values.stream().anyMatch(value::equalsIgnoreCase); - } - return false; - } +package io.mosip.authentication.common.service.validator; + +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.BIO_PATH; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.REQUEST; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.SESSION_ID; + +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import javax.annotation.PostConstruct; + +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; + +import io.mosip.authentication.common.service.util.AuthTypeUtil; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.BioIdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.DataDTO; +import io.mosip.authentication.core.indauth.dto.DigitalId; +import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.RequestDTO; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.kernel.core.exception.ParseException; +import io.mosip.kernel.core.function.FunctionWithThrowable; +import io.mosip.kernel.core.logger.spi.Logger; +import io.mosip.kernel.core.util.DateUtils; +import io.mosip.kernel.core.util.StringUtils; + +/** + * + * This class validates the parameters for Authorization Request. The class + * {@code AuthRequestValidator} validates AuthRequestDTO + * + * @author Manoj SP + * @author Rakesh Roshan + * + */ +@Component +@Primary +public class AuthRequestValidator extends BaseAuthRequestValidator { + + private static final String DATE_TIME = "dateTime"; + + private static final String DATA_TIMESTAMP = "data/timestamp"; + + /** The Constant DIGITAL_ID. */ + private static final String DIGITAL_ID = "data/digitalId/"; + + /** The Constant FINGERPRINT_COUNT. */ + private static final int FINGERPRINT_COUNT = 10; + + /** The Constant REQUEST_REQUEST_TIME. */ + private static final String REQUEST_REQUEST_TIME = "request/timestamp"; + + /** The mosip logger. */ + private static Logger mosipLogger = IdaLogger.getLogger(AuthRequestValidator.class); + + /** + * Allowed environments + */ + private List allowedEnvironments; + + /** + * Allowed domainUris + */ + private List allowedDomainUris; + + @PostConstruct + public void initialize() { + allowedEnvironments = Arrays.stream(EnvUtil.getAllowedEnv().split((","))) + .map(String::trim).collect(Collectors.toList()); + allowedDomainUris = Arrays.stream(EnvUtil.getAllowedDomainUri().split((","))) + .map(String::trim).collect(Collectors.toList()); + } + + /** + * Supports. + * + * @param clazz the clazz + * @return true, if successful + */ + /* + * (non-Javadoc) + * + * @see io.mosip.authentication.service.impl.indauth.validator. + * BaseAuthRequestValidator#supports(java.lang.Class) + */ + @Override + public boolean supports(Class clazz) { + return AuthRequestDTO.class.equals(clazz) || KycAuthRequestDTO.class.equals(clazz); + } + + /** + * Validate. + * + * @param target the target + * @param errors the errors + */ + /* + * (non-Javadoc) + * + * @see io.mosip.authentication.service.impl.indauth.validator. + * BaseAuthRequestValidator#validate(java.lang.Object, + * org.springframework.validation.Errors) + */ + @Override + public void validate(Object target, Errors errors) { + + AuthRequestDTO authRequestDto = (AuthRequestDTO) target; + + if (authRequestDto != null) { + if (!errors.hasErrors()) { + validateConsentReq(authRequestDto.isConsentObtained(), errors); + } + + if (!errors.hasErrors()) { + validateReqTime(authRequestDto.getRequestTime(), errors, IdAuthCommonConstants.REQ_TIME); + // Validation for Time Stamp in the RequestDTO. + validateReqTime(authRequestDto.getRequest().getTimestamp(), errors, REQUEST_REQUEST_TIME); + } + + if (!errors.hasErrors()) { + validateDomainURI(authRequestDto, errors); + } + + if (!errors.hasErrors()) { + validateEnv(authRequestDto, errors); + } + + if (!errors.hasErrors()) { + validateTxnId(authRequestDto.getTransactionID(), errors, IdAuthCommonConstants.TRANSACTION_ID); + } + if (!errors.hasErrors()) { + validateAllowedAuthTypes(authRequestDto, errors); + } + + if (!errors.hasErrors()) { + validateBiometrics(authRequestDto.getRequest().getBiometrics(), authRequestDto.getTransactionID(), errors); + } + + if (!errors.hasErrors()) { + super.validate(target, errors); + + if (!errors.hasErrors()) { + checkAuthRequest(authRequestDto, errors); + } + } + + if (!errors.hasErrors()) { + validateAuthType(authRequestDto, errors); + } + + } else { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), IdAuthCommonConstants.VALIDATE, + IdAuthCommonConstants.INVALID_INPUT_PARAMETER + REQUEST); + errors.rejectValue(REQUEST ,IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorCode(), + IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorMessage()); + } + } + + /** + * Validate biometric timestamps. + * + * @param biometrics the biometrics + * @param authTxnId + * @param errors the errors + */ + protected void validateBiometrics(List biometrics, String authTxnId, Errors errors) { + if (biometrics != null) { + for (int i = 0; i < biometrics.size(); i++) { + BioIdentityInfoDTO bioIdentityInfoDTO = biometrics.get(i); + if (bioIdentityInfoDTO.getData() == null) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, i, IdAuthCommonConstants.DATA) }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } else { + validateBioTxnId(authTxnId, errors, i, bioIdentityInfoDTO.getData().getTransactionId()); + validateBiometricTimestampAndDigitalIdTimestamp(biometrics.size() - 1, errors, i, + bioIdentityInfoDTO.getData()); + validateSuccessiveBioSegmentTimestamp(biometrics, errors, i, bioIdentityInfoDTO); + } + } + } + } + + private void validateSuccessiveBioSegmentTimestamp(List biometrics, Errors errors, int index, + BioIdentityInfoDTO bioIdentityInfoDTO) { + if (!errors.hasErrors() && index != 0) { + LocalDateTime currentIndexDateTime = DateUtils.parseDateToLocalDateTime( + this.biometricTimestampParser(bioIdentityInfoDTO.getData().getTimestamp())); + LocalDateTime previousIndexDateTime = DateUtils.parseDateToLocalDateTime( + this.biometricTimestampParser((biometrics.get(index - 1).getData().getTimestamp()))); + long bioTimestampDiffInSeconds = Duration.between(previousIndexDateTime, currentIndexDateTime).toSeconds(); + + Long allowedTimeDiffInSeconds = EnvUtil.getBioSegmentTimeDiffAllowed(); + if (bioTimestampDiffInSeconds < 0 || bioTimestampDiffInSeconds > allowedTimeDiffInSeconds) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + IdAuthenticationErrorConstants.INVALID_BIO_TIMESTAMP); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.INVALID_BIO_TIMESTAMP.getErrorCode(), new Object[] { allowedTimeDiffInSeconds }, + IdAuthenticationErrorConstants.INVALID_BIO_TIMESTAMP.getErrorMessage()); + } + validateSuccessiveDigitalIdTimestamp(biometrics, errors, index, bioIdentityInfoDTO, allowedTimeDiffInSeconds); + } + } + + protected void validateSuccessiveDigitalIdTimestamp(List biometrics, Errors errors, int index, + BioIdentityInfoDTO bioIdentityInfoDTO, Long allowedTimeDiffInSeconds) { + LocalDateTime currentIndexDateTime = DateUtils.parseDateToLocalDateTime( + this.biometricTimestampParser(bioIdentityInfoDTO.getData().getDigitalId().getDateTime())); + LocalDateTime previousIndexDateTime = DateUtils.parseDateToLocalDateTime( + this.biometricTimestampParser(biometrics.get(index - 1).getData().getDigitalId().getDateTime())); + long digitalIdTimestampDiffInSeconds = Duration.between(previousIndexDateTime, currentIndexDateTime).toSeconds(); + if (digitalIdTimestampDiffInSeconds < 0 || digitalIdTimestampDiffInSeconds > allowedTimeDiffInSeconds) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + IdAuthenticationErrorConstants.INVALID_BIO_DIGITALID_TIMESTAMP); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.INVALID_BIO_DIGITALID_TIMESTAMP.getErrorCode(), new Object[] { allowedTimeDiffInSeconds }, + IdAuthenticationErrorConstants.INVALID_BIO_DIGITALID_TIMESTAMP.getErrorMessage()); + } + } + + private void validateBioTxnId(String authTxnId, Errors errors, int index, String bioTxnId) { + // authTxnId validation is already done at this point + if (Objects.isNull(bioTxnId)) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, IdAuthCommonConstants.BIO_TXN_ID_PATH) }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + + } else + if(!authTxnId.contentEquals(bioTxnId)) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, IdAuthCommonConstants.BIO_TXN_ID_PATH) }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + + private void validateBiometricTimestampAndDigitalIdTimestamp(int biometricSize, Errors errors, int index, + DataDTO dataDTO) { + + String paramName = String.format(BIO_PATH, index, DATA_TIMESTAMP); + if (index == biometricSize) { + // validating future datetime check and other checks on last segment of bio and + // digitalId + validateReqTime(dataDTO.getTimestamp(), errors, paramName, this::biometricTimestampParser); + + if (!errors.hasErrors()) { + validateDigitalIdTimestamp(dataDTO.getDigitalId(), errors, String.format(BIO_PATH, index, DIGITAL_ID)); + } + } else { + // validating null check on bio timestamps and digitialId timestamps except last + // segment + nullCheckOnBioTimestampAndDigitalIdTimestamp(errors, index, dataDTO, paramName); + } + } + + private void nullCheckOnBioTimestampAndDigitalIdTimestamp(Errors errors, int i, DataDTO dataDTO, String paramName) { + if (StringUtils.isEmpty(dataDTO.getTimestamp())) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + MISSING_INPUT_PARAMETER + paramName); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), new Object[] { paramName }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + // null check only on digitalId and digitalId timestamp + nullCheckDigitalIdAndTimestamp(dataDTO.getDigitalId(), errors, String.format(BIO_PATH, i, DIGITAL_ID)); + } + + /** + * Validate digital id timestamp. + * + * @param digitalId the digital id + * @param errors the errors + * @param field the field + */ + protected void validateDigitalIdTimestamp(DigitalId digitalId, Errors errors, String field) { + final String dateTimeField = field + DATE_TIME; + if (nullCheckDigitalIdAndTimestamp(digitalId, errors, field)) { + validateReqTime(digitalId.getDateTime(), errors, dateTimeField, this::biometricTimestampParser); + } + + } + + protected boolean nullCheckDigitalIdAndTimestamp(DigitalId digitalId, Errors errors, String field) { + if (digitalId != null) { + if (digitalId.getDateTime() == null) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), new Object[] { field + DATE_TIME }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + return false; + } + } else { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), new Object[] { field }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + return false; + } + return true; + } + + /** + * Validate domain URI and env. + * + * @param authRequestDto the auth request dto + * @param errors the errors + */ + private void validateDomainURI(AuthRequestDTO authRequestDto, Errors errors) { + + // It is error if domain URI in request is not null but in biometrics it is null + if(authRequestDto.getDomainUri() != null) { + String nullBioDomainUris = ""; + if(authRequestDto.getRequest().getBiometrics() != null) { + nullBioDomainUris = IntStream.range(0, authRequestDto.getRequest().getBiometrics().size()) + .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) + && authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri() == null) + .mapToObj(String::valueOf).collect(Collectors.joining(",")); + } + + if (!nullBioDomainUris.isEmpty()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "bio domain uri is null"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), + "request/biometrics/" + nullBioDomainUris + "/data/domainUri")); + } + } + + // It is error if domain URI in biometrics is not null and null in the request + if (authRequestDto.getDomainUri() == null && (authRequestDto.getRequest().getBiometrics() != null && + authRequestDto.getRequest().getBiometrics().stream().filter(bio -> Objects.nonNull(bio.getData())) + .anyMatch(bio -> bio.getData().getDomainUri() != null))) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "request domainUri is null"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), + "request/domainUri")); + + } + + if(authRequestDto.getDomainUri() != null && authRequestDto.getRequest().getBiometrics() != null) { + // Both are not null and they both are not equal + String requestAndBioDomainUrisNotSame = IntStream + .range(0, authRequestDto.getRequest().getBiometrics().size()) + .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) + && authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri() != null + && !authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri() + .contentEquals(authRequestDto.getDomainUri())) + .mapToObj(String::valueOf).collect(Collectors.joining(",")); + if(!requestAndBioDomainUrisNotSame.isEmpty()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "request domainUri is no matching against bio domainUri"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INPUT_MISMATCH.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INPUT_MISMATCH.getErrorMessage(), + "request/biometrics/" + requestAndBioDomainUrisNotSame + "/data/domainUri", "request/domainUri")); + } + } + + if(authRequestDto.getRequest().getBiometrics() != null) { + // bio domain uri is not null and not matching with configurations + String notMatchingBioDomainsUris = IntStream.range(0, authRequestDto.getRequest().getBiometrics().size()) + .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) + && authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri() != null + && !isValuesContainsIgnoreCase(allowedDomainUris, + authRequestDto.getRequest().getBiometrics().get(i).getData().getDomainUri())) + .mapToObj(String::valueOf).collect(Collectors.joining(",")); + if (!notMatchingBioDomainsUris.isEmpty()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "bio domain uri is not matching with configured domain uris"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), + "request/biometrics/" + notMatchingBioDomainsUris + "/data/domainUri")); + + } + } + + // request domain uri is not null and not matching with configurations + if (authRequestDto.getDomainUri() != null + && !isValuesContainsIgnoreCase(allowedDomainUris, authRequestDto.getDomainUri())) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, + "request domain uri is not matching with configured domain uris"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), + "request/domainUri")); + } + + } + + /** + * Validate domain URI and env. + * + * @param authRequestDto the auth request dto + * @param errors the errors + */ + private void validateEnv(AuthRequestDTO authRequestDto, Errors errors) { + + if(authRequestDto.getEnv() != null) { + String nullBioEnvUris = ""; + if(authRequestDto.getRequest().getBiometrics() != null) { + nullBioEnvUris = IntStream.range(0, authRequestDto.getRequest().getBiometrics().size()) + .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) + && authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv() == null) + .mapToObj(String::valueOf).collect(Collectors.joining(",")); + } + + if (!nullBioEnvUris.isEmpty()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "bio env is null"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), + "request/biometrics/" + nullBioEnvUris + "/data/env")); + } + } + + // It is error if env in biometrics is not null and null in the request + if (authRequestDto.getEnv() == null && (authRequestDto.getRequest().getBiometrics() != null && + authRequestDto.getRequest().getBiometrics().stream().filter(bio -> Objects.nonNull(bio.getData())) + .anyMatch(bio -> bio.getData().getEnv() != null))) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "request env is null"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), + "request/env")); + + } + + if(authRequestDto.getEnv() != null && authRequestDto.getRequest().getBiometrics() != null) { + // Both are not null and they both are not equal + String requestAndBioEnvNotSame = IntStream + .range(0, authRequestDto.getRequest().getBiometrics().size()) + .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) + && authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv() != null + && !authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv() + .contentEquals(authRequestDto.getEnv())) + .mapToObj(String::valueOf).collect(Collectors.joining(",")); + if(!requestAndBioEnvNotSame.isEmpty()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "request env is no matching against bio env"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INPUT_MISMATCH.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INPUT_MISMATCH.getErrorMessage(), + "request/biometrics/" + requestAndBioEnvNotSame + "/data/env", "request/env")); + } + } + + if(authRequestDto.getRequest().getBiometrics() != null) { + // bio env is not null and not matching with configurations + String notMatchingBioEnvss = IntStream.range(0, authRequestDto.getRequest().getBiometrics().size()) + .filter(i -> Objects.nonNull(authRequestDto.getRequest().getBiometrics().get(i).getData()) + && authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv() != null + && !isValuesContainsIgnoreCase(allowedEnvironments, + authRequestDto.getRequest().getBiometrics().get(i).getData().getEnv())) + .mapToObj(String::valueOf).collect(Collectors.joining(",")); + if (!notMatchingBioEnvss.isEmpty()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "bio env is not matching with configured environments"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), + "request/biometrics/" + notMatchingBioEnvss + "/data/env")); + + } + } + + // request env is not null and not matching with configurations + if (authRequestDto.getEnv() != null + && !isValuesContainsIgnoreCase(allowedEnvironments, authRequestDto.getEnv())) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, + "request env is not matching with configured environments"); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), + "request/env")); + } + + } + + /** + * Validate req time. + * + * @param reqTime the req time + * @param errors the errors + * @param paramName the param name + */ + @Override + protected void validateReqTime(String reqTime, Errors errors, String paramName) { + super.validateReqTime(reqTime, errors, paramName); + if (!errors.hasErrors()) { + validateRequestTimedOut(reqTime, errors); + } + } + + /** + * Validate req time. + * + * @param reqTime the req time + * @param errors the errors + * @param paramName the param name + * @param dateTimeParser the date time parser + */ + protected void validateReqTime(String reqTime, Errors errors, String paramName, + FunctionWithThrowable dateTimeParser) { + super.validateReqTime(reqTime, errors, paramName, dateTimeParser); + if (!errors.hasErrors()) { + validateRequestTimedOut(reqTime, errors, dateTimeParser, paramName); + } + } + + /** + * Check auth request. + * + * @param authRequest the auth request + * @param errors the errors + */ + private void checkAuthRequest(AuthRequestDTO authRequest, Errors errors) { + if (AuthTypeUtil.isDemo(authRequest)) { + checkDemoAuth(authRequest, errors); + } + } + + /** + * Gets the max finger count. + * + * @return the max finger count + */ + @Override + protected int getMaxFingerCount() { + return FINGERPRINT_COUNT; + } + + /** + * Validate device details. + * + * @param authRequest the auth request + * @param errors the errors + */ + public void validateDeviceDetails(AuthRequestDTO authRequest, Errors errors) { + List bioData = Optional.ofNullable(authRequest.getRequest()).map(RequestDTO::getBiometrics) + .map(List::stream).orElseGet(Stream::empty).map(BioIdentityInfoDTO::getData) + .collect(Collectors.toList()); + + IntStream.range(0, bioData.size()).forEach(index -> { + if (StringUtils.isEmpty(bioData.get(index).getDeviceCode())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, "deviceCode") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + if (StringUtils.isEmpty(bioData.get(index).getDeviceServiceVersion())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, "deviceServiceVersion") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + if (Objects.isNull(bioData.get(index).getDigitalId())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, "digitalId") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } else { + if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getSerialNo())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, "digitalId/serialNo") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getMake())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "make") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getModel())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "model") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getType())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "type") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getDeviceSubType())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "deviceSubType") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getDp())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "deviceProvider") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + if (StringUtils.isEmpty(bioData.get(index).getDigitalId().getDpId())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(BIO_PATH, index, DIGITAL_ID + "deviceProviderId") }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + + } + }); + } + + /** + * Biometric timestamp parser. + * + * @param timestamp the timestamp + * @return the date + * @throws ParseException the parse exception + */ + private Date biometricTimestampParser(String timestamp) throws ParseException { + try { + // First try parsing with biometric timestamp format + return DateUtils.parseToDate(timestamp, EnvUtil.getBiometricDateTimePattern()); + } catch (ParseException e) { + mosipLogger.debug( + "error parsing timestamp with biomerics date time pattern: {}, so paring with request time pattern", + e.getMessage()); + // Try parsing with request time stamp format + return this.requestTimeParser(timestamp); + } + } + + /** + * Checks the list of Strings contains given string or not by ignoring the case + * + * @param values + * @param value + * @return + */ + private boolean isValuesContainsIgnoreCase(List values, String value) { + if (value != null) { + return values.stream().anyMatch(value::equalsIgnoreCase); + } + return false; + } } \ No newline at end of file diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/validator/BaseAuthRequestValidator.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/validator/BaseAuthRequestValidator.java index 7d2078f7067..0296e90dc8b 100644 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/validator/BaseAuthRequestValidator.java +++ b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/validator/BaseAuthRequestValidator.java @@ -1,1081 +1,1166 @@ -package io.mosip.authentication.common.service.validator; - -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.OptionalInt; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import java.util.stream.Stream; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.validation.Errors; - -import io.mosip.authentication.common.service.helper.IdInfoHelper; -import io.mosip.authentication.common.service.impl.match.BioAuthType; -import io.mosip.authentication.common.service.impl.match.BioMatchType; -import io.mosip.authentication.common.service.impl.match.DOBType; -import io.mosip.authentication.common.service.impl.match.DemoAuthType; -import io.mosip.authentication.common.service.impl.match.DemoMatchType; -import io.mosip.authentication.common.service.impl.match.PinMatchType; -import io.mosip.authentication.common.service.util.AuthTypeUtil; -import io.mosip.authentication.common.service.util.EnvUtil; -import io.mosip.authentication.core.constant.IdAuthCommonConstants; -import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; -import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; -import io.mosip.authentication.core.indauth.dto.BaseAuthRequestDTO; -import io.mosip.authentication.core.indauth.dto.BioIdentityInfoDTO; -import io.mosip.authentication.core.indauth.dto.DataDTO; -import io.mosip.authentication.core.indauth.dto.IdentityDTO; -import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; -import io.mosip.authentication.core.indauth.dto.RequestDTO; -import io.mosip.authentication.core.logger.IdaLogger; -import io.mosip.authentication.core.spi.indauth.match.AuthType; -import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; -import io.mosip.authentication.core.spi.indauth.match.IdMapping; -import io.mosip.authentication.core.spi.indauth.match.MatchType; -import io.mosip.authentication.core.spi.indauth.match.MatchType.Category; -import io.mosip.kernel.core.logger.spi.Logger; -import io.mosip.kernel.core.pinvalidator.exception.InvalidPinException; -import io.mosip.kernel.core.util.StringUtils; -import io.mosip.kernel.pinvalidator.impl.PinValidatorImpl; - -/** - * The Class BaseAuthRequestValidator. - * - * @author Manoj SP - * @author Prem Kumar - * @author RakeshRoshan - * - */ -@Component -public abstract class BaseAuthRequestValidator extends IdAuthValidator { - - /** The Constant OTP2. */ - private static final String OTP2 = "OTP"; - - /** The Constant PIN. */ - private static final String PIN = "PIN"; - - /** The Final Constant For PIN_VALUE. */ - private static final String PIN_VALUE = "pinValue"; - - /** The mosip logger. */ - private static Logger mosipLogger = IdaLogger.getLogger(BaseAuthRequestValidator.class); - - /** The Constant iris. */ - private static final String IRIS = "iris"; - - /** The Constant face. */ - private static final String FACE = "face"; - - /** The id info helper. */ - @Autowired - protected IdInfoHelper idInfoHelper; - - /** The id info helper. */ - @Autowired - protected IdInfoFetcher idInfoFetcher; - - /** The pin validator. */ - @Autowired - private PinValidatorImpl pinValidator; - - /** The Constant REQUEST. */ - private static final String REQUEST = "request"; - - /** The Constant SESSION_ID. */ - private static final String SESSION_ID = "SESSION_ID"; - - /** The Constant IRIS_COUNT. */ - private static final int IRIS_COUNT = 2; - - /** - * Supports. - * - * @param clazz the clazz - * @return true, if successful - */ - /* - * (non-Javadoc) - * - * @see org.springframework.validation.Validator#supports(java.lang.Class) - */ - @Override - public boolean supports(Class clazz) { - return BaseAuthRequestDTO.class.isAssignableFrom(clazz); - } - - /** - * Validate. - * - * @param req the req - * @param errors the errors - */ - /* - * (non-Javadoc) - * - * @see org.springframework.validation.Validator#validate(java.lang.Object, - * org.springframework.validation.Errors) - */ - @Override - public void validate(Object req, Errors errors) { - BaseAuthRequestDTO baseAuthRequestDTO = (BaseAuthRequestDTO) req; - - if (baseAuthRequestDTO != null) { - validateId(baseAuthRequestDTO.getId(), errors); - } - - } - - /** - * validates the Static Pin Details. - * - * @param authRequestDTO - * the auth request DTO - * @param errors - * the errors - */ - protected void validateAdditionalFactorsDetails(AuthRequestDTO authRequestDTO, Errors errors) { - - if ((AuthTypeUtil.isPin(authRequestDTO) && isMatchtypeEnabled(PinMatchType.SPIN))) { - - Optional pinOpt = Optional.ofNullable(authRequestDTO.getRequest()).map(RequestDTO::getStaticPin); - - if (!pinOpt.isPresent()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Missing pinval in the request"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), new Object[] { PIN }, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); - } else { - try { - pinValidator.validatePin(pinOpt.get()); - } catch (InvalidPinException e) { - mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), "validateStaticPin", - "INVALID_INPUT_PARAMETER - pinValue - value -> " + pinOpt.get()); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - new Object[] { PIN_VALUE }, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); - } - - } - } else if ((AuthTypeUtil.isOtp(authRequestDTO) && isMatchtypeEnabled(PinMatchType.OTP))) { - Optional otp = Optional.ofNullable(authRequestDTO.getRequest()).map(RequestDTO::getOtp); - - if (!otp.isPresent()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Missing OTP value in the request"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), - new Object[] { Category.OTP.getType() }, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); - } else { - try { - pinValidator.validatePin(otp.get()); - } catch (InvalidPinException e) { - mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), "validateOtpValue", - "INVALID_INPUT_PARAMETER - OtppinValue - value -> " + otp.get()); - errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - new Object[] { OTP2 }, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); - } - } - } - } - - /** - * Validate Biometric details i.e validating fingers,iris,face and device - * information. - * - * @param authRequestDTO - * the auth request DTO - * @param errors - * the errors - * @param allowedAuthType - * the allowed auth type - */ - protected void validateBioMetadataDetails(AuthRequestDTO authRequestDTO, Errors errors, - Set allowedAuthType) { - if (authRequestDTO.getRequest() != null) { - List bioInfo = authRequestDTO.getRequest().getBiometrics(); - - if (bioInfo != null && !bioInfo.isEmpty()) { - OptionalInt nullDataIndex = IntStream.range(0, bioInfo.size()) - .filter(index -> bioInfo.get(index).getData() == null).findAny(); - if (nullDataIndex.isPresent()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "missing biometric request"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), - new Object[] { Category.BIO.getType() + "/*/data" }, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); - } else { - List bioData = bioInfo.stream().map(BioIdentityInfoDTO::getData) - .collect(Collectors.toList()); - validateBioType(bioData, errors, allowedAuthType); - validateBioData(bioData, errors); - validateCount(authRequestDTO, errors, bioData); - } - } - } - } - - /** - * Validate count. - * - * @param authRequestDTO - * the auth request DTO - * @param errors - * the errors - * @param bioData - * the bio data - */ - private void validateCount(AuthRequestDTO authRequestDTO, Errors errors, List bioData) { - if (!errors.hasErrors()) { - BioAuthType[] fingerTypes; - if(EnvUtil.getIsFmrEnabled()) { - fingerTypes = new BioAuthType[] {BioAuthType.FGR_IMG, BioAuthType.FGR_MIN, BioAuthType.FGR_IMG_COMPOSITE, BioAuthType.FGR_MIN_COMPOSITE}; - } else { - fingerTypes = new BioAuthType[] {BioAuthType.FGR_IMG, BioAuthType.FGR_IMG_COMPOSITE}; - } - if (isAuthtypeEnabled(fingerTypes)) { - validateFinger(authRequestDTO, bioData, errors); - } - - if (isAuthtypeEnabled(BioAuthType.IRIS_IMG, BioAuthType.IRIS_COMP_IMG)) { - validateIris(authRequestDTO, bioData, errors); - } - if (isMatchtypeEnabled(BioMatchType.FACE)) { - validateFace(authRequestDTO, bioData, errors); - } - } - } - - /** - * Validate bio data. - * - * @param bioData - * the bio data - * @param errors - * the errors - */ - private void validateBioData(List bioData, Errors errors) { - List filterdBioData = bioData.stream() - .filter(dataDto -> dataDto.getBioValue() == null || dataDto.getBioValue().isEmpty()) - .collect(Collectors.toList()); - filterdBioData.forEach(bioInfo -> { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { "bioValue for bioType - " + bioInfo.getBioType() + " " + "& bioSubType - " - + bioInfo.getBioSubType() }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - }); - - } - - /** - * Validates the BioType value. - * - * @param bioInfos - * the bio infos - * @param errors - * the errors - * @param allowedAuthTypesFromConfig - * the allowed auth types from config - */ - private void validateBioType(List bioInfos, Errors errors, Set allowedAuthTypesFromConfig) { - BioAuthType[] authTypes = BioAuthType.values(); - Set availableAuthTypeInfos = new HashSet<>(); - for (BioAuthType authType : authTypes) { - availableAuthTypeInfos.add(authType.getConfigNameValue().toLowerCase()); - } - Set allowedAvailableAuthTypes = allowedAuthTypesFromConfig.stream().filter(authTypeFromConfig -> { - String authType = authTypeFromConfig.toLowerCase(); - boolean contains = (authType.equalsIgnoreCase(MatchType.Category.DEMO.getType()) - || authType.equalsIgnoreCase(MatchType.Category.OTP.getType())) ? true - : availableAuthTypeInfos.contains(authType); - // TODO handle invalid bio authtype cases - if (!contains) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Invalid bio type config: " + authTypeFromConfig); - } - return contains; - }).map(BioAuthType::getTypeForConfigNameValue).filter(Optional::isPresent).map(Optional::get) - .collect(Collectors.toSet()); - - for (int i = 0; i < bioInfos.size(); i++) { - DataDTO bioInfo = bioInfos.get(i); - String bioType = bioInfo.getBioType(); - if (StringUtils.isEmpty(bioType)) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(IdAuthCommonConstants.BIO_TYPE_INPUT_PARAM, i) }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } else if (allowedAvailableAuthTypes.stream().noneMatch(authType -> authType.equalsIgnoreCase(bioType))) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), - new Object[] { MatchType.Category.BIO.getType() + "-" + bioType }, - IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); - } else { - validateBioType(errors, allowedAvailableAuthTypes, bioInfo, i); - } - } - - } - - /** - * Validate bio type. - * - * @param errors the errors - * @param availableAuthTypeInfos the available auth type infos - * @param bioInfo the bio info - * @param bioIndex the bio index - */ - private void validateBioType(Errors errors, Set availableAuthTypeInfos, DataDTO bioInfo, int bioIndex) { - String bioType = bioInfo.getBioType(); - if (availableAuthTypeInfos.stream().noneMatch(authType -> authType.equalsIgnoreCase(bioType))) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(IdAuthCommonConstants.BIO_TYPE_INPUT_PARAM, bioIndex) + " - " + bioType }, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); - } else { - String bioSubType = bioInfo.getBioSubType(); - if(!BioAuthType.FACE_IMG.getType().equalsIgnoreCase(bioType)) { - if (bioSubType != null && !bioSubType.isEmpty()) { - // Valid bio type - Optional bioAuthTypeOpt = BioAuthType.getSingleBioAuthTypeForType(bioType); - if (bioAuthTypeOpt.isPresent()) { - BioAuthType bioAuthType = bioAuthTypeOpt.get(); - Set associatedMatchTypes = bioAuthType.getAssociatedMatchTypes(); - boolean invalidBioType = associatedMatchTypes.stream() - .filter(matchType -> matchType instanceof BioMatchType) - .map(matchType -> (BioMatchType) matchType).map(BioMatchType::getIdMapping) - .map(IdMapping::getSubType).distinct() - .noneMatch(idName -> idName.equalsIgnoreCase(bioSubType)); - if (invalidBioType) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(IdAuthCommonConstants.BIO_SUB_TYPE_INPUT_PARAM, bioIndex) + " - " + bioSubType }, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); - } - - } - } else { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { String.format(IdAuthCommonConstants.BIO_SUB_TYPE_INPUT_PARAM, bioIndex) }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - } - } - } - } - - /** - * Validate fingers. - * - * @param authRequestDTO - * the auth request DTO - * @param bioInfo - * the bio info - * @param errors - * the errors - */ - private void validateFinger(AuthRequestDTO authRequestDTO, List bioInfo, Errors errors) { - if (EnvUtil.getIsFmrEnabled() && isAvailableBioType(bioInfo, BioAuthType.FGR_MIN)) { - validateFingerRequestCount(authRequestDTO, errors, BioAuthType.FGR_MIN.getType()); - } - if (isAvailableBioType(bioInfo, BioAuthType.FGR_IMG)) { - validateFingerRequestCount(authRequestDTO, errors, BioAuthType.FGR_IMG.getType()); - } - } - - /** - * Validates the Iris parameters present in thr request. - * - * @param authRequestDTO - * the auth request DTO - * @param bioInfo - * the bio info - * @param errors - * the errors - */ - private void validateIris(AuthRequestDTO authRequestDTO, List bioInfo, Errors errors) { - if (isAvailableBioType(bioInfo, BioAuthType.IRIS_IMG)) { - validateIrisRequestCount(authRequestDTO, errors); - validateMultiIrisValue(authRequestDTO, errors); - } - } - - /** - * Validation for MultiIris Values present in the request. - * - * @param authRequestDTO - * the auth request DTO - * @param errors - * the errors - */ - private void validateMultiIrisValue(AuthRequestDTO authRequestDTO, Errors errors) { - if (isDuplicateBioValue(authRequestDTO, BioAuthType.IRIS_IMG.getType(), getMaxIrisCount())) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Duplicate IRIS in request"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.DUPLICATE_IRIS.getErrorCode(), - String.format(IdAuthenticationErrorConstants.DUPLICATE_IRIS.getErrorMessage(), - IdAuthCommonConstants.REQUEST)); - } - } - - /** - * Checks if is duplicate bio value. - * - * @param authRequestDTO - * the auth request DTO - * @param type - * the type - * @param maxCount - * the max count - * @return true, if is duplicate bio value - */ - private boolean isDuplicateBioValue(AuthRequestDTO authRequestDTO, String type, int maxCount) { - Map countsMap = getBioValueCounts(authRequestDTO, type); - return hasDuplicate(countsMap, maxCount); - } - - /** - * Checks for duplicate. - * - * @param countsMap - * the counts map - * @param maxCount - * the max count - * @return true, if successful - */ - private boolean hasDuplicate(Map countsMap, int maxCount) { - return countsMap.entrySet().stream() - .anyMatch(entry -> (entry.getKey().equalsIgnoreCase(IdAuthCommonConstants.UNKNOWN_BIO) - && entry.getValue() > maxCount) - || (!entry.getKey().equalsIgnoreCase(IdAuthCommonConstants.UNKNOWN_BIO) - && entry.getValue() > 1)); - } - - /** - * Gets the bio subtype counts. - * - * @param authRequestDTO - * the auth request DTO - * @param type - * the type - * @return the bio subtype counts - */ - private Map getBioSubtypeCounts(AuthRequestDTO authRequestDTO, String type) { - return getBioSubtypeCount(getBioIds(authRequestDTO, type)); - } - - /** - * Gets the bio value counts. - * - * @param authRequestDTO - * the auth request DTO - * @param type - * the type - * @return the bio value counts - */ - private Map getBioValueCounts(AuthRequestDTO authRequestDTO, String type) { - return getBioValuesCount(getBioIds(authRequestDTO, type)); - } - - /** - * Gets the bio ids. - * - * @param authRequestDTO - * the auth request DTO - * @param type - * the type - * @return the bio ids - */ - private List getBioIds(AuthRequestDTO authRequestDTO, String type) { - List identity = Optional.ofNullable(authRequestDTO.getRequest()) - .map(RequestDTO::getBiometrics).orElseGet(Collections::emptyList); - if (!identity.isEmpty()) { - return identity.stream().filter(Objects::nonNull) - .filter(bioId -> bioId.getData().getBioType().equalsIgnoreCase(type)).collect(Collectors.toList()); - } - return Collections.emptyList(); - } - - /** - * Validate Face. - * - * @param authRequestDTO - * the auth request DTO - * @param bioInfo - * the bio info - * @param errors - * the errors - */ - private void validateFace(AuthRequestDTO authRequestDTO, List bioInfo, Errors errors) { - - if (isAvailableBioType(bioInfo, BioAuthType.FACE_IMG)) { - validateFaceBioType(authRequestDTO, errors); - } - } - - /** - * Validate face bio type. - * - * @param authRequestDTO - * the auth request DTO - * @param errors - * the errors - */ - private void validateFaceBioType(AuthRequestDTO authRequestDTO, Errors errors) { - List listBioIdentity = getBioIds(authRequestDTO, BioAuthType.FACE_IMG.getType()); - if (listBioIdentity.size() > 1) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Face : face count is more than 1."); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.FACE_EXCEEDING.getErrorCode(), new Object[] { FACE }, - IdAuthenticationErrorConstants.FACE_EXCEEDING.getErrorMessage()); - } - } - - /** - * check any IdentityInfoDto data available or not. - * - * @param authRequestDTO - * the auth request DTO - * @param functions - * the functions - * @return true, if successful - */ - @SuppressWarnings("unchecked") - boolean checkAnyIdInfoAvailable(AuthRequestDTO authRequestDTO, - Function>... functions) { - return Stream.>>of(functions).anyMatch(func -> Optional - .ofNullable(authRequestDTO.getRequest()).map(RequestDTO::getDemographics).map(func) - .filter(list -> list != null && !list.isEmpty() - && list.stream().allMatch(idDto -> idDto.getValue() != null && !idDto.getValue().isEmpty())) - .isPresent()); - } - - /** - * If DemoAuthType is Bio, then validate bioinfo is available or not. - * - * @param bioInfoList - * the bio info list - * @param bioType - * the bio type - * @return true, if is available bio type - */ - private boolean isAvailableBioType(List bioInfoList, BioAuthType bioType) { - return bioInfoList.parallelStream().anyMatch(bio -> bio.getBioType() != null && !bio.getBioType().isEmpty() - && bio.getBioType().equals(bioType.getType())); - } - - /** - * If DemoAuthType is Bio, Then check duplicate request of finger and number - * finger of request should not exceed to 10. - * - * @param authRequestDTO - * the auth request DTO - * @param errors - * the errors - * @param bioType - * the bio type - */ - private void validateFingerRequestCount(AuthRequestDTO authRequestDTO, Errors errors, String bioType) { - Map fingerSubtypesCountsMap = getBioSubtypeCounts(authRequestDTO, bioType); - boolean anyInfoIsMoreThanOne = hasDuplicate(fingerSubtypesCountsMap, getMaxFingerCount()); - Map fingerValuesCountsMap = getBioValueCounts(authRequestDTO, bioType); - boolean anyValueIsMoreThanOne = hasDuplicate(fingerValuesCountsMap, getMaxFingerCount()); - - if (anyInfoIsMoreThanOne || anyValueIsMoreThanOne) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Duplicate fingers"); - errors.reject(IdAuthenticationErrorConstants.DUPLICATE_FINGER.getErrorCode(), - IdAuthenticationErrorConstants.DUPLICATE_FINGER.getErrorMessage()); - } - - validateMaxFingerCount(errors, fingerSubtypesCountsMap); - } - - /** - * Validate max finger count. - * - * @param errors - * the errors - * @param fingerSubtypesCountsMap - * the finger subtypes counts map - */ - private void validateMaxFingerCount(Errors errors, Map fingerSubtypesCountsMap) { - long fingerCountExceeding = fingerSubtypesCountsMap.values().stream().mapToLong(l -> l).sum(); - int maxFingerCount = getMaxFingerCount(); - if (fingerCountExceeding > maxFingerCount) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "finger count is exceeding to " + maxFingerCount); - errors.reject(IdAuthenticationErrorConstants.FINGER_EXCEEDING.getErrorCode(), - String.format(IdAuthenticationErrorConstants.FINGER_EXCEEDING.getErrorMessage(), maxFingerCount)); - } - } - - /** - * Gets the max finger count. - * - * @return the max finger count - */ - protected abstract int getMaxFingerCount(); - - /** - * Gets the bio subtype count. - * - * @param idendityInfoList - * the idendity info list - * @return the bio subtype count - */ - private Map getBioSubtypeCount(List idendityInfoList) { - return idendityInfoList.stream().map(BioIdentityInfoDTO::getData) - .collect(Collectors.groupingBy(DataDTO::getBioSubType, Collectors.counting())); - - } - - /** - * Gets the bio values count. - * - * @param idendityInfoList - * the idendity info list - * @return the bio values count - */ - private Map getBioValuesCount(List idendityInfoList) { - return idendityInfoList.stream().map(BioIdentityInfoDTO::getData) - .collect(Collectors.groupingBy(DataDTO::getBioValue, Collectors.counting())); - - } - - /** - * validate Iris request count. left and right eye should not exceed 1 and total - * iris should not exceed 2. - * - * @param authRequestDTO - * the auth request DTO - * @param errors - * the errors - */ - private void validateIrisRequestCount(AuthRequestDTO authRequestDTO, Errors errors) { - Map irisSubtypeCounts = getBioSubtypeCounts(authRequestDTO, BioAuthType.IRIS_IMG.getType()); - if (irisSubtypeCounts.entrySet().stream().anyMatch( - map -> (map.getKey().equalsIgnoreCase(IdAuthCommonConstants.UNKNOWN_BIO) && map.getValue() > 2) - || (!map.getKey().equalsIgnoreCase(IdAuthCommonConstants.UNKNOWN_BIO) && map.getValue() > 1))) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Iris : either left eye or right eye count is more than 1."); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.IRIS_EXCEEDING.getErrorCode(), new Object[] { IRIS }, - IdAuthenticationErrorConstants.IRIS_EXCEEDING.getErrorMessage()); - } - - } - - /** - * Check demo auth. - * - * @param authRequest - * the auth request - * @param errors - * the errors - */ - protected void checkDemoAuth(AuthRequestDTO authRequest, Errors errors) { - AuthType[] authTypes = DemoAuthType.values(); - Set availableAuthTypeInfos = new HashSet<>(); - boolean hasMatch = false; - for (AuthType authType : authTypes) { - if (authType.isAuthTypeEnabled(authRequest, idInfoFetcher)) { - Set associatedMatchTypes = authType.getAssociatedMatchTypes(); - for (MatchType matchType : associatedMatchTypes) { - if (isMatchtypeEnabled(matchType)) { - if(!matchType.equals(DemoMatchType.DYNAMIC)) { - List identityInfos = matchType.getIdentityInfoList(authRequest.getRequest()); - hasMatch = checkIdentityInfoAndLanguageDetails(errors, availableAuthTypeInfos, hasMatch, authType, matchType, - identityInfos); - } else { - Set dynamicAttributeNames = new HashSet<>(idInfoFetcher.getMappingConfig().getDynamicAttributes().keySet()); - Optional.ofNullable(authRequest.getRequest()) - .map(RequestDTO::getDemographics) - .map(IdentityDTO::getMetadata) - .map(Map::keySet) - .ifPresent(dynamicAttributeNames::addAll); - for(String idName : dynamicAttributeNames) { - Map> identityInfosMap = idInfoFetcher.getIdentityInfo(matchType, idName, authRequest.getRequest()); - for(List identityInfos : identityInfosMap.values()) { - hasMatch = checkIdentityInfoAndLanguageDetails(errors, availableAuthTypeInfos, hasMatch, authType, matchType, - identityInfos); - } - } - } - } - - } - } - } - - if (!hasMatch) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Missing IdentityInfoDTO"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), - new Object[] { Category.DEMO.getType() }, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); - } else { - checkOtherValues(authRequest, errors, availableAuthTypeInfos); - } - } - - /** - * Check identity info and language details. - * - * @param errors the errors - * @param availableAuthTypeInfos the available auth type infos - * @param hasMatch the has match - * @param authType the auth type - * @param matchType the match type - * @param identityInfos the identity infos - * @return true, if successful - */ - private boolean checkIdentityInfoAndLanguageDetails(Errors errors, Set availableAuthTypeInfos, boolean hasMatch, AuthType authType, - MatchType matchType, List identityInfos) { - if (identityInfos != null && !identityInfos.isEmpty()) { - availableAuthTypeInfos.add(authType.getType()); - hasMatch = true; - checkIdentityInfoValue(identityInfos, errors); - checkLangaugeDetails(matchType, identityInfos, errors); - } - return hasMatch; - } - - /** - * Check identity info value. - * - * @param identityInfos - * the identity infos - * @param errors - * the errors - */ - private void checkIdentityInfoValue(List identityInfos, Errors errors) { - for (IdentityInfoDTO identityInfoDTO : identityInfos) { - if (Objects.isNull(identityInfoDTO.getValue())) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "IdentityInfoDTO is invalid"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), - new Object[] { Category.DEMO.getType() }, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); - } - - } - - } - - /** - * Check other values. - * - * @param authRequest - * the auth request - * @param errors - * the errors - * @param availableAuthTypeInfos - * the available auth type infos - */ - private void checkOtherValues(AuthRequestDTO authRequest, Errors errors, Set availableAuthTypeInfos) { - - if (isMatchtypeEnabled(DemoMatchType.DOBTYPE)) { - checkDOBType(authRequest, errors); - } - - if (isMatchtypeEnabled(DemoMatchType.AGE)) { - checkAge(authRequest, errors); - } - - if (isAuthtypeEnabled(DemoAuthType.ADDRESS, DemoAuthType.FULL_ADDRESS)) { - validateAdAndFullAd(availableAuthTypeInfos, errors); - } - - } - - /** - * Checks if is matchtype enabled. - * - * @param matchType - * the match type - * @return true, if is matchtype enabled - */ - private boolean isMatchtypeEnabled(MatchType matchType) { - return idInfoHelper.isMatchtypeEnabled(matchType); - } - - /** - * Checks if is authtype enabled. - * - * @param authTypes - * the auth types - * @return true, if is authtype enabled - */ - private boolean isAuthtypeEnabled(AuthType... authTypes) { - return Stream.of(authTypes).anyMatch( - authType -> authType.getAssociatedMatchTypes().stream().anyMatch(idInfoHelper::isMatchtypeEnabled)); - } - - /** - * Validate ad and full ad. - * - * @param availableAuthTypeInfos - * the available auth type infos - * @param errors - * the errors - */ - private void validateAdAndFullAd(Set availableAuthTypeInfos, Errors errors) { - if (availableAuthTypeInfos.contains(DemoAuthType.ADDRESS.getType()) - && availableAuthTypeInfos.contains(DemoAuthType.FULL_ADDRESS.getType())) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Ad and FAD are enabled"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), - new Object[] { Category.DEMO.getType() }, - IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); - } - } - - /** - * Check DOB type. - * - * @param authRequest - * the auth request - * @param errors - * the errors - */ - private void checkDOBType(AuthRequestDTO authRequest, Errors errors) { - List dobTypeList = DemoMatchType.DOBTYPE.getIdentityInfoList(authRequest.getRequest()); - if (dobTypeList != null) { - for (IdentityInfoDTO identityInfoDTO : dobTypeList) { - if (!DOBType.isTypePresent(identityInfoDTO.getValue())) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Demographic data – DOBType(pi) did not match"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - new Object[] { "DOBType" }, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); - } - } - } - - } - - /** - * Check age. - * - * @param authRequest - * the auth request - * @param errors - * the errors - */ - private void checkAge(AuthRequestDTO authRequest, Errors errors) { - List ageList = DemoMatchType.AGE.getIdentityInfoList(authRequest.getRequest()); - if (ageList != null) { - for (IdentityInfoDTO identityInfoDTO : ageList) { - try { - Integer.parseInt(identityInfoDTO.getValue()); - } catch (NumberFormatException e) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.VALIDATE, "Demographic data – Age(pi) did not match"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - new Object[] { "age" }, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); - } - } - } - } - - /** - * Check langauge details. - * - * @param demoMatchType - * the demo match type - * @param identityInfos - * the identity infos - * @param errors - * the errors - */ - private void checkLangaugeDetails(MatchType demoMatchType, List identityInfos, Errors errors) { - //Dynamic attributes validations are skipping here - //will be done in match input building stage(MatchInputBuilder) - if (!demoMatchType.isDynamic() && demoMatchType.isMultiLanguage() && identityInfos.stream().anyMatch( - identityInfo -> (identityInfo.getLanguage() == null || identityInfo.getLanguage().isEmpty()))) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.MISSING_INPUT_PARAMETER, "LanguageCode cannot be null"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), - new Object[] { "LanguageCode" }, - IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); - - } - - if (!demoMatchType.isDynamic() && !errors.hasErrors() && demoMatchType.isMultiLanguage()) { - Map langCount = identityInfos.stream() - .collect(Collectors.groupingBy(IdentityInfoDTO::getLanguage, Collectors.counting())); - - langCount.keySet().forEach(langCode -> validateLangCode(langCode, errors, REQUEST)); - - for (long value : langCount.values()) { - if (value > 1) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.INVALID_INPUT_PARAMETER, "Invalid or Multiple language code"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - new Object[] { "LanguageCode" }, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); - } - } - - if (langCount.keySet().size() > 1 && !demoMatchType.isMultiLanguage()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - IdAuthCommonConstants.INVALID_INPUT_PARAMETER, "Invalid or Multiple language code"); - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), - new Object[] { "LanguageCode" }, - IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); - } - } - } - - /** - * Validates the AuthType. - * - * @param authType - * the auth type - * @param errors - * the errors - */ - protected void validateAuthType(AuthRequestDTO authRequestDto, Errors errors) { - if (!(AuthTypeUtil.isDemo(authRequestDto) - || AuthTypeUtil.isBio(authRequestDto) - || AuthTypeUtil.isOtp(authRequestDto) - || AuthTypeUtil.isPin(authRequestDto))) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.NO_AUTHENTICATION_TYPE_SELECTED_IN_REQUEST.getErrorCode(), - IdAuthenticationErrorConstants.NO_AUTHENTICATION_TYPE_SELECTED_IN_REQUEST.getErrorMessage()); - } - } - - /** - * Method to validate auth type. - * - * @param requestDTO - * the request DTO - * @param errors - * the errors - */ - protected void validateAllowedAuthTypes(AuthRequestDTO requestDTO, Errors errors) { - Set allowedAuthType = getAllowedAuthTypes(); - validateAuthType(requestDTO, errors, allowedAuthType); - } - - /** - * Validate auth type. - * - * @param requestDTO - * the request DTO - * @param errors - * the errors - * @param authTypeDTO - * the auth type DTO - * @param allowedAuthType - * the allowed auth type - */ - private void validateAuthType(AuthRequestDTO requestDTO, Errors errors, - Set allowedAuthType) { - checkAllowedAuthType(requestDTO, errors, allowedAuthType); - validateBioMetadataDetails(requestDTO, errors, allowedAuthType); - } - - /** - * Check allowed auth type. - * - * @param requestDTO - * the request DTO - * @param errors - * the errors - * @param authTypeDTO - * the auth type DTO - * @param allowedAuthType - * the allowed auth type - */ - private void checkAllowedAuthType(AuthRequestDTO requestDTO, Errors errors, - Set allowedAuthType) { - if (AuthTypeUtil.isDemo(requestDTO)) { - if (allowedAuthType.contains(MatchType.Category.DEMO.getType())) { - checkDemoAuth(requestDTO, errors); - } else { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), - new Object[] { MatchType.Category.DEMO.getType() }, - IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); - } - } - - boolean isOtp = AuthTypeUtil.isOtp(requestDTO); - if (isOtp && !allowedAuthType.contains(MatchType.Category.OTP.getType())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), - new Object[] { MatchType.Category.OTP.getType() }, - IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); - } - - boolean isPin = AuthTypeUtil.isPin(requestDTO); - if (isPin && !allowedAuthType.contains(MatchType.Category.SPIN.getType())) { - errors.rejectValue(IdAuthCommonConstants.REQUEST, - IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), - new Object[] { MatchType.Category.SPIN.getType() }, - IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); - } - - if ((isOtp || isPin) && !errors.hasErrors()) { - validateAdditionalFactorsDetails(requestDTO, errors); - } - } - - /** - * validates langauges - * request. - * - * @param langCode the lang code - * @param errors the errors - * @param field the field - */ - protected void validateLangCode(String langCode, Errors errors, String field) { - if (Objects.nonNull(langCode)) { - if (!idInfoFetcher.getSystemSupportedLanguageCodes().contains(langCode)) { - mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), IdAuthCommonConstants.VALIDATE, - IdAuthCommonConstants.INVALID_INPUT_PARAMETER + field + " : " + langCode); - errors.rejectValue(field, IdAuthenticationErrorConstants.UNSUPPORTED_LANGUAGE.getErrorCode(), - new Object[] { field.concat(" : " + langCode) }, - IdAuthenticationErrorConstants.UNSUPPORTED_LANGUAGE.getErrorMessage()); - } - } - - } - - /** - * Gets the max iris count. - * - * @return the max iris count - */ - protected int getMaxIrisCount() { - return IRIS_COUNT; - } - +package io.mosip.authentication.common.service.validator; + +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.OptionalInt; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.validation.Errors; + +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.impl.match.BioAuthType; +import io.mosip.authentication.common.service.impl.match.BioMatchType; +import io.mosip.authentication.common.service.impl.match.DOBType; +import io.mosip.authentication.common.service.impl.match.DemoAuthType; +import io.mosip.authentication.common.service.impl.match.DemoMatchType; +import io.mosip.authentication.common.service.impl.match.KeyBindedTokenAuthType; +import io.mosip.authentication.common.service.impl.match.KeyBindedTokenMatchType; +import io.mosip.authentication.common.service.impl.match.PasswordMatchType; +import io.mosip.authentication.common.service.impl.match.PinMatchType; +import io.mosip.authentication.common.service.util.AuthTypeUtil; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.BaseAuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.BioIdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.DataDTO; +import io.mosip.authentication.core.indauth.dto.IdentityDTO; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.KeyBindedTokenDTO; +import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.KycRequestDTO; +import io.mosip.authentication.core.indauth.dto.RequestDTO; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.spi.indauth.match.AuthType; +import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; +import io.mosip.authentication.core.spi.indauth.match.IdMapping; +import io.mosip.authentication.core.spi.indauth.match.MatchType; +import io.mosip.authentication.core.spi.indauth.match.MatchType.Category; +import io.mosip.kernel.core.logger.spi.Logger; +import io.mosip.kernel.core.pinvalidator.exception.InvalidPinException; +import io.mosip.kernel.core.util.StringUtils; +import io.mosip.kernel.pinvalidator.impl.PinValidatorImpl; + +/** + * The Class BaseAuthRequestValidator. + * + * @author Manoj SP + * @author Prem Kumar + * @author RakeshRoshan + * + */ +@Component +public abstract class BaseAuthRequestValidator extends IdAuthValidator { + + /** The Constant OTP2. */ + private static final String OTP2 = "OTP"; + + /** The Constant PIN. */ + private static final String PIN = "PIN"; + + /** The Final Constant For PIN_VALUE. */ + private static final String PIN_VALUE = "pinValue"; + + /** The mosip logger. */ + private static Logger mosipLogger = IdaLogger.getLogger(BaseAuthRequestValidator.class); + + /** The Constant iris. */ + private static final String IRIS = "iris"; + + /** The Constant face. */ + private static final String FACE = "face"; + + /** The id info helper. */ + @Autowired + protected IdInfoHelper idInfoHelper; + + /** The id info helper. */ + @Autowired + protected IdInfoFetcher idInfoFetcher; + + /** The pin validator. */ + @Autowired + private PinValidatorImpl pinValidator; + + /** The Constant REQUEST. */ + private static final String REQUEST = "request"; + + /** The Constant SESSION_ID. */ + private static final String SESSION_ID = "SESSION_ID"; + + /** The Constant IRIS_COUNT. */ + private static final int IRIS_COUNT = 2; + + /** + * Supports. + * + * @param clazz the clazz + * @return true, if successful + */ + /* + * (non-Javadoc) + * + * @see org.springframework.validation.Validator#supports(java.lang.Class) + */ + @Override + public boolean supports(Class clazz) { + return BaseAuthRequestDTO.class.isAssignableFrom(clazz); + } + + /** + * Validate. + * + * @param req the req + * @param errors the errors + */ + /* + * (non-Javadoc) + * + * @see org.springframework.validation.Validator#validate(java.lang.Object, + * org.springframework.validation.Errors) + */ + @Override + public void validate(Object req, Errors errors) { + BaseAuthRequestDTO baseAuthRequestDTO = (BaseAuthRequestDTO) req; + + if (baseAuthRequestDTO != null) { + validateId(baseAuthRequestDTO.getId(), errors); + } + + } + + /** + * validates the Static Pin Details. + * + * @param authRequestDTO + * the auth request DTO + * @param errors + * the errors + */ + protected void validateAdditionalFactorsDetails(AuthRequestDTO authRequestDTO, Errors errors) { + + if ((AuthTypeUtil.isPin(authRequestDTO) && isMatchtypeEnabled(PinMatchType.SPIN))) { + + Optional pinOpt = Optional.ofNullable(authRequestDTO.getRequest()).map(RequestDTO::getStaticPin); + + if (!pinOpt.isPresent()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Missing pinval in the request"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), new Object[] { PIN }, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); + } else { + try { + pinValidator.validatePin(pinOpt.get()); + } catch (InvalidPinException e) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), "validateStaticPin", + "INVALID_INPUT_PARAMETER - pinValue - value -> " + pinOpt.get()); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { PIN_VALUE }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + + } + } else if ((AuthTypeUtil.isOtp(authRequestDTO) && isMatchtypeEnabled(PinMatchType.OTP))) { + Optional otp = Optional.ofNullable(authRequestDTO.getRequest()).map(RequestDTO::getOtp); + + if (!otp.isPresent()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Missing OTP value in the request"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), + new Object[] { Category.OTP.getType() }, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); + } else { + try { + pinValidator.validatePin(otp.get()); + } catch (InvalidPinException e) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), "validateOtpValue", + "INVALID_INPUT_PARAMETER - OtppinValue - value -> " + otp.get()); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { OTP2 }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + } + } + + private void validatePasswordDetails(AuthRequestDTO authRequestDTO, Errors errors) { + + if (isMatchtypeEnabled(PasswordMatchType.PASSWORD)) { + KycAuthRequestDTO kycAuthRequestDTO = (KycAuthRequestDTO) authRequestDTO; + Optional passwordOpt = Optional.ofNullable(kycAuthRequestDTO.getRequest()).map(KycRequestDTO::getPassword); + if (!passwordOpt.isPresent()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Missing Password value in the request"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), + new Object[] { Category.PWD.getType() }, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); + } else { + if (passwordOpt.get().isBlank()) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), "validatePasswordDetails", + "INVALID_INPUT_PARAMETER - Pwd value -> " + passwordOpt.get()); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { "PWD" }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + } + } + + private void validateKBTDetails(AuthRequestDTO authRequestDTO, Errors errors) { + if(authRequestDTO instanceof KycAuthRequestDTO) { + KycAuthRequestDTO kycAuthRequestDTO = (KycAuthRequestDTO)authRequestDTO; + boolean isKbt = CollectionUtils.isEmpty(kycAuthRequestDTO.getRequest().getKeyBindedTokens()); + if (!isKbt) { + KeyBindedTokenDTO kbtDto = kycAuthRequestDTO.getRequest().getKeyBindedTokens().get(0); + if (Objects.isNull(kbtDto.getFormat()) || kbtDto.getFormat().isBlank()) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), "validateKBTDetails", + "INVALID_INPUT_PARAMETER - KBT value -> " + kbtDto.getFormat()); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { "KeyBindedTokens.Format" }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + if (Objects.isNull(kbtDto.getToken()) || kbtDto.getToken().isBlank()) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), "validateKBTDetails", + "INVALID_INPUT_PARAMETER - KBT value -> " + kbtDto.getToken()); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { "KeyBindedTokens.Token" }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + if (Objects.isNull(kbtDto.getType()) || kbtDto.getType().isBlank()) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), "validateKBTDetails", + "INVALID_INPUT_PARAMETER - KBT value -> " + kbtDto.getType()); + errors.rejectValue(REQUEST, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { "KeyBindedTokens.Type" }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + } + } + + /** + * Validate Biometric details i.e validating fingers,iris,face and device + * information. + * + * @param authRequestDTO + * the auth request DTO + * @param errors + * the errors + * @param allowedAuthType + * the allowed auth type + */ + protected void validateBioMetadataDetails(AuthRequestDTO authRequestDTO, Errors errors, + Set allowedAuthType) { + if (authRequestDTO.getRequest() != null) { + List bioInfo = authRequestDTO.getRequest().getBiometrics(); + + if (bioInfo != null && !bioInfo.isEmpty()) { + OptionalInt nullDataIndex = IntStream.range(0, bioInfo.size()) + .filter(index -> bioInfo.get(index).getData() == null).findAny(); + if (nullDataIndex.isPresent()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "missing biometric request"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), + new Object[] { Category.BIO.getType() + "/*/data" }, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); + } else { + List bioData = bioInfo.stream().map(BioIdentityInfoDTO::getData) + .collect(Collectors.toList()); + validateBioType(bioData, errors, allowedAuthType); + validateBioData(bioData, errors); + validateCount(authRequestDTO, errors, bioData); + } + } + } + } + + /** + * Validate count. + * + * @param authRequestDTO + * the auth request DTO + * @param errors + * the errors + * @param bioData + * the bio data + */ + private void validateCount(AuthRequestDTO authRequestDTO, Errors errors, List bioData) { + if (!errors.hasErrors()) { + BioAuthType[] fingerTypes; + if(EnvUtil.getIsFmrEnabled()) { + fingerTypes = new BioAuthType[] {BioAuthType.FGR_IMG, BioAuthType.FGR_MIN, BioAuthType.FGR_IMG_COMPOSITE, BioAuthType.FGR_MIN_COMPOSITE}; + } else { + fingerTypes = new BioAuthType[] {BioAuthType.FGR_IMG, BioAuthType.FGR_IMG_COMPOSITE}; + } + if (isAuthtypeEnabled(fingerTypes)) { + validateFinger(authRequestDTO, bioData, errors); + } + + if (isAuthtypeEnabled(BioAuthType.IRIS_IMG, BioAuthType.IRIS_COMP_IMG)) { + validateIris(authRequestDTO, bioData, errors); + } + if (isMatchtypeEnabled(BioMatchType.FACE)) { + validateFace(authRequestDTO, bioData, errors); + } + } + } + + /** + * Validate bio data. + * + * @param bioData + * the bio data + * @param errors + * the errors + */ + private void validateBioData(List bioData, Errors errors) { + List filterdBioData = bioData.stream() + .filter(dataDto -> dataDto.getBioValue() == null || dataDto.getBioValue().isEmpty()) + .collect(Collectors.toList()); + filterdBioData.forEach(bioInfo -> { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { "bioValue for bioType - " + bioInfo.getBioType() + " " + "& bioSubType - " + + bioInfo.getBioSubType() }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + }); + + } + + /** + * Validates the BioType value. + * + * @param bioInfos + * the bio infos + * @param errors + * the errors + * @param allowedAuthTypesFromConfig + * the allowed auth types from config + */ + private void validateBioType(List bioInfos, Errors errors, Set allowedAuthTypesFromConfig) { + BioAuthType[] authTypes = BioAuthType.values(); + Set availableAuthTypeInfos = new HashSet<>(); + for (BioAuthType authType : authTypes) { + availableAuthTypeInfos.add(authType.getConfigNameValue().toLowerCase()); + } + Set allowedAvailableAuthTypes = allowedAuthTypesFromConfig.stream().filter(authTypeFromConfig -> { + String authType = authTypeFromConfig.toLowerCase(); + boolean contains = (authType.equalsIgnoreCase(MatchType.Category.DEMO.getType()) + || authType.equalsIgnoreCase(MatchType.Category.OTP.getType())) ? true + : availableAuthTypeInfos.contains(authType); + // TODO handle invalid bio authtype cases + if (!contains) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Invalid bio type config: " + authTypeFromConfig); + } + return contains; + }).map(BioAuthType::getTypeForConfigNameValue).filter(Optional::isPresent).map(Optional::get) + .collect(Collectors.toSet()); + + for (int i = 0; i < bioInfos.size(); i++) { + DataDTO bioInfo = bioInfos.get(i); + String bioType = bioInfo.getBioType(); + if (StringUtils.isEmpty(bioType)) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(IdAuthCommonConstants.BIO_TYPE_INPUT_PARAM, i) }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } else if (allowedAvailableAuthTypes.stream().noneMatch(authType -> authType.equalsIgnoreCase(bioType))) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), + new Object[] { MatchType.Category.BIO.getType() + "-" + bioType }, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); + } else { + validateBioType(errors, allowedAvailableAuthTypes, bioInfo, i); + } + } + + } + + /** + * Validate bio type. + * + * @param errors the errors + * @param availableAuthTypeInfos the available auth type infos + * @param bioInfo the bio info + * @param bioIndex the bio index + */ + private void validateBioType(Errors errors, Set availableAuthTypeInfos, DataDTO bioInfo, int bioIndex) { + String bioType = bioInfo.getBioType(); + if (availableAuthTypeInfos.stream().noneMatch(authType -> authType.equalsIgnoreCase(bioType))) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(IdAuthCommonConstants.BIO_TYPE_INPUT_PARAM, bioIndex) + " - " + bioType }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } else { + String bioSubType = bioInfo.getBioSubType(); + if(!BioAuthType.FACE_IMG.getType().equalsIgnoreCase(bioType)) { + if (bioSubType != null && !bioSubType.isEmpty()) { + // Valid bio type + Optional bioAuthTypeOpt = BioAuthType.getSingleBioAuthTypeForType(bioType); + if (bioAuthTypeOpt.isPresent()) { + BioAuthType bioAuthType = bioAuthTypeOpt.get(); + Set associatedMatchTypes = bioAuthType.getAssociatedMatchTypes(); + boolean invalidBioType = associatedMatchTypes.stream() + .filter(matchType -> matchType instanceof BioMatchType) + .map(matchType -> (BioMatchType) matchType).map(BioMatchType::getIdMapping) + .map(IdMapping::getSubType).distinct() + .noneMatch(idName -> idName.equalsIgnoreCase(bioSubType)); + if (invalidBioType) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(IdAuthCommonConstants.BIO_SUB_TYPE_INPUT_PARAM, bioIndex) + " - " + bioSubType }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + + } + } else { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { String.format(IdAuthCommonConstants.BIO_SUB_TYPE_INPUT_PARAM, bioIndex) }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + } + } + } + + /** + * Validate fingers. + * + * @param authRequestDTO + * the auth request DTO + * @param bioInfo + * the bio info + * @param errors + * the errors + */ + private void validateFinger(AuthRequestDTO authRequestDTO, List bioInfo, Errors errors) { + if (EnvUtil.getIsFmrEnabled() && isAvailableBioType(bioInfo, BioAuthType.FGR_MIN)) { + validateFingerRequestCount(authRequestDTO, errors, BioAuthType.FGR_MIN.getType()); + } + if (isAvailableBioType(bioInfo, BioAuthType.FGR_IMG)) { + validateFingerRequestCount(authRequestDTO, errors, BioAuthType.FGR_IMG.getType()); + } + } + + /** + * Validates the Iris parameters present in thr request. + * + * @param authRequestDTO + * the auth request DTO + * @param bioInfo + * the bio info + * @param errors + * the errors + */ + private void validateIris(AuthRequestDTO authRequestDTO, List bioInfo, Errors errors) { + if (isAvailableBioType(bioInfo, BioAuthType.IRIS_IMG)) { + validateIrisRequestCount(authRequestDTO, errors); + validateMultiIrisValue(authRequestDTO, errors); + } + } + + /** + * Validation for MultiIris Values present in the request. + * + * @param authRequestDTO + * the auth request DTO + * @param errors + * the errors + */ + private void validateMultiIrisValue(AuthRequestDTO authRequestDTO, Errors errors) { + if (isDuplicateBioValue(authRequestDTO, BioAuthType.IRIS_IMG.getType(), getMaxIrisCount())) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Duplicate IRIS in request"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.DUPLICATE_IRIS.getErrorCode(), + String.format(IdAuthenticationErrorConstants.DUPLICATE_IRIS.getErrorMessage(), + IdAuthCommonConstants.REQUEST)); + } + } + + /** + * Checks if is duplicate bio value. + * + * @param authRequestDTO + * the auth request DTO + * @param type + * the type + * @param maxCount + * the max count + * @return true, if is duplicate bio value + */ + private boolean isDuplicateBioValue(AuthRequestDTO authRequestDTO, String type, int maxCount) { + Map countsMap = getBioValueCounts(authRequestDTO, type); + return hasDuplicate(countsMap, maxCount); + } + + /** + * Checks for duplicate. + * + * @param countsMap + * the counts map + * @param maxCount + * the max count + * @return true, if successful + */ + private boolean hasDuplicate(Map countsMap, int maxCount) { + return countsMap.entrySet().stream() + .anyMatch(entry -> (entry.getKey().equalsIgnoreCase(IdAuthCommonConstants.UNKNOWN_BIO) + && entry.getValue() > maxCount) + || (!entry.getKey().equalsIgnoreCase(IdAuthCommonConstants.UNKNOWN_BIO) + && entry.getValue() > 1)); + } + + /** + * Gets the bio subtype counts. + * + * @param authRequestDTO + * the auth request DTO + * @param type + * the type + * @return the bio subtype counts + */ + private Map getBioSubtypeCounts(AuthRequestDTO authRequestDTO, String type) { + return getBioSubtypeCount(getBioIds(authRequestDTO, type)); + } + + /** + * Gets the bio value counts. + * + * @param authRequestDTO + * the auth request DTO + * @param type + * the type + * @return the bio value counts + */ + private Map getBioValueCounts(AuthRequestDTO authRequestDTO, String type) { + return getBioValuesCount(getBioIds(authRequestDTO, type)); + } + + /** + * Gets the bio ids. + * + * @param authRequestDTO + * the auth request DTO + * @param type + * the type + * @return the bio ids + */ + private List getBioIds(AuthRequestDTO authRequestDTO, String type) { + List identity = Optional.ofNullable(authRequestDTO.getRequest()) + .map(RequestDTO::getBiometrics).orElseGet(Collections::emptyList); + if (!identity.isEmpty()) { + return identity.stream().filter(Objects::nonNull) + .filter(bioId -> bioId.getData().getBioType().equalsIgnoreCase(type)).collect(Collectors.toList()); + } + return Collections.emptyList(); + } + + /** + * Validate Face. + * + * @param authRequestDTO + * the auth request DTO + * @param bioInfo + * the bio info + * @param errors + * the errors + */ + private void validateFace(AuthRequestDTO authRequestDTO, List bioInfo, Errors errors) { + + if (isAvailableBioType(bioInfo, BioAuthType.FACE_IMG)) { + validateFaceBioType(authRequestDTO, errors); + } + } + + /** + * Validate face bio type. + * + * @param authRequestDTO + * the auth request DTO + * @param errors + * the errors + */ + private void validateFaceBioType(AuthRequestDTO authRequestDTO, Errors errors) { + List listBioIdentity = getBioIds(authRequestDTO, BioAuthType.FACE_IMG.getType()); + if (listBioIdentity.size() > 1) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Face : face count is more than 1."); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.FACE_EXCEEDING.getErrorCode(), new Object[] { FACE }, + IdAuthenticationErrorConstants.FACE_EXCEEDING.getErrorMessage()); + } + } + + /** + * check any IdentityInfoDto data available or not. + * + * @param authRequestDTO + * the auth request DTO + * @param functions + * the functions + * @return true, if successful + */ + @SuppressWarnings("unchecked") + boolean checkAnyIdInfoAvailable(AuthRequestDTO authRequestDTO, + Function>... functions) { + return Stream.>>of(functions).anyMatch(func -> Optional + .ofNullable(authRequestDTO.getRequest()).map(RequestDTO::getDemographics).map(func) + .filter(list -> list != null && !list.isEmpty() + && list.stream().allMatch(idDto -> idDto.getValue() != null && !idDto.getValue().isEmpty())) + .isPresent()); + } + + /** + * If DemoAuthType is Bio, then validate bioinfo is available or not. + * + * @param bioInfoList + * the bio info list + * @param bioType + * the bio type + * @return true, if is available bio type + */ + private boolean isAvailableBioType(List bioInfoList, BioAuthType bioType) { + return bioInfoList.parallelStream().anyMatch(bio -> bio.getBioType() != null && !bio.getBioType().isEmpty() + && bio.getBioType().equals(bioType.getType())); + } + + /** + * If DemoAuthType is Bio, Then check duplicate request of finger and number + * finger of request should not exceed to 10. + * + * @param authRequestDTO + * the auth request DTO + * @param errors + * the errors + * @param bioType + * the bio type + */ + private void validateFingerRequestCount(AuthRequestDTO authRequestDTO, Errors errors, String bioType) { + Map fingerSubtypesCountsMap = getBioSubtypeCounts(authRequestDTO, bioType); + boolean anyInfoIsMoreThanOne = hasDuplicate(fingerSubtypesCountsMap, getMaxFingerCount()); + Map fingerValuesCountsMap = getBioValueCounts(authRequestDTO, bioType); + boolean anyValueIsMoreThanOne = hasDuplicate(fingerValuesCountsMap, getMaxFingerCount()); + + if (anyInfoIsMoreThanOne || anyValueIsMoreThanOne) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Duplicate fingers"); + errors.reject(IdAuthenticationErrorConstants.DUPLICATE_FINGER.getErrorCode(), + IdAuthenticationErrorConstants.DUPLICATE_FINGER.getErrorMessage()); + } + + validateMaxFingerCount(errors, fingerSubtypesCountsMap); + } + + /** + * Validate max finger count. + * + * @param errors + * the errors + * @param fingerSubtypesCountsMap + * the finger subtypes counts map + */ + private void validateMaxFingerCount(Errors errors, Map fingerSubtypesCountsMap) { + long fingerCountExceeding = fingerSubtypesCountsMap.values().stream().mapToLong(l -> l).sum(); + int maxFingerCount = getMaxFingerCount(); + if (fingerCountExceeding > maxFingerCount) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "finger count is exceeding to " + maxFingerCount); + errors.reject(IdAuthenticationErrorConstants.FINGER_EXCEEDING.getErrorCode(), + String.format(IdAuthenticationErrorConstants.FINGER_EXCEEDING.getErrorMessage(), maxFingerCount)); + } + } + + /** + * Gets the max finger count. + * + * @return the max finger count + */ + protected abstract int getMaxFingerCount(); + + /** + * Gets the bio subtype count. + * + * @param idendityInfoList + * the idendity info list + * @return the bio subtype count + */ + private Map getBioSubtypeCount(List idendityInfoList) { + return idendityInfoList.stream().map(BioIdentityInfoDTO::getData) + .collect(Collectors.groupingBy(DataDTO::getBioSubType, Collectors.counting())); + + } + + /** + * Gets the bio values count. + * + * @param idendityInfoList + * the idendity info list + * @return the bio values count + */ + private Map getBioValuesCount(List idendityInfoList) { + return idendityInfoList.stream().map(BioIdentityInfoDTO::getData) + .collect(Collectors.groupingBy(DataDTO::getBioValue, Collectors.counting())); + + } + + /** + * validate Iris request count. left and right eye should not exceed 1 and total + * iris should not exceed 2. + * + * @param authRequestDTO + * the auth request DTO + * @param errors + * the errors + */ + private void validateIrisRequestCount(AuthRequestDTO authRequestDTO, Errors errors) { + Map irisSubtypeCounts = getBioSubtypeCounts(authRequestDTO, BioAuthType.IRIS_IMG.getType()); + if (irisSubtypeCounts.entrySet().stream().anyMatch( + map -> (map.getKey().equalsIgnoreCase(IdAuthCommonConstants.UNKNOWN_BIO) && map.getValue() > 2) + || (!map.getKey().equalsIgnoreCase(IdAuthCommonConstants.UNKNOWN_BIO) && map.getValue() > 1))) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Iris : either left eye or right eye count is more than 1."); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.IRIS_EXCEEDING.getErrorCode(), new Object[] { IRIS }, + IdAuthenticationErrorConstants.IRIS_EXCEEDING.getErrorMessage()); + } + + } + + /** + * Check demo auth. + * + * @param authRequest + * the auth request + * @param errors + * the errors + */ + protected void checkDemoAuth(AuthRequestDTO authRequest, Errors errors) { + AuthType[] authTypes = DemoAuthType.values(); + Set availableAuthTypeInfos = new HashSet<>(); + boolean hasMatch = false; + for (AuthType authType : authTypes) { + if (authType.isAuthTypeEnabled(authRequest, idInfoFetcher)) { + Set associatedMatchTypes = authType.getAssociatedMatchTypes(); + for (MatchType matchType : associatedMatchTypes) { + if (isMatchtypeEnabled(matchType)) { + if(!matchType.equals(DemoMatchType.DYNAMIC)) { + List identityInfos = matchType.getIdentityInfoList(authRequest.getRequest()); + hasMatch = checkIdentityInfoAndLanguageDetails(errors, availableAuthTypeInfos, hasMatch, authType, matchType, + identityInfos); + } else { + Set dynamicAttributeNames = new HashSet<>(idInfoFetcher.getMappingConfig().getDynamicAttributes().keySet()); + Optional.ofNullable(authRequest.getRequest()) + .map(RequestDTO::getDemographics) + .map(IdentityDTO::getMetadata) + .map(Map::keySet) + .ifPresent(dynamicAttributeNames::addAll); + for(String idName : dynamicAttributeNames) { + Map> identityInfosMap = idInfoFetcher.getIdentityInfo(matchType, idName, authRequest.getRequest()); + for(List identityInfos : identityInfosMap.values()) { + hasMatch = checkIdentityInfoAndLanguageDetails(errors, availableAuthTypeInfos, hasMatch, authType, matchType, + identityInfos); + } + } + } + } + + } + } + } + + if (!hasMatch) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Missing IdentityInfoDTO"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), + new Object[] { Category.DEMO.getType() }, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); + } else { + checkOtherValues(authRequest, errors, availableAuthTypeInfos); + } + } + + /** + * Check identity info and language details. + * + * @param errors the errors + * @param availableAuthTypeInfos the available auth type infos + * @param hasMatch the has match + * @param authType the auth type + * @param matchType the match type + * @param identityInfos the identity infos + * @return true, if successful + */ + private boolean checkIdentityInfoAndLanguageDetails(Errors errors, Set availableAuthTypeInfos, boolean hasMatch, AuthType authType, + MatchType matchType, List identityInfos) { + if (identityInfos != null && !identityInfos.isEmpty()) { + availableAuthTypeInfos.add(authType.getType()); + hasMatch = true; + checkIdentityInfoValue(identityInfos, errors); + checkLangaugeDetails(matchType, identityInfos, errors); + } + return hasMatch; + } + + /** + * Check identity info value. + * + * @param identityInfos + * the identity infos + * @param errors + * the errors + */ + private void checkIdentityInfoValue(List identityInfos, Errors errors) { + for (IdentityInfoDTO identityInfoDTO : identityInfos) { + if (Objects.isNull(identityInfoDTO.getValue())) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "IdentityInfoDTO is invalid"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), + new Object[] { Category.DEMO.getType() }, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); + } + + } + + } + + /** + * Check other values. + * + * @param authRequest + * the auth request + * @param errors + * the errors + * @param availableAuthTypeInfos + * the available auth type infos + */ + private void checkOtherValues(AuthRequestDTO authRequest, Errors errors, Set availableAuthTypeInfos) { + + if (isMatchtypeEnabled(DemoMatchType.DOBTYPE)) { + checkDOBType(authRequest, errors); + } + + if (isMatchtypeEnabled(DemoMatchType.AGE)) { + checkAge(authRequest, errors); + } + + if (isAuthtypeEnabled(DemoAuthType.ADDRESS, DemoAuthType.FULL_ADDRESS)) { + validateAdAndFullAd(availableAuthTypeInfos, errors); + } + + } + + /** + * Checks if is matchtype enabled. + * + * @param matchType + * the match type + * @return true, if is matchtype enabled + */ + private boolean isMatchtypeEnabled(MatchType matchType) { + return idInfoHelper.isMatchtypeEnabled(matchType); + } + + /** + * Checks if is authtype enabled. + * + * @param authTypes + * the auth types + * @return true, if is authtype enabled + */ + private boolean isAuthtypeEnabled(AuthType... authTypes) { + return Stream.of(authTypes).anyMatch( + authType -> authType.getAssociatedMatchTypes().stream().anyMatch(idInfoHelper::isMatchtypeEnabled)); + } + + /** + * Validate ad and full ad. + * + * @param availableAuthTypeInfos + * the available auth type infos + * @param errors + * the errors + */ + private void validateAdAndFullAd(Set availableAuthTypeInfos, Errors errors) { + if (availableAuthTypeInfos.contains(DemoAuthType.ADDRESS.getType()) + && availableAuthTypeInfos.contains(DemoAuthType.FULL_ADDRESS.getType())) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Ad and FAD are enabled"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorCode(), + new Object[] { Category.DEMO.getType() }, + IdAuthenticationErrorConstants.MISSING_AUTHTYPE.getErrorMessage()); + } + } + + /** + * Check DOB type. + * + * @param authRequest + * the auth request + * @param errors + * the errors + */ + private void checkDOBType(AuthRequestDTO authRequest, Errors errors) { + List dobTypeList = DemoMatchType.DOBTYPE.getIdentityInfoList(authRequest.getRequest()); + if (dobTypeList != null) { + for (IdentityInfoDTO identityInfoDTO : dobTypeList) { + if (!DOBType.isTypePresent(identityInfoDTO.getValue())) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Demographic data – DOBType(pi) did not match"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { "DOBType" }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + } + + } + + /** + * Check age. + * + * @param authRequest + * the auth request + * @param errors + * the errors + */ + private void checkAge(AuthRequestDTO authRequest, Errors errors) { + List ageList = DemoMatchType.AGE.getIdentityInfoList(authRequest.getRequest()); + if (ageList != null) { + for (IdentityInfoDTO identityInfoDTO : ageList) { + try { + Integer.parseInt(identityInfoDTO.getValue()); + } catch (NumberFormatException e) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.VALIDATE, "Demographic data – Age(pi) did not match"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { "age" }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + } + } + + /** + * Check langauge details. + * + * @param demoMatchType + * the demo match type + * @param identityInfos + * the identity infos + * @param errors + * the errors + */ + private void checkLangaugeDetails(MatchType demoMatchType, List identityInfos, Errors errors) { + //Dynamic attributes validations are skipping here + //will be done in match input building stage(MatchInputBuilder) + if (!demoMatchType.isDynamic() && demoMatchType.isMultiLanguage() && identityInfos.stream().anyMatch( + identityInfo -> (identityInfo.getLanguage() == null || identityInfo.getLanguage().isEmpty()))) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.MISSING_INPUT_PARAMETER, "LanguageCode cannot be null"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { "LanguageCode" }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + + } + + if (!demoMatchType.isDynamic() && !errors.hasErrors() && demoMatchType.isMultiLanguage()) { + Map langCount = identityInfos.stream() + .collect(Collectors.groupingBy(IdentityInfoDTO::getLanguage, Collectors.counting())); + + langCount.keySet().forEach(langCode -> validateLangCode(langCode, errors, REQUEST)); + + for (long value : langCount.values()) { + if (value > 1) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.INVALID_INPUT_PARAMETER, "Invalid or Multiple language code"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { "LanguageCode" }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + + if (langCount.keySet().size() > 1 && !demoMatchType.isMultiLanguage()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), + IdAuthCommonConstants.INVALID_INPUT_PARAMETER, "Invalid or Multiple language code"); + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { "LanguageCode" }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + } + + /** + * Validates the AuthType. + * + * @param authType + * the auth type + * @param errors + * the errors + */ + protected void validateAuthType(AuthRequestDTO authRequestDto, Errors errors) { + if (!(AuthTypeUtil.isDemo(authRequestDto) + || AuthTypeUtil.isBio(authRequestDto) + || AuthTypeUtil.isOtp(authRequestDto) + || AuthTypeUtil.isPin(authRequestDto) + || AuthTypeUtil.isPassword(authRequestDto) + || AuthTypeUtil.isKeyBindedToken(authRequestDto))) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.NO_AUTHENTICATION_TYPE_SELECTED_IN_REQUEST.getErrorCode(), + IdAuthenticationErrorConstants.NO_AUTHENTICATION_TYPE_SELECTED_IN_REQUEST.getErrorMessage()); + } + } + + /** + * Method to validate auth type. + * + * @param requestDTO + * the request DTO + * @param errors + * the errors + */ + protected void validateAllowedAuthTypes(AuthRequestDTO requestDTO, Errors errors) { + Set allowedAuthType = getAllowedAuthTypes(); + validateAuthType(requestDTO, errors, allowedAuthType); + } + + /** + * Validate auth type. + * + * @param requestDTO + * the request DTO + * @param errors + * the errors + * @param authTypeDTO + * the auth type DTO + * @param allowedAuthType + * the allowed auth type + */ + private void validateAuthType(AuthRequestDTO requestDTO, Errors errors, + Set allowedAuthType) { + checkAllowedAuthType(requestDTO, errors, allowedAuthType); + validateBioMetadataDetails(requestDTO, errors, allowedAuthType); + } + + /** + * Check allowed auth type. + * + * @param requestDTO + * the request DTO + * @param errors + * the errors + * @param authTypeDTO + * the auth type DTO + * @param allowedAuthType + * the allowed auth type + */ + private void checkAllowedAuthType(AuthRequestDTO requestDTO, Errors errors, + Set allowedAuthType) { + if (AuthTypeUtil.isDemo(requestDTO)) { + if (allowedAuthType.contains(MatchType.Category.DEMO.getType())) { + checkDemoAuth(requestDTO, errors); + } else { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), + new Object[] { MatchType.Category.DEMO.getType() }, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); + } + } + + boolean isOtp = AuthTypeUtil.isOtp(requestDTO); + if (isOtp && !allowedAuthType.contains(MatchType.Category.OTP.getType())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), + new Object[] { MatchType.Category.OTP.getType() }, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); + } + + boolean isPin = AuthTypeUtil.isPin(requestDTO); + if (isPin && !allowedAuthType.contains(MatchType.Category.SPIN.getType())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), + new Object[] { MatchType.Category.SPIN.getType() }, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); + } + + boolean isKeyBindedToken = AuthTypeUtil.isKeyBindedToken(requestDTO); + if (isKeyBindedToken && !allowedAuthType.contains(MatchType.Category.KBT.getType())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), + new Object[] { MatchType.Category.KBT.getType() }, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); + } + + boolean isPassword = AuthTypeUtil.isPassword(requestDTO); + if (isPassword && !allowedAuthType.contains(MatchType.Category.PWD.getType())) { + errors.rejectValue(IdAuthCommonConstants.REQUEST, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorCode(), + new Object[] { MatchType.Category.PWD.getType() }, + IdAuthenticationErrorConstants.AUTH_TYPE_NOT_SUPPORTED.getErrorMessage()); + } + + if ((isOtp || isPin) && !errors.hasErrors()) { + validateAdditionalFactorsDetails(requestDTO, errors); + } + if(isPassword && !errors.hasErrors()) { + validatePasswordDetails(requestDTO, errors); + } + if (!errors.hasErrors()) { + validateKBTDetails(requestDTO, errors); + } + } + + /** + * validates langauges + * request. + * + * @param langCode the lang code + * @param errors the errors + * @param field the field + */ + protected void validateLangCode(String langCode, Errors errors, String field) { + if (Objects.nonNull(langCode)) { + if (!idInfoFetcher.getSystemSupportedLanguageCodes().contains(langCode)) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), IdAuthCommonConstants.VALIDATE, + IdAuthCommonConstants.INVALID_INPUT_PARAMETER + field + " : " + langCode); + errors.rejectValue(field, IdAuthenticationErrorConstants.UNSUPPORTED_LANGUAGE.getErrorCode(), + new Object[] { field.concat(" : " + langCode) }, + IdAuthenticationErrorConstants.UNSUPPORTED_LANGUAGE.getErrorMessage()); + } + } + } + + /** + * Gets the max iris count. + * + * @return the max iris count + */ + protected int getMaxIrisCount() { + return IRIS_COUNT; + } + } \ No newline at end of file diff --git a/authentication/authentication-common/src/main/resource/bootstrap.properties b/authentication/authentication-common/src/main/resource/bootstrap.properties new file mode 100644 index 00000000000..d9749e5e7fc --- /dev/null +++ b/authentication/authentication-common/src/main/resource/bootstrap.properties @@ -0,0 +1,2 @@ +mosip.ida.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port} +spring.kafka.admin.properties.allow.auto.create.topics=true \ No newline at end of file diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/helper/TokenValidationHelperTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/helper/TokenValidationHelperTest.java new file mode 100644 index 00000000000..0e7b328781a --- /dev/null +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/helper/TokenValidationHelperTest.java @@ -0,0 +1,139 @@ +package io.mosip.authentication.common.service.helper; + +import io.mosip.authentication.common.service.entity.KycTokenData; +import io.mosip.authentication.common.service.repository.KycTokenDataRepository; +import io.mosip.authentication.common.service.repository.OIDCClientDataRepository; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.spi.indauth.service.KycService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.test.context.junit4.SpringRunner; + +import java.time.LocalDateTime; +import java.util.*; + +@RunWith(SpringRunner.class) +public class TokenValidationHelperTest { + + /** The Kyc Service */ + @Mock + private KycService kycService; + + @Mock + private KycTokenDataRepository kycTokenDataRepo; + + @Mock + private IdInfoHelper idInfoHelper; + + @Mock + private OIDCClientDataRepository oidcClientDataRepo; + + @InjectMocks + TokenValidationHelper tokenValidationHelper; + + + @Test + public void findAndValidateIssuedTokenTestWithValidDetails_thenPass() throws IdAuthenticationBusinessException { + + KycTokenData kycTokenData = new KycTokenData(); + kycTokenData.setPsuToken("1234567890"); + kycTokenData.setKycToken("1234567890"); + kycTokenData.setKycTokenStatus("ACTIVE"); + kycTokenData.setOidcClientId("12345"); + kycTokenData.setTokenIssuedDateTime(LocalDateTime.now()); + kycTokenData.setIdVidHash("1234567"); + kycTokenData.setRequestTransactionId("123456"); + Mockito.when(kycTokenDataRepo.findByKycToken(Mockito.anyString())).thenReturn(Optional.of(kycTokenData)); + Mockito.when( kycService.isKycTokenExpire(Mockito.any(),Mockito.anyString())).thenReturn(false); + + tokenValidationHelper.findAndValidateIssuedToken("1234567890", "12345", "123456", "1234567"); + + } + + @Test + public void findAndValidateIssuedTokenTestWithInValidTokenDetails_thenFail() throws IdAuthenticationBusinessException { + + Mockito.when(kycTokenDataRepo.findByKycToken(Mockito.anyString())).thenReturn(Optional.empty()); + Mockito.when( kycService.isKycTokenExpire(Mockito.any(),Mockito.anyString())).thenReturn(false); + + try{ + tokenValidationHelper.findAndValidateIssuedToken("1234567890", "12346", "123456", "1234567"); + }catch (IdAuthenticationBusinessException e){ + assert(e.getErrorCode().equalsIgnoreCase("IDA-KYE-001")); + } + + } + + @Test + public void findAndValidateIssuedTokenTestWithExpiredTokenDetails_thenFail() throws IdAuthenticationBusinessException { + + KycTokenData kycTokenData = new KycTokenData(); + kycTokenData.setPsuToken("1234567890"); + kycTokenData.setKycToken("1234567890"); + kycTokenData.setKycTokenStatus("ACTIVE"); + kycTokenData.setOidcClientId("12345"); + kycTokenData.setTokenIssuedDateTime(LocalDateTime.now()); + kycTokenData.setIdVidHash("1234567"); + kycTokenData.setRequestTransactionId("123456"); + Mockito.when(kycTokenDataRepo.findByKycToken(Mockito.anyString())).thenReturn(Optional.of(kycTokenData)); + Mockito.when( kycService.isKycTokenExpire(Mockito.any(),Mockito.anyString())).thenReturn(true); + + try{ + tokenValidationHelper.findAndValidateIssuedToken("1234567890", "12345", "123456", "1234567"); + }catch (IdAuthenticationBusinessException e){ + assert(e.getErrorCode().equalsIgnoreCase("IDA-KYE-002")); + } + + } + + @Test + public void findAndValidateIssuedTokenTestWithInValidDetails_thenPass() throws IdAuthenticationBusinessException { + + KycTokenData kycTokenData = new KycTokenData(); + kycTokenData.setPsuToken("1234567890"); + kycTokenData.setKycToken("1234567890"); + kycTokenData.setKycTokenStatus("ACTIVE"); + kycTokenData.setOidcClientId("12345"); + kycTokenData.setTokenIssuedDateTime(LocalDateTime.now()); + kycTokenData.setIdVidHash("1234567"); + kycTokenData.setRequestTransactionId("123456"); + Mockito.when(kycTokenDataRepo.findByKycToken(Mockito.anyString())).thenReturn(Optional.of(kycTokenData)); + Mockito.when( kycService.isKycTokenExpire(Mockito.any(),Mockito.anyString())).thenReturn(false); + + + try{ + tokenValidationHelper.findAndValidateIssuedToken("1234567890", "12346", "123456", "1234567"); + }catch (IdAuthenticationBusinessException e){ + assert(e.getErrorCode().equalsIgnoreCase("IDA-KYE-004")); + } + + try{ + tokenValidationHelper.findAndValidateIssuedToken("1234567890", "12345", "123457", "1234567"); + }catch (IdAuthenticationBusinessException e){ + assert(e.getErrorCode().equalsIgnoreCase("IDA-KYE-005")); + } + + try{ + tokenValidationHelper.findAndValidateIssuedToken("1234567890", "12345", "123456", "1234568"); + }catch (IdAuthenticationBusinessException e){ + assert(e.getErrorCode().equalsIgnoreCase("IDA-KYE-007")); + } + + kycTokenData.setKycTokenStatus("EXPIRED"); + try{ + tokenValidationHelper.findAndValidateIssuedToken("1234567890", "12345", "123456", "1234567"); + }catch (IdAuthenticationBusinessException e){ + assert(e.getErrorCode().equalsIgnoreCase("IDA-KYE-002")); + } + + kycTokenData.setKycTokenStatus("PROCESSED"); + try{ + tokenValidationHelper.findAndValidateIssuedToken("1234567890", "12345", "123456", "1234567"); + }catch (IdAuthenticationBusinessException e){ + assert(e.getErrorCode().equalsIgnoreCase("IDA-KYE-003")); + } + } +} diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/AuthAnonymousProfileServiceImplTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/AuthAnonymousProfileServiceImplTest.java index 946968f5c31..889959faa75 100644 --- a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/AuthAnonymousProfileServiceImplTest.java +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/AuthAnonymousProfileServiceImplTest.java @@ -11,6 +11,7 @@ import java.util.Map; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; @@ -25,8 +26,6 @@ import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.context.WebApplicationContext; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.mosip.authentication.common.service.entity.AutnTxn; @@ -71,6 +70,7 @@ public class AuthAnonymousProfileServiceImplTest { Map requestMetadata = null; Map responseMetadata = null; Map> idInfoMap = null; + List errorCodes = null; @Before public void before() { @@ -79,6 +79,7 @@ public void before() { requestMetadata = new HashMap<>(); responseMetadata = new HashMap<>(); idInfoMap = new HashMap>(); + errorCodes = new ArrayList<>(); ReflectionTestUtils.setField(anonymousProfileServiceImpl, "mapper", mapper); ReflectionTestUtils.setField(idInfoHelper, "idInfoFetcher", idInfoFetcherImpl); @@ -87,8 +88,12 @@ public void before() { ReflectionTestUtils.setField(anonymousProfileServiceImpl, "dateOfBirthPattern", "yyyy/MM/dd"); } + @Ignore @Test public void createAnonymousProfileWith_YourOfBirthTest() throws IdAuthenticationBusinessException { + requestBody = new HashMap<>(); + requestMetadata = new HashMap<>(); + errorCodes = new ArrayList<>(); List dobList = new ArrayList(); IdentityInfoDTO dob = new IdentityInfoDTO(); dob.setLanguage("Eng"); @@ -96,6 +101,7 @@ public void createAnonymousProfileWith_YourOfBirthTest() throws IdAuthentication dobList.add(dob); idInfoMap.put("dateOfBirth", dobList); responseMetadata.put("IDENTITY_INFO", idInfoMap ); + Map authResponse = new HashMap<>(); authResponse.put("authStatus", "true"); @@ -103,12 +109,17 @@ public void createAnonymousProfileWith_YourOfBirthTest() throws IdAuthentication responseBody.put("response", authResponse); Mockito.when(idInfoHelper.getEntityInfoAsString(DemoMatchType.DOB, idInfoMap)).thenReturn("1993/04/11"); - AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null); + AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile", + requestBody, requestMetadata, responseMetadata, true, errorCodes); assertEquals(anonymousProfile.getYearOfBirth(), "1993"); } + @Ignore @Test public void createAnonymousProfileWith_PreferredLangTest() throws IdAuthenticationBusinessException { + requestBody = new HashMap<>(); + requestMetadata = new HashMap<>(); + errorCodes = new ArrayList<>(); List preferedLangList = new ArrayList(); IdentityInfoDTO lang = new IdentityInfoDTO(); lang.setLanguage("eng"); @@ -123,12 +134,16 @@ public void createAnonymousProfileWith_PreferredLangTest() throws IdAuthenticati responseBody.put("response", authResponse); Mockito.when(idInfoHelper.getDynamicEntityInfoAsString(idInfoMap, null, "preferredLanguage")).thenReturn("eng"); - AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null); + AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes); assertEquals(List.of("eng"), anonymousProfile.getPreferredLanguages()); } + @Ignore @Test public void createAnonymousProfileWith_GenderTest() throws IdAuthenticationBusinessException { + requestBody = new HashMap<>(); + requestMetadata = new HashMap<>(); + errorCodes = new ArrayList<>(); List genderList = new ArrayList(); IdentityInfoDTO gender = new IdentityInfoDTO(); gender.setLanguage("eng"); @@ -143,12 +158,16 @@ public void createAnonymousProfileWith_GenderTest() throws IdAuthenticationBusin responseBody.put("response", authResponse); Mockito.when(idInfoHelper.getEntityInfoAsString(DemoMatchType.GENDER, "eng", idInfoMap)).thenReturn("Female"); - AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody,requestMetadata, responseMetadata, true, null); + AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody,requestMetadata, responseMetadata, true, errorCodes); assertEquals("Female", anonymousProfile.getGender()); } + @Ignore @Test public void createAnonymousProfileWith_LocationTest() throws IdAuthenticationBusinessException { + requestBody = new HashMap<>(); + requestMetadata = new HashMap<>(); + errorCodes = new ArrayList<>(); List preferedLangList = new ArrayList(); IdentityInfoDTO lang = new IdentityInfoDTO(); lang.setLanguage(null); @@ -168,12 +187,16 @@ public void createAnonymousProfileWith_LocationTest() throws IdAuthenticationBus responseBody.put("response", authResponse); Mockito.when(idInfoHelper.getIdEntityInfoMap(DemoMatchType.DYNAMIC, idInfoMap, "eng", "locationHierarchyForProfiling")).thenReturn(locationMap); - AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null); + AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes); assertEquals(List.of("zone1", "123456"), anonymousProfile.getLocation()); } + @Ignore @Test public void createAnonymousProfileWith_BiometricInfoTest() throws IdAuthenticationBusinessException, IOException { + requestBody = new HashMap<>(); + requestMetadata = new HashMap<>(); + errorCodes = new ArrayList<>(); List preferedLangList = new ArrayList(); IdentityInfoDTO lang = new IdentityInfoDTO(); lang.setLanguage("eng"); @@ -202,7 +225,7 @@ public void createAnonymousProfileWith_BiometricInfoTest() throws IdAuthenticati authResponse.put("authStatus", "true"); authResponse.put("authToken", "1234567890"); responseBody.put("response", authResponse); - AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null); + AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes); assertEquals(1, anonymousProfile.getBiometricInfo().size()); assertEquals("Iris", anonymousProfile.getBiometricInfo().get(0).getType()); assertEquals("LEFT", anonymousProfile.getBiometricInfo().get(0).getSubtype()); @@ -212,6 +235,9 @@ public void createAnonymousProfileWith_BiometricInfoTest() throws IdAuthenticati @Test public void createAnonymousProfileWith_AuthFactorsTest() throws IdAuthenticationBusinessException { + requestBody = new HashMap<>(); + requestMetadata = new HashMap<>(); + errorCodes = new ArrayList<>(); AutnTxn authTxn = new AutnTxn(); authTxn.setAuthTypeCode("OTP-REQUEST,DEMO-AUTH,BIO-AUTH"); responseMetadata.put("AutnTxn",authTxn); @@ -221,7 +247,7 @@ public void createAnonymousProfileWith_AuthFactorsTest() throws IdAuthentication authResponse.put("authToken", "1234567890"); responseBody.put("response", authResponse); - AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null); + AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes); assertEquals(3, anonymousProfile.getAuthFactors().size()); assertEquals(List.of("OTP-REQUEST","DEMO-AUTH","BIO-AUTH"), anonymousProfile.getAuthFactors()); @@ -229,18 +255,24 @@ public void createAnonymousProfileWith_AuthFactorsTest() throws IdAuthentication @Test public void createAnonymousProfileWith_PartnerTest() throws IdAuthenticationBusinessException { + requestBody = new HashMap<>(); + requestMetadata = new HashMap<>(); + errorCodes = new ArrayList<>(); PartnerDTO partner = new PartnerDTO(); partner.setPartnerName("SyncByte"); partner.setPartnerId("abc"); requestMetadata.put("partnerId", "abc"); requestMetadata.put("abc", partner); - AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null); + AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes); assertEquals(partner.getPartnerName(), anonymousProfile.getPartnerName()); } @Test public void createAnonymousProfileExceptionTest() throws IdAuthenticationBusinessException { + requestBody = new HashMap<>(); + requestMetadata = new HashMap<>(); + errorCodes = new ArrayList<>(); Map authResponse = new HashMap<>(); authResponse.put("authStatus", "false"); authResponse.put("authToken", ""); diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/KeyBindedTokenAuthServiceImplTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/KeyBindedTokenAuthServiceImplTest.java new file mode 100644 index 00000000000..3ca7339c265 --- /dev/null +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/KeyBindedTokenAuthServiceImplTest.java @@ -0,0 +1,69 @@ +package io.mosip.authentication.common.service.impl; + + +import io.mosip.authentication.common.service.builder.MatchInputBuilder; +import io.mosip.authentication.common.service.config.IDAMappingConfig; +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.repository.IdentityBindingCertificateRepository; +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.spi.indauth.match.MatchOutput; +import org.apache.commons.collections.map.HashedMap; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@RunWith(SpringRunner.class) +public class KeyBindedTokenAuthServiceImplTest { + + @InjectMocks + IdInfoHelper idInfoHelper; + + /** The id info helper. */ + @Mock + MatchInputBuilder matchInputBuilder; + + /** The ida mapping config. */ + @Mock + IDAMappingConfig idaMappingConfig; + + @Mock + IdAuthSecurityManager securityManager; + + @Mock + IdentityBindingCertificateRepository identityBindingCertificateRepository; + + @InjectMocks + KeyBindedTokenAuthServiceImpl keyBindedTokenAuthService; + + @Test + public void authenticateTestWithValidDetails_thenPass() throws IdAuthenticationBusinessException { + AuthRequestDTO authRequestDTO = new AuthRequestDTO(); + + ReflectionTestUtils.setField(keyBindedTokenAuthService,"idInfoHelper",idInfoHelper); + IdentityInfoDTO identityInfoDTO=new IdentityInfoDTO(); + identityInfoDTO.setValue("value"); + identityInfoDTO.setLanguage("end"); + List list=new ArrayList<>(); + list.add(identityInfoDTO); + Map> idInfo= new HashedMap(); + idInfo.put("key",list); + + MatchOutput matchOutput=new MatchOutput(5,true,"fingerpring",null,"end","idName"); + + matchOutput.setLanguage("end"); + List matchOutputList=new ArrayList<>(); + matchOutputList.add(matchOutput); + keyBindedTokenAuthService.authenticate(authRequestDTO,"individualId",idInfo,"partnerId"); + + } +} diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/OTPAuthServiceTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/OTPAuthServiceTest.java index 853c570c75f..47759155a1a 100644 --- a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/OTPAuthServiceTest.java +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/OTPAuthServiceTest.java @@ -139,7 +139,7 @@ public void TestValidValidateOtp() throws IdAuthenticationBusinessException { List valueList = new ArrayList<>(); valueList.add("1234567890"); Mockito.when(repository.findByTxnId(Mockito.anyString(), Mockito.any(), Mockito.any())).thenReturn(autntxnList); - Mockito.when(otpmanager.validateOtp(Mockito.anyString(), Mockito.anyString())).thenReturn(true); + Mockito.when(otpmanager.validateOtp(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(true); AuthStatusInfo authStatusInfo = otpauthserviceimpl.authenticate(authreqdto, "123456", Collections.emptyMap(), "PARTNER1"); assertNotNull(authStatusInfo); diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/OTPServiceImplTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/OTPServiceImplTest.java index 174ebec013f..6fd9a568fa2 100644 --- a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/OTPServiceImplTest.java +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/OTPServiceImplTest.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -215,23 +216,19 @@ public void TestgenerateOtp() throws IdAuthenticationBusinessException, RestServ @SuppressWarnings("rawtypes") @Test - public void TestPhonenumberisNull() throws IdAuthenticationBusinessException, RestServiceException { + public void TestPhonenumberisNull_Phone_Channel_Alone() throws IdAuthenticationBusinessException, RestServiceException { OtpRequestDTO otpRequestDto = new OtpRequestDTO(); otpRequestDto.setId("id"); otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); otpRequestDto.setTransactionID("1234567890"); - ArrayList channelList = new ArrayList(); + List channelList = List.of("PHONE"); otpRequestDto.setOtpChannel(channelList); otpRequestDto.setIndividualId("2345678901234"); otpRequestDto.setIndividualIdType(IdType.UIN.getType()); otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); Map valueMap = new HashMap<>(); - Map> idInfo = new HashMap<>(); - List mailList = new ArrayList<>(); - IdentityInfoDTO identityInfoDTO = new IdentityInfoDTO(); - identityInfoDTO.setValue("abc@test.com"); - mailList.add(identityInfoDTO); - idInfo.put("email", mailList); + Map idInfo = new HashMap<>(); + idInfo.put("email", "abc@test.com"); valueMap.put("response", idInfo); Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) .thenReturn(valueMap); @@ -246,22 +243,134 @@ public void TestPhonenumberisNull() throws IdAuthenticationBusinessException, Re map.put("otp", "123456"); response.setResponse(map); Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(response); + Mockito.when(otpManager.sendOtp(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any())).thenReturn(true); try { otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); + Assert.fail(); } catch(IdAuthenticationBusinessException ex) { assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorCode(), ex.getErrorCode()); - assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage(), ex.getErrorText()); + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage() + ". Phone Number is not found in identity data.", ex.getErrorText()); } } - - @Test(expected = IdAuthenticationBusinessException.class) - public void TestPhoneorEmailisNull() throws IdAuthenticationBusinessException, RestServiceException { + + @SuppressWarnings("rawtypes") + @Test + public void TestPhonenumberisNull_bothChannels() throws IdAuthenticationBusinessException, RestServiceException { OtpRequestDTO otpRequestDto = new OtpRequestDTO(); otpRequestDto.setId("id"); otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); otpRequestDto.setTransactionID("1234567890"); - ArrayList channelList = new ArrayList(); + List channelList = List.of("PHONE", "EMAIL"); + otpRequestDto.setOtpChannel(channelList); + otpRequestDto.setIndividualId("2345678901234"); + otpRequestDto.setIndividualIdType(IdType.UIN.getType()); + otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); + Map valueMap = new HashMap<>(); + Map idInfo = new HashMap<>(); + idInfo.put("email", "abc@test.com"); + valueMap.put("response", idInfo); + Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) + .thenReturn(valueMap); + Mockito.when(idAuthService.getToken(Mockito.any())).thenReturn("2345678901234"); + Mockito.when(autntxnrepository.countRequestDTime(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(1); + Mockito.when(uinHashSaltRepo.retrieveSaltById(Mockito.anyInt())).thenReturn("2344"); + Mockito.when(idAuthSecurityManager.getUser()).thenReturn("ida_app_user"); + RestRequestDTO value = getRestDto(); + Mockito.when(restRequestFactory.buildRequest(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(value); + ResponseWrapper response = new ResponseWrapper<>(); + Map map = new HashMap<>(); + map.put("otp", "123456"); + response.setResponse(map); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(response); + Mockito.when(otpManager.sendOtp(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any())).thenReturn(true); + otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); + } + + @SuppressWarnings("rawtypes") + @Test + public void TestEmailIdisNull_Email_Channel_Alone() throws IdAuthenticationBusinessException, RestServiceException { + OtpRequestDTO otpRequestDto = new OtpRequestDTO(); + otpRequestDto.setId("id"); + otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); + otpRequestDto.setTransactionID("1234567890"); + List channelList = List.of("EMAIL"); + otpRequestDto.setOtpChannel(channelList); + otpRequestDto.setIndividualId("2345678901234"); + otpRequestDto.setIndividualIdType(IdType.UIN.getType()); + otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); + Map valueMap = new HashMap<>(); + Map idInfo = new HashMap<>(); + idInfo.put("phone", "9292292934"); + valueMap.put("response", idInfo); + Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) + .thenReturn(valueMap); + Mockito.when(idAuthService.getToken(Mockito.any())).thenReturn("2345678901234"); + Mockito.when(autntxnrepository.countRequestDTime(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(1); + Mockito.when(uinHashSaltRepo.retrieveSaltById(Mockito.anyInt())).thenReturn("2344"); + Mockito.when(idAuthSecurityManager.getUser()).thenReturn("ida_app_user"); + RestRequestDTO value = getRestDto(); + Mockito.when(restRequestFactory.buildRequest(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(value); + ResponseWrapper response = new ResponseWrapper<>(); + Map map = new HashMap<>(); + map.put("otp", "123456"); + response.setResponse(map); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(response); + Mockito.when(otpManager.sendOtp(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any())).thenReturn(true); + try { + otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); + Assert.fail(); + } + catch(IdAuthenticationBusinessException ex) { + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorCode(), ex.getErrorCode()); + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage() + ". Email ID is not found in identity data.", ex.getErrorText()); + } + } + + @SuppressWarnings("rawtypes") + @Test + public void TestEmailIdisNull_bothChannels() throws IdAuthenticationBusinessException, RestServiceException { + OtpRequestDTO otpRequestDto = new OtpRequestDTO(); + otpRequestDto.setId("id"); + otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); + otpRequestDto.setTransactionID("1234567890"); + List channelList = List.of("PHONE", "EMAIL"); + otpRequestDto.setOtpChannel(channelList); + otpRequestDto.setIndividualId("2345678901234"); + otpRequestDto.setIndividualIdType(IdType.UIN.getType()); + otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); + Map valueMap = new HashMap<>(); + Map idInfo = new HashMap<>(); + idInfo.put("phone", "9384848384"); + valueMap.put("response", idInfo); + Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) + .thenReturn(valueMap); + Mockito.when(idAuthService.getToken(Mockito.any())).thenReturn("2345678901234"); + Mockito.when(autntxnrepository.countRequestDTime(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(1); + Mockito.when(uinHashSaltRepo.retrieveSaltById(Mockito.anyInt())).thenReturn("2344"); + Mockito.when(idAuthSecurityManager.getUser()).thenReturn("ida_app_user"); + RestRequestDTO value = getRestDto(); + Mockito.when(restRequestFactory.buildRequest(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(value); + ResponseWrapper response = new ResponseWrapper<>(); + Map map = new HashMap<>(); + map.put("otp", "123456"); + response.setResponse(map); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(response); + Mockito.when(otpManager.sendOtp(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any())).thenReturn(true); + otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); + } + + @Test + public void TestPhoneorEmailisNull_both_channels_provided() throws IdAuthenticationBusinessException, RestServiceException { + OtpRequestDTO otpRequestDto = new OtpRequestDTO(); + otpRequestDto.setId("id"); + otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); + otpRequestDto.setTransactionID("1234567890"); + List channelList = List.of("PHONE", "EMAIL"); otpRequestDto.setOtpChannel(channelList); String individualId = "2345678901234"; otpRequestDto.setIndividualId(individualId); @@ -269,18 +378,6 @@ public void TestPhoneorEmailisNull() throws IdAuthenticationBusinessException, R otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); Map valueMap = new HashMap<>(); Map> idInfo = new HashMap<>(); - List mailList = new ArrayList<>(); - IdentityInfoDTO identityInfoDTO = new IdentityInfoDTO(); - identityInfoDTO.setValue("abc@bc.com"); - mailList.add(identityInfoDTO); - List phoneList = new ArrayList<>(); - IdentityInfoDTO identityInfoDTO1 = new IdentityInfoDTO(); - identityInfoDTO1.setValue("9876543210"); - phoneList.add(identityInfoDTO1); - idInfo.put("email", mailList); - idInfo.put("mobile", phoneList); - valueMap.put("uin", "426789089018"); - valueMap.put("phone", "426789089018"); valueMap.put("response", idInfo); Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) .thenReturn(valueMap); @@ -303,8 +400,210 @@ public void TestPhoneorEmailisNull() throws IdAuthenticationBusinessException, R Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( IdRepoErrorConstants.CLIENT_ERROR, response.toString(), response)); + try { + otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); + Assert.fail(); + } catch (IdAuthenticationBusinessException ex) { + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorCode(), ex.getErrorCode()); + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage() + ". Both Phone Number and Email ID are not found in identity data.", ex.getErrorText()); + } + } + + + @SuppressWarnings("rawtypes") + @Test + public void TestPhonenumberisNull_Phone_Channel_Alone_lowercase() throws IdAuthenticationBusinessException, RestServiceException { + OtpRequestDTO otpRequestDto = new OtpRequestDTO(); + otpRequestDto.setId("id"); + otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); + otpRequestDto.setTransactionID("1234567890"); + List channelList = List.of("phone"); + otpRequestDto.setOtpChannel(channelList); + otpRequestDto.setIndividualId("2345678901234"); + otpRequestDto.setIndividualIdType(IdType.UIN.getType()); + otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); + Map valueMap = new HashMap<>(); + Map idInfo = new HashMap<>(); + idInfo.put("email", "abc@test.com"); + valueMap.put("response", idInfo); + Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) + .thenReturn(valueMap); + Mockito.when(idAuthService.getToken(Mockito.any())).thenReturn("2345678901234"); + Mockito.when(autntxnrepository.countRequestDTime(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(1); + Mockito.when(uinHashSaltRepo.retrieveSaltById(Mockito.anyInt())).thenReturn("2344"); + Mockito.when(idAuthSecurityManager.getUser()).thenReturn("ida_app_user"); + RestRequestDTO value = getRestDto(); + Mockito.when(restRequestFactory.buildRequest(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(value); + ResponseWrapper response = new ResponseWrapper<>(); + Map map = new HashMap<>(); + map.put("otp", "123456"); + response.setResponse(map); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(response); + Mockito.when(otpManager.sendOtp(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any())).thenReturn(true); + try { + otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); + Assert.fail(); + } + catch(IdAuthenticationBusinessException ex) { + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorCode(), ex.getErrorCode()); + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage() + ". Phone Number is not found in identity data.", ex.getErrorText()); + } + } + + @SuppressWarnings("rawtypes") + @Test + public void TestPhonenumberisNull_bothChannels_lowercase() throws IdAuthenticationBusinessException, RestServiceException { + OtpRequestDTO otpRequestDto = new OtpRequestDTO(); + otpRequestDto.setId("id"); + otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); + otpRequestDto.setTransactionID("1234567890"); + List channelList = List.of("phone", "email"); + otpRequestDto.setOtpChannel(channelList); + otpRequestDto.setIndividualId("2345678901234"); + otpRequestDto.setIndividualIdType(IdType.UIN.getType()); + otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); + Map valueMap = new HashMap<>(); + Map idInfo = new HashMap<>(); + idInfo.put("email", "abc@test.com"); + valueMap.put("response", idInfo); + Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) + .thenReturn(valueMap); + Mockito.when(idAuthService.getToken(Mockito.any())).thenReturn("2345678901234"); + Mockito.when(autntxnrepository.countRequestDTime(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(1); + Mockito.when(uinHashSaltRepo.retrieveSaltById(Mockito.anyInt())).thenReturn("2344"); + Mockito.when(idAuthSecurityManager.getUser()).thenReturn("ida_app_user"); + RestRequestDTO value = getRestDto(); + Mockito.when(restRequestFactory.buildRequest(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(value); + ResponseWrapper response = new ResponseWrapper<>(); + Map map = new HashMap<>(); + map.put("otp", "123456"); + response.setResponse(map); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(response); + Mockito.when(otpManager.sendOtp(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any())).thenReturn(true); + otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); + } + + @SuppressWarnings("rawtypes") + @Test + public void TestEmailIdisNull_Email_Channel_Alone_lowercase() throws IdAuthenticationBusinessException, RestServiceException { + OtpRequestDTO otpRequestDto = new OtpRequestDTO(); + otpRequestDto.setId("id"); + otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); + otpRequestDto.setTransactionID("1234567890"); + List channelList = List.of("email"); + otpRequestDto.setOtpChannel(channelList); + otpRequestDto.setIndividualId("2345678901234"); + otpRequestDto.setIndividualIdType(IdType.UIN.getType()); + otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); + Map valueMap = new HashMap<>(); + Map idInfo = new HashMap<>(); + idInfo.put("phone", "9292292934"); + valueMap.put("response", idInfo); + Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) + .thenReturn(valueMap); + Mockito.when(idAuthService.getToken(Mockito.any())).thenReturn("2345678901234"); + Mockito.when(autntxnrepository.countRequestDTime(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(1); + Mockito.when(uinHashSaltRepo.retrieveSaltById(Mockito.anyInt())).thenReturn("2344"); + Mockito.when(idAuthSecurityManager.getUser()).thenReturn("ida_app_user"); + RestRequestDTO value = getRestDto(); + Mockito.when(restRequestFactory.buildRequest(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(value); + ResponseWrapper response = new ResponseWrapper<>(); + Map map = new HashMap<>(); + map.put("otp", "123456"); + response.setResponse(map); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(response); + Mockito.when(otpManager.sendOtp(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any())).thenReturn(true); + try { + otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); + Assert.fail(); + } + catch(IdAuthenticationBusinessException ex) { + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorCode(), ex.getErrorCode()); + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage() + ". Email ID is not found in identity data.", ex.getErrorText()); + } + } + + @SuppressWarnings("rawtypes") + @Test + public void TestEmailIdisNull_bothChannels_lowercase() throws IdAuthenticationBusinessException, RestServiceException { + OtpRequestDTO otpRequestDto = new OtpRequestDTO(); + otpRequestDto.setId("id"); + otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); + otpRequestDto.setTransactionID("1234567890"); + List channelList = List.of("phone", "email"); + otpRequestDto.setOtpChannel(channelList); + otpRequestDto.setIndividualId("2345678901234"); + otpRequestDto.setIndividualIdType(IdType.UIN.getType()); + otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); + Map valueMap = new HashMap<>(); + Map idInfo = new HashMap<>(); + idInfo.put("phone", "9384848384"); + valueMap.put("response", idInfo); + Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) + .thenReturn(valueMap); + Mockito.when(idAuthService.getToken(Mockito.any())).thenReturn("2345678901234"); + Mockito.when(autntxnrepository.countRequestDTime(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(1); + Mockito.when(uinHashSaltRepo.retrieveSaltById(Mockito.anyInt())).thenReturn("2344"); + Mockito.when(idAuthSecurityManager.getUser()).thenReturn("ida_app_user"); + RestRequestDTO value = getRestDto(); + Mockito.when(restRequestFactory.buildRequest(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(value); + ResponseWrapper response = new ResponseWrapper<>(); + Map map = new HashMap<>(); + map.put("otp", "123456"); + response.setResponse(map); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(response); + Mockito.when(otpManager.sendOtp(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any())).thenReturn(true); otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); } + + @Test + public void TestPhoneorEmailisNull_both_channels_provided_lowercase() throws IdAuthenticationBusinessException, RestServiceException { + OtpRequestDTO otpRequestDto = new OtpRequestDTO(); + otpRequestDto.setId("id"); + otpRequestDto.setRequestTime(new SimpleDateFormat(EnvUtil.getDateTimePattern()).format(new Date())); + otpRequestDto.setTransactionID("1234567890"); + List channelList = List.of("phone", "email"); + otpRequestDto.setOtpChannel(channelList); + String individualId = "2345678901234"; + otpRequestDto.setIndividualId(individualId); + otpRequestDto.setIndividualIdType(IdType.UIN.getType()); + otpRequestDto.setRequestTime("2019-02-18T18:17:48.923+05:30"); + Map valueMap = new HashMap<>(); + Map> idInfo = new HashMap<>(); + valueMap.put("response", idInfo); + Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) + .thenReturn(valueMap); + Mockito.when(idAuthService.getToken(Mockito.any())).thenReturn(individualId); + Mockito.when(autntxnrepository.countRequestDTime(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(1); + RestRequestDTO value = getRestDto(); + Mockito.when(restRequestFactory.buildRequest(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(value); + ResponseWrapper response = new ResponseWrapper<>(); + List errors = new ArrayList<>(); + ServiceError serviceError = new ServiceError(); + serviceError.setErrorCode(OtpErrorConstants.EMAILPHONENOTREGISTERED.getErrorCode()); + serviceError.setMessage(OtpErrorConstants.EMAILPHONENOTREGISTERED.getErrorMessage()); + errors.add(serviceError); + response.setErrors(errors); + + Mockito.when(idAuthService.processIdType(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anySet())) + .thenReturn(valueMap); + Mockito.when(uinHashSaltRepo.retrieveSaltById(Mockito.anyInt())).thenReturn("2344"); + Mockito.when(idAuthSecurityManager.getUser()).thenReturn("ida_app_user"); + + Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( + IdRepoErrorConstants.CLIENT_ERROR, response.toString(), response)); + try { + otpServiceImpl.generateOtp(otpRequestDto, "1234567890", new TestObjectWithMetadata()); + Assert.fail(); + } catch (IdAuthenticationBusinessException ex) { + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorCode(), ex.getErrorCode()); + assertEquals(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED.getErrorMessage() + ". Both Phone Number and Email ID are not found in identity data.", ex.getErrorText()); + } + } @Test(expected = IdAuthenticationBusinessException.class) public void TestOtpFloodException() throws IdAuthenticationBusinessException { @@ -363,7 +662,7 @@ private OtpRequestDTO getOtpRequestDTO() { // otpRequestDto.setRequestTime(new SimpleDateFormat(env.getDateTimePattern()).format(new Date())); otpRequestDto.setTransactionID("1234567890"); ArrayList channelList = new ArrayList(); - channelList.add("MOBILE"); + channelList.add("PHONE"); channelList.add("EMAIL"); otpRequestDto.setOtpChannel(channelList); otpRequestDto.setIndividualId("2345678901234"); diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/match/OtpMatchingStrategyTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/match/OtpMatchingStrategyTest.java index 67469ed2685..2a08c49f489 100644 --- a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/match/OtpMatchingStrategyTest.java +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/match/OtpMatchingStrategyTest.java @@ -25,6 +25,7 @@ import io.mosip.authentication.common.service.integration.OTPManager; import io.mosip.authentication.common.service.repository.OtpTxnRepository; import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; import io.mosip.authentication.core.spi.indauth.match.MatchFunction; import io.mosip.authentication.core.spi.indauth.match.ValidateOtpFunction; @@ -98,6 +99,7 @@ public void TestInValidOtpMatchingStrategy() throws IdAuthenticationBusinessExce MatchFunction matchFunction = OtpMatchingStrategy.EXACT.getMatchFunction(); Map matchProperties = new HashMap<>(); matchProperties.put(ValidateOtpFunction.class.getSimpleName(), ""); + matchProperties.put(IdAuthCommonConstants.IDVID, ""); int value = matchFunction.match("123456", "IDA_asdEEFAER", matchProperties); assertEquals(0, value); } diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/OTPManagerTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/OTPManagerTest.java index 8b8330a1fcd..b569ba19928 100644 --- a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/OTPManagerTest.java +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/OTPManagerTest.java @@ -3,6 +3,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; @@ -61,6 +65,8 @@ @ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class }) public class OTPManagerTest { + private static final String FROZEN_ERROR_MESSAGE = "OTP request/validation has been frozen for the Individual-ID for 30 seconds due to consecutive failure attempts for 5 times."; + @InjectMocks private OTPManager otpManager; @@ -100,10 +106,12 @@ public class OTPManagerTest { @Before public void before() { ReflectionTestUtils.setField(restRequestFactory, "env", environment); - ReflectionTestUtils.setField(otpManager, "environment", environment); ReflectionTestUtils.setField(env, "otpExpiryTime", 12); + ReflectionTestUtils.setField(otpManager, "numberOfValidationAttemptsAllowed", 5); + ReflectionTestUtils.setField(otpManager, "otpFrozenTimeMinutes", 30); templateLanguages.add("eng"); templateLanguages.add("ara"); + EnvUtil.setKeySplitter("#KEY_SPLITTER#"); } private static final String VALIDATION_UNSUCCESSFUL = "VALIDATION_UNSUCCESSFUL"; @@ -128,8 +136,137 @@ public void sendOtpTest() throws RestServiceException, IdAuthenticationBusinessE Map valueMap = new HashMap<>(); valueMap.put("namePri", "Name in PrimaryLang"); valueMap.put("nameSec", "Name in SecondaryLang"); - boolean sendOtpResponse = otpManager.sendOtp(otpRequestDTO, "426789089018", "UIN", valueMap, templateLanguages); - assertEquals(sendOtpResponse, true); + try { + when(otpRepo.save(Mockito.any())).thenAnswer(invocation -> { + assertEquals(IdAuthCommonConstants.ACTIVE_STATUS, ((OtpTransaction)invocation.getArguments()[0]).getStatusCode()); + return null; + }); + boolean result = otpManager.sendOtp(otpRequestDTO, "426789089018", "UIN", valueMap, templateLanguages); + assertTrue(result); + verify(otpRepo, times(1)).save(Mockito.any()); + } catch(IdAuthUncheckedException ex) { + fail(); + } + } + + @Test + public void sendOtpTest_frozen_within30mins() throws RestServiceException, IdAuthenticationBusinessException { + OtpGeneratorRequestDto otpGeneratorRequestDto = getOtpGeneratorRequestDto(); + ResponseWrapper otpGeneratorResponsetDto = new ResponseWrapper<>(); + Map response = new HashMap<>(); + response.put("status", "success"); + otpGeneratorResponsetDto.setResponse(response); + RestRequestDTO restRequestDTO = getRestRequestDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_GENERATE_SERVICE, otpGeneratorRequestDto, + OtpGeneratorResponseDto.class)).thenReturn(restRequestDTO); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(otpGeneratorResponsetDto); + OtpRequestDTO otpRequestDTO = getOtpRequestDto(); + Map valueMap = new HashMap<>(); + valueMap.put("namePri", "Name in PrimaryLang"); + valueMap.put("nameSec", "Name in SecondaryLang"); + when(securityManager.hash(Mockito.anyString())).thenReturn("refidHash"); + OtpTransaction entity = new OtpTransaction(); + entity.setStatusCode(IdAuthCommonConstants.FROZEN); + entity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(30, ChronoUnit.MINUTES)); + when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(entity)); + try { + otpManager.sendOtp(otpRequestDTO, "426789089018", "UIN", valueMap, templateLanguages); + } catch(IdAuthenticationBusinessException ex) { + assertEquals(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), ex.getErrorCode()); + assertEquals(FROZEN_ERROR_MESSAGE, ex.getErrorText()); + } + } + + @Test + public void sendOtpTest_frozen_In31mins() throws RestServiceException, IdAuthenticationBusinessException { + OtpGeneratorRequestDto otpGeneratorRequestDto = getOtpGeneratorRequestDto(); + ResponseWrapper otpGeneratorResponsetDto = new ResponseWrapper<>(); + Map response = new HashMap<>(); + response.put("status", "success"); + otpGeneratorResponsetDto.setResponse(response); + RestRequestDTO restRequestDTO = getRestRequestDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_GENERATE_SERVICE, otpGeneratorRequestDto, + OtpGeneratorResponseDto.class)).thenReturn(restRequestDTO); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(otpGeneratorResponsetDto); + OtpRequestDTO otpRequestDTO = getOtpRequestDto(); + Map valueMap = new HashMap<>(); + valueMap.put("namePri", "Name in PrimaryLang"); + valueMap.put("nameSec", "Name in SecondaryLang"); + when(securityManager.hash(Mockito.anyString())).thenReturn("refidHash"); + OtpTransaction entity = new OtpTransaction(); + entity.setStatusCode(IdAuthCommonConstants.FROZEN); + entity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(31, ChronoUnit.MINUTES)); + when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(entity)); + try { + when(otpRepo.save(Mockito.any())).thenAnswer(invocation -> { + assertEquals(IdAuthCommonConstants.ACTIVE_STATUS, ((OtpTransaction)invocation.getArguments()[0]).getStatusCode()); + return null; + }); + boolean result = otpManager.sendOtp(otpRequestDTO, "426789089018", "UIN", valueMap, templateLanguages); + assertTrue(result); + } catch(IdAuthUncheckedException ex) { + fail(); + } + } + + @Test + public void sendOtpTest_USED_entry() throws RestServiceException, IdAuthenticationBusinessException { + OtpGeneratorRequestDto otpGeneratorRequestDto = getOtpGeneratorRequestDto(); + ResponseWrapper otpGeneratorResponsetDto = new ResponseWrapper<>(); + Map response = new HashMap<>(); + response.put("status", "success"); + otpGeneratorResponsetDto.setResponse(response); + RestRequestDTO restRequestDTO = getRestRequestDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_GENERATE_SERVICE, otpGeneratorRequestDto, + OtpGeneratorResponseDto.class)).thenReturn(restRequestDTO); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(otpGeneratorResponsetDto); + OtpRequestDTO otpRequestDTO = getOtpRequestDto(); + Map valueMap = new HashMap<>(); + valueMap.put("namePri", "Name in PrimaryLang"); + valueMap.put("nameSec", "Name in SecondaryLang"); + when(securityManager.hash(Mockito.anyString())).thenReturn("refidHash"); + OtpTransaction entity = new OtpTransaction(); + entity.setStatusCode(IdAuthCommonConstants.USED_STATUS); + entity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(31, ChronoUnit.MINUTES)); + when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(entity)); + try { + when(otpRepo.save(Mockito.any())).thenAnswer(invocation -> { + assertEquals(IdAuthCommonConstants.ACTIVE_STATUS, ((OtpTransaction)invocation.getArguments()[0]).getStatusCode()); + return null; + }); + boolean result = otpManager.sendOtp(otpRequestDTO, "426789089018", "UIN", valueMap, templateLanguages); + assertTrue(result); + } catch(IdAuthUncheckedException ex) { + fail(); + } + } + + @Test + public void sendOtpTest_frozen_within25mins() throws RestServiceException, IdAuthenticationBusinessException { + OtpGeneratorRequestDto otpGeneratorRequestDto = getOtpGeneratorRequestDto(); + ResponseWrapper otpGeneratorResponsetDto = new ResponseWrapper<>(); + Map response = new HashMap<>(); + response.put("status", "success"); + otpGeneratorResponsetDto.setResponse(response); + RestRequestDTO restRequestDTO = getRestRequestDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_GENERATE_SERVICE, otpGeneratorRequestDto, + OtpGeneratorResponseDto.class)).thenReturn(restRequestDTO); + Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(otpGeneratorResponsetDto); + OtpRequestDTO otpRequestDTO = getOtpRequestDto(); + Map valueMap = new HashMap<>(); + valueMap.put("namePri", "Name in PrimaryLang"); + valueMap.put("nameSec", "Name in SecondaryLang"); + when(securityManager.hash(Mockito.anyString())).thenReturn("refidHash"); + OtpTransaction entity = new OtpTransaction(); + entity.setStatusCode(IdAuthCommonConstants.FROZEN); + entity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(25, ChronoUnit.MINUTES)); + when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(entity)); + try { + otpManager.sendOtp(otpRequestDTO, "426789089018", "UIN", valueMap, templateLanguages); + } catch(IdAuthenticationBusinessException ex) { + assertEquals(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), ex.getErrorCode()); + assertEquals(FROZEN_ERROR_MESSAGE, ex.getErrorText()); + } } @Test(expected = IdAuthUncheckedException.class) @@ -167,12 +304,10 @@ public void sendOtpTest_existingEntry() throws RestServiceException, IdAuthentic Map valueMap = new HashMap<>(); valueMap.put("namePri", "Name in PrimaryLang"); valueMap.put("nameSec", "Name in SecondaryLang"); - OtpTransaction otpEntry = new OtpTransaction(); - Mockito.when(otpRepo.findByOtpHashAndStatusCode(Mockito.anyString(), Mockito.anyString())).thenReturn(Optional.of(otpEntry )); boolean sendOtpResponse = otpManager.sendOtp(otpRequestDTO, "426789089018", "UIN", valueMap, templateLanguages); assertEquals(sendOtpResponse, true); } - + @Test public void sendOtpTest_blockedStatus() throws RestServiceException, IdAuthenticationBusinessException { OtpGeneratorRequestDto otpGeneratorRequestDto = getOtpGeneratorRequestDto(); @@ -372,7 +507,7 @@ public void TestRestServiceException() throws IdAuthenticationBusinessException, responseMap.put("response", valuemap); Mockito.when(restHelper.requestSync(Mockito.any())) .thenThrow(new RestServiceException(IdRepoErrorConstants.CLIENT_ERROR, output, valuemap)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -388,7 +523,7 @@ public void TestOtpAuth() throws RestServiceException, IdAuthenticationBusinessE Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) .thenReturn(restRequestDTO); Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(response1); - boolean expactedOTP = otpManager.validateOtp("Test123", "123456"); + boolean expactedOTP = otpManager.validateOtp("Test123", "123456", "426789089018"); assertTrue(expactedOTP); } @@ -403,7 +538,14 @@ public void TestOtpAuthFailure() valueMap.put("status", "failure"); valueMap.put("message", "Validation_Unsuccessful"); Mockito.when(restHelper.requestSync(Mockito.any())).thenReturn(valueMap); - boolean expactedOTP = otpManager.validateOtp("Test123", "123456"); + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + boolean expactedOTP = otpManager.validateOtp("Test123", "123456", "426789089018"); assertFalse(expactedOTP); } @@ -424,7 +566,7 @@ public void TestRestServiceExceptionwithInvalid() throws RestServiceException, I .thenReturn(restRequestDTO); Mockito.when(restHelper.requestSync(Mockito.any())) .thenThrow(new RestServiceException(IdRepoErrorConstants.CLIENT_ERROR, output, response)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -445,7 +587,7 @@ public void TestRestServiceExceptionwithInvalidUnknownMessage() .thenReturn(restRequestDTO); Mockito.when(restHelper.requestSync(Mockito.any())) .thenThrow(new RestServiceException(IdRepoErrorConstants.CLIENT_ERROR, output, response)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -466,7 +608,7 @@ public void TestRestServiceExceptionwithInvalidWithoutStatus() .thenReturn(restRequestDTO); Mockito.when(restHelper.requestSync(Mockito.any())) .thenThrow(new RestServiceException(IdRepoErrorConstants.CLIENT_ERROR, output, responseMap)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -486,7 +628,7 @@ public void TestRestServiceExceptionwithInvalidWithoutStatusWithOTPNOTGENERATEDE RestServiceException restServiceException = new RestServiceException(IdRepoErrorConstants.CLIENT_ERROR, output, responseMap); Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(restServiceException); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -506,7 +648,7 @@ public void TestRestServiceExceptionwithInvalidWithoutStatusWithSOMEOTHERERRORDE RestServiceException restServiceException = new RestServiceException(IdRepoErrorConstants.CLIENT_ERROR, output, responseMap); Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(restServiceException); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -514,7 +656,7 @@ public void TestRestServiceExceptionwithInvalidWithoutStatusWithSOMEOTHERERRORDE public void TestDataValidationException() throws IdAuthenticationBusinessException { Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) .thenThrow(new IDDataValidationException()); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Test(expected = IdAuthUncheckedException.class) @@ -577,7 +719,7 @@ public void testValidateOTP_ThrowRestServiceExceptionWith_StatusFailureAndMessag Mockito.when(restHelper.requestSync(Mockito.any())) .thenThrow(new RestServiceException(IdRepoErrorConstants.CLIENT_ERROR, output, valueMap)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -595,6 +737,449 @@ public void TestResponseBodyisEmpty() throws RestServiceException, IdAuthenticat otpManager.sendOtp(otpRequestDTO, "123456", "UIN", valueMap, templateLanguages); } + @Test + public void TestInvalidAttemptWith_noEntity() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + } catch (IdAuthenticationBusinessException ex) { + assertEquals(IdAuthenticationErrorConstants.OTP_REQUEST_REQUIRED.getErrorCode(), ex.getErrorCode()); + } + } + + @Test + public void TestInvalidAttemptWith_UsedEntity() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.USED_STATUS); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + } catch (IdAuthenticationBusinessException ex) { + assertEquals(IdAuthenticationErrorConstants.OTP_REQUEST_REQUIRED.getErrorCode(), ex.getErrorCode()); + } + } + + @Test + public void TestInvalidAttemptWith_nullUpdateCount() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + boolean result = otpManager.validateOtp("Test123", "123456", "426789089018"); + assertFalse(result); + assertEquals((long)1, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.ACTIVE_STATUS, otpEntity.getStatusCode()); + verify(otpRepo, times(1)).save(otpEntity); + } catch (IdAuthenticationBusinessException ex) { + fail(); + } + } + + @Test + public void TestInvalidAttemptWith_1UpdateCount() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntity.setValidationRetryCount(1); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + boolean result = otpManager.validateOtp("Test123", "123456", "426789089018"); + assertFalse(result); + assertEquals((long)2, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.ACTIVE_STATUS, otpEntity.getStatusCode()); + verify(otpRepo, times(1)).save(otpEntity); + } catch (IdAuthenticationBusinessException ex) { + fail(); + } + } + + @Test + public void TestInvalidAttemptWith_4UpdateCount() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntity.setValidationRetryCount(4); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + } catch (IdAuthenticationBusinessException ex) { + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.FROZEN, otpEntity.getStatusCode()); + verify(otpRepo, times(1)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), ex.getErrorCode()); + assertEquals(FROZEN_ERROR_MESSAGE, ex.getErrorText()); + } + } + + @Test + public void TestInvalidAttemptWith_FrozenStatus() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(25, ChronoUnit.MINUTES)); + otpEntity.setValidationRetryCount(5); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + fail(); + } catch (IdAuthenticationBusinessException ex) { + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.FROZEN, otpEntity.getStatusCode()); + verify(otpRepo, times(0)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), ex.getErrorCode()); + assertEquals(FROZEN_ERROR_MESSAGE, ex.getErrorText()); + } + } + + @Test + public void TestInvalidAttemptWith_FrozenStatusWithin25Mins() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setValidationRetryCount(5); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(25, ChronoUnit.MINUTES)); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + fail(); + } catch (IdAuthenticationBusinessException ex) { + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.FROZEN, otpEntity.getStatusCode()); + verify(otpRepo, times(0)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), ex.getErrorCode()); + assertEquals(FROZEN_ERROR_MESSAGE, ex.getErrorText()); + } + } + + @Test + public void TestInvalidAttemptWith_FrozenStatusWithin29Mins() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setValidationRetryCount(5); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(29, ChronoUnit.MINUTES)); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + fail(); + } catch (IdAuthenticationBusinessException ex) { + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.FROZEN, otpEntity.getStatusCode()); + verify(otpRepo, times(0)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), ex.getErrorCode()); + assertEquals(FROZEN_ERROR_MESSAGE, ex.getErrorText()); + } + } + + @Test + public void TestInvalidAttemptWith_FrozenStatusWithin31Mins() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setValidationRetryCount(5); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(31, ChronoUnit.MINUTES)); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + } catch (IdAuthenticationBusinessException ex) { + assertEquals(IdAuthCommonConstants.UNFROZEN, otpEntity.getStatusCode()); + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + verify(otpRepo, times(1)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_REQUEST_REQUIRED.getErrorCode(), ex.getErrorCode()); + } + } + + + @Test + public void TestValidAttemptWith_nullUpdateCount() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntity.setOtpHash("313233343536234B45595F53504C49545445522354657374313233"); + otpEntity.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().plus(1, ChronoUnit.MINUTES)); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + boolean result = otpManager.validateOtp("Test123", "123456", "426789089018"); + assertTrue(result); + assertEquals(IdAuthCommonConstants.USED_STATUS, otpEntity.getStatusCode()); + verify(otpRepo, times(1)).save(otpEntity); + } catch (IdAuthenticationBusinessException ex) { + fail(); + } + } + + @Test + public void TestValidAttemptWith_1UpdateCount() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntity.setValidationRetryCount(1); + otpEntity.setOtpHash("313233343536234B45595F53504C49545445522354657374313233"); + otpEntity.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().plus(1, ChronoUnit.MINUTES)); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + boolean result = otpManager.validateOtp("Test123", "123456", "426789089018"); + assertTrue(result); + assertEquals(IdAuthCommonConstants.USED_STATUS, otpEntity.getStatusCode()); + verify(otpRepo, times(1)).save(otpEntity); + } catch (IdAuthenticationBusinessException ex) { + fail(); + } + } + + @Test + public void TestValidAttemptWith_4UpdateCount() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntity.setValidationRetryCount(4); + otpEntity.setOtpHash("313233343536234B45595F53504C49545445522354657374313233"); + otpEntity.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().plus(1, ChronoUnit.MINUTES)); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + boolean result = otpManager.validateOtp("Test123", "123456", "426789089018"); + assertTrue(result); + assertEquals(IdAuthCommonConstants.USED_STATUS, otpEntity.getStatusCode()); + verify(otpRepo, times(1)).save(otpEntity); + } catch (IdAuthenticationBusinessException ex) { + fail(); + } + } + + @Test + public void TestValidAttemptWith_FrozenStatus() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(25, ChronoUnit.MINUTES)); + otpEntity.setValidationRetryCount(5); + otpEntity.setOtpHash("313233343536234B45595F53504C49545445522354657374313233"); + otpEntity.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().plus(1, ChronoUnit.MINUTES)); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + fail(); + } catch (IdAuthenticationBusinessException ex) { + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.FROZEN, otpEntity.getStatusCode()); + verify(otpRepo, times(0)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), ex.getErrorCode()); + assertEquals(FROZEN_ERROR_MESSAGE, ex.getErrorText()); + } + } + + @Test + public void TestValidAttemptWith_FrozenStatusWithin25Mins() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setValidationRetryCount(5); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(25, ChronoUnit.MINUTES)); + otpEntity.setOtpHash("313233343536234B45595F53504C49545445522354657374313233"); + otpEntity.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().plus(1, ChronoUnit.MINUTES)); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + fail(); + } catch (IdAuthenticationBusinessException ex) { + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.FROZEN, otpEntity.getStatusCode()); + verify(otpRepo, times(0)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), ex.getErrorCode()); + assertEquals(FROZEN_ERROR_MESSAGE, ex.getErrorText()); + } + } + + @Test + public void TestValidAttemptWith_FrozenStatusWithin29Mins() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setValidationRetryCount(5); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(29, ChronoUnit.MINUTES)); + otpEntity.setOtpHash("313233343536234B45595F53504C49545445522354657374313233"); + otpEntity.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().plus(1, ChronoUnit.MINUTES)); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + fail(); + } catch (IdAuthenticationBusinessException ex) { + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.FROZEN, otpEntity.getStatusCode()); + verify(otpRepo, times(0)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_FROZEN.getErrorCode(), ex.getErrorCode()); + assertEquals(FROZEN_ERROR_MESSAGE, ex.getErrorText()); + } + } + + @Test + public void TestValidAttemptWith_FrozenStatusWithin31Mins() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setValidationRetryCount(5); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(31, ChronoUnit.MINUTES)); + otpEntity.setOtpHash("313233343536234B45595F53504C49545445522354657374313233"); + otpEntity.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().plus(1, ChronoUnit.MINUTES)); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + } catch (IdAuthenticationBusinessException ex) { + assertEquals(IdAuthCommonConstants.UNFROZEN, otpEntity.getStatusCode()); + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + verify(otpRepo, times(1)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_REQUEST_REQUIRED.getErrorCode(), ex.getErrorCode()); + } + } + + @Test + public void TestValidAttemptWith_FrozenStatusWithin31Mins_expiredOtp() + throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { + RestRequestDTO restRequestDTO = getRestRequestvalidDTO(); + Mockito.when(restRequestFactory.buildRequest(RestServicesConstants.OTP_VALIDATE_SERVICE, null, Map.class)) + .thenReturn(restRequestDTO); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.FROZEN); + otpEntity.setValidationRetryCount(5); + otpEntity.setUpdDTimes(DateUtils.getUTCCurrentDateTime().minus(31, ChronoUnit.MINUTES)); + otpEntity.setOtpHash("313233343536234B45595F53504C49545445522354657374313233"); + otpEntity.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().minus(1, ChronoUnit.MINUTES)); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + + try { + otpManager.validateOtp("Test123", "123456", "426789089018"); + } catch (IdAuthenticationBusinessException ex) { + assertEquals((long)5, (long)otpEntity.getValidationRetryCount()); + assertEquals(IdAuthCommonConstants.UNFROZEN, otpEntity.getStatusCode()); + verify(otpRepo, times(1)).save(otpEntity); + assertEquals(IdAuthenticationErrorConstants.OTP_REQUEST_REQUIRED.getErrorCode(), ex.getErrorCode()); + } + } + @Test public void TestThrowOtpException_UINLocked() throws RestServiceException, IdAuthUncheckedException, IdAuthenticationBusinessException { @@ -610,8 +1195,16 @@ public void TestThrowOtpException_UINLocked() Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( IdRepoErrorConstants.CLIENT_ERROR, responseMap.toString(), (Object) responseMap)); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setOtpHash("otphash"); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + try { - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } catch (IdAuthenticationBusinessException ex) { assertEquals(IdAuthenticationErrorConstants.BLOCKED_OTP_VALIDATE.getErrorCode(), ex.getErrorCode()); assertEquals(IdAuthenticationErrorConstants.BLOCKED_OTP_VALIDATE.getErrorMessage(), ex.getErrorText()); @@ -630,8 +1223,16 @@ public void TestThrowOtpException_OtpExpired() throws RestServiceException, IdAu responseMap.put("response", valueMap); Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( IdRepoErrorConstants.CLIENT_ERROR, responseMap.toString(), (Object) responseMap)); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); + try { - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } catch (IdAuthenticationBusinessException ex) { assertEquals(IdAuthenticationErrorConstants.EXPIRED_OTP.getErrorCode(), ex.getErrorCode()); assertEquals(IdAuthenticationErrorConstants.EXPIRED_OTP.getErrorMessage(), ex.getErrorText()); @@ -651,14 +1252,20 @@ public void TestThrowOtpException_ValidationUnsuccessful() responseMap.put("response", valueMap); Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( IdRepoErrorConstants.CLIENT_ERROR, responseMap.toString(), (Object) responseMap)); + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + OtpTransaction otpEntity = new OtpTransaction(); + otpEntity.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntity.setOtpHash("otphash"); + + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntity )); try { - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } catch (IdAuthenticationBusinessException ex) { assertEquals(IdAuthenticationErrorConstants.INVALID_OTP.getErrorCode(), ex.getErrorCode()); assertEquals(IdAuthenticationErrorConstants.INVALID_OTP.getErrorMessage(), ex.getErrorText()); } } - + @Test public void TestThrowOtpException_OtpPresent_Expired() throws RestServiceException, IdAuthenticationBusinessException { @@ -674,15 +1281,18 @@ public void TestThrowOtpException_OtpPresent_Expired() IdRepoErrorConstants.CLIENT_ERROR, responseMap.toString(), (Object) responseMap)); OtpTransaction otpEntry = new OtpTransaction(); otpEntry.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().minus(1, ChronoUnit.HOURS)); - Mockito.when(otpRepo.findByOtpHashAndStatusCode(Mockito.anyString(), Mockito.anyString())).thenReturn(Optional.of(otpEntry)); + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + otpEntry.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntry.setOtpHash("otphash"); + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntry)); try { - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } catch (IdAuthenticationBusinessException ex) { assertEquals(IdAuthenticationErrorConstants.EXPIRED_OTP.getErrorCode(), ex.getErrorCode()); assertEquals(IdAuthenticationErrorConstants.EXPIRED_OTP.getErrorMessage(), ex.getErrorText()); } } - + @Test public void TestThrowOtpException_OtpPresent_NotExpired_Valid() throws RestServiceException, IdAuthenticationBusinessException { @@ -698,9 +1308,12 @@ public void TestThrowOtpException_OtpPresent_NotExpired_Valid() IdRepoErrorConstants.CLIENT_ERROR, responseMap.toString(), (Object) responseMap)); OtpTransaction otpEntry = new OtpTransaction(); otpEntry.setExpiryDtimes(DateUtils.getUTCCurrentDateTime().plus(1, ChronoUnit.HOURS)); - Mockito.when(otpRepo.findByOtpHashAndStatusCode(Mockito.anyString(), Mockito.anyString())).thenReturn(Optional.of(otpEntry)); + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("hash"); + otpEntry.setStatusCode(IdAuthCommonConstants.ACTIVE_STATUS); + otpEntry.setOtpHash("otphash"); + Mockito.when(otpRepo.findFirstByRefIdAndStatusCodeInAndGeneratedDtimesNotNullOrderByGeneratedDtimesDesc(Mockito.anyString(), Mockito.anyList())).thenReturn(Optional.of(otpEntry)); try { - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } catch (IdAuthenticationBusinessException ex) { assertEquals(IdAuthenticationErrorConstants.INVALID_OTP.getErrorCode(), ex.getErrorCode()); assertEquals(IdAuthenticationErrorConstants.INVALID_OTP.getErrorMessage(), ex.getErrorText()); @@ -721,7 +1334,7 @@ public void TestThrowOtpException_ValidationUnsuccessful_Invalid() responseMap.put("response", valueMap); Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( IdRepoErrorConstants.CLIENT_ERROR, responseMap.toString(), (Object) responseMap)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -748,7 +1361,7 @@ public void TestThrowKeynotFound() throws RestServiceException, IdAuthentication responseMap.put("response", valueMap); Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( IdRepoErrorConstants.CLIENT_ERROR, responseMap.toString(), (Object) responseMap)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -764,7 +1377,7 @@ public void TestthrowKeyNotFoundException() throws IdAuthenticationBusinessExcep responseMap.put("response", valueMap); Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( IdRepoErrorConstants.CLIENT_ERROR, responseMap.toString(), (Object) responseMap)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @Ignore @@ -779,7 +1392,7 @@ public void TestIDDataValidationException() throws RestServiceException, IdAuthe responseMap.put("response", valueMap); Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( IdRepoErrorConstants.CLIENT_ERROR, responseMap.toString(), (Object) responseMap)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } @@ -833,7 +1446,7 @@ public void TestThrowOtpKeyException() throws RestServiceException, IdAuthentica valueMap.put("errors", (Object) errorList); Mockito.when(restHelper.requestSync(Mockito.any())).thenThrow(new RestServiceException( IdRepoErrorConstants.CLIENT_ERROR, new ObjectMapper().writeValueAsString(valueMap), valueMap)); - otpManager.validateOtp("Test123", "123456"); + otpManager.validateOtp("Test123", "123456", "426789089018"); } diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/PartnerServiceManagerTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/PartnerServiceManagerTest.java index 1bf210f2b49..f8acdee39fd 100644 --- a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/PartnerServiceManagerTest.java +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/PartnerServiceManagerTest.java @@ -865,7 +865,7 @@ public void Test_validatePartnerMappingDetails_apikeyCommenceNotBefore() { if (e.getUndeclaredThrowable() instanceof IdAuthenticationBaseException) { IdAuthenticationBaseException idAuthenticationBaseException = (IdAuthenticationBaseException) e .getUndeclaredThrowable(); - assertEquals(IdAuthenticationErrorConstants.PARTNER_NOT_REGISTERED.getErrorCode(), + assertEquals(IdAuthenticationErrorConstants.PARTNER_API_EXPIRED.getErrorCode(), idAuthenticationBaseException.getErrorCode()); } } @@ -898,7 +898,7 @@ public void Test_validatePartnerMappingDetails_apikeyExpiryNotAfter() { if (e.getUndeclaredThrowable() instanceof IdAuthenticationBaseException) { IdAuthenticationBaseException idAuthenticationBaseException = (IdAuthenticationBaseException) e .getUndeclaredThrowable(); - assertEquals(IdAuthenticationErrorConstants.PARTNER_NOT_REGISTERED.getErrorCode(), + assertEquals(IdAuthenticationErrorConstants.PARTNER_API_EXPIRED.getErrorCode(), idAuthenticationBaseException.getErrorCode()); } } diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/ValidateOtpRequestTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/ValidateOtpRequestTest.java index 36c851c9398..d4fb660facf 100644 --- a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/ValidateOtpRequestTest.java +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/integration/ValidateOtpRequestTest.java @@ -101,7 +101,7 @@ public void Test() throws IdAuthenticationBusinessException, RestServiceExceptio // ReflectionTestUtils.setField(otpManager, "otpvalidateresponsedto", otpvalidateresponsedto); // TODO: for validate OTP as true - assertEquals(false, otpManager.validateOtp("12345", "23232")); + assertEquals(false, otpManager.validateOtp("12345", "23232", "426789089018")); } @Test @@ -112,7 +112,7 @@ public void zTest_InvalidvalidateOTP() throws RestServiceException, IdAuthentica Mockito.when(helper.requestSync(Mockito.any(RestRequestDTO.class))).thenReturn(valuemap); ReflectionTestUtils.setField(otpManager, "restHelper", helper); - assertFalse(otpManager.validateOtp("2323", "2323")); + assertFalse(otpManager.validateOtp("2323", "2323", "426789089018")); } } \ No newline at end of file diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/util/KeyBindedTokenMatcherUtilTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/util/KeyBindedTokenMatcherUtilTest.java new file mode 100644 index 00000000000..6bfd363de7d --- /dev/null +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/util/KeyBindedTokenMatcherUtilTest.java @@ -0,0 +1,157 @@ +package io.mosip.authentication.common.service.util; + +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.kernel.keymanagerservice.util.KeymanagerUtil; +import org.bouncycastle.util.io.pem.PemObject; +import org.bouncycastle.util.io.pem.PemReader; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.StringReader; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +@RunWith(SpringRunner.class) +public class KeyBindedTokenMatcherUtilTest { + + @Mock + KeymanagerUtil keymanagerUtil; + @InjectMocks + KeyBindedTokenMatcherUtil keyBindedTokenMatcherUtil; + + + @Test + public void matchTestWithInValidToken_thenFail() { + + Map properties =new HashMap<>(); + Map bindingCertificates =new HashMap<>(); + Map input =new HashMap<>(); + input.put("individualId","individualId"); + input.put("type","type"); + input.put("format","jwt"); + input.put("token",".eyJ"); + + try{ + keyBindedTokenMatcherUtil.match(input, bindingCertificates, properties); + }catch (IdAuthenticationBusinessException e){ + } + } + @Test + public void matchTestWithExpiredToken_thenFail() { + + Map properties =new HashMap<>(); + Map bindingCertificates =new HashMap<>(); + Map input =new HashMap<>(); + input.put("individualId","individualId"); + input.put("type","type"); + input.put("format","jwt"); + input.put("token","eyJ0eXAiOiJKV1QiLCJ4NXQjUzI1NiI6IjBFSmtKMDYyWnZNZ0dKSk9BRVNYWFo1Tl9hamRDOG04Y0hPTXVKVVRGWUEiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE2OTg5ODgyMTcsIm5iZiI6MTY5ODk4ODIxNywiZXhwIjoxNjk4OTg4ODIyLCJqdGkiOiJYZkpRaGVfU3RuNTNmaWc3YVV3V3MiLCJhdWQiOiJpZGEtYmluZGluZyIsInN1YiI6IjQxNTg2MTI2MDkiLCJpc3MiOiJwb3N0bWFuLWluamkifQ.bSqcJZlq5PyAExwPoww41OF-vBIyaADZ8OsXzA_7gtowNl0kChVAB11eIPEcjuFvYeQiSpQgNZsS2-w84ZBdiqh72kkJQLjN7ItMKNf-cekNRmG6XFf1os1vom7CwrguataoYvboiiXYw0WUfsZTmnhcOKC8XN3qAsB2YAyYEnBJBeKy5aCNAfJiOULTMrqAqcu-A1MA_wtAkaCJggiNxf1-5bJWjZYyQOkis0nHmbgWjzzThdd6TzMkLnUyNxzO2n1E9A19OJ2ZH0ZN1d46c8QBMsYmGX-Kz8B8GBDnDlwC4M5g4hmxuXCN6sBcVjAONl92LxI1htSZ6muv3xL1YQ"); + + try{ + keyBindedTokenMatcherUtil.match(input, bindingCertificates, properties); + }catch (IdAuthenticationBusinessException e){ + Assert.assertEquals("IDA-KBT-002",e.getErrorCode()); + } + } + + @Test + public void matchTestWithInValidThumbprint_thenFail() { + + Map properties =new HashMap<>(); + Map bindingCertificates =new HashMap<>(); + Map input =new HashMap<>(); + input.put("individualId","individualId"); + input.put("type","type"); + input.put("format","jwt"); + input.put("token","eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJrdHkiOiJSU0EiLCJlIjoiQVFBQiIsInVzZSI6InNpZyIsImtpZCI6IkFBNzBWbUQ2OGltaUU2NDhSdDBzRWNhc1N3VkJDNGxtbno4ZUFPZmRYQzgiLCJhbGciOiJSUzI1NiIsIm4iOiJzZFNtY0o1bzJZX1JMOURORXFEQl9fV0xqV1RUY3JvRHpMaXRFRUxSb3h3MF9talV1azAyd1NlcTY3YlR4YzR0b2JMTS04Y19DNkVsNUgtQzlsTFF3VURZYnZ1VmxpX2lBLWtvZ0Rxa1dOTEEwbWZaLW9FRUtEYTlJV280VmY4MHl2Z09EN2hfSlpCWG53dHZjaTRqUlNaekc1R05sU2VJY25ZU0tiNVpvTTBOVDEtb0VrLU1tQnIxcmZGYWpGZ0hvMXhQSTQwUkN6UFhNWnkwOXY5Y2R5SVdTbWFzd2VRMmcxbEtsVHhqcVhibEtiTjZMQzNhUXc2azlFVVEzNjJ5QW5FMmZWOWpkcmNFb29RT0ZYZk1ZTHQ2UlFRMmJQSjIxb01aT0RGUjU0cHlVT0RxdlowMnczcnZMS0ozU2dvTHEtLVlDUTEzNi04cWJqNXpTVnNwMlEiLCJpYXQiOjE2OTg5OTQzMzR9.J4DNzGDNWE6AIIg7PAF8CZufFOOKA97ngBn1xMU05T9X_eqV9mfSk3G-fDXRRGS3ucS25gB2k6kOh7vt0eoVYEgw1lOQ2ERM2UoT7sWzUYvt0zedkP2zgkcubkeOwC-dY65_NiFRZ4iXudu38iLd2iQcAdwnp9e5HBfCFxiVkxIByMfGac6SwrCByNnPQnaiYn_988UKW7YVoqK4NK2kIJ405bz9kRWb8MMIRSTRskg0gYoQs9tCQGfD0QJWjJGk_Qqj2eDuH2pHresKELchjhe9hbbkajG021azpvPdq3t4PrYlqhiFajE-MRKwAR7Ey3_CfSHSoJ4mg2OBrhOVsA"); + + try{ + keyBindedTokenMatcherUtil.match(input, bindingCertificates, properties); + }catch (IdAuthenticationBusinessException e){ + Assert.assertEquals("IDA-MLC-009",e.getErrorCode()); + } + } + @Test + public void matchTestWithInValidCerts_thenFail() throws IdAuthenticationBusinessException { + ReflectionTestUtils.setField(keyBindedTokenMatcherUtil, "iatAdjSeconds", 30000000); + Map properties =new HashMap<>(); + Map bindingCertificates =new HashMap<>(); + Map input =new HashMap<>(); + input.put("individualId","individualId"); + input.put("type","type"); + input.put("format","jwt"); + input.put("token","eyJ0eXAiOiJKV1QiLCJ4NXQjUzI1NiI6IjBFSmtKMDYyWnZNZ0dKSk9BRVNYWFo1Tl9hamRDOG04Y0hPTXVKVVRGWUEiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE2OTg5ODgyMTcsIm5iZiI6MTY5ODk4ODIxNywiZXhwIjoxNjk4OTg4ODIyLCJqdGkiOiJYZkpRaGVfU3RuNTNmaWc3YVV3V3MiLCJhdWQiOiJpZGEtYmluZGluZyIsInN1YiI6IjQxNTg2MTI2MDkiLCJpc3MiOiJwb3N0bWFuLWluamkifQ.bSqcJZlq5PyAExwPoww41OF-vBIyaADZ8OsXzA_7gtowNl0kChVAB11eIPEcjuFvYeQiSpQgNZsS2-w84ZBdiqh72kkJQLjN7ItMKNf-cekNRmG6XFf1os1vom7CwrguataoYvboiiXYw0WUfsZTmnhcOKC8XN3qAsB2YAyYEnBJBeKy5aCNAfJiOULTMrqAqcu-A1MA_wtAkaCJggiNxf1-5bJWjZYyQOkis0nHmbgWjzzThdd6TzMkLnUyNxzO2n1E9A19OJ2ZH0ZN1d46c8QBMsYmGX-Kz8B8GBDnDlwC4M5g4hmxuXCN6sBcVjAONl92LxI1htSZ6muv3xL1YQ"); + + try { + keyBindedTokenMatcherUtil.match(input, bindingCertificates, properties); + }catch (IdAuthenticationBusinessException e){ + Assert.assertEquals("IDA-KBT-001",e.getErrorCode()); + } + } + + @Test + public void matchTestWithValidCerts_thenFail() throws IdAuthenticationBusinessException { + ReflectionTestUtils.setField(keyBindedTokenMatcherUtil, "iatAdjSeconds", 300000000); + Map properties =new HashMap<>(); + Map bindingCertificates =new HashMap<>(); + bindingCertificates.put("D04264274EB666F32018924E0044975D9E4DFDA8DD0BC9BC70738CB895131580-TYPE","X509"); + Map input =new HashMap<>(); + input.put("individualId","individualId"); + input.put("type","type"); + input.put("format","jwt"); + input.put("token","eyJ0eXAiOiJKV1QiLCJ4NXQjUzI1NiI6IjBFSmtKMDYyWnZNZ0dKSk9BRVNYWFo1Tl9hamRDOG04Y0hPTXVKVVRGWUEiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE2OTg5ODgyMTcsIm5iZiI6MTY5ODk4ODIxNywiZXhwIjoxNjk4OTg4ODIyLCJqdGkiOiJYZkpRaGVfU3RuNTNmaWc3YVV3V3MiLCJhdWQiOiJpZGEtYmluZGluZyIsInN1YiI6IjQxNTg2MTI2MDkiLCJpc3MiOiJwb3N0bWFuLWluamkifQ.bSqcJZlq5PyAExwPoww41OF-vBIyaADZ8OsXzA_7gtowNl0kChVAB11eIPEcjuFvYeQiSpQgNZsS2-w84ZBdiqh72kkJQLjN7ItMKNf-cekNRmG6XFf1os1vom7CwrguataoYvboiiXYw0WUfsZTmnhcOKC8XN3qAsB2YAyYEnBJBeKy5aCNAfJiOULTMrqAqcu-A1MA_wtAkaCJggiNxf1-5bJWjZYyQOkis0nHmbgWjzzThdd6TzMkLnUyNxzO2n1E9A19OJ2ZH0ZN1d46c8QBMsYmGX-Kz8B8GBDnDlwC4M5g4hmxuXCN6sBcVjAONl92LxI1htSZ6muv3xL1YQ"); + String certificateString="-----BEGIN CERTIFICATE-----\n" + + "MIIC6jCCAdKgAwIBAgIGAYuT8Am8MA0GCSqGSIb3DQEBCwUAMDYxNDAyBgNVBAMM\n" + + "K0FBNzBWbUQ2OGltaUU2NDhSdDBzRWNhc1N3VkJDNGxtbno4ZUFPZmRYQzgwHhcN\n" + + "MjMxMTAzMDY0NzQzWhcNMjQwODI5MDY0NzQzWjA2MTQwMgYDVQQDDCtBQTcwVm1E\n" + + "NjhpbWlFNjQ4UnQwc0VjYXNTd1ZCQzRsbW56OGVBT2ZkWEM4MIIBIjANBgkqhkiG\n" + + "9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsdSmcJ5o2Y/RL9DNEqDB//WLjWTTcroDzLit\n" + + "EELRoxw0/mjUuk02wSeq67bTxc4tobLM+8c/C6El5H+C9lLQwUDYbvuVli/iA+ko\n" + + "gDqkWNLA0mfZ+oEEKDa9IWo4Vf80yvgOD7h/JZBXnwtvci4jRSZzG5GNlSeIcnYS\n" + + "Kb5ZoM0NT1+oEk+MmBr1rfFajFgHo1xPI40RCzPXMZy09v9cdyIWSmasweQ2g1lK\n" + + "lTxjqXblKbN6LC3aQw6k9EUQ362yAnE2fV9jdrcEooQOFXfMYLt6RQQ2bPJ21oMZ\n" + + "ODFR54pyUODqvZ02w3rvLKJ3SgoLq++YCQ136+8qbj5zSVsp2QIDAQABMA0GCSqG\n" + + "SIb3DQEBCwUAA4IBAQAR4qLsRAmLc3iNcX2I+YXdHHh1Vmoje2xMELZwpGbXq9LE\n" + + "ozKEQxjSoidwmXwH/m7biH0/X7w1fFgT3ZxgaCVk3BWF+oS691+nQZceORbWYGDg\n" + + "fyyliMT/f25bIfqfqLnk1p6A6RyAGkU5ICPEchDKziX6X4AkbIYXGkcNwi7naSpo\n" + + "VULtcruR7Q3yCnXLJC4hyT7q8dp2GsmUiB/xP5jw2WtxwJZy60Syea0h2e8GEAmn\n" + + "K25CO5bPD/lEVhvwEzY2ZWg7ZMp1FE02fhFbSXpbF9BACy8UsEZ0Pcr0daWUtXTC\n" + + "5xbRhnAbNF0ixcSvZFcZvPhHDSnmnjABuHmuCUAQ\n" + + "-----END CERTIFICATE-----"; + Certificate certificate=convertToCertificate(certificateString); + Mockito.when(keymanagerUtil.convertToCertificate(Mockito.anyString())).thenReturn(certificate); + try{ + keyBindedTokenMatcherUtil.match(input, bindingCertificates, properties); + }catch (IdAuthenticationBusinessException e){ + Assert.assertEquals("IDA-KBT-003",e.getErrorCode()); + } + } + + public static Certificate convertToCertificate(String certData) { + try { + StringReader strReader = new StringReader(certData); + PemReader pemReader = new PemReader(strReader); + PemObject pemObject = pemReader.readPemObject(); + if (Objects.isNull(pemObject)) { + throw new RuntimeException("Invalid certificate"); + } + byte[] certBytes = pemObject.getContent(); + CertificateFactory certFactory = CertificateFactory.getInstance("X.509"); + return certFactory.generateCertificate(new ByteArrayInputStream(certBytes)); + } catch (IOException | CertificateException e) { + throw new RuntimeException("Invalid certificate"); + } + } +} diff --git a/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/util/TokenEncoderUtilTest.java b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/util/TokenEncoderUtilTest.java new file mode 100644 index 00000000000..b4b89aa1404 --- /dev/null +++ b/authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/util/TokenEncoderUtilTest.java @@ -0,0 +1,27 @@ +package io.mosip.authentication.common.service.util; + + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +public class TokenEncoderUtilTest { + + + + @Test + public void encodeBase58TestWithVaidDetails_thenPass(){ + String st="string"; + String result=TokenEncoderUtil.encodeBase58(st.getBytes()); + Assert.assertEquals("zVbyBrMk",result); + } + + @Test + public void encodeBase58TestWithNull_thenFail(){ + String st="string"; + String result=TokenEncoderUtil.encodeBase58(null); + } + +} diff --git a/authentication/authentication-common/src/test/resources/sample-data-test.properties b/authentication/authentication-common/src/test/resources/sample-data-test.properties index c5c7f6eb1ba..2462a88af4c 100644 --- a/authentication/authentication-common/src/test/resources/sample-data-test.properties +++ b/authentication/authentication-common/src/test/resources/sample-data-test.properties @@ -1 +1 @@ -sample.demo.entity={ "id": "mosip.id.read", "ver": "1.0", "timestamp": "", "err": "", "status": "SUCCCESSFUL", "errmsg": "", "responseCode": "OK", "uin": "7867780967875678", "response": { "identity": { "fullName": [{ "language": "ara", "label": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0627\u0648\u0644", "value": "\u0627\u0628\u0631\u0627\u0647\u064A\u0645" }, { "language": "fre", "label": "Prénom", "value": "Ibrahim" }], "middleName": [{ "language": "ara", "label": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0623\u0648\u0633\u0637", "value": "\u0628\u0646" }, { "language": "fre", "label": "deuxičme nom", "value": "Ibn" }], "lastName": [{ "language": "ara", "label": "\u0627\u0644\u0643\u0646\u064A\u0629", "value": "\u0639\u0644\u064A" }, { "language": "fre", "label": "nom de famille", "value": "Ali" }], "dateOfBirth": [{ "label": "\u062A\u0627\u0631\u064A\u062E \u0627\u0644\u0648\u0644\u0627\u062F\u0629", "value": "16/04/1955" }, { "label": "date de naissance", "value": "16/04/1955" }], "gender": [{ "language": "ara", "label": "\u062C\u0646\u0633", "value": "\u0627\u0644\u0630\u0643\u0631" }, { "language": "fre", "label": "le sexe", "value": "mâle" }], "addressLine1": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 1", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 1" }, { "language": "fre", "label": "Adresse 1", "value": "exemple d'adresse ligne 1" }], "addressLine2": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 2", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 2" }, { "language": "fre", "label": "Adresse 2", "value": "exemple d'adresse ligne 2" }], "addressLine3": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 3", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 3" }, { "language": "fre", "label": "Adresse 3", "value": "exemple d'adresse ligne 3" }], "region": [{ "label": "Région", "value": "Tanger-Tétouan-Al Hoceima" }], "province": [{ "language": "ara", "label": "\u0627\u0644\u0645\u062D\u0627\u0641\u0638\u0629", "value": "\u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633" }, { "language": "fre", "label": "province", "value": "Fčs-Meknčs" }], "city": [{ "language": "ara", "label": "\u0645\u062F\u064A\u0646\u0629", "value": "\u0641\u0627\u0633-\u0627\u0644\u062F\u0627\u0631 \u0627\u0644\u0628\u064A\u0636\u0627\u0621" }, { "language": "fre", "label": "ville", "value": "Casablanca" }], "pinCode": [{ "language": "ara", "label": "\u0645\u062F\u064A\u0646\u0629", "value": "600001" }, { "language": "fre", "label": "ville", "value": "600001" }], "localAdministrativeAuthority": [{ "language": "ara", "label": "\u0627\u0644\u0647\u064A\u0626\u0629 \u0627\u0644\u0625\u062F\u0627\u0631\u064A\u0629 \u0627\u0644\u0645\u062D\u0644\u064A\u0629", "value": "\u0637\u0646\u062C\u0629 - \u062A\u0637\u0648\u0627\u0646 - \u0627\u0644\u062D\u0633\u064A\u0645\u0629" }, { "language": "fre", "label": "Autorité administrative locale", "value": "Tanger-Tétouan-Al Hoceima" }], "phone": [{ "language": "", "label": "\u0631\u0642\u0645 \u0627\u0644\u0647\u0627\u062A\u0641 \u0627\u0644\u0645\u062D\u0645\u0648\u0644", "value": "+212-5398-12345" }, { "language": "fre", "label": "numéro de portable", "value": "+212-5398-12345" }], "face": [{ "label": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0627\u064A\u0645\u064A\u0644", "value": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxMTEhUQEhIVFRUSFRASEBUQEhAQFRgWFRYWFxcVGBUYHSogGBolHRUVITEhJSkrLi4uFx8zODMtNygtLisBCgoKDg0OGhAQGSsdHR0rKysrMS0tKzcrLTcvLS0rLS0tLS0xKy0tKy0tKy0tKy01LSsrLS0tKysrLSstLS0tLf/AABEIAOEA4QMBIgACEQEDEQH/xAAcAAEAAQUBAQAAAAAAAAAAAAAABAMFBgcIAgH/xABEEAABAwIEAgcFBQUECwAAAAABAAIDBBEFEiExBkEHE1FhcYGRIjJyobEUQlJi0RUjM7LBc4KSkwg0NUNEVGODotLx/8QAGQEBAAMBAQAAAAAAAAAAAAAAAAIDBAEF/8QAJhEBAQACAQQCAQQDAAAAAAAAAAECEQMSITFREzJBIlKRoRRhcf/aAAwDAQACEQMRAD8A3iiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAix3jLjGmw6Nr5y4l5tHHGAXu7bXIAA7SsRg6aaVzwDTTNYd3kxm3flB1CDaCKLhmIxVEbZoXh7HC4LTf8A+FSkBERAREQEREBERAREQEREBERAREQEREBERARFDp8UhfI+FkrDJGbSMDhmad9QghcV8SQ0EPXzXIuGta2xc4nkFqLG+l6slJFMxkDORI62T1Psj0KidLvEH2qtMDDeKmuwW2Mn3z5beRWHxxriUi4zcV4i/wB6un8nkfRQv2tVB3Wfap8w2PWv/VemsC8ujR3S5u40qns6qpENXGbezVxZyPhe0gg96tNfVskeDHTMgFiC2F0jmnsNnk2PgvhjXwtQ0unC3FM+HyiSJxMZI66In2Xjw5O71uDBelrD5yGvc6Fx0tK3S/xDRaGe1QKiJHLHYUE7XtD2ODmnUFpBB8wqi5T4U40rMPdeGS7PvwyXdGfAfdPeF0jwjxNFX0zKmPTNdrmOIzNcNC0rqK9oiICIiAiIgIiICIiAiIgIiICIiAiIgLlji6qf+0at7Xua7r5RmY4tNgcu47hZdEHjXD8zmGshDoyWvDngWI31Oh8lz5x/LTuxGd9IQYnOaQW6tLi1uct7s10rsWiM8+3clS2KDG5V2yKKSa0ry4qi2RfS9B6JXglfC9U3PXR9co0rVVLl4cghyRrwx7m+65w+FxH0UzLdUpY0cXfAOOK6jIMNQ4tG8cpMkZ8jt5WW9OjvpDixEGNwEVQ0XdHe4cPxMJ3C5syKXhNa6mmjqYjZ8L2vbqRe24PcRceaOadgIsc4E4qZiNMKhrcjgSyRl72cO/sWRrrgiIgIiICIiAiIgIiICIiAvEzMzS3a4I9QvaIOTuLcIko6uWmlGocXsNrBzHElrx3HUeRVpDllPStVOkxSpzknI5sbL8mtAIA7rknzWNQU9za29reey4kNeqgeti4XwnTdU1kkYc63tO1BuewrFMc4SqIHEsYZIrnK5mrgOxw3Vc5cbdLLx5SbWlr17D18gw+d3uwynwjef6KfT8P1TzYU8n95hb63UuqI6qCXLyASbAEnsAJPos9wXgDZ9S7/ALbD9Xfosuo8JhiH7uNre8DX1VWXPjPHdZjw5Xz2acGFVB2p5v8AJl/RV4sAqnGwp5B8TCwf+S3IWqk5qh/kX0n8E9tSVfD1RCM72ezzLSHW8bKE+MELbtSwEEHY3BWsMWo+pmdHyvdvgdlZx8nV5V58fT4WF0WU93NfZAORUqoaoL4lcqb06AIQKSZ4PvzbfC0BbTXKPBtPVPq4oKSd8MkrrZmucGgAXLnAbiw5rqqmY4MaHuzODWhzrWuQNTbkuoqiIiAiIgIiICIiAiIgIiICj4gx5jeI3ZX5TkP5uV+5SEQcncSVE0lXM6qFp81pRly6t0GngApPDdHnnjb+YE+Wqznp4rY2zxwCGPrHxtkfL/vLBzg0eGjvmsW6Pm3qWeDz8lDO6lWYd7G0KbD9FPZQKTTjRSmheba9CREZRBVHUgspQS6jtLSCaNU/s6uDiqTl3bmlukp1HlhV1cFHlC7K5YsdQFg/GsPuP7y0/VZ9XBYdxRFmid+WzvRX8V7xTyTswGrF1Fk02UuZRnNW1jbE6CMKMtY6pPu0zCPF8gsPlf5Lf6596EMWMNeacn2Kljhb/qMF2/IOXQS6iIiICIiAiIgIiICIiAiIgIiINA9P0NsQhk/HTNaP7kkhP84Vo6Ov9Yb8L/6LNf8ASBwt7209S1ji2LrGSOA0aH5dT5tC1PhFNPIT1JcCLD2SQdTa2ihnNyp4XVdDwyADUgeJAXsV8W3Ws/xtWrKXgCpe0GorC38oL5CPUgLxP0dRjatN/wA0X6OWL48P3f02fJn+3+23o5WuF2kEdxBX260hLg1fRXlp5i9rBmJjcdhvdjlLwjivGJ2OdDaRrNHO6tnjvzKXg/Ms0Tn/ABZW4yVaq/H6aLSSeNp7C4X9FqWjxXFK9zoWzOAb/E2jDeWthdXSl4BgbrUTve7mI7NHqbkrvwzH7X+D5bl9Z/LMn8c0H/MN9HfoqEnGtCf+Ib6O/RWiHhnDRoYie90j/wChCkHgvD3j2YiPhll/9k1x/wCzfJfSnV8WUZ2nb81aKnGKZ4cOuZYgg69qi8ScBsjY6Sne45RcsfY6DsKsmC8NMni617nDMXBoblGxtrcdqtxxw1uVVllnvVi1yuFyAQbEjQqNKNCq2O4E6neADmDhdptY6ciqB28lpnedmepfDVc6Koglb70c0LhbueLjzFx5rrhct8J8NSvkimkGWJskbnXvcta4EgDyK6ZwzEY5254zcA2NxYg9iTKXsXGzuloiLqIiIgIiICIiAiIgIiICIiDG+ken6zDKtg3MLy3xGoWoOBqQRVErOwMLb66Os7+q3vjFN1kEsVr545G28WlardTtEtNO0AGWkayS1x7cDspNj4jXuVfLP01ZxX9UX50Bf1hJs2JheQNC42JAvyGi1BPxU/O0NfmcS5zm5fZAGoF+Yst1UrXOFwR7TcrgRcEd6xtvRvTB+cAkXvlLiBvt4LLjnhJr8tOeGdu54XCqomRwx1IJ6t8Qke15vYFmYi/govR7RhtIxzRYSl8trW0cTYeio8fVD3NioQ4dZVObGGsFgyIEZjbwG6y6mp2xsaxos2Noa3wAsucuU12/KXHLvv8AhhWEwMp66qp7WM+Woj10I+8B4E381cIoRJOyJ2gJ15XtyUXj2lc0RYhECZKV13gfeiOjh5K40cTKqNlRE7RwDmkbg9nim/GVNecY1p0gYg6OrmjbGTazYg32Ws23HMbrOujRjpqFxmGrJXNifzy5Wm1+wEkK8V3DcU5D5wJHBuW5a0G3eQLlVvsjI2BjPZaNmgkN9NlP5sd+Ffw5e1uxluWEuP4Hn5FYbw8y1LF3h7v8T3H+qvXHWK5IOqGr5v3cbeeuhKiQU/Vxsj/A1rfQKOP1/wCpZfZZOKYbsa78Jt6rGsCpOtqY4+ReL+A1P0WW8SD9we4tVr4JpPadN2Xa0+O6vxy1hVOU3lGw7tFoox3dwWX8BwFsUhP3pPoAFh+EMABcdyth8NQ5adv5rv17yq+CfqT5r+ldERFrZRERAREQEREBERAREQEREBak41wqoopzUxtM1LI8u6tts8T5PfygfdJAPiVttWnimHNTP/LZ3oVHL61LH7Rq+k6QIGizopwezqXFSzx7I8WpqGokcdAXsMbR4k8lcaWbRXKlkWC3H03yZe1k4YwKfrHV1aQ6okGVjR7sTPwjsWUPFmqNPWhup5KnNijSNFC25XaUkk09b6HUG4IKxA8PVdHI5+HytMTyXOgl90E/h7Fkjam6q9cuy2OWSsZfjuKjQ0Ebu9s4A+aizYhismgp4or83Pz29FljnqPK5SmU9RG433WJ0HDjmyfaamQzTcr+63wCmVKudQ5Wuc6qW7fKOpPCy4xGH5YjqHbhT6GFsQEbW2FrDs7/ADUSD2pnO5N0HirxNTWDbak2HmVK+kZ7XfBoHTPbCzn7x/C3mVs2GMNaGjZoAHgFbOHcGbTRgDV7rGR3aezwCuy08eHTGfkz6qIiKxWIiICIiAiIgIiICIiAiIgKnPEHNcw7OBB8wqiINVuaY5HRu3Y4tPkdCp7agNbmJ0Cm8d0WWRtQNn+w/wCIbH0+iwnGMTs3ID4rByYay03YZ7x2lV3EjdspPfdRmY2zmx3k7T6K4wcPPLWlj4hcAkubnOvmvUvDdSBdssX+UP1Ue3tLutz8fcPdj08yvcPErhq+PTuvdV2YVV852jwjA+pXv9mSE2kka5vMFjQfUJqHdcKWubIMzT4jmkr1ixqOomc1uwNvEK6NxVjhvZNO7V53qz4jUBjSefJVK3E2jbVY7VTukdbvU5FeVZ50W4QJHmd4uGe0L7Zjt6brYeJYFBOQ6RntNcHBzSWOuO0jfzVq6OqLq6QG1s5J8hoPoVlC14TWLJne4iIpoiIiAiIgIiICIiAiIgIiICIrJxJxXSULM9TM1p+6we1I7uawalBe14fK0buA8SAue+MOmOpqCWUgNPFtmNnSu7ydm+Autd1uKzym8s8rz+eR5+V0HWPEElPNA+J88bcwOUl7dHcjv2rRD5CXFpsSCQSDcG3MHmFrew7Ash4fxO1o3H4SfoquXHc2s48tXTdGFNLomEH7o+Si45WzRkNY8j5qDgGL5Yw2+oVLEa7OSfqsV8tu+ydhOIyPdkkN7jQ96uz2WWIQy5SDzGu6vLsWGXU8kNrDjf8AFd6q3PkNtLKRXTZnEqM1lz23U5FdqjqVVuI2OldswX8TyCudPhTrXdoOzmrdxnHakeBsMvpdTx1vSGW9bZRw700Rsa2KemLWtAaHQuDrAaatO/qtp4Dj9PWRiWnkDwdxs4dzmnUFcc3VxwXHJ6WQSwSOY4dh37iOYWxldkItW9H3S3HVOZTVTermdZrXiwje7kD+En0W0kBERAREQEREBERAREQERUquobGx0jjZrGuc4nsAuUGEdK/HIw+DqoiDUzgiIb5G7GR3hfQcyucKqofK4ySvc97t3PJcT5qdxNjT62qlqnknO45AfusB9lo7NPqrcgoPCp3UiQKORqgBSKOEvexjfec5rW+JKRwC2qz/AKO+E3GRtU9pDWg9WHbkn73go55TGbqWGNyul3qMCewAxEnQZm8723CiuMrfeY4dvsn9FnktLYXXqnPJYOpu6WAhzz7sbj2+y7b+ikxYTUybRuA/NYD5rYDV9XOp3oYdS8JO3keB3N1PqrpBhrI/daPHc+qvEhUOROq06ZEGoasY4rhzU0o/KT6LK5mLW3GvEdy6mh5XbK/6tb+qt45beyvksk7sDC9gKq2NenNW1iUQSCCCQQQQRoQRsV0B0QdJH2oChq3ATtFoXk260Dl8Y+a0CQlPO5j2yMJa5hDmkaEEbFB2qiwfor41GIU+WQj7RDYSgaZhyeB3rOEBERAREQEREBF8c4AEnQDUkrRPGPSFUzTvFNO+KBpys6uzS633i7fXsug3sStT9OPFzWUwoYJWl87rT5HAlsTdSDbbMbDwuta1WOVUgIfUzOB3DppCPS6xiuYc5J57IKbV9K8Ar0g+OCokahVyFTBAc0nYOaT4A6oNp8DcGMLWTTtzOdZwa7ZoO2nMrZkdOGiwGytWCTiwts4NI8CFfAvN5Mrle70ePGYzspGG6hTQWKurQvssIIVe1mlpaV9JX2dmUqiXqTj5IVGeVUkeo0j12I1jPHWP/ZosjD+9lBDfyt5uWpgOZV34sxL7RVSSX9kHq2fC3T5m5Vput/Hh04sPJn1ZPS8lfC5V4qUkZney3vVitGDC42C9dU0d5VR7h7rNuZVWGBBK4Xx+WgqmVMdxlPtt5PYd2ldW4Di8dVBHUxG7ZGgjuPMHvC5S+zA6ELLeB+MpsNDmMAkicQ4xvJFjzLTyug6QRQcDxEVFPFUBuUTMbIAdxmF7KcgIiICIiChX/wAKT4H/AMpXLg/hN8kRBQKgYly80RBbl6CIg+uUebZfUQrffCf8KH+yi/lCy9q+IvMz8vSw8KrVUCIq1i3YkrY5EU4hVF6h1nuP+B/0KIpRGtEfqV8KIvSec9Q7jxCm417oREEKkVxgREEpq+v2REHS/A3+z6T+wi/lCviIgIiICIiD/9mRXao6lVbiNjpXbMF/E8grnT4U613aDs5q3cZx2pHgbDL6XU8db0hlvW2UcO9NEbGtinpi1rQGh0Lg6wGmrTv6raeA4/T1kYlp5A8HcbOHc5p1BXHN1ccFxyelkEsEjmOHYd+4jmFsZXZCLVvR90tx1TmU1U3q5nWa14sI3u5A/hJ9FtJAREQEREBERAREQEREBEVKrqGxsdI42axrnOJ7ALlBhHSvxyMPg6qIg1M4IiG+Ruxkd4X0HMrnCqqHyuMkr3Pe7dzyXE+ancTY0+tqpap5JzuOQH7rAfZaOzT6q3IKDwqd1IkCjkaoAUijhL3sY33nOa1viSkcAtqs/wCjvhNxkbVPaQ1oPVh25J+94KOeUxm6lhjcrpd6jAnsAMRJ0GZvO9tworjK33mOHb7J/RZ5LS2F16pzyWDqbulgIc8+7G49vsu2/opMWE1Mm0bgPzWA+a2A1fVzqd6GHUvCTt5HgdzdT6q6QYayP3Wjx3PqrxIVDkTqtOmRBqGrGOK4c1NKPyk+iyuZi1txrxHcupoeV2yv+rW/qreOW3sr5LJO7AwvYCqtjXpzVtYlEEgggkEEEEaEEbFdAdEHSR9qAoatwE4=" }], "emailId": [{ "language": "ara", "label": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0627\u064A\u0645\u064A\u0644", "value": "sample@samplamail.com" }, { "language": "fre", "label": "identifiant email", "value": "sample@samplamail.com" }], "CNEOrPINNumber": [{ "language": "ara", "label": "\u0631\u0642\u0645 CNE / PIN", "value": "AB453625" }, { "language": "fre", "label": "Numéro CNE / PIN", "value": "AB453625" }], "parentOrGuardianName": [{ "language": "ara", "label": "\u0627\u0633\u0645 \u0648\u0644\u064A \u0627\u0644\u0623\u0645\u0631 / \u0627\u0644\u0648\u0635\u064A", "value": "\u0633\u0644\u0645\u0649" }, { "language": "fre", "label": "Nom du parent / tuteur", "value": "salma" }], "parentOrGuardianRIDOrUIN": [{ "language": "ara", "label": "\u0627\u0644\u0648\u0627\u0644\u062F / \u0627\u0644\u0648\u0635\u064A RID / UIN", "value": "123456789123" }, { "language": "fre", "label": "parent / tuteur RID / UIN", "value": "123456789123" }], "leftEye": [{ "language": "ara", "label": "\u0627\u0644\u0639\u064A\u0646 \u0627\u0644\u064A\u0633\u0631\u0649", "value": "hashed_fileName.png" }, { "language": "fre", "label": "oeil gauche", "value": "hashed_fileName.png" }], "rightEye": [{ "language": "ara", "label": "\u0627\u0644\u0639\u064A\u0646 \u0627\u0644\u064A\u0645\u0646\u0649", "value": "hashed_fileName.png" }, { "language": "fre", "label": "l'\u0153il droit", "value": "hashed_fileName.png" }], "leftSlap": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 1", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biométrique 1", "value": "hashed_fileName.png" }], "rightSlap": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 2", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biométrique 2", "value": "hashed_fileName.png" }], "thumbs": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 3", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biométrique 3", "value": "hashed_fileName.png" }] } } } \ No newline at end of file +sample.demo.entity={ "id": "mosip.id.read", "ver": "1.0", "timestamp": "", "err": "", "status": "SUCCCESSFUL", "errmsg": "", "responseCode": "OK", "uin": "7867780967875678", "response": { "identity": { "fullName": [{ "language": "ara", "label": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0627\u0648\u0644", "value": "\u0627\u0628\u0631\u0627\u0647\u064A\u0645" }, { "language": "fre", "label": "Prďż˝nom", "value": "Ibrahim" }], "middleName": [{ "language": "ara", "label": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0623\u0648\u0633\u0637", "value": "\u0628\u0646" }, { "language": "fre", "label": "deuxiďż˝me nom", "value": "Ibn" }], "lastName": [{ "language": "ara", "label": "\u0627\u0644\u0643\u0646\u064A\u0629", "value": "\u0639\u0644\u064A" }, { "language": "fre", "label": "nom de famille", "value": "Ali" }], "dateOfBirth": [{ "label": "\u062A\u0627\u0631\u064A\u062E \u0627\u0644\u0648\u0644\u0627\u062F\u0629", "value": "16/04/1955" }, { "label": "date de naissance", "value": "16/04/1955" }], "gender": [{ "language": "ara", "label": "\u062C\u0646\u0633", "value": "\u0627\u0644\u0630\u0643\u0631" }, { "language": "fre", "label": "le sexe", "value": "mďż˝le" }], "addressLine1": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 1", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 1" }, { "language": "fre", "label": "Adresse 1", "value": "exemple d'adresse ligne 1" }], "addressLine2": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 2", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 2" }, { "language": "fre", "label": "Adresse 2", "value": "exemple d'adresse ligne 2" }], "addressLine3": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 3", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 3" }, { "language": "fre", "label": "Adresse 3", "value": "exemple d'adresse ligne 3" }], "region": [{ "label": "Rďż˝gion", "value": "Tanger-Tďż˝touan-Al Hoceima" }], "province": [{ "language": "ara", "label": "\u0627\u0644\u0645\u062D\u0627\u0641\u0638\u0629", "value": "\u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633" }, { "language": "fre", "label": "province", "value": "Fďż˝s-Meknďż˝s" }], "city": [{ "language": "ara", "label": "\u0645\u062F\u064A\u0646\u0629", "value": "\u0641\u0627\u0633-\u0627\u0644\u062F\u0627\u0631 \u0627\u0644\u0628\u064A\u0636\u0627\u0621" }, { "language": "fre", "label": "ville", "value": "Casablanca" }], "pinCode": [{ "language": "ara", "label": "\u0645\u062F\u064A\u0646\u0629", "value": "600001" }, { "language": "fre", "label": "ville", "value": "600001" }], "localAdministrativeAuthority": [{ "language": "ara", "label": "\u0627\u0644\u0647\u064A\u0626\u0629 \u0627\u0644\u0625\u062F\u0627\u0631\u064A\u0629 \u0627\u0644\u0645\u062D\u0644\u064A\u0629", "value": "\u0637\u0646\u062C\u0629 - \u062A\u0637\u0648\u0627\u0646 - \u0627\u0644\u062D\u0633\u064A\u0645\u0629" }, { "language": "fre", "label": "Autoritďż˝ administrative locale", "value": "Tanger-Tďż˝touan-Al Hoceima" }], "phone": [{ "language": "", "label": "\u0631\u0642\u0645 \u0627\u0644\u0647\u0627\u062A\u0641 \u0627\u0644\u0645\u062D\u0645\u0648\u0644", "value": "+212-5398-12345" }, { "language": "fre", "label": "numďż˝ro de portable", "value": "+212-5398-12345" }], "face": [{ "label": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0627\u064A\u0645\u064A\u0644", "value": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxMTEhUQEhIVFRUSFRASEBUQEhAQFRgWFRYWFxcVGBUYHSogGBolHRUVITEhJSkrLi4uFx8zODMtNygtLisBCgoKDg0OGhAQGSsdHR0rKysrMS0tKzcrLTcvLS0rLS0tLS0xKy0tKy0tKy0tKy01LSsrLS0tKysrLSstLS0tLf/AABEIAOEA4QMBIgACEQEDEQH/xAAcAAEAAQUBAQAAAAAAAAAAAAAABAMFBgcIAgH/xABEEAABAwIEAgcFBQUECwAAAAABAAIDBBEFEiExBkEHE1FhcYGRIjJyobEUQlJi0RUjM7LBc4KSkwg0NUNEVGODotLx/8QAGQEBAAMBAQAAAAAAAAAAAAAAAAIDBAEF/8QAJhEBAQACAQQCAQQDAAAAAAAAAAECEQMSITFREzJBIlKRoRRhcf/aAAwDAQACEQMRAD8A3iiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAix3jLjGmw6Nr5y4l5tHHGAXu7bXIAA7SsRg6aaVzwDTTNYd3kxm3flB1CDaCKLhmIxVEbZoXh7HC4LTf8A+FSkBERAREQEREBERAREQEREBERAREQEREBERARFDp8UhfI+FkrDJGbSMDhmad9QghcV8SQ0EPXzXIuGta2xc4nkFqLG+l6slJFMxkDORI62T1Psj0KidLvEH2qtMDDeKmuwW2Mn3z5beRWHxxriUi4zcV4i/wB6un8nkfRQv2tVB3Wfap8w2PWv/VemsC8ujR3S5u40qns6qpENXGbezVxZyPhe0gg96tNfVskeDHTMgFiC2F0jmnsNnk2PgvhjXwtQ0unC3FM+HyiSJxMZI66In2Xjw5O71uDBelrD5yGvc6Fx0tK3S/xDRaGe1QKiJHLHYUE7XtD2ODmnUFpBB8wqi5T4U40rMPdeGS7PvwyXdGfAfdPeF0jwjxNFX0zKmPTNdrmOIzNcNC0rqK9oiICIiAiIgIiICIiAiIgIiICIiAiIgLlji6qf+0at7Xua7r5RmY4tNgcu47hZdEHjXD8zmGshDoyWvDngWI31Oh8lz5x/LTuxGd9IQYnOaQW6tLi1uct7s10rsWiM8+3clS2KDG5V2yKKSa0ry4qi2RfS9B6JXglfC9U3PXR9co0rVVLl4cghyRrwx7m+65w+FxH0UzLdUpY0cXfAOOK6jIMNQ4tG8cpMkZ8jt5WW9OjvpDixEGNwEVQ0XdHe4cPxMJ3C5syKXhNa6mmjqYjZ8L2vbqRe24PcRceaOadgIsc4E4qZiNMKhrcjgSyRl72cO/sWRrrgiIgIiICIiAiIgIiICIiAvEzMzS3a4I9QvaIOTuLcIko6uWmlGocXsNrBzHElrx3HUeRVpDllPStVOkxSpzknI5sbL8mtAIA7rknzWNQU9za29reey4kNeqgeti4XwnTdU1kkYc63tO1BuewrFMc4SqIHEsYZIrnK5mrgOxw3Vc5cbdLLx5SbWlr17D18gw+d3uwynwjef6KfT8P1TzYU8n95hb63UuqI6qCXLyASbAEnsAJPos9wXgDZ9S7/ALbD9Xfosuo8JhiH7uNre8DX1VWXPjPHdZjw5Xz2acGFVB2p5v8AJl/RV4sAqnGwp5B8TCwf+S3IWqk5qh/kX0n8E9tSVfD1RCM72ezzLSHW8bKE+MELbtSwEEHY3BWsMWo+pmdHyvdvgdlZx8nV5V58fT4WF0WU93NfZAORUqoaoL4lcqb06AIQKSZ4PvzbfC0BbTXKPBtPVPq4oKSd8MkrrZmucGgAXLnAbiw5rqqmY4MaHuzODWhzrWuQNTbkuoqiIiAiIgIiICIiAiIgIiICj4gx5jeI3ZX5TkP5uV+5SEQcncSVE0lXM6qFp81pRly6t0GngApPDdHnnjb+YE+Wqznp4rY2zxwCGPrHxtkfL/vLBzg0eGjvmsW6Pm3qWeDz8lDO6lWYd7G0KbD9FPZQKTTjRSmheba9CREZRBVHUgspQS6jtLSCaNU/s6uDiqTl3bmlukp1HlhV1cFHlC7K5YsdQFg/GsPuP7y0/VZ9XBYdxRFmid+WzvRX8V7xTyTswGrF1Fk02UuZRnNW1jbE6CMKMtY6pPu0zCPF8gsPlf5Lf6596EMWMNeacn2Kljhb/qMF2/IOXQS6iIiICIiAiIgIiICIiAiIgIiINA9P0NsQhk/HTNaP7kkhP84Vo6Ov9Yb8L/6LNf8ASBwt7209S1ji2LrGSOA0aH5dT5tC1PhFNPIT1JcCLD2SQdTa2ihnNyp4XVdDwyADUgeJAXsV8W3Ws/xtWrKXgCpe0GorC38oL5CPUgLxP0dRjatN/wA0X6OWL48P3f02fJn+3+23o5WuF2kEdxBX260hLg1fRXlp5i9rBmJjcdhvdjlLwjivGJ2OdDaRrNHO6tnjvzKXg/Ms0Tn/ABZW4yVaq/H6aLSSeNp7C4X9FqWjxXFK9zoWzOAb/E2jDeWthdXSl4BgbrUTve7mI7NHqbkrvwzH7X+D5bl9Z/LMn8c0H/MN9HfoqEnGtCf+Ib6O/RWiHhnDRoYie90j/wChCkHgvD3j2YiPhll/9k1x/wCzfJfSnV8WUZ2nb81aKnGKZ4cOuZYgg69qi8ScBsjY6Sne45RcsfY6DsKsmC8NMni617nDMXBoblGxtrcdqtxxw1uVVllnvVi1yuFyAQbEjQqNKNCq2O4E6neADmDhdptY6ciqB28lpnedmepfDVc6Koglb70c0LhbueLjzFx5rrhct8J8NSvkimkGWJskbnXvcta4EgDyK6ZwzEY5254zcA2NxYg9iTKXsXGzuloiLqIiIgIiICIiAiIgIiICIiDG+ken6zDKtg3MLy3xGoWoOBqQRVErOwMLb66Os7+q3vjFN1kEsVr545G28WlardTtEtNO0AGWkayS1x7cDspNj4jXuVfLP01ZxX9UX50Bf1hJs2JheQNC42JAvyGi1BPxU/O0NfmcS5zm5fZAGoF+Yst1UrXOFwR7TcrgRcEd6xtvRvTB+cAkXvlLiBvt4LLjnhJr8tOeGdu54XCqomRwx1IJ6t8Qke15vYFmYi/govR7RhtIxzRYSl8trW0cTYeio8fVD3NioQ4dZVObGGsFgyIEZjbwG6y6mp2xsaxos2Noa3wAsucuU12/KXHLvv8AhhWEwMp66qp7WM+Woj10I+8B4E381cIoRJOyJ2gJ15XtyUXj2lc0RYhECZKV13gfeiOjh5K40cTKqNlRE7RwDmkbg9nim/GVNecY1p0gYg6OrmjbGTazYg32Ws23HMbrOujRjpqFxmGrJXNifzy5Wm1+wEkK8V3DcU5D5wJHBuW5a0G3eQLlVvsjI2BjPZaNmgkN9NlP5sd+Ffw5e1uxluWEuP4Hn5FYbw8y1LF3h7v8T3H+qvXHWK5IOqGr5v3cbeeuhKiQU/Vxsj/A1rfQKOP1/wCpZfZZOKYbsa78Jt6rGsCpOtqY4+ReL+A1P0WW8SD9we4tVr4JpPadN2Xa0+O6vxy1hVOU3lGw7tFoox3dwWX8BwFsUhP3pPoAFh+EMABcdyth8NQ5adv5rv17yq+CfqT5r+ldERFrZRERAREQEREBERAREQEREBak41wqoopzUxtM1LI8u6tts8T5PfygfdJAPiVttWnimHNTP/LZ3oVHL61LH7Rq+k6QIGizopwezqXFSzx7I8WpqGokcdAXsMbR4k8lcaWbRXKlkWC3H03yZe1k4YwKfrHV1aQ6okGVjR7sTPwjsWUPFmqNPWhup5KnNijSNFC25XaUkk09b6HUG4IKxA8PVdHI5+HytMTyXOgl90E/h7Fkjam6q9cuy2OWSsZfjuKjQ0Ebu9s4A+aizYhismgp4or83Pz29FljnqPK5SmU9RG433WJ0HDjmyfaamQzTcr+63wCmVKudQ5Wuc6qW7fKOpPCy4xGH5YjqHbhT6GFsQEbW2FrDs7/ADUSD2pnO5N0HirxNTWDbak2HmVK+kZ7XfBoHTPbCzn7x/C3mVs2GMNaGjZoAHgFbOHcGbTRgDV7rGR3aezwCuy08eHTGfkz6qIiKxWIiICIiAiIgIiICIiAiIgKnPEHNcw7OBB8wqiINVuaY5HRu3Y4tPkdCp7agNbmJ0Cm8d0WWRtQNn+w/wCIbH0+iwnGMTs3ID4rByYay03YZ7x2lV3EjdspPfdRmY2zmx3k7T6K4wcPPLWlj4hcAkubnOvmvUvDdSBdssX+UP1Ue3tLutz8fcPdj08yvcPErhq+PTuvdV2YVV852jwjA+pXv9mSE2kka5vMFjQfUJqHdcKWubIMzT4jmkr1ixqOomc1uwNvEK6NxVjhvZNO7V53qz4jUBjSefJVK3E2jbVY7VTukdbvU5FeVZ50W4QJHmd4uGe0L7Zjt6brYeJYFBOQ6RntNcHBzSWOuO0jfzVq6OqLq6QG1s5J8hoPoVlC14TWLJne4iIpoiIiAiIgIiICIiAiIgIiICIrJxJxXSULM9TM1p+6we1I7uawalBe14fK0buA8SAue+MOmOpqCWUgNPFtmNnSu7ydm+Autd1uKzym8s8rz+eR5+V0HWPEElPNA+J88bcwOUl7dHcjv2rRD5CXFpsSCQSDcG3MHmFrew7Ash4fxO1o3H4SfoquXHc2s48tXTdGFNLomEH7o+Si45WzRkNY8j5qDgGL5Yw2+oVLEa7OSfqsV8tu+ydhOIyPdkkN7jQ96uz2WWIQy5SDzGu6vLsWGXU8kNrDjf8AFd6q3PkNtLKRXTZnEqM1lz23U5FdqjqVVuI2OldswX8TyCudPhTrXdoOzmrdxnHakeBsMvpdTx1vSGW9bZRw700Rsa2KemLWtAaHQuDrAaatO/qtp4Dj9PWRiWnkDwdxs4dzmnUFcc3VxwXHJ6WQSwSOY4dh37iOYWxldkItW9H3S3HVOZTVTermdZrXiwje7kD+En0W0kBERAREQEREBERAREQERUquobGx0jjZrGuc4nsAuUGEdK/HIw+DqoiDUzgiIb5G7GR3hfQcyucKqofK4ySvc97t3PJcT5qdxNjT62qlqnknO45AfusB9lo7NPqrcgoPCp3UiQKORqgBSKOEvexjfec5rW+JKRwC2qz/AKO+E3GRtU9pDWg9WHbkn73go55TGbqWGNyul3qMCewAxEnQZm8723CiuMrfeY4dvsn9FnktLYXXqnPJYOpu6WAhzz7sbj2+y7b+ikxYTUybRuA/NYD5rYDV9XOp3oYdS8JO3keB3N1PqrpBhrI/daPHc+qvEhUOROq06ZEGoasY4rhzU0o/KT6LK5mLW3GvEdy6mh5XbK/6tb+qt45beyvksk7sDC9gKq2NenNW1iUQSCCCQQQQRoQRsV0B0QdJH2oChq3ATtFoXk260Dl8Y+a0CQlPO5j2yMJa5hDmkaEEbFB2qiwfor41GIU+WQj7RDYSgaZhyeB3rOEBERAREQEREBF8c4AEnQDUkrRPGPSFUzTvFNO+KBpys6uzS633i7fXsug3sStT9OPFzWUwoYJWl87rT5HAlsTdSDbbMbDwuta1WOVUgIfUzOB3DppCPS6xiuYc5J57IKbV9K8Ar0g+OCokahVyFTBAc0nYOaT4A6oNp8DcGMLWTTtzOdZwa7ZoO2nMrZkdOGiwGytWCTiwts4NI8CFfAvN5Mrle70ePGYzspGG6hTQWKurQvssIIVe1mlpaV9JX2dmUqiXqTj5IVGeVUkeo0j12I1jPHWP/ZosjD+9lBDfyt5uWpgOZV34sxL7RVSSX9kHq2fC3T5m5Vput/Hh04sPJn1ZPS8lfC5V4qUkZney3vVitGDC42C9dU0d5VR7h7rNuZVWGBBK4Xx+WgqmVMdxlPtt5PYd2ldW4Di8dVBHUxG7ZGgjuPMHvC5S+zA6ELLeB+MpsNDmMAkicQ4xvJFjzLTyug6QRQcDxEVFPFUBuUTMbIAdxmF7KcgIiICIiChX/wAKT4H/AMpXLg/hN8kRBQKgYly80RBbl6CIg+uUebZfUQrffCf8KH+yi/lCy9q+IvMz8vSw8KrVUCIq1i3YkrY5EU4hVF6h1nuP+B/0KIpRGtEfqV8KIvSec9Q7jxCm417oREEKkVxgREEpq+v2REHS/A3+z6T+wi/lCviIgIiICIiD/9mRXao6lVbiNjpXbMF/E8grnT4U613aDs5q3cZx2pHgbDL6XU8db0hlvW2UcO9NEbGtinpi1rQGh0Lg6wGmrTv6raeA4/T1kYlp5A8HcbOHc5p1BXHN1ccFxyelkEsEjmOHYd+4jmFsZXZCLVvR90tx1TmU1U3q5nWa14sI3u5A/hJ9FtJAREQEREBERAREQEREBEVKrqGxsdI42axrnOJ7ALlBhHSvxyMPg6qIg1M4IiG+Ruxkd4X0HMrnCqqHyuMkr3Pe7dzyXE+ancTY0+tqpap5JzuOQH7rAfZaOzT6q3IKDwqd1IkCjkaoAUijhL3sY33nOa1viSkcAtqs/wCjvhNxkbVPaQ1oPVh25J+94KOeUxm6lhjcrpd6jAnsAMRJ0GZvO9tworjK33mOHb7J/RZ5LS2F16pzyWDqbulgIc8+7G49vsu2/opMWE1Mm0bgPzWA+a2A1fVzqd6GHUvCTt5HgdzdT6q6QYayP3Wjx3PqrxIVDkTqtOmRBqGrGOK4c1NKPyk+iyuZi1txrxHcupoeV2yv+rW/qreOW3sr5LJO7AwvYCqtjXpzVtYlEEgggkEEEEaEEbFdAdEHSR9qAoatwE4=" }], "emailId": [{ "language": "ara", "label": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0627\u064A\u0645\u064A\u0644", "value": "sample@samplamail.com" }, { "language": "fre", "label": "identifiant email", "value": "sample@samplamail.com" }], "CNEOrPINNumber": [{ "language": "ara", "label": "\u0631\u0642\u0645 CNE / PIN", "value": "AB453625" }, { "language": "fre", "label": "Numďż˝ro CNE / PIN", "value": "AB453625" }], "parentOrGuardianName": [{ "language": "ara", "label": "\u0627\u0633\u0645 \u0648\u0644\u064A \u0627\u0644\u0623\u0645\u0631 / \u0627\u0644\u0648\u0635\u064A", "value": "\u0633\u0644\u0645\u0649" }, { "language": "fre", "label": "Nom du parent / tuteur", "value": "salma" }], "parentOrGuardianRIDOrUIN": [{ "language": "ara", "label": "\u0627\u0644\u0648\u0627\u0644\u062F / \u0627\u0644\u0648\u0635\u064A RID / UIN", "value": "123456789123" }, { "language": "fre", "label": "parent / tuteur RID / UIN", "value": "123456789123" }], "leftEye": [{ "language": "ara", "label": "\u0627\u0644\u0639\u064A\u0646 \u0627\u0644\u064A\u0633\u0631\u0649", "value": "hashed_fileName.png" }, { "language": "fre", "label": "oeil gauche", "value": "hashed_fileName.png" }], "rightEye": [{ "language": "ara", "label": "\u0627\u0644\u0639\u064A\u0646 \u0627\u0644\u064A\u0645\u0646\u0649", "value": "hashed_fileName.png" }, { "language": "fre", "label": "l'\u0153il droit", "value": "hashed_fileName.png" }], "leftSlap": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 1", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biomďż˝trique 1", "value": "hashed_fileName.png" }], "rightSlap": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 2", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biomďż˝trique 2", "value": "hashed_fileName.png" }], "thumbs": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 3", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biomďż˝trique 3", "value": "hashed_fileName.png" }] } } } \ No newline at end of file diff --git a/authentication/authentication-core/pom.xml b/authentication/authentication-core/pom.xml index 48b32159874..880c432f564 100644 --- a/authentication/authentication-core/pom.xml +++ b/authentication/authentication-core/pom.xml @@ -1,194 +1,194 @@ - - 4.0.0 - - - io.mosip.authentication - authentication-parent - 1.2.1-SNAPSHOT - - 1.2.1-SNAPSHOT - - authentication-core - jar - - authentication-core - Maven project of MOSIP ID-Authentication Core - - - - - io.mosip.kernel - kernel-core - ${kernel-core.version} - - - org.springframework.boot - - spring-boot-starter-security - - - - com.fasterxml.jackson.core - jackson-databind - - - - - - - - commons-codec - commons-codec - ${commons.codec.version} - - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - - - org.springframework.boot - spring-boot-starter-web - ${spring.boot.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - org.springframework.boot - spring-boot-starter-cache - ${spring.boot.version} - - - - - com.machinezoo.sourceafis - sourceafis - ${sourceafis.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - - io.mosip.idrepository - id-repository-core - ${id-repository-core.version} - - - io.mosip.kernel - kernel-auth-adapter - - - org.springframework.boot - - spring-boot-starter-security - - - - org.springframework.security - spring-security-test - - - - - io.mosip.kernel - kernel-biosdk-provider - ${kernel-biosdk-provider.version} - - - io.mosip.kernel - kernel-core - - - io.mosip.kernel - kernel-biometrics-api - - - - - io.mosip.kernel - kernel-demographics-api - ${kernel-demoapi.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - org.springframework.boot - spring-boot-starter-webflux - ${spring.boot.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - io.mosip.kernel - kernel-logger-logback - ${kernel-logger-logback.version} - - - org.springframework.boot - - spring-boot-starter-security - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-afterburner - ${jackson.version} - - - io.mosip.kernel - kernel-biometrics-api - ${kernel-biometrics-api.version} - - - io.mosip.kernel - kernel-core - - - com.fasterxml.jackson.core - jackson-databind - - - - - \ No newline at end of file + + 4.0.0 + + + io.mosip.authentication + authentication-parent + 1.2.1.0 + + 1.2.1.0 + + authentication-core + jar + + authentication-core + Maven project of MOSIP ID-Authentication Core + + + + + io.mosip.kernel + kernel-core + ${kernel-core.version} + + + org.springframework.boot + + spring-boot-starter-security + + + + com.fasterxml.jackson.core + jackson-databind + + + + + + + + commons-codec + commons-codec + ${commons.codec.version} + + + org.apache.commons + commons-lang3 + ${commons.lang.version} + + + + org.springframework.boot + spring-boot-starter-web + ${spring.boot.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + org.springframework.boot + spring-boot-starter-cache + ${spring.boot.version} + + + + + com.machinezoo.sourceafis + sourceafis + ${sourceafis.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + + io.mosip.idrepository + id-repository-core + ${id-repository-core.version} + + + io.mosip.kernel + kernel-auth-adapter + + + org.springframework.boot + + spring-boot-starter-security + + + + org.springframework.security + spring-security-test + + + + + io.mosip.kernel + kernel-biosdk-provider + ${kernel-biosdk-provider.version} + + + io.mosip.kernel + kernel-core + + + io.mosip.kernel + kernel-biometrics-api + + + + + io.mosip.kernel + kernel-demographics-api + ${kernel-demoapi.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + org.springframework.boot + spring-boot-starter-webflux + ${spring.boot.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + org.springdoc + springdoc-openapi-ui + ${springdoc.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + io.mosip.kernel + kernel-logger-logback + ${kernel-logger-logback.version} + + + org.springframework.boot + + spring-boot-starter-security + + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-afterburner + ${jackson.version} + + + io.mosip.kernel + kernel-biometrics-api + ${kernel-biometrics-api.version} + + + io.mosip.kernel + kernel-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/AuditEvents.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/AuditEvents.java index eddf713814a..566996881ca 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/AuditEvents.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/AuditEvents.java @@ -46,7 +46,11 @@ public enum AuditEvents { KYC_EXCHANGE_REQUEST_RESPONSE("IDA_015", "System", "Kyc Exchange Request"), KEY_BINDIN_REQUEST_RESPONSE("IDA_016", "System", "Identity Key Binding Request"), + + VCI_EXCHANGE_REQUEST_RESPONSE("IDA_017", "System", "Vci Exchange Request"), + PASSWORD_BASED_AUTH_REQUEST("IDA_018", "System", "Password Based Auth Request"), + /** Static_Pin_Storage_Request_Response. */ STATIC_PIN_STORAGE_REQUEST_RESPONSE("IDA-EVT-OLD-006","BUSINESS", ""),//not applicable for release v1 diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/AuditModules.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/AuditModules.java index b49641d2eb9..0069e5c6867 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/AuditModules.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/AuditModules.java @@ -23,6 +23,8 @@ public enum AuditModules { FACE_AUTH("IDA-FAA", "Face Authentication Request", "Face Authenticator"), TOKEN_AUTH("IDA-TOA","Token Authentication requested", "Token Authenticator"), + + PASSWORD_AUTH("IDA-PSD","Password Authentication requested", "Password Authenticator"), /** The e KY C AUTH. */ EKYC_AUTH("IDA-EKA", "E-KYC Authentication Request", "eKYC Authenticator"), @@ -31,6 +33,8 @@ public enum AuditModules { KYC_EXCHANGE("IDA-KEX", "KYC Exchange Request", "KYC Exchange"), + VCI_EXCHANGE("IDA-VCI", "VCI Exchange Request", "VCI Exchange"), + IDENTITY_KEY_BINDING("IDA-IKB", "Identity Key Binding Request", "Key Binding"), /** The otp request. */ diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthCommonConstants.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthCommonConstants.java index ab3cf18d428..96ec2319a51 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthCommonConstants.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthCommonConstants.java @@ -248,6 +248,10 @@ public final class IdAuthCommonConstants { /** The Constant USED_STATUS. */ public static final String USED_STATUS = "used"; + + public static final String FROZEN = "frozen"; + + public static final String UNFROZEN = "unfrozen"; /** The Constant EXPIRY_DT. */ public static final String EXPIRY_DT = "expiryDt"; @@ -403,6 +407,68 @@ public final class IdAuthCommonConstants { public static final String CERT_TP_AF_SEPERATOR = "-"; + public static final String CREDENTIAL_SUBJECT_ID = "credSubjectId"; + + public static final String VC_FORMAT = "vcFormat"; + + public static final String VC_AUTH_TOKEN = "vcAuthToken"; + + public static final String VC_CREDENTIAL_TYPE = "credentialType"; + + public static final boolean VCI_EXCHANGE_CONSUME_VID_DEFAULT = true; + + public static final Character COLON = ':'; + + public static final String JWK_KEY_TYPE = "kty"; + + public static final String VC_ID = "id"; + + public static final String LANGUAGE_STRING = "language"; + + public static final String VALUE_STRING = "value"; + + public static final String VC_AT_CONTEXT = "@context"; + + public static final String VC_TYPE = "type"; + + public static final String VC_ISSUER = "issuer"; + + public static final String VC_ISSUANCE_DATE = "issuanceDate"; + + public static final String VC_PROOF_CREATED = "created"; + + public static final String VC_PROOF_PURPOSE = "proofPurpose"; + + public static final String VC_PROOF_TYPE = "type"; + + public static final String VC_PROOF_VERIFICATION_METHOD = "verificationMethod"; + + public static final String CREDENTIALSUBJECT = "credentialSubject"; + + public static final String VCI_EXCHANGE_SUCCESS = "VciExchange status : true"; + + public static final String VC_CREDENTIAL_DEF = "credentialsDefinition"; + + public static final String PASSWORD_BASED_AUTH = "PasswordBasedAuth"; + + public static final String PASSWORD = "password"; + + public static final String SALT = "salt"; + + public static final String SEMI_COLON = ";"; + + public static final String OIDC_CLIENT_DATA = "oidc_client_data"; + + public static final String PARTNER_API_KEY_DATA = "partner_api_key_data"; + + public static final String PARTNER_API_KEY_POLICY_ID_DATA = "partner_api_key_policy_id_data"; + + public static final String PARTNER_DATA = "partner_data"; + + public static final String POLICY_DATA = "policy_data"; + + public static final String MISP_LIC_DATA = "misp_lic_data"; + private IdAuthCommonConstants() { } } diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthConfigKeyConstants.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthConfigKeyConstants.java index d2e58d56797..d678bd80262 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthConfigKeyConstants.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthConfigKeyConstants.java @@ -134,6 +134,7 @@ private IdAuthConfigKeyConstants() { public static final String AUTH_TRANSACTION_STATUS_TOPIC = "ida-topic-auth-transaction-status"; public static final String AUTH_ANONYMOUS_PROFILE_TOPIC = "ida-topic-auth-anonymous-profile"; public static final String AUTH_FRAUD_ANALYSIS_TOPIC = "ida-topic-fraud-analysis"; + public static final String AUTHENTICATION_ERROR_EVENTING_TOPIC = "ida-topic-authentication-error-eventing"; public static final String IDA_MAX_CREDENTIAL_PULL_WINDOW_DAYS = "ida-max-credential-pull-window-days"; public static final String IDA_MAX_WEBSUB_MSG_PULL_WINDOW_DAYS = "ida-max-websub-messages-pull-window-days"; @@ -172,4 +173,6 @@ private IdAuthConfigKeyConstants() { public static final String KYC_EXCHANGE_DEFAULT_LANGUAGE = "mosip.ida.kyc.exchange.default.lang"; public static final String IDP_AMR_ACR_IDA_MAPPING_SOURCE = "idp.amr-acr.ida.mapping.property.source"; + + public static final String AUTHENTICATION_ERROR_EVENTING_ENABLED = "mosip.ida.authentication.error.eventing.enabled"; } diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthenticationErrorConstants.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthenticationErrorConstants.java index ace98f21e97..a34ed44f30c 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthenticationErrorConstants.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthenticationErrorConstants.java @@ -30,7 +30,9 @@ public enum IdAuthenticationErrorConstants { OTP_CHANNEL_NOT_CONFIGURED("IDA-OTA-009", "%s not configured for the country"), OTP_AUTH_IDTYPE_MISMATCH("IDA-OTA-010", "Input Identity Type does not match Identity Type of OTP Request"), PARTNER_ID_MISMATCH("IDA-OTA-011", "Input Partner-ID does not match Partner-ID of OTP Request"), - + OTP_REQUEST_REQUIRED("IDA-OTA-012", "OTP validation can't be performed against this Individual-ID. Generate OTP first."), + OTP_FROZEN("IDA-OTA-013", + "OTP request/validation has been frozen for the Individual-ID for %s due to consecutive failure attempts for %s times."), INVALID_TIMESTAMP("IDA-MLC-001", "Request to be received at MOSIP within %s seconds", "Please send the request within %s seconds"), @@ -65,7 +67,7 @@ public enum IdAuthenticationErrorConstants { "Please capture biometrics within %s seconds of previous biometric capture"), INVALID_BIO_DIGITALID_TIMESTAMP("IDA-MLC-031", "DigitalId of Biometrics not captured within %s seconds of previous biometrics", "Please capture DigitalId of biometrics within %s seconds of previous biometric capture"), - + DEMOGRAPHIC_DATA_MISMATCH_LANG("IDA-DEA-001", "Demographic data %s in %s did not match", "Please re-enter your %s in %s"), DEMO_DATA_MISMATCH("IDA-DEA-001", "Demographic data %s did not match", "Please re-enter your %s"), @@ -94,7 +96,8 @@ public enum IdAuthenticationErrorConstants { BINDED_KEY_NOT_FOUND("IDA-KBT-001", "Certificate not found for the input x5t#S256: %s and authtype: %s"), BINDED_TOKEN_EXPIRED("IDA-KBT-002", "Signed token issued at (iat) is not in allowed time range."), - ERROR_TOKEN_VERIFICATION("IDA-KBT-003", "Error verifying key binded token. Error: %s"), + ERROR_TOKEN_VERIFICATION("IDA-KBT-003", "Binded Token verification failed.", + "Please retry token generation with correct Key."), INVALID_ENCRYPT_EKYC_RESPONSE("IDA-EKA-001", "Unable to encrypt eKYC response"), @@ -144,6 +147,12 @@ public enum IdAuthenticationErrorConstants { "Please bind a key for the input VID/UIN before performing KBT Auth."), KEY_BINDING_CHECK_FAILED("IDA-MPA-035", "KeyBindedToken check failed for the given token.", "Provide Valid KeyBindedToken to perform auth."), + UNAUTHORISED_VCI_EXCHANGE_PARTNER("IDA-MPA-036", "Partner is unauthorised for VCI-Exchange"), + VCI_EXCHANGE_NOT_ALLOWED("IDA-MPA-037", "%s not allowed as per policy", + "Please try after updating misp policy"), + URI_PATH_PARAMS_MISSING("IDA-MPA-038", "Required Number of Path parameters are missing in URI", + "Please try adding all the required path parameters."), + PARTNER_API_EXPIRED("IDA-MPA-039", "Partner API is expired or using before Commence Start Date."), DATA_VALIDATION_FAILED("IDA-IDV-001", "Input Data Validation Failed"), @@ -192,15 +201,27 @@ public enum IdAuthenticationErrorConstants { KYC_TOKEN_ALREADY_PROCESSED("IDA-KYE-003", "KYC Token already processed."), KYC_TOKEN_INVALID_OIDC_CLIENT_ID("IDA-KYE-004", "KYC Token does not belong to the input oidc client id."), KYC_TOKEN_INVALID_TRANSACTION_ID("IDA-KYE-005", "KYC Auth and KYC Exchange transaction ids are different."), - PARTNER_POLICY_NOT_FOUND("IDA-KYE-004", "Partner Policy not found."), + PARTNER_POLICY_NOT_FOUND("IDA-KYE-006", "Partner Policy not found."), + KYC_TOKEN_INVALID_UIN_VID("IDA-KYE-007", "KYC Token does not belong to the input UIN/VID."), ID_KEY_BINDING_NOT_ALLOWED("IDA-IKB-001", "Key Binding not allowed for the Id."), CREATE_PUBLIC_KEY_OBJECT_ERROR("IDA-IKB-002", "Error creating Public Key object."), PUBLIC_KEY_BINDING_NOT_ALLOWED("IDA-IKB-003", "Publick Key already Binded to another Id."), IDENTITY_NAME_NOT_FOUND("IDA-IKB-004", "Identity Name not found."), CREATE_CERTIFICATE_OBJECT_ERROR("IDA-IKB-005", "Error creating Certificate object."), - TOKEN_AUTH_IDTYPE_MISMATCH("IDA-TOA-001", "Input Identity Type does not match Identity Type of Token Request"),; + TOKEN_AUTH_IDTYPE_MISMATCH("IDA-TOA-001", "Input Identity Type does not match Identity Type of Token Request"), + + KEY_TYPE_NOT_SUPPORT("IDA-VCI-001", "Not Supported JWK Key Type."), + CREATE_VCI_PUBLIC_KEY_OBJECT_ERROR("IDA-VCI-002", "Error creating Public Key object."), + KEY_ALREADY_MAPPED_ERROR("IDA-VCI-003", "Error Key already mapped to different id/vid."), + VCI_NOT_SUPPORTED_ERROR("IDA-VCI-004", "Error VCI not supported."), + LDP_VC_GENERATION_FAILED("IDA-VCI-005", "Ldp VC generation Failed."), + + PASSWORD_MISMATCH("IDA-PSD-001", "Password value did not match", "Please re-enter your correct password"), + PASSWORD_MISSING("IDA-PSD-002", "For the input VID/UIN - No Password found in DB.", + "Please use UIN/VID with Password Auth."); + private final String errorCode; private final String errorMessage; private String actionMessage; diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/RequestType.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/RequestType.java index 6f713d7c237..870913f7ef8 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/RequestType.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/RequestType.java @@ -20,7 +20,9 @@ public enum RequestType { KYC_EXCHANGE_REQUEST("KYC-EXCHANGE","KYC Exchange Request"), IDENTITY_KEY_BINDING("IDENTITY-KEY-BINDING","Identity Key Binding Request"), TOKEN_REQUEST("TOKEN-REQUEST", "Token Request"), - TOKEN_AUTH("TOKEN-AUTH","Token based Authentication"); + TOKEN_AUTH("TOKEN-AUTH","Token based Authentication"), + VCI_EXCHANGE_REQUEST("VCI-EXCHANGE-REQUEST","VCI Exchange Request"), + PASSWORD_AUTH("PASSWORD-AUTH","Password Auth"); String type; String message; diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/VCFormats.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/VCFormats.java new file mode 100644 index 00000000000..83d90fc29ae --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/VCFormats.java @@ -0,0 +1,18 @@ +package io.mosip.authentication.core.constant; + +public enum VCFormats { + LDP_VC("ldp_vc"), + JWT_VC_JSON("jwt_vc_json"), + JWT_VC_JSON_LD("jwt_vc_json-ld"), + MSO_MDOC("mso_mdoc"); + + private final String format; + + private VCFormats(String format) { + this.format = format; + } + + public String getFormat() { + return format; + } +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/VCStatus.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/VCStatus.java new file mode 100644 index 00000000000..b96ce536844 --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/VCStatus.java @@ -0,0 +1,24 @@ +package io.mosip.authentication.core.constant; + +public enum VCStatus { + + /** */ + ACTIVE("ACTIVE"), + + /** */ + INACTIVE("INACTIVE"), + + /** */ + REVOKED("REVOKED"); + + private String status; + + private VCStatus(String status) { + this.status = status; + } + + public String getStatus() { + return this.status; + } + +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/IdType.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/IdType.java index 5a6eb8861e9..8831f219dd5 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/IdType.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/IdType.java @@ -24,7 +24,8 @@ public enum IdType { /** The uin. */ UIN("UIN"), /** The vid. */ - VID("VID") + VID("VID"), + HANDLE("HANDLE") ; /** diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/KycRequestDTO.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/KycRequestDTO.java index 90c9587478f..02fda3481ad 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/KycRequestDTO.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/KycRequestDTO.java @@ -10,4 +10,6 @@ public class KycRequestDTO extends RequestDTO { /** H/W or S/W token */ private List keyBindedTokens; + + private String password; } diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VCResponseDTO.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VCResponseDTO.java new file mode 100644 index 00000000000..5be31b3b2f8 --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VCResponseDTO.java @@ -0,0 +1,18 @@ +package io.mosip.authentication.core.indauth.dto; + +import lombok.Data; + +/** + * The class for VCResponseDTO Holds the values for Verifiable Credential response data. + * + * @author Mahammed Taheer + * + */ + +@Data +public class VCResponseDTO { + + /** The Variable to hold value of Verifiable Credentials data */ + private T verifiableCredentials; + +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VciCredentialsDefinitionRequestDTO.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VciCredentialsDefinitionRequestDTO.java new file mode 100644 index 00000000000..9d2667d0a1c --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VciCredentialsDefinitionRequestDTO.java @@ -0,0 +1,26 @@ +package io.mosip.authentication.core.indauth.dto; + +import java.util.List; +import java.util.Map; + +import lombok.Data; + +/** + * The Class VciCredentialsDefinitionRequestDTO for credential definition input. + * + * @author Mahammed Taheer + * + */ +@Data +public class VciCredentialsDefinitionRequestDTO { + + /** */ + private Map credentialSubject; + + /** */ + private List type; + + /** */ + private List context; + +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VciExchangeRequestDTO.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VciExchangeRequestDTO.java new file mode 100644 index 00000000000..1b36f908830 --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VciExchangeRequestDTO.java @@ -0,0 +1,42 @@ +package io.mosip.authentication.core.indauth.dto; + +import java.util.List; +import java.util.Map; + +import javax.validation.constraints.NotNull; + +import io.mosip.authentication.core.dto.ObjectWithMetadata; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * The class VciExchangeRequestDTO to holds the request parameters + * for VCI Exchange. + * + * @author Mahammed Taheer + * + */ +@Data +@EqualsAndHashCode(callSuper=true) +public class VciExchangeRequestDTO extends BaseRequestDTO implements ObjectWithMetadata { + + /** The Variable to hold value of kyc Token */ + @NotNull + private String vcAuthToken; + + /** The Variable to hold value of Credential Subject Id */ + @NotNull + private String credSubjectId; + + /** The Variable to hold value of VC Format type */ + @NotNull + private String vcFormat; + + /** The Variable to hold value of credential definition */ + private VciCredentialsDefinitionRequestDTO credentialsDefinition; + + /** The Variable to hold value of list of user selected locales */ + private List locales; + + private Map metadata; +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VciExchangeResponseDTO.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VciExchangeResponseDTO.java new file mode 100644 index 00000000000..f96da1b093d --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/indauth/dto/VciExchangeResponseDTO.java @@ -0,0 +1,19 @@ +package io.mosip.authentication.core.indauth.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * The Class For VciExchangeResponseDTO extending {@link BaseAuthResponseDTO} + * + * @author Mahammed Taheer + */ + +@Data +@EqualsAndHashCode(callSuper=true) +public class VciExchangeResponseDTO extends BaseAuthResponseDTO { + + /** The VCResponseDTO */ + private VCResponseDTO response; + +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/partner/dto/MispPolicyDTO.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/partner/dto/MispPolicyDTO.java index 4d4c050ac24..8798de4688f 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/partner/dto/MispPolicyDTO.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/partner/dto/MispPolicyDTO.java @@ -17,4 +17,6 @@ public class MispPolicyDTO { private boolean allowOTPRequestDelegation; private boolean allowKeyBindingDelegation; + + private boolean allowVciRequestDelegation; } diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/facade/KycFacade.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/facade/KycFacade.java index bdfd1342f5c..061275376af 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/facade/KycFacade.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/facade/KycFacade.java @@ -1,6 +1,7 @@ package io.mosip.authentication.core.spi.indauth.facade; import java.util.Map; + import javax.annotation.Nonnull; import io.mosip.authentication.core.dto.ObjectWithMetadata; @@ -8,9 +9,8 @@ import io.mosip.authentication.core.exception.IdAuthenticationDaoException; import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; import io.mosip.authentication.core.indauth.dto.AuthResponseDTO; -import io.mosip.authentication.core.indauth.dto.BaseAuthResponseDTO; -import io.mosip.authentication.core.indauth.dto.EkycAuthRequestDTO; import io.mosip.authentication.core.indauth.dto.EKycAuthResponseDTO; +import io.mosip.authentication.core.indauth.dto.EkycAuthRequestDTO; import io.mosip.authentication.core.indauth.dto.KycAuthResponseDTO; import io.mosip.authentication.core.indauth.dto.KycExchangeRequestDTO; import io.mosip.authentication.core.indauth.dto.KycExchangeResponseDTO; diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/facade/VciFacade.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/facade/VciFacade.java new file mode 100644 index 00000000000..2fb379acea7 --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/facade/VciFacade.java @@ -0,0 +1,32 @@ +package io.mosip.authentication.core.spi.indauth.facade; + +import java.util.Map; + +import io.mosip.authentication.core.dto.ObjectWithMetadata; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeResponseDTO; + +/** + * This class used to integrate with VCI service + * + * @author Mahammed Taheer + */ +public interface VciFacade { + + /** + * Process the VciExchangeRequestDTO to integrate with VciService. + * + * @param vciExchangeRequestDTO is DTO of VciExchangeRequestDTO + * @param partnerId the partner id + * @param oidcClientId the client id + * @param metadata the metadata + * @param requestWithMetadata the request with metadata + * @return the VCI Exchange response DTO + * @throws IdAuthenticationBusinessException the id authentication business + * exception + */ + VciExchangeResponseDTO processVciExchange(VciExchangeRequestDTO vciExchangeRequestDTO, + String partnerId, String oidcClientId, Map metadata, ObjectWithMetadata requestWithMetadata) throws IdAuthenticationBusinessException; + +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/ComparePasswordFunction.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/ComparePasswordFunction.java new file mode 100644 index 00000000000..41464cc05bb --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/ComparePasswordFunction.java @@ -0,0 +1,22 @@ +package io.mosip.authentication.core.spi.indauth.match; + +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; + +/** + * To match Password against Stored Hashed Password and Salt + + */ +public interface ComparePasswordFunction { + + /** + * To Match Password. + * + * @param passwordValue the password value + * @param passwordHashValue the stored password hash value + * @param salt the stored salt value + * @return true, if successful + * @throws IdAuthenticationBusinessException the id authentication business exception + */ + public boolean matchPasswordFunction(String passwordValue, String passwordHashValue, String salt) throws IdAuthenticationBusinessException; + +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/IdInfoFetcher.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/IdInfoFetcher.java index 92c1585159b..237e97b6a22 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/IdInfoFetcher.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/IdInfoFetcher.java @@ -1,241 +1,261 @@ -package io.mosip.authentication.core.spi.indauth.match; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.springframework.core.env.Environment; - -import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; -import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; -import io.mosip.authentication.core.indauth.dto.RequestDTO; -import io.mosip.authentication.core.spi.bioauth.CbeffDocType; -import io.mosip.authentication.core.util.DemoMatcherUtil; -import io.mosip.authentication.core.util.DemoNormalizer; - -/** - * The IdInfoFetcher interface that provides the helper methods invoked by the - * classes involved in ID Info matching. - * - * @author Loganathan.Sekar - * @author Nagarjuna - */ -public interface IdInfoFetcher { - - /** - * Gets the template default language codes - * @return - */ - public List getTemplatesDefaultLanguageCodes(); - - /** - * Gets the system supported languages. - * Combination of Mandatory and optional languages. - * @return - */ - public List getSystemSupportedLanguageCodes(); - - /** - * To check language type. - * - * @param languageForMatchType the language for match type - * @param languageFromReq the language from req - * @return true, if successful - */ - public boolean checkLanguageType(String languageForMatchType, String languageFromReq); - - /** - * Get language name for Match Properties based on language code. - * - * @param languageCode language code - * @return language name - */ - public Optional getLanguageName(String languageCode); - - /** - * Gets the identity info for the MatchType from the IdentityDTO. - * - * @param matchType the match type - * @param idName - * @param identity the identity - * @param language the language - * @return the identity info - */ - public Map getIdentityRequestInfo(MatchType matchType, String idName, RequestDTO identity, String language); - - /** - * Gets the identity info. - * - * @param matchType the match type - * @param idName the id name - * @param identity the identity - * @return the identity info - */ - public Map> getIdentityInfo(MatchType matchType, String idName, RequestDTO identity); - - /** - * Gets the identity info for the MatchType from the IdentityDTO. - * - * @param matchType the match type - * @param idName - * @param identity the identity - * @param language the language - * @return the identity info - */ - public Map getIdentityRequestInfo(MatchType matchType, RequestDTO identity, String language); - - /** - * Get the Validate Otp function. - * - * @return the ValidateOtpFunction - */ - public ValidateOtpFunction getValidateOTPFunction(); - - /** - * To fetch cbeff values. - * - * @param idEntity the id entity - * @param cbeffDocTypes the cbeff doc types - * @param matchType the match type - * @return the cbeff values - * @throws IdAuthenticationBusinessException the id authentication business exception - */ - public Map>> getCbeffValues(Map> idEntity, - CbeffDocType[] cbeffDocTypes, MatchType matchType) throws IdAuthenticationBusinessException; - - /** - * To get EnvPropertyResolver. - * - * @return the environment - */ - public Environment getEnvironment(); - - /** - * Title info fetcher from Master data manager. - * - * @return the title fetcher - */ - public MasterDataFetcher getTitleFetcher(); - - /** - * Gets the matching threshold. - * - * @param key the key - * @return the matching threshold - */ - public Optional getMatchingThreshold(String key); - - - /** - * Gets the demo normalizer object to normalise the - * corresponding(address/name) used for demographic authentication - * . - * - * @return the demo normalizer - */ - public DemoNormalizer getDemoNormalizer(); - - /** - * Gets the user preferred language attribute - * @return - */ - public List getUserPreferredLanguages(Map> idInfo); - - - /** - * Gets the match function. - * - * @param authType the auth type - * @return the match function - */ - public TriFunctionWithBusinessException, Map, Map, Double> getMatchFunction(AuthType authType); - - - /** - * Gets the type for id name. - * - * @param idName the id name - * @param idMappings the id mappings - * @return the type for id name - */ - public Optional getTypeForIdName(String idName, IdMapping[] idMappings); - - /** - * Gets the mapping config. - * - * @return the mapping config - */ - public MappingConfig getMappingConfig(); - - /** - * - * @return - */ - public DemoMatcherUtil getDemoMatcherUtil(); - - - /** - * Gets the available dynamic attributes names. - * - * @param request the request - * @return the available dynamic attributes names - */ - Set getAvailableDynamicAttributesNames(RequestDTO request); - - /** - * Fetch data from Identity info value based on Identity response. - * - * @param idResponseDTO the id response DTO - * @return the id info - * @throws IdAuthenticationBusinessException the id authentication business exception - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - public static Map> getIdInfo(Map idResponseDTO) { - return idResponseDTO.entrySet().stream().flatMap(entry -> { - if (entry.getValue() instanceof Map) { - return ((Map) entry.getValue()).entrySet().stream(); - } else { - return Stream.of(entry); - } - }).collect(Collectors.toMap(t -> t.getKey(), entry -> { - Object val = entry.getValue(); - if (val instanceof List) { - List arrayList = (List) val; - if (!arrayList.isEmpty()) { - Object object = arrayList.get(0); - if (object instanceof Map) { - return arrayList.stream().filter(elem -> elem instanceof Map) - .map(elem -> (Map) elem).map(map1 -> { - String value = String.valueOf(map1.get("value")); - IdentityInfoDTO idInfo = new IdentityInfoDTO(); - if (map1.containsKey("language")) { - idInfo.setLanguage(String.valueOf(map1.get("language"))); - } - idInfo.setValue(value); - return idInfo; - }).collect(Collectors.toList()); - - } else if (object instanceof String) { - return arrayList.stream().map(string -> { - String value = (String) string; - IdentityInfoDTO idInfo = new IdentityInfoDTO(); - idInfo.setValue(value); - return idInfo; - }).collect(Collectors.toList()); - } - } - } else if (val instanceof Boolean || val instanceof String || val instanceof Long || val instanceof Integer - || val instanceof Double || val instanceof Float) { - IdentityInfoDTO idInfo = new IdentityInfoDTO(); - idInfo.setValue(String.valueOf(val)); - return Stream.of(idInfo).collect(Collectors.toList()); - } - return Collections.emptyList(); - })); - } -} +package io.mosip.authentication.core.spi.indauth.match; + +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.PASSWORD; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.SEMI_COLON; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.COLON; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.springframework.core.env.Environment; + +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.RequestDTO; +import io.mosip.authentication.core.spi.bioauth.CbeffDocType; +import io.mosip.authentication.core.util.DemoMatcherUtil; +import io.mosip.authentication.core.util.DemoNormalizer; + +/** + * The IdInfoFetcher interface that provides the helper methods invoked by the + * classes involved in ID Info matching. + * + * @author Loganathan.Sekar + * @author Nagarjuna + */ +public interface IdInfoFetcher { + + /** + * Gets the template default language codes + * @return + */ + public List getTemplatesDefaultLanguageCodes(); + + /** + * Gets the system supported languages. + * Combination of Mandatory and optional languages. + * @return + */ + public List getSystemSupportedLanguageCodes(); + + /** + * To check language type. + * + * @param languageForMatchType the language for match type + * @param languageFromReq the language from req + * @return true, if successful + */ + public boolean checkLanguageType(String languageForMatchType, String languageFromReq); + + /** + * Get language name for Match Properties based on language code. + * + * @param languageCode language code + * @return language name + */ + public Optional getLanguageName(String languageCode); + + /** + * Gets the identity info for the MatchType from the IdentityDTO. + * + * @param matchType the match type + * @param idName + * @param identity the identity + * @param language the language + * @return the identity info + */ + public Map getIdentityRequestInfo(MatchType matchType, String idName, RequestDTO identity, String language); + + /** + * Gets the identity info. + * + * @param matchType the match type + * @param idName the id name + * @param identity the identity + * @return the identity info + */ + public Map> getIdentityInfo(MatchType matchType, String idName, RequestDTO identity); + + /** + * Gets the identity info for the MatchType from the IdentityDTO. + * + * @param matchType the match type + * @param idName + * @param identity the identity + * @param language the language + * @return the identity info + */ + public Map getIdentityRequestInfo(MatchType matchType, RequestDTO identity, String language); + + /** + * Get the Validate Otp function. + * + * @return the ValidateOtpFunction + */ + public ValidateOtpFunction getValidateOTPFunction(); + + /** + * To fetch cbeff values. + * + * @param idEntity the id entity + * @param cbeffDocTypes the cbeff doc types + * @param matchType the match type + * @return the cbeff values + * @throws IdAuthenticationBusinessException the id authentication business exception + */ + public Map>> getCbeffValues(Map> idEntity, + CbeffDocType[] cbeffDocTypes, MatchType matchType) throws IdAuthenticationBusinessException; + + /** + * To get EnvPropertyResolver. + * + * @return the environment + */ + public Environment getEnvironment(); + + /** + * Title info fetcher from Master data manager. + * + * @return the title fetcher + */ + public MasterDataFetcher getTitleFetcher(); + + /** + * Gets the matching threshold. + * + * @param key the key + * @return the matching threshold + */ + public Optional getMatchingThreshold(String key); + + + /** + * Gets the demo normalizer object to normalise the + * corresponding(address/name) used for demographic authentication + * . + * + * @return the demo normalizer + */ + public DemoNormalizer getDemoNormalizer(); + + /** + * Gets the user preferred language attribute + * @return + */ + public List getUserPreferredLanguages(Map> idInfo); + + + /** + * Gets the match function. + * + * @param authType the auth type + * @return the match function + */ + public TriFunctionWithBusinessException, Map, Map, Double> getMatchFunction(AuthType authType); + + + /** + * Gets the type for id name. + * + * @param idName the id name + * @param idMappings the id mappings + * @return the type for id name + */ + public Optional getTypeForIdName(String idName, IdMapping[] idMappings); + + /** + * Gets the mapping config. + * + * @return the mapping config + */ + public MappingConfig getMappingConfig(); + + /** + * + * @return + */ + public DemoMatcherUtil getDemoMatcherUtil(); + + + /** + * Gets the available dynamic attributes names. + * + * @param request the request + * @return the available dynamic attributes names + */ + Set getAvailableDynamicAttributesNames(RequestDTO request); + + /** + * Fetch data from Identity info value based on Identity response. + * + * @param idResponseDTO the id response DTO + * @return the id info + * @throws IdAuthenticationBusinessException the id authentication business exception + */ + @SuppressWarnings({ "unchecked", "rawtypes" }) + public static Map> getIdInfo(Map idResponseDTO) { + return idResponseDTO.entrySet().stream().flatMap(entry -> { + if (entry.getValue() instanceof Map) { + return ((Map) entry.getValue()).entrySet().stream(); + } else { + return Stream.of(entry); + } + }).collect(Collectors.toMap(t -> t.getKey(), entry -> { + Object val = entry.getValue(); + if (val instanceof List) { + List arrayList = (List) val; + if (!arrayList.isEmpty()) { + Object object = arrayList.get(0); + if (object instanceof Map) { + return arrayList.stream().filter(elem -> elem instanceof Map) + .map(elem -> (Map) elem).map(map1 -> { + String value = String.valueOf(map1.get("value")); + IdentityInfoDTO idInfo = new IdentityInfoDTO(); + if (map1.containsKey("language")) { + idInfo.setLanguage(String.valueOf(map1.get("language"))); + } + idInfo.setValue(value); + return idInfo; + }).collect(Collectors.toList()); + + } else if (object instanceof String) { + return arrayList.stream().map(string -> { + String value = (String) string; + IdentityInfoDTO idInfo = new IdentityInfoDTO(); + idInfo.setValue(value); + return idInfo; + }).collect(Collectors.toList()); + } + } + } else if (val instanceof Boolean || val instanceof String || val instanceof Long || val instanceof Integer + || val instanceof Double || val instanceof Float) { + IdentityInfoDTO idInfo = new IdentityInfoDTO(); + idInfo.setValue(String.valueOf(val)); + return Stream.of(idInfo).collect(Collectors.toList()); + } else if (entry.getKey().equals(PASSWORD) && val instanceof Map) { + Map map = (Map) val; + String passwordData = map.entrySet().stream() + .map(mapEntry -> mapEntry.getKey().trim() + String.valueOf(COLON) + mapEntry.getValue().trim()) + .collect(Collectors.joining(SEMI_COLON)); + IdentityInfoDTO idInfo = new IdentityInfoDTO(); + idInfo.setValue(String.valueOf(passwordData)); + return Stream.of(idInfo).collect(Collectors.toList()); + } + + return Collections.emptyList(); + })); + } + + /** + * To Get match Password function. + * + * @return the ComparePasswordFunction + */ + public ComparePasswordFunction getMatchPasswordFunction(); +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/MappingConfig.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/MappingConfig.java index 4f8e57e2fef..b7281c5acb8 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/MappingConfig.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/MappingConfig.java @@ -1,245 +1,252 @@ -package io.mosip.authentication.core.spi.indauth.match; - -import java.util.List; -import java.util.Map; - -/** - * The Interface MappingConfig. - * - * @author Dinesh Karuppiah.T - */ - -public interface MappingConfig { - - /** - * List of value to hold Full Name. - * - * @return the name - */ - public List getName(); - - /** - * List of value to hold DOB. - * - * @return the dob - */ - public List getDob(); - - /** - * List of value to hold DOBtype. - * - * @return the dob type - */ - public List getDobType(); - - /** - * List of value to hold Age. - * - * @return the age - */ - public List getAge(); - - /** - * List of value to hold Gender. - * - * @return the gender - */ - public List getGender(); - - /** - * List of value to hold Phone Number. - * - * @return the phone number - */ - public List getPhoneNumber(); - - /** - * List of value to hold Email ID. - * - * @return the email id - */ - public List getEmailId(); - - /** - * List of value to hold Address Line 1. - * - * @return the address line 1 - */ - public List getAddressLine1(); - - /** - * List of value to hold Address Line 2. - * - * @return the address line 2 - */ - public List getAddressLine2(); - - /** - * List of value to hold Address Line 3. - * - * @return the address line 3 - */ - public List getAddressLine3(); - - /** - * List of value to hold Location 1. - * - * @return the location 1 - */ - public List getLocation1(); - - /** - * List of value to hold Location 2. - * - * @return the location 2 - */ - public List getLocation2(); - - /** - * List of value to hold Location 3. - * - * @return the location 3 - */ - public List getLocation3(); - - /** - * List of value to hold Postalcode. - * - * @return the pin code - */ - public List getPostalCode(); - - /** - * List of value to hold Full Address. - * - * @return the full address - */ - public List getFullAddress(); - - /** - * List of value to hold Otp. - * - * @return the otp - */ - public List getOtp(); - - /** - * List of value to hold Pin. - * - * @return the pin - */ - public List getPin(); - - /** - * List of value to hold IRIS. - * - * @return the iris - */ - public List getIris(); - - /** - * List of value to hold Left Index. - * - * @return the left index - */ - - public List getLeftIndex(); - - /** - * List of value to hold Left Little. - * - * @return the left little - */ - public List getLeftLittle(); - - /** - * List of value to hold Left Middle. - * - * @return the left middle - */ - public List getLeftMiddle(); - - /** - * List of value to hold Left Ring. - * - * @return the left ring - */ - public List getLeftRing(); - - /** - * List of value to hold Left Thumb. - * - * @return the left thumb - */ - public List getLeftThumb(); - - /** - * List of value to hold Right Index. - * - * @return the right index - */ - public List getRightIndex(); - - /** - * List of value to hold Right Little. - * - * @return the right little - */ - public List getRightLittle(); - - /** - * List of value to hold Right Middle. - * - * @return the right middle - */ - public List getRightMiddle(); - - /** - * List of value to hold Right Ring. - * - * @return the right ring - */ - public List getRightRing(); - - /** - * List of value to hold Right Thumb. - * - * @return the right thumb - */ - public List getRightThumb(); - - /** - * List of value to hold Finger print. - * - * @return the fingerprint - */ - public List getFingerprint(); - - /** - * List of value to hold Face. - * - * @return the face - */ - public List getFace(); - - /** - * Gets the left eye. - * - * @return the left eye - */ - public List getLeftEye(); - - /** - * Gets the right eye. - * - * @return the right eye - */ - public List getRightEye(); - - /** - * Gets the dynamic attributes. - * - * @return the dynamic attributes - */ - public Map> getDynamicAttributes(); -} +package io.mosip.authentication.core.spi.indauth.match; + +import java.util.List; +import java.util.Map; + +/** + * The Interface MappingConfig. + * + * @author Dinesh Karuppiah.T + */ + +public interface MappingConfig { + + /** + * List of value to hold Full Name. + * + * @return the name + */ + public List getName(); + + /** + * List of value to hold DOB. + * + * @return the dob + */ + public List getDob(); + + /** + * List of value to hold DOBtype. + * + * @return the dob type + */ + public List getDobType(); + + /** + * List of value to hold Age. + * + * @return the age + */ + public List getAge(); + + /** + * List of value to hold Gender. + * + * @return the gender + */ + public List getGender(); + + /** + * List of value to hold Phone Number. + * + * @return the phone number + */ + public List getPhoneNumber(); + + /** + * List of value to hold Email ID. + * + * @return the email id + */ + public List getEmailId(); + + /** + * List of value to hold Address Line 1. + * + * @return the address line 1 + */ + public List getAddressLine1(); + + /** + * List of value to hold Address Line 2. + * + * @return the address line 2 + */ + public List getAddressLine2(); + + /** + * List of value to hold Address Line 3. + * + * @return the address line 3 + */ + public List getAddressLine3(); + + /** + * List of value to hold Location 1. + * + * @return the location 1 + */ + public List getLocation1(); + + /** + * List of value to hold Location 2. + * + * @return the location 2 + */ + public List getLocation2(); + + /** + * List of value to hold Location 3. + * + * @return the location 3 + */ + public List getLocation3(); + + /** + * List of value to hold Postalcode. + * + * @return the pin code + */ + public List getPostalCode(); + + /** + * List of value to hold Full Address. + * + * @return the full address + */ + public List getFullAddress(); + + /** + * List of value to hold Otp. + * + * @return the otp + */ + public List getOtp(); + + /** + * List of value to hold Pin. + * + * @return the pin + */ + public List getPin(); + + /** + * List of value to hold IRIS. + * + * @return the iris + */ + public List getIris(); + + /** + * List of value to hold Left Index. + * + * @return the left index + */ + + public List getLeftIndex(); + + /** + * List of value to hold Left Little. + * + * @return the left little + */ + public List getLeftLittle(); + + /** + * List of value to hold Left Middle. + * + * @return the left middle + */ + public List getLeftMiddle(); + + /** + * List of value to hold Left Ring. + * + * @return the left ring + */ + public List getLeftRing(); + + /** + * List of value to hold Left Thumb. + * + * @return the left thumb + */ + public List getLeftThumb(); + + /** + * List of value to hold Right Index. + * + * @return the right index + */ + public List getRightIndex(); + + /** + * List of value to hold Right Little. + * + * @return the right little + */ + public List getRightLittle(); + + /** + * List of value to hold Right Middle. + * + * @return the right middle + */ + public List getRightMiddle(); + + /** + * List of value to hold Right Ring. + * + * @return the right ring + */ + public List getRightRing(); + + /** + * List of value to hold Right Thumb. + * + * @return the right thumb + */ + public List getRightThumb(); + + /** + * List of value to hold Finger print. + * + * @return the fingerprint + */ + public List getFingerprint(); + + /** + * List of value to hold Face. + * + * @return the face + */ + public List getFace(); + + /** + * Gets the left eye. + * + * @return the left eye + */ + public List getLeftEye(); + + /** + * Gets the right eye. + * + * @return the right eye + */ + public List getRightEye(); + + /** + * Gets the dynamic attributes. + * + * @return the dynamic attributes + */ + public Map> getDynamicAttributes(); + + /** + * List of value to hold password. + * + * @return the password + */ + public List getPassword(); +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/MatchType.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/MatchType.java index 9866f289c78..1965b389880 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/MatchType.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/MatchType.java @@ -1,207 +1,210 @@ -package io.mosip.authentication.core.spi.indauth.match; - -import java.util.AbstractMap.SimpleEntry; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; -import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; -import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; -import io.mosip.authentication.core.indauth.dto.RequestDTO; - -/** - * Base interface for the match type. - * - * @author Loganathan Sekar - * @author Dinesh Karuppiah.T - */ -public interface MatchType { - - /** - * The Category Enum - */ - public enum Category { - - /** Demo category */ - DEMO("demo"), - /** OTP category */ - OTP("otp"), - /** Bio category */ - BIO("bio"), - /** s-pin category. */ - SPIN("pin"), - /** Token category */ - KBT("kbt"); - - /** The type. */ - String type; - - /** - * Instantiates a Category. - * - * @param type the type - */ - private Category(String type) { - this.type = type; - } - - /** - * Gets the type. - * - * @return the type - */ - public String getType() { - return type; - } - - /** - * Get the category for the type. - * - * @param type the type - * @return Optional of category - */ - public static Optional getCategory(String type) { - return Stream.of(values()).filter(t -> t.getType().equals(type)).findAny(); - } - - } - - /** - * Gets the IDMapping. - * - * @return ID Mapping - */ - public IdMapping getIdMapping(); - - /** - * Gets the allowed matching strategy for the MatchingStrategyType value. - * - * @param matchStrategyType the match strategy type - * @return the allowed matching strategy - */ - Optional getAllowedMatchingStrategy(MatchingStrategyType matchStrategyType); - - /** - * Get the Identity Info Function. - * - * @return the Identity Info Function - */ - public Function>> getIdentityInfoFunction(); - - /** - * Get the Identity Info Function. - * - * @return the reqest info function - */ - public default Function> getReqestInfoFunction() { - return req -> Collections.emptyMap(); - } - - /** - * Get the IdentityInfoDTO list out of the identity block for this MatchType. - * - * @param identity the IdentityDTO - * @return the list of IdentityInfoDTO - */ - public default List getIdentityInfoList(RequestDTO identity) { - return getIdentityInfoFunction().apply(identity).values().stream().filter(Objects::nonNull) - .flatMap(List::stream).collect(Collectors.toList()); - } - - /** - * Gets the Entity info mapper function. - * - * @return the Entity info mapper function - */ - public BiFunction, Map, Map> getEntityInfoMapper(); - - /** - * Get the category of this MatchType. - * - * @return the category - */ - public Category getCategory(); - - /** - * Flag to fetch Identity Info. - * - * @return boolean value true or false - */ - public default boolean hasIdEntityInfo() { - return true; - } - - /** - * Flag to fetch Request Entity Info. - * - * @return the flag - */ - public default boolean hasRequestEntityInfo() { - return false; - } - - /** - * Flag to check MultiLanguage. - * - * @return the flag - */ - public default boolean isMultiLanguage() { - return false; - } - - public default boolean isMultiLanguage(String propName, Map> identityEntity, MappingConfig mappingConfig) { - return isMultiLanguage(); - } - /** - * Returns the set of given matching strategies. - * - * @param items the matching strategies - * @return the sets the - */ - public static Set setOf(T... items) { - return Stream.of(items).collect(Collectors.toSet()); - - } - - /** - * To fetch Map Entity Info. - * - * @param idEntity the id entity - * @param idInfoHelper the id info helper - * @return the map - * @throws IdAuthenticationBusinessException the id authentication business exception - */ - public default Map>> mapEntityInfo( - Map> idEntity, IdInfoFetcher idInfoHelper) - throws IdAuthenticationBusinessException { - return idEntity.entrySet().stream() - .collect(Collectors.toMap(Entry::getKey, entry -> new SimpleEntry<>(entry.getKey(), entry.getValue()))); - } - - /** - * Check if the mapped property is of multi-language type. - * - * @param propName mapped property name - * @param cfg mapping - * @return true, if is prop multi lang - */ - public default boolean isPropMultiLang(String propName, MappingConfig cfg) { - return false; - } - - public default boolean isDynamic() { - return false; - } - -} +package io.mosip.authentication.core.spi.indauth.match; + +import java.util.AbstractMap.SimpleEntry; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.AuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.RequestDTO; + +/** + * Base interface for the match type. + * + * @author Loganathan Sekar + * @author Dinesh Karuppiah.T + */ +public interface MatchType { + + /** + * The Category Enum + */ + public enum Category { + + /** Demo category */ + DEMO("demo"), + /** OTP category */ + OTP("otp"), + /** Bio category */ + BIO("bio"), + /** s-pin category. */ + SPIN("pin"), + /** Token category */ + KBT("kbt"), + /** Password category */ + PWD("pwd"); + + /** The type. */ + String type; + + /** + * Instantiates a Category. + * + * @param type the type + */ + private Category(String type) { + this.type = type; + } + + /** + * Gets the type. + * + * @return the type + */ + public String getType() { + return type; + } + + /** + * Get the category for the type. + * + * @param type the type + * @return Optional of category + */ + public static Optional getCategory(String type) { + return Stream.of(values()).filter(t -> t.getType().equals(type)).findAny(); + } + + } + + /** + * Gets the IDMapping. + * + * @return ID Mapping + */ + public IdMapping getIdMapping(); + + /** + * Gets the allowed matching strategy for the MatchingStrategyType value. + * + * @param matchStrategyType the match strategy type + * @return the allowed matching strategy + */ + Optional getAllowedMatchingStrategy(MatchingStrategyType matchStrategyType); + + /** + * Get the Identity Info Function. + * + * @return the Identity Info Function + */ + public Function>> getIdentityInfoFunction(); + + /** + * Get the Identity Info Function. + * + * @return the reqest info function + */ + public default Function> getReqestInfoFunction() { + return req -> Collections.emptyMap(); + } + + /** + * Get the IdentityInfoDTO list out of the identity block for this MatchType. + * + * @param identity the IdentityDTO + * @return the list of IdentityInfoDTO + */ + public default List getIdentityInfoList(RequestDTO identity) { + return getIdentityInfoFunction().apply(identity).values().stream().filter(Objects::nonNull) + .flatMap(List::stream).collect(Collectors.toList()); + } + + /** + * Gets the Entity info mapper function. + * + * @return the Entity info mapper function + */ + public BiFunction, Map, Map> getEntityInfoMapper(); + + /** + * Get the category of this MatchType. + * + * @return the category + */ + public Category getCategory(); + + /** + * Flag to fetch Identity Info. + * + * @return boolean value true or false + */ + public default boolean hasIdEntityInfo() { + return true; + } + + /** + * Flag to fetch Request Entity Info. + * + * @return the flag + */ + public default boolean hasRequestEntityInfo() { + return false; + } + + /** + * Flag to check MultiLanguage. + * + * @return the flag + */ + public default boolean isMultiLanguage() { + return false; + } + + public default boolean isMultiLanguage(String propName, Map> identityEntity, MappingConfig mappingConfig) { + return isMultiLanguage(); + } + /** + * Returns the set of given matching strategies. + * + * @param items the matching strategies + * @return the sets the + */ + public static Set setOf(T... items) { + return Stream.of(items).collect(Collectors.toSet()); + + } + + /** + * To fetch Map Entity Info. + * + * @param idEntity the id entity + * @param idInfoHelper the id info helper + * @return the map + * @throws IdAuthenticationBusinessException the id authentication business exception + */ + public default Map>> mapEntityInfo( + Map> idEntity, IdInfoFetcher idInfoHelper) + throws IdAuthenticationBusinessException { + return idEntity.entrySet().stream() + .collect(Collectors.toMap(Entry::getKey, entry -> new SimpleEntry<>(entry.getKey(), entry.getValue()))); + } + + /** + * Check if the mapped property is of multi-language type. + * + * @param propName mapped property name + * @param cfg mapping + * @return true, if is prop multi lang + */ + public default boolean isPropMultiLang(String propName, MappingConfig cfg) { + return false; + } + + public default boolean isDynamic() { + return false; + } + +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/ValidateOtpFunction.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/ValidateOtpFunction.java index 2661afe2469..b5c2b9ee379 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/ValidateOtpFunction.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/match/ValidateOtpFunction.java @@ -17,6 +17,6 @@ public interface ValidateOtpFunction { * @return true, if successful * @throws IdAuthenticationBusinessException the id authentication business exception */ - public boolean validateOtp(String otpValue, String otpKey) throws IdAuthenticationBusinessException; + public boolean validateOtp(String otpValue, String otpKey, String individualId) throws IdAuthenticationBusinessException; } diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/service/PasswordAuthService.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/service/PasswordAuthService.java new file mode 100644 index 00000000000..7b22ba59bf6 --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/service/PasswordAuthService.java @@ -0,0 +1,4 @@ +package io.mosip.authentication.core.spi.indauth.service; + +public interface PasswordAuthService extends AuthService { +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/service/VciService.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/service/VciService.java new file mode 100644 index 00000000000..463ab775979 --- /dev/null +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/spi/indauth/service/VciService.java @@ -0,0 +1,47 @@ +package io.mosip.authentication.core.spi.indauth.service; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.VCResponseDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; + +/** + * This interface is used to build Verifiable Credentials. + * + * @author Mahammed Taheer + */ +public interface VciService { + + /** + * Method used to add the Credential Subject Id in DB. + * + * @param credSubjectId the Credential Subject id of the identity + * @param idVidHash the Id/VID hash value + * @param tokenId the token id of the identity + * @return void + * @throws IdAuthenticationBusinessException the id authentication business + * exception + */ + public void addCredSubjectId(String credSubjectId, + String idVidHash, String tokenId, String oidcClientId) throws IdAuthenticationBusinessException; + + + /** + * Method to build the verifiable credentials. + * + * @param credSubjectId the Credential Subject id of the identity + * @param vcFormat VC format + * @param idInfo List of Identity Info of the user. + * @param locales locale data to be added in VC. + * @return VCResponseDTO VC Response based on requested format. + * @throws IdAuthenticationBusinessException the id authentication business + * exception + */ + public VCResponseDTO buildVerifiableCredentials(String credSubjectId, String vcFormat, + Map> idInfo, List locales, Set allowedAttributes, + VciExchangeRequestDTO vciExchangeRequestDTO, String psuToken) throws IdAuthenticationBusinessException; +} diff --git a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/util/IdTypeUtil.java b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/util/IdTypeUtil.java index 4767aa7dba8..7cb5386510a 100644 --- a/authentication/authentication-core/src/main/java/io/mosip/authentication/core/util/IdTypeUtil.java +++ b/authentication/authentication-core/src/main/java/io/mosip/authentication/core/util/IdTypeUtil.java @@ -1,8 +1,14 @@ package io.mosip.authentication.core.util; +import java.util.Map; import java.util.Objects; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.kernel.core.exception.BaseUncheckedException; +import io.mosip.kernel.core.logger.spi.Logger; +import io.mosip.kernel.core.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import io.mosip.authentication.core.constant.IdAuthCommonConstants; @@ -11,6 +17,8 @@ import io.mosip.authentication.core.indauth.dto.IdType; import io.mosip.kernel.core.idvalidator.exception.InvalidIDException; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.SESSION_ID; + /** * @author Manoj SP * @author Nagarjuna @@ -19,9 +27,14 @@ @Component public class IdTypeUtil { + private static Logger mosipLogger = IdaLogger.getLogger(IdTypeUtil.class); + @Autowired IdValidationUtil idValidator; + @Value("#{${mosip.ida.handle-types.regex}}") + private Map handleTypesRegex; + public boolean validateUin(String uin) { try { if (Objects.nonNull(idValidator)) @@ -44,11 +57,36 @@ public boolean validateVid(String vid) { } } + public boolean validateHandle(String handle) { + try { + if(Objects.nonNull(handleTypesRegex)) { + if(StringUtils.isEmpty(handle)) + return false; + + int index = handle.lastIndexOf("@"); + if(index <= 0) + return false; + + String handleType = handle.substring(index); + if(!handleTypesRegex.containsKey(handleType)) + return false; + + return handle.matches(handleTypesRegex.get(handleType)); + } + } catch (BaseUncheckedException e) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), "VALIDATE_HANDLE", + "Failed to validate handle >> "+ e.getMessage()); + } + return false; + } + public IdType getIdType(String id) throws IdAuthenticationBusinessException { if (this.validateUin(id)) return IdType.UIN; if (this.validateVid(id)) return IdType.VID; + if (this.validateHandle(id)) + return IdType.HANDLE; throw new IdAuthenticationBusinessException( IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), String.format(IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage(), diff --git a/authentication/authentication-filter-api/pom.xml b/authentication/authentication-filter-api/pom.xml index c9e59aefd2c..fa9379b25e4 100644 --- a/authentication/authentication-filter-api/pom.xml +++ b/authentication/authentication-filter-api/pom.xml @@ -4,9 +4,9 @@ io.mosip.authentication authentication-parent - 1.2.1-SNAPSHOT + 1.2.1.0 - 1.2.1-SNAPSHOT + 1.2.1.0 authentication-filter-api authentication-filter-api ID Authentication Filter API diff --git a/authentication/authentication-filter-api/src/test/java/io/mosip/authentication/authfilter/exception/IdAuthenticationFilterExceptionTest.java b/authentication/authentication-filter-api/src/test/java/io/mosip/authentication/authfilter/exception/IdAuthenticationFilterExceptionTest.java new file mode 100644 index 00000000000..c525d580e24 --- /dev/null +++ b/authentication/authentication-filter-api/src/test/java/io/mosip/authentication/authfilter/exception/IdAuthenticationFilterExceptionTest.java @@ -0,0 +1,33 @@ +package io.mosip.authentication.authfilter.exception; + +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import org.junit.Test; + +public class IdAuthenticationFilterExceptionTest { + + @Test(expected= IdAuthenticationFilterException.class) + public void IdAuthenticationFilterException() throws IdAuthenticationFilterException { + throw new IdAuthenticationFilterException(); + } + + @Test(expected=IdAuthenticationFilterException.class) + public void IdAuthenticationFilterException2args() throws IdAuthenticationFilterException { + throw new IdAuthenticationFilterException("errorcode", "errormessage"); + } + + @Test(expected=IdAuthenticationFilterException.class) + public void IdAuthenticationFilterException3args() throws IdAuthenticationFilterException { + throw new IdAuthenticationFilterException("errorcode", "errormessage", null); + } + + @Test(expected=IdAuthenticationFilterException.class) + public void IdAuthenticationFilterExceptionEnum() throws IdAuthenticationFilterException { + throw new IdAuthenticationFilterException(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED); + } + + @Test(expected=IdAuthenticationFilterException.class) + public void IdAuthenticationFilterExceptionEnumThrowable() throws IdAuthenticationFilterException { + throw new IdAuthenticationFilterException(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED, null); + } + +} diff --git a/authentication/authentication-filter-api/src/test/java/io/mosip/authentication/authfilter/exception/InvalidAuthFilterJarSignatureExceptionTest.java b/authentication/authentication-filter-api/src/test/java/io/mosip/authentication/authfilter/exception/InvalidAuthFilterJarSignatureExceptionTest.java new file mode 100644 index 00000000000..17999eaaff2 --- /dev/null +++ b/authentication/authentication-filter-api/src/test/java/io/mosip/authentication/authfilter/exception/InvalidAuthFilterJarSignatureExceptionTest.java @@ -0,0 +1,33 @@ +package io.mosip.authentication.authfilter.exception; + +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import org.junit.Test; + +public class InvalidAuthFilterJarSignatureExceptionTest { + + @Test(expected= InvalidAuthFilterJarSignatureException.class) + public void InvalidAuthFilterJarSignatureException() throws InvalidAuthFilterJarSignatureException { + throw new InvalidAuthFilterJarSignatureException(); + } + + @Test(expected=InvalidAuthFilterJarSignatureException.class) + public void InvalidAuthFilterJarSignatureException2args() throws InvalidAuthFilterJarSignatureException { + throw new InvalidAuthFilterJarSignatureException("errorcode", "errormessage"); + } + + @Test(expected=InvalidAuthFilterJarSignatureException.class) + public void InvalidAuthFilterJarSignatureException3args() throws InvalidAuthFilterJarSignatureException { + throw new InvalidAuthFilterJarSignatureException("errorcode", "errormessage", null); + } + + @Test(expected=InvalidAuthFilterJarSignatureException.class) + public void InvalidAuthFilterJarSignatureExceptionEnum() throws InvalidAuthFilterJarSignatureException { + throw new InvalidAuthFilterJarSignatureException(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED); + } + + @Test(expected=InvalidAuthFilterJarSignatureException.class) + public void InvalidAuthFilterJarSignatureExceptionEnumThrowable() throws InvalidAuthFilterJarSignatureException { + throw new InvalidAuthFilterJarSignatureException(IdAuthenticationErrorConstants.OTP_GENERATION_FAILED, null); + } + +} diff --git a/authentication/authentication-hotlistfilter-impl/pom.xml b/authentication/authentication-hotlistfilter-impl/pom.xml index 99124957bb8..ba2ec6e3e8b 100644 --- a/authentication/authentication-hotlistfilter-impl/pom.xml +++ b/authentication/authentication-hotlistfilter-impl/pom.xml @@ -4,9 +4,9 @@ io.mosip.authentication authentication-parent - 1.2.1-SNAPSHOT + 1.2.1.0 - 1.2.1-SNAPSHOT + 1.2.1.0 authentication-hotlistfilter-impl authentication-hotlistfilter-impl ID Authentication Filter Implementation for Hotlist validation @@ -74,9 +74,6 @@ 1.7.25 - 2.9.5 - 2.9.8 - 2.9.6 20180130 2.2.10 20180813 @@ -245,6 +242,14 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + @@ -261,6 +266,16 @@ io.mosip.authentication authentication-common ${authentication-common.version} + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + io.mosip.kernel @@ -288,12 +303,65 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + org.springdoc springdoc-openapi-ui ${springdoc.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + + + io.mosip.kernel + kernel-openid-bridge-api + ${kernel-openid-bridge-api.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} com.fasterxml.jackson.core diff --git a/authentication/authentication-internal-service/Dockerfile b/authentication/authentication-internal-service/Dockerfile index ebb9bdc1c6f..acf26219f82 100644 --- a/authentication/authentication-internal-service/Dockerfile +++ b/authentication/authentication-internal-service/Dockerfile @@ -108,6 +108,8 @@ ENV current_module_env=authentication-internal-service ADD configure_start.sh configure_start.sh +ADD ./lib/* "${loader_path_env}"/ + RUN chmod +x configure_start.sh ADD target/${current_module_env}-*.jar ${current_module_env}.jar @@ -125,18 +127,18 @@ USER ${container_user_uid}:${container_user_gid} ENTRYPOINT [ "./configure_start.sh" ] CMD if [ "$is_glowroot_env" = "present" ]; then \ - wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ - wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ unzip glowroot.zip ; \ rm -rf glowroot.zip ; \ sed -i "s//${current_module_env}/g" glowroot/glowroot.properties ; \ - wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ java -jar -Djava.security.debug=sunpkcs11 -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" -Dfile.encoding="UTF-8" ${current_module_env}.jar ; \ else \ - wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ - wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ + wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ java -jar -Djava.security.debug=sunpkcs11 -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" -Dfile.encoding="UTF-8" ${current_module_env}.jar ; \ fi #Sample docker run command: -# sudo docker run --rm -it -e artifactory_url_env="http://artifactory" -e spring_config_label_env="1.0.9" -e active_profile_env="dev" -e spring_config_url_env="http://config-server/config" -e PKCS11_PROXY_SOCKET=tcp://softhsm-ida:5666 -p 8093:8093 authentication-internal-service:1.0.9 \ No newline at end of file +# sudo docker run --rm -it -e artifactory_url_env="http://artifactory" -e spring_config_label_env="1.0.9" -e active_profile_env="dev" -e spring_config_url_env="http://config-server/config" -e PKCS11_PROXY_SOCKET=tcp://softhsm-ida:5666 -p 8093:8093 authentication-internal-service:1.0.9 diff --git a/authentication/authentication-internal-service/lib/libargon2.so b/authentication/authentication-internal-service/lib/libargon2.so new file mode 100755 index 00000000000..bf8cad86215 Binary files /dev/null and b/authentication/authentication-internal-service/lib/libargon2.so differ diff --git a/authentication/authentication-internal-service/pom.xml b/authentication/authentication-internal-service/pom.xml index 473a90d2069..cb177773ff6 100644 --- a/authentication/authentication-internal-service/pom.xml +++ b/authentication/authentication-internal-service/pom.xml @@ -7,9 +7,9 @@ io.mosip.authentication authentication-parent - 1.2.1-SNAPSHOT + 1.2.1.0 - 1.2.1-SNAPSHOT + 1.2.1.0 authentication-internal-service authentication-internal-service @@ -20,6 +20,16 @@ io.mosip.authentication authentication-common ${authentication-common.version} + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + io.mosip.authentication @@ -40,6 +50,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + @@ -73,6 +87,12 @@ io.springfox springfox-swagger2 ${maven.swagger.version} + + + com.fasterxml.jackson.core + jackson-annotations + + io.springfox @@ -149,6 +169,14 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + @@ -160,12 +188,65 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + org.springframework.boot spring-boot-starter-webflux ${spring.boot.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + + + io.mosip.kernel + kernel-openid-bridge-api + ${kernel-openid-bridge-api.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} com.fasterxml.jackson.core diff --git a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java index 5fd7cb5b228..808ad5a3ffd 100644 --- a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java +++ b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java @@ -28,9 +28,10 @@ import io.mosip.authentication.common.service.impl.DemoAuthServiceImpl; import io.mosip.authentication.common.service.impl.IdInfoFetcherImpl; import io.mosip.authentication.common.service.impl.IdServiceImpl; +import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl; import io.mosip.authentication.common.service.impl.OTPAuthServiceImpl; import io.mosip.authentication.common.service.impl.OTPServiceImpl; -import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl; +import io.mosip.authentication.common.service.impl.PasswordAuthServiceImpl; import io.mosip.authentication.common.service.impl.hotlist.HotlistServiceImpl; import io.mosip.authentication.common.service.impl.idevent.CredentialStoreServiceImpl; import io.mosip.authentication.common.service.impl.idevent.IdChangeEventHandlerServiceImpl; @@ -46,6 +47,7 @@ import io.mosip.authentication.common.service.integration.NotificationManager; import io.mosip.authentication.common.service.integration.OTPManager; import io.mosip.authentication.common.service.integration.PartnerServiceManager; +import io.mosip.authentication.common.service.integration.PasswordComparator; import io.mosip.authentication.common.service.integration.TokenIdManager; import io.mosip.authentication.common.service.util.BioMatcherUtil; import io.mosip.authentication.common.service.util.EnvUtil; @@ -135,7 +137,8 @@ io.mosip.kernel.keymanagerservice.dto.AuthorizedRolesDTO.class, io.mosip.kernel.partnercertservice.dto.AuthorizedRolesDTO.class, io.mosip.kernel.signature.dto.AuthorizedRolesDTO.class, - EnvUtil.class, KeyBindedTokenMatcherUtil.class, HSMHealthCheck.class, PrivateKeyDecryptorHelper.class }) + EnvUtil.class, KeyBindedTokenMatcherUtil.class, HSMHealthCheck.class, PrivateKeyDecryptorHelper.class, + PasswordAuthServiceImpl.class, PasswordComparator.class }) @ComponentScan(basePackages = { "io.mosip.authentication.internal.service.*", "${mosip.auth.adapter.impl.basepackage}", "io.mosip.kernel.core.logger.config", "io.mosip.authentication.common.service.config" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = { diff --git a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalAuthTxnController.java b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalAuthTxnController.java index 1c8b844cee4..6eb73ca1b19 100644 --- a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalAuthTxnController.java +++ b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalAuthTxnController.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.Objects; import java.util.TimeZone; +import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -23,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController; import io.mosip.authentication.common.service.helper.AuditHelper; -import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; import io.mosip.authentication.common.service.util.EnvUtil; import io.mosip.authentication.core.autntxn.dto.AutnTxnDto; import io.mosip.authentication.core.autntxn.dto.AutnTxnRequestDto; @@ -74,9 +74,6 @@ public class InternalAuthTxnController { @Autowired private AuditHelper auditHelper; - @Autowired - private IdAuthSecurityManager securityManager; - @InitBinder public void initBinder(WebDataBinder binder) { binder.setValidator(authTxnValidator); @@ -124,8 +121,9 @@ public ResponseEntity getAuthTxnDetails( Objects.isNull(individualIdType) ? idTypeUtil.getIdType(individualId).getType() : individualIdType); authtxnrequestdto.setPageStart(pageStart); authtxnrequestdto.setPageFetch(pageFetch); - String idvidHash = securityManager.hash(individualId); - + // Removed Storing the idvid hash value in audit entries. + // For this type of request storing a UUID instead of idvid hash. + String randomId = UUID.randomUUID().toString(); try { Errors errors = new BindException(authtxnrequestdto, "authtxnrequestdto"); authTxnValidator.validate(authtxnrequestdto, errors); @@ -137,20 +135,20 @@ public ResponseEntity getAuthTxnDetails( autnTxnResponseDto.setResponseTime(getResponseTime()); boolean status = true; - auditHelper.audit(AuditModules.AUTH_TRANSACTION_HISTORY, AuditEvents.RETRIEVE_AUTH_TRANSACTION_HISTORY_REQUEST_RESPONSE, idvidHash, + auditHelper.audit(AuditModules.AUTH_TRANSACTION_HISTORY, AuditEvents.RETRIEVE_AUTH_TRANSACTION_HISTORY_REQUEST_RESPONSE, randomId, IdType.getIDTypeOrDefault(authtxnrequestdto.getIndividualIdType()), "auth transaction history status : " + status ); return new ResponseEntity<>(autnTxnResponseDto, HttpStatus.OK); } catch (IDDataValidationException e) { logger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), AUTH_TXN_DETAILS, e.getErrorText()); - auditHelper.audit(AuditModules.AUTH_TRANSACTION_HISTORY, AuditEvents.RETRIEVE_AUTH_TRANSACTION_HISTORY_REQUEST_RESPONSE, idvidHash, + auditHelper.audit(AuditModules.AUTH_TRANSACTION_HISTORY, AuditEvents.RETRIEVE_AUTH_TRANSACTION_HISTORY_REQUEST_RESPONSE, randomId, IdType.getIDTypeOrDefault(authtxnrequestdto.getIndividualIdType()), e ); throw new IdAuthenticationAppException(IdAuthenticationErrorConstants.DATA_VALIDATION_FAILED, e); } catch (IdAuthenticationBusinessException e) { logger.error(IdAuthCommonConstants.SESSION_ID, e.getClass().toString(), e.getErrorCode(), e.getErrorText()); - auditHelper.audit(AuditModules.AUTH_TRANSACTION_HISTORY, AuditEvents.RETRIEVE_AUTH_TRANSACTION_HISTORY_REQUEST_RESPONSE, idvidHash, + auditHelper.audit(AuditModules.AUTH_TRANSACTION_HISTORY, AuditEvents.RETRIEVE_AUTH_TRANSACTION_HISTORY_REQUEST_RESPONSE, randomId, IdType.getIDTypeOrDefault(authtxnrequestdto.getIndividualIdType()), e ); throw new IdAuthenticationAppException(e.getErrorCode(), e.getErrorText(), e); } diff --git a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalOTPController.java b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalOTPController.java index f9c29fef54e..2e60506a41f 100644 --- a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalOTPController.java +++ b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalOTPController.java @@ -122,7 +122,7 @@ public OtpResponseDTO generateOTP(@Valid @RequestBody OtpRequestDTO otpRequestDt Optional partner = Optional.empty(); AuthTransactionBuilder authTxnBuilder = authTransactionHelper .createAndSetAuthTxnBuilderMetadataToRequest(otpRequestDto, !isPartnerReq, partner); - String idvidHash = securityManager.hash(otpRequestDto.getIndividualId()); + try { String idType = Objects.nonNull(otpRequestDto.getIndividualIdType()) ? otpRequestDto.getIndividualIdType() : idTypeUtil.getIdType(otpRequestDto.getIndividualId()).getType(); @@ -134,20 +134,20 @@ public OtpResponseDTO generateOTP(@Valid @RequestBody OtpRequestDTO otpRequestDt otpResponseDTO.getResponseTime()); boolean status = otpResponseDTO.getErrors() == null || otpResponseDTO.getErrors().isEmpty(); - auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.INTERNAL_OTP_TRIGGER_REQUEST_RESPONSE, idvidHash, + auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.INTERNAL_OTP_TRIGGER_REQUEST_RESPONSE, otpRequestDto.getTransactionID(), IdType.getIDTypeOrDefault(otpRequestDto.getIndividualIdType()), "Internal OTP Request status : " + status); return otpResponseDTO; } catch (IDDataValidationException e) { logger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), GENERATE_OTP, e.getErrorText()); - auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.INTERNAL_OTP_TRIGGER_REQUEST_RESPONSE, idvidHash, + auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.INTERNAL_OTP_TRIGGER_REQUEST_RESPONSE, otpRequestDto.getTransactionID(), IdType.getIDTypeOrDefault(otpRequestDto.getIndividualIdType()), e); IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWithMetadata, e); e.putMetadata(IdAuthCommonConstants.TRANSACTION_ID, otpRequestDto.getTransactionID()); throw authTransactionHelper.createDataValidationException(authTxnBuilder, e, requestWithMetadata); } catch (IdAuthenticationBusinessException e) { logger.error(IdAuthCommonConstants.SESSION_ID, e.getClass().toString(), e.getErrorCode(), e.getErrorText()); - auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.INTERNAL_OTP_TRIGGER_REQUEST_RESPONSE, idvidHash, + auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.INTERNAL_OTP_TRIGGER_REQUEST_RESPONSE, otpRequestDto.getTransactionID(), IdType.getIDTypeOrDefault(otpRequestDto.getIndividualIdType()), e); authTransactionHelper.setAuthTransactionEntityMetadata(requestWithMetadata, authTxnBuilder); IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWithMetadata, e); diff --git a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalUpdateAuthTypeController.java b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalUpdateAuthTypeController.java index 0816149e4c8..4c6e23cccea 100644 --- a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalUpdateAuthTypeController.java +++ b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/controller/InternalUpdateAuthTypeController.java @@ -1,98 +1,98 @@ -package io.mosip.authentication.internal.service.controller; - -import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.IDA_WEBSUB_AUTHTYPE_CALLBACK_SECRET; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.mosip.authentication.common.service.helper.AuditHelper; -import io.mosip.authentication.core.constant.AuditEvents; -import io.mosip.authentication.core.constant.AuditModules; -import io.mosip.authentication.core.constant.IdAuthCommonConstants; -import io.mosip.authentication.core.exception.IDDataValidationException; -import io.mosip.authentication.core.exception.IdAuthenticationAppException; -import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; -import io.mosip.authentication.core.indauth.dto.IdType; -import io.mosip.authentication.core.logger.IdaLogger; -import io.mosip.authentication.core.spi.authtype.status.service.UpdateAuthtypeStatusService; -import io.mosip.idrepository.core.dto.AuthTypeStatusEventDTO; -import io.mosip.kernel.core.logger.spi.Logger; -import io.mosip.kernel.core.websub.model.EventModel; -import io.mosip.kernel.core.websub.spi.SubscriptionClient; -import io.mosip.kernel.websub.api.annotation.PreAuthenticateContentAndVerifyIntent; -import io.mosip.kernel.websub.api.model.SubscriptionChangeRequest; -import io.mosip.kernel.websub.api.model.SubscriptionChangeResponse; -import io.mosip.kernel.websub.api.model.UnsubscriptionRequest; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.responses.ApiResponses; - -/** - * The InternalUpdateAuthTypeController use to fetch Auth Transaction. - * - * @author Dinesh Karuppiah.T - */ -@RestController -@Tag(name = "internal-update-auth-type-controller", description = "Internal Update Auth Type Controller") -public class InternalUpdateAuthTypeController { - - /** The logger. */ - private static Logger logger = IdaLogger.getLogger(InternalUpdateAuthTypeController.class); - - @Autowired - private UpdateAuthtypeStatusService authtypeStatusService; - - @Autowired - private AuditHelper auditHelper; - - @Autowired - private ObjectMapper mapper; - - @Autowired - @Qualifier("subscriptionExtendedClient") - SubscriptionClient subscribe; - - @PostMapping(value = "/callback/authTypeCallback/{partnerId}", consumes = "application/json") - @Operation(summary = "updateAuthtypeStatus", description = "updateAuthtypeStatus", tags = { "internal-update-auth-type-controller" }) - - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "OK"), - @ApiResponse(responseCode = "201", description = "Created" ,content = @Content(schema = @Schema(hidden = true))), - @ApiResponse(responseCode = "401", description = "Unauthorized" ,content = @Content(schema = @Schema(hidden = true))), - @ApiResponse(responseCode = "403", description = "Forbidden" ,content = @Content(schema = @Schema(hidden = true))), - @ApiResponse(responseCode = "404", description = "Not Found" ,content = @Content(schema = @Schema(hidden = true)))}) - @PreAuthenticateContentAndVerifyIntent(secret = "${"+ IDA_WEBSUB_AUTHTYPE_CALLBACK_SECRET +"}", callback = "${ida-websub-auth-type-callback-relative-url}", topic = "${ida-topic-auth-type-status-updated}") - public void updateAuthtypeStatus(@RequestBody EventModel eventModel, @PathVariable("partnerId") String partnerId) - throws IdAuthenticationAppException, IDDataValidationException { - if(eventModel.getEvent() != null && eventModel.getEvent().getData() != null) { - AuthTypeStatusEventDTO event = mapper.convertValue(eventModel.getEvent().getData(), AuthTypeStatusEventDTO.class); - try { - logger.debug(IdAuthCommonConstants.SESSION_ID, "updateAuthtypeStatus", this.getClass().getCanonicalName(), "handling updateAuthtypeStatus event for partnerId: " + partnerId); - - authtypeStatusService.updateAuthTypeStatus(event.getTokenId(), event.getAuthTypeStatusList()); - - auditHelper.audit(AuditModules.AUTH_TYPE_STATUS, AuditEvents.UPDATE_AUTH_TYPE_STATUS_REQUEST_RESPONSE, - event.getTokenId(), IdType.UIN, "internal auth type status update status : " + true); - } catch (IdAuthenticationBusinessException e) { - logger.error(IdAuthCommonConstants.SESSION_ID, e.getClass().toString(), e.getErrorCode(), e.getErrorText()); - auditHelper.audit(AuditModules.AUTH_TYPE_STATUS, AuditEvents.UPDATE_AUTH_TYPE_STATUS_REQUEST_RESPONSE, - event.getTokenId(), IdType.UIN, e); - throw new IdAuthenticationAppException(e.getErrorCode(), e.getErrorText(), e); - } - } - - } - -} +package io.mosip.authentication.internal.service.controller; + +import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.IDA_WEBSUB_AUTHTYPE_CALLBACK_SECRET; + +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.mosip.authentication.common.service.helper.AuditHelper; +import io.mosip.authentication.core.constant.AuditEvents; +import io.mosip.authentication.core.constant.AuditModules; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.exception.IDDataValidationException; +import io.mosip.authentication.core.exception.IdAuthenticationAppException; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.IdType; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.spi.authtype.status.service.UpdateAuthtypeStatusService; +import io.mosip.idrepository.core.dto.AuthTypeStatusEventDTO; +import io.mosip.kernel.core.logger.spi.Logger; +import io.mosip.kernel.core.websub.model.EventModel; +import io.mosip.kernel.core.websub.spi.SubscriptionClient; +import io.mosip.kernel.websub.api.annotation.PreAuthenticateContentAndVerifyIntent; +import io.mosip.kernel.websub.api.model.SubscriptionChangeRequest; +import io.mosip.kernel.websub.api.model.SubscriptionChangeResponse; +import io.mosip.kernel.websub.api.model.UnsubscriptionRequest; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; + +/** + * The InternalUpdateAuthTypeController use to fetch Auth Transaction. + * + * @author Dinesh Karuppiah.T + */ +@RestController +@Tag(name = "internal-update-auth-type-controller", description = "Internal Update Auth Type Controller") +public class InternalUpdateAuthTypeController { + + /** The logger. */ + private static Logger logger = IdaLogger.getLogger(InternalUpdateAuthTypeController.class); + + @Autowired + private UpdateAuthtypeStatusService authtypeStatusService; + + @Autowired + private AuditHelper auditHelper; + + @Autowired + private ObjectMapper mapper; + + @Autowired + @Qualifier("subscriptionExtendedClient") + SubscriptionClient subscribe; + + @PostMapping(value = "/callback/authTypeCallback/{partnerId}", consumes = "application/json") + @Operation(summary = "updateAuthtypeStatus", description = "updateAuthtypeStatus", tags = { "internal-update-auth-type-controller" }) + + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "201", description = "Created" ,content = @Content(schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "401", description = "Unauthorized" ,content = @Content(schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Forbidden" ,content = @Content(schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Not Found" ,content = @Content(schema = @Schema(hidden = true)))}) + @PreAuthenticateContentAndVerifyIntent(secret = "${"+ IDA_WEBSUB_AUTHTYPE_CALLBACK_SECRET +"}", callback = "${ida-websub-auth-type-callback-relative-url}", topic = "${ida-topic-auth-type-status-updated}") + public void updateAuthtypeStatus(@RequestBody EventModel eventModel, @PathVariable("partnerId") String partnerId) + throws IdAuthenticationAppException, IDDataValidationException { + if(eventModel.getEvent() != null && eventModel.getEvent().getData() != null) { + AuthTypeStatusEventDTO event = mapper.convertValue(eventModel.getEvent().getData(), AuthTypeStatusEventDTO.class); + try { + logger.debug(IdAuthCommonConstants.SESSION_ID, "updateAuthtypeStatus", this.getClass().getCanonicalName(), "handling updateAuthtypeStatus event for partnerId: " + partnerId); + + authtypeStatusService.updateAuthTypeStatus(event.getTokenId(), event.getAuthTypeStatusList()); + + auditHelper.audit(AuditModules.AUTH_TYPE_STATUS, AuditEvents.UPDATE_AUTH_TYPE_STATUS_REQUEST_RESPONSE, + eventModel.getEvent().getId(), IdType.UIN, "internal auth type status update status : " + true); + } catch (IdAuthenticationBusinessException e) { + logger.error(IdAuthCommonConstants.SESSION_ID, e.getClass().toString(), e.getErrorCode(), e.getErrorText()); + auditHelper.audit(AuditModules.AUTH_TYPE_STATUS, AuditEvents.UPDATE_AUTH_TYPE_STATUS_REQUEST_RESPONSE, + eventModel.getEvent().getId(), IdType.UIN, e); + throw new IdAuthenticationAppException(e.getErrorCode(), e.getErrorText(), e); + } + } + + } + +} diff --git a/authentication/authentication-otp-service/Dockerfile b/authentication/authentication-otp-service/Dockerfile index ab421840c93..a170041d25a 100644 --- a/authentication/authentication-otp-service/Dockerfile +++ b/authentication/authentication-otp-service/Dockerfile @@ -91,6 +91,8 @@ ENV current_module_env=authentication-otp-service ADD configure_start.sh configure_start.sh +ADD ./lib/* "${loader_path_env}"/ + RUN chmod +x configure_start.sh ADD target/${current_module_env}-*.jar ${current_module_env}.jar @@ -108,16 +110,16 @@ USER ${container_user_uid}:${container_user_gid} ENTRYPOINT [ "./configure_start.sh" ] CMD if [ "$is_glowroot_env" = "present" ]; then \ - wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ unzip glowroot.zip ; \ rm -rf glowroot.zip ; \ sed -i "s//${current_module_env}/g" glowroot/glowroot.properties ; \ - wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ java -jar -Djava.security.debug=sunpkcs11 -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" ${current_module_env}.jar ; \ else \ - wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ java -jar -Djava.security.debug=sunpkcs11 -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" ${current_module_env}.jar ; \ fi #Sample docker run command: -# sudo docker run --rm -it -e artifactory_url_env="http://artifactory" -e spring_config_label_env="1.0.9" -e active_profile_env="dev" -e spring_config_url_env="http://config-server/config" -e PKCS11_PROXY_SOCKET=tcp://softhsm-ida:5666 -p 8092:8092 authentication-otp-service:1.0.9 \ No newline at end of file +# sudo docker run --rm -it -e artifactory_url_env="http://artifactory" -e spring_config_label_env="1.0.9" -e active_profile_env="dev" -e spring_config_url_env="http://config-server/config" -e PKCS11_PROXY_SOCKET=tcp://softhsm-ida:5666 -p 8092:8092 authentication-otp-service:1.0.9 diff --git a/authentication/authentication-otp-service/lib/libargon2.so b/authentication/authentication-otp-service/lib/libargon2.so new file mode 100755 index 00000000000..bf8cad86215 Binary files /dev/null and b/authentication/authentication-otp-service/lib/libargon2.so differ diff --git a/authentication/authentication-otp-service/pom.xml b/authentication/authentication-otp-service/pom.xml index acb7e9cb48b..64f53361b8a 100644 --- a/authentication/authentication-otp-service/pom.xml +++ b/authentication/authentication-otp-service/pom.xml @@ -7,9 +7,9 @@ io.mosip.authentication authentication-parent - 1.2.1-SNAPSHOT + 1.2.1.0 - 1.2.1-SNAPSHOT + 1.2.1.0 authentication-otp-service authentication-otp-service @@ -20,6 +20,16 @@ io.mosip.authentication authentication-common ${authentication-common.version} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + org.springframework.boot @@ -30,6 +40,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + @@ -92,6 +106,14 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + @@ -103,6 +125,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + @@ -120,6 +146,55 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + + + io.mosip.kernel + kernel-openid-bridge-api + ${kernel-openid-bridge-api.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + diff --git a/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java b/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java index 9859390798f..09e87a79cb0 100644 --- a/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java +++ b/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java @@ -12,6 +12,7 @@ import io.mosip.authentication.common.service.cache.MasterDataCache; import io.mosip.authentication.common.service.cache.MasterDataCacheInitializer; import io.mosip.authentication.common.service.config.IDAMappingConfig; +import io.mosip.authentication.common.service.config.KafkaProducerConfig; import io.mosip.authentication.common.service.config.LangComparatorConfig; import io.mosip.authentication.common.service.config.OpenApiProperties; import io.mosip.authentication.common.service.config.SwaggerConfig; @@ -27,9 +28,10 @@ import io.mosip.authentication.common.service.impl.AuthtypeStatusImpl; import io.mosip.authentication.common.service.impl.IdInfoFetcherImpl; import io.mosip.authentication.common.service.impl.IdServiceImpl; +import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl; import io.mosip.authentication.common.service.impl.OTPAuthServiceImpl; import io.mosip.authentication.common.service.impl.OTPServiceImpl; -import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl; +import io.mosip.authentication.common.service.impl.PasswordAuthServiceImpl; import io.mosip.authentication.common.service.impl.hotlist.HotlistServiceImpl; import io.mosip.authentication.common.service.impl.masterdata.MasterDataCacheUpdateServiceImpl; import io.mosip.authentication.common.service.impl.notification.NotificationServiceImpl; @@ -41,7 +43,9 @@ import io.mosip.authentication.common.service.integration.NotificationManager; import io.mosip.authentication.common.service.integration.OTPManager; import io.mosip.authentication.common.service.integration.PartnerServiceManager; +import io.mosip.authentication.common.service.integration.PasswordComparator; import io.mosip.authentication.common.service.integration.TokenIdManager; +import io.mosip.authentication.common.service.kafka.impl.AuthenticationErrorEventingPublisher; import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; import io.mosip.authentication.common.service.util.EnvUtil; import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; @@ -69,6 +73,7 @@ import io.mosip.kernel.keymanager.hsm.health.HSMHealthCheck; import io.mosip.kernel.keymanager.hsm.impl.KeyStoreImpl; import io.mosip.kernel.keymanagerservice.helper.KeymanagerDBHelper; +import io.mosip.kernel.keymanagerservice.helper.PrivateKeyDecryptorHelper; import io.mosip.kernel.keymanagerservice.helper.SessionKeyDecrytorHelper; import io.mosip.kernel.keymanagerservice.service.impl.KeymanagerServiceImpl; import io.mosip.kernel.keymanagerservice.util.KeymanagerUtil; @@ -80,7 +85,6 @@ import io.mosip.kernel.tokenidgenerator.generator.TokenIDGenerator; import io.mosip.kernel.tokenidgenerator.service.impl.TokenIDGeneratorServiceImpl; import io.mosip.kernel.zkcryptoservice.service.impl.ZKCryptoManagerServiceImpl; -import io.mosip.kernel.keymanagerservice.helper.PrivateKeyDecryptorHelper; /** * Spring-boot class for ID Authentication Application. @@ -108,7 +112,8 @@ LangComparatorConfig.class, OpenApiProperties.class, SessionKeyDecrytorHelper.class, ExternalRestHelperConfig.class, IdaRequestResponsConsumerUtil.class, PartnerCACertEventServiceImpl.class, PartnerCACertEventInitializer.class, IdAuthWebSubInitializer.class, AuthAnonymousEventPublisher.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class, - HSMHealthCheck.class, PrivateKeyDecryptorHelper.class }) + HSMHealthCheck.class, PrivateKeyDecryptorHelper.class, + PasswordAuthServiceImpl.class, PasswordComparator.class, AuthenticationErrorEventingPublisher.class, KafkaProducerConfig.class }) @ComponentScan(basePackages = { "io.mosip.authentication.otp.service.*", "io.mosip.kernel.core.logger.config", "${mosip.auth.adapter.impl.basepackage}" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = { "io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" })) @@ -125,4 +130,4 @@ public static void main(String[] args) { SpringApplication.run(OtpApplication.class, args); } -} \ No newline at end of file +} diff --git a/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/controller/OTPController.java b/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/controller/OTPController.java index a448558651a..79ad01cf973 100644 --- a/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/controller/OTPController.java +++ b/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/controller/OTPController.java @@ -1,8 +1,11 @@ package io.mosip.authentication.otp.service.controller; +import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED; + import java.util.Objects; import java.util.Optional; +import javax.annotation.PostConstruct; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -14,7 +17,10 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.security.SecurityScheme; import io.swagger.v3.oas.annotations.tags.Tag; + +import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.validation.Errors; import org.springframework.web.bind.WebDataBinder; @@ -27,6 +33,7 @@ import io.mosip.authentication.common.service.builder.AuthTransactionBuilder; import io.mosip.authentication.common.service.helper.AuditHelper; import io.mosip.authentication.common.service.helper.AuthTransactionHelper; +import io.mosip.authentication.common.service.kafka.impl.AuthenticationErrorEventingPublisher; import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; import io.mosip.authentication.common.service.validator.OTPRequestValidator; @@ -90,11 +97,26 @@ public class OTPController { @Autowired private IdAuthSecurityManager securityManager; + + @Autowired(required = false) + private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher; + + @Value("${"+ AUTHENTICATION_ERROR_EVENTING_ENABLED +":false}") + private boolean isEventingEnabled; @InitBinder private void initBinder(WebDataBinder binder) { binder.setValidator(otpRequestValidator); } + + @PostConstruct + public void init() { + if (isEventingEnabled) { + if (Objects.isNull(authenticationErrorEventingPublisher)) { + throw new BeanCreationException(AuthenticationErrorEventingPublisher.class.getName(), "Failed to create a bean"); + } + } + } /** * send OtpRequestDTO request to generate OTP and received OtpResponseDTO as @@ -130,11 +152,12 @@ public OtpResponseDTO generateOTP(@Valid @RequestBody OtpRequestDTO otpRequestDt Optional partner = partnerService.getPartner(partnerId, otpRequestDto.getMetadata()); AuthTransactionBuilder authTxnBuilder = authTransactionHelper .createAndSetAuthTxnBuilderMetadataToRequest(otpRequestDto, !isPartnerReq, partner); - String idvidHash = securityManager.hash(otpRequestDto.getIndividualId()); + try { String idType = Objects.nonNull(otpRequestDto.getIndividualIdType()) ? otpRequestDto.getIndividualIdType() : idTypeUtil.getIdType(otpRequestDto.getIndividualId()).getType(); otpRequestDto.setIndividualIdType(idType); + String idvidHash = securityManager.hash(otpRequestDto.getIndividualId()); otpRequestValidator.validateIdvId(otpRequestDto.getIndividualId(), idType, errors, IdAuthCommonConstants.IDV_ID); DataValidationUtil.validate(errors); OtpResponseDTO otpResponseDTO = otpService.generateOtp(otpRequestDto, partnerId, requestWithMetadata); @@ -142,20 +165,27 @@ public OtpResponseDTO generateOTP(@Valid @RequestBody OtpRequestDTO otpRequestDt otpResponseDTO.getResponseTime()); boolean status = otpResponseDTO.getErrors() == null || otpResponseDTO.getErrors().isEmpty(); - auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.OTP_TRIGGER_REQUEST_RESPONSE, idvidHash, + auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.OTP_TRIGGER_REQUEST_RESPONSE, otpRequestDto.getTransactionID(), IdType.getIDTypeOrDefault(otpRequestDto.getIndividualIdType()), "otpRequest status : " + status); return otpResponseDTO; } catch (IDDataValidationException e) { logger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), GENERATE_OTP, e.getErrorText()); - auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.OTP_TRIGGER_REQUEST_RESPONSE , idvidHash, + auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.OTP_TRIGGER_REQUEST_RESPONSE , otpRequestDto.getTransactionID(), IdType.getIDTypeOrDefault(otpRequestDto.getIndividualIdType()), e); IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWithMetadata, e); e.putMetadata(IdAuthCommonConstants.TRANSACTION_ID, otpRequestDto.getTransactionID()); throw authTransactionHelper.createDataValidationException(authTxnBuilder, e, requestWithMetadata); } catch (IdAuthenticationBusinessException e) { logger.error(IdAuthCommonConstants.SESSION_ID, e.getClass().toString(), e.getErrorCode(), e.getErrorText()); - auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.OTP_TRIGGER_REQUEST_RESPONSE , idvidHash, + + if (isEventingEnabled) { + if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) { + authenticationErrorEventingPublisher.notify(otpRequestDto, request.getHeader("signature"), + partner, e, otpRequestDto.getMetadata()); + } + } + auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.OTP_TRIGGER_REQUEST_RESPONSE , otpRequestDto.getTransactionID(), IdType.getIDTypeOrDefault(otpRequestDto.getIndividualIdType()), e); authTransactionHelper.setAuthTransactionEntityMetadata(requestWithMetadata, authTxnBuilder); IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWithMetadata, e); @@ -169,4 +199,4 @@ public OtpResponseDTO generateOTP(@Valid @RequestBody OtpRequestDTO otpRequestDt } } -} +} \ No newline at end of file diff --git a/authentication/authentication-service/Dockerfile b/authentication/authentication-service/Dockerfile index a599400a367..9a884f2c320 100644 --- a/authentication/authentication-service/Dockerfile +++ b/authentication/authentication-service/Dockerfile @@ -111,6 +111,8 @@ ENV current_module_env=authentication-service ADD configure_start.sh configure_start.sh +ADD ./lib/* "${loader_path_env}"/ + RUN chmod +x configure_start.sh ADD target/${current_module_env}-*.jar ${current_module_env}.jar @@ -128,18 +130,18 @@ USER ${container_user_uid}:${container_user_gid} ENTRYPOINT [ "./configure_start.sh" ] CMD if [ "$is_glowroot_env" = "present" ]; then \ - wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ - wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ unzip glowroot.zip ; \ rm -rf glowroot.zip ; \ sed -i "s//${current_module_env}/g" glowroot/glowroot.properties ; \ - wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ java -jar -Djava.security.debug=sunpkcs11 -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" -Dfile.encoding="UTF-8" ${current_module_env}.jar ; \ else \ - wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ - wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ + wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ java -jar -Djava.security.debug=sunpkcs11 -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" -Dfile.encoding="UTF-8" ${current_module_env}.jar ; \ fi #Sample docker run command: -# sudo docker run --rm -it -e artifactory_url_env="http://artifactory" -e spring_config_label_env="1.0.9" -e active_profile_env="dev" -e spring_config_url_env="http://config-server/config" -e PKCS11_PROXY_SOCKET=tcp://softhsm-ida:5666 -p 8090:8090 authentication-service:1.0.9 \ No newline at end of file +# sudo docker run --rm -it -e artifactory_url_env="http://artifactory" -e spring_config_label_env="1.0.9" -e active_profile_env="dev" -e spring_config_url_env="http://config-server/config" -e PKCS11_PROXY_SOCKET=tcp://softhsm-ida:5666 -p 8090:8090 authentication-service:1.0.9 diff --git a/authentication/authentication-service/lib/libargon2.so b/authentication/authentication-service/lib/libargon2.so new file mode 100755 index 00000000000..bf8cad86215 Binary files /dev/null and b/authentication/authentication-service/lib/libargon2.so differ diff --git a/authentication/authentication-service/pom.xml b/authentication/authentication-service/pom.xml index faa8e0d1e68..41968eeb7a0 100644 --- a/authentication/authentication-service/pom.xml +++ b/authentication/authentication-service/pom.xml @@ -6,9 +6,9 @@ io.mosip.authentication authentication-parent - 1.2.1-SNAPSHOT + 1.2.1.0 - 1.2.1-SNAPSHOT + 1.2.1.0 authentication-service jar @@ -21,11 +21,27 @@ io.mosip.authentication authentication-core ${authentication-core.version} + + + com.fasterxml.jackson.core + jackson-core + + io.mosip.authentication authentication-common ${authentication-common.version} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + io.mosip.authentication @@ -82,6 +98,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + @@ -116,6 +136,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-annotations + @@ -153,6 +177,14 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + @@ -170,6 +202,14 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + @@ -181,6 +221,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + @@ -204,12 +248,78 @@ io.mosip.biometric.util biometrics-util ${kernel-biometrics-util} + + + com.fasterxml.jackson.core + jackson-databind + + org.openpnp opencv 4.5.3-4 + + info.weboftrust + ld-signatures-java + 1.0.0 + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + + + io.mosip.kernel + kernel-openid-bridge-api + ${kernel-openid-bridge-api.version} + + + com.fasterxml.jackson.core + jackson-databind + + + diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java index c2977ec2e2b..c78f0debcc6 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java @@ -23,6 +23,7 @@ import io.mosip.authentication.common.service.helper.AuthTransactionHelper; import io.mosip.authentication.common.service.helper.ExternalRestHelperConfig; import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.helper.TokenValidationHelper; import io.mosip.authentication.common.service.helper.WebSubHelper; import io.mosip.authentication.common.service.impl.AuthAnonymousProfileServiceImpl; import io.mosip.authentication.common.service.impl.AuthContextClazzRefProvider; @@ -32,6 +33,7 @@ import io.mosip.authentication.common.service.impl.IdInfoFetcherImpl; import io.mosip.authentication.common.service.impl.IdServiceImpl; import io.mosip.authentication.common.service.impl.OTPAuthServiceImpl; +import io.mosip.authentication.common.service.impl.PasswordAuthServiceImpl; import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl; import io.mosip.authentication.common.service.impl.hotlist.HotlistServiceImpl; import io.mosip.authentication.common.service.impl.masterdata.MasterDataCacheUpdateServiceImpl; @@ -44,7 +46,9 @@ import io.mosip.authentication.common.service.integration.NotificationManager; import io.mosip.authentication.common.service.integration.OTPManager; import io.mosip.authentication.common.service.integration.PartnerServiceManager; +import io.mosip.authentication.common.service.integration.PasswordComparator; import io.mosip.authentication.common.service.integration.TokenIdManager; +import io.mosip.authentication.common.service.kafka.impl.AuthenticationErrorEventingPublisher; import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; import io.mosip.authentication.common.service.util.BioMatcherUtil; import io.mosip.authentication.common.service.util.EnvUtil; @@ -62,6 +66,7 @@ import io.mosip.authentication.core.util.DemoNormalizer; import io.mosip.authentication.core.util.IdTypeUtil; import io.mosip.authentication.core.util.IdValidationUtil; +import io.mosip.authentication.service.kyc.util.VCSchemaProviderUtil; import io.mosip.kernel.biosdk.provider.factory.BioAPIFactory; import io.mosip.kernel.biosdk.provider.impl.BioProviderImpl_V_0_8; import io.mosip.kernel.biosdk.provider.impl.BioProviderImpl_V_0_9; @@ -77,6 +82,7 @@ import io.mosip.kernel.keygenerator.bouncycastle.KeyGenerator; import io.mosip.kernel.keymanager.hsm.impl.KeyStoreImpl; import io.mosip.kernel.keymanagerservice.helper.KeymanagerDBHelper; +import io.mosip.kernel.keymanagerservice.helper.PrivateKeyDecryptorHelper; import io.mosip.kernel.keymanagerservice.helper.SessionKeyDecrytorHelper; import io.mosip.kernel.keymanagerservice.service.impl.KeymanagerServiceImpl; import io.mosip.kernel.keymanagerservice.util.KeymanagerUtil; @@ -89,7 +95,7 @@ import io.mosip.kernel.tokenidgenerator.service.impl.TokenIDGeneratorServiceImpl; import io.mosip.kernel.zkcryptoservice.service.impl.ZKCryptoManagerServiceImpl; import io.mosip.kernel.keymanager.hsm.health.HSMHealthCheck; -import io.mosip.kernel.keymanagerservice.helper.PrivateKeyDecryptorHelper; + /** * Spring-boot class for ID Authentication Application. @@ -99,7 +105,7 @@ */ @SpringBootApplication(exclude = { HibernateDaoConfig.class, SecurityAutoConfiguration.class }) @Import(value = { IdValidationUtil.class, IDAMappingConfig.class, KeyBindedTokenAuthServiceImpl.class, - AuthContextClazzRefProvider.class, CbeffImpl.class, + AuthContextClazzRefProvider.class, CbeffImpl.class, RestRequestFactory.class, AuditRequestFactory.class, AuditRequestFactory.class, NotificationManager.class, NotificationServiceImpl.class, IdTemplateManager.class, TemplateManagerBuilderImpl.class, IdAuthExceptionHandler.class, IdInfoFetcherImpl.class, OTPManager.class, MasterDataManager.class, IdInfoHelper.class, OTPAuthServiceImpl.class, @@ -119,7 +125,8 @@ IdAuthFraudAnalysisEventManager.class, IdAuthFraudAnalysisEventPublisher.class, AuthFiltersValidator.class, AuthAnonymousProfileServiceImpl.class, AuthAnonymousEventPublisher.class, SessionKeyDecrytorHelper.class, ExternalRestHelperConfig.class, IdaRequestResponsConsumerUtil.class, PartnerCACertEventServiceImpl.class, PartnerCACertEventInitializer.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class, - HSMHealthCheck.class, PrivateKeyDecryptorHelper.class }) + HSMHealthCheck.class, TokenValidationHelper.class, VCSchemaProviderUtil.class, PrivateKeyDecryptorHelper.class, + PasswordAuthServiceImpl.class, PasswordComparator.class, AuthenticationErrorEventingPublisher.class }) @ComponentScan(basePackages = { "io.mosip.authentication.service.*", "io.mosip.kernel.core.logger.config", "io.mosip.authentication.common.service.config", "${mosip.auth.adapter.impl.basepackage}" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = { "io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" })) diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/controller/AuthController.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/controller/AuthController.java index 84cb7a2b639..9558c2b3b41 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/controller/AuthController.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/controller/AuthController.java @@ -1,11 +1,16 @@ package io.mosip.authentication.service.controller; +import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED; + import java.util.Objects; import java.util.Optional; +import javax.annotation.PostConstruct; import javax.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.validation.Errors; import org.springframework.validation.annotation.Validated; @@ -19,6 +24,7 @@ import io.mosip.authentication.common.service.builder.AuthTransactionBuilder; import io.mosip.authentication.common.service.helper.AuditHelper; import io.mosip.authentication.common.service.helper.AuthTransactionHelper; +import io.mosip.authentication.common.service.kafka.impl.AuthenticationErrorEventingPublisher; import io.mosip.authentication.common.service.util.AuthTypeUtil; import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; import io.mosip.authentication.common.service.validator.AuthRequestValidator; @@ -88,6 +94,12 @@ public class AuthController { @Autowired private PartnerService partnerService; + + @Autowired(required = false) + private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher; + + @Value("${"+ AUTHENTICATION_ERROR_EVENTING_ENABLED +":false}") + private boolean isEventingEnabled; /** @@ -98,6 +110,15 @@ public class AuthController { private void initAuthRequestBinder(WebDataBinder binder) { binder.setValidator(authRequestValidator); } + + @PostConstruct + public void init() { + if (isEventingEnabled) { + if (Objects.isNull(authenticationErrorEventingPublisher)) { + throw new BeanCreationException(AuthenticationErrorEventingPublisher.class.getName(), "Failed to create a bean"); + } + } + } /** * authenticateRequest - method to authenticate request. @@ -157,8 +178,14 @@ public AuthResponseDTO authenticateIndividual(@Validated @RequestBody AuthReques throw authTransactionHelper.createDataValidationException(authTxnBuilder, e, requestWithMetadata); } catch (IdAuthenticationBusinessException e) { mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), - "authenticateApplication", e.getErrorCode() + " : " + e.getErrorText()); + "authenticateApplication", e.getErrorCode() + " : " + e.getErrorText()); + if (isEventingEnabled) { + if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) { + authenticationErrorEventingPublisher.notify(authrequestdto, request.getHeader("signature"), + partner, e, authrequestdto.getMetadata()); + } + } auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.AUTH_REQUEST_RESPONSE, authrequestdto, e); IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWithMetadata, e); e.putMetadata(IdAuthCommonConstants.TRANSACTION_ID, authrequestdto.getTransactionID()); diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/config/KycFilterConfig.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/config/KycFilterConfig.java index d4066164795..3e02f3c9b58 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/config/KycFilterConfig.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/config/KycFilterConfig.java @@ -8,6 +8,7 @@ import io.mosip.authentication.service.kyc.filter.KycAuthFilter; import io.mosip.authentication.service.kyc.filter.KycAuthenticationFilter; import io.mosip.authentication.service.kyc.filter.KycExchangeFilter; +import io.mosip.authentication.service.kyc.filter.VciExchangeFilter; /** * The configuration for adding filters. @@ -68,4 +69,17 @@ public FilterRegistrationBean getKeyBindingFilter() { registrationBean.addUrlPatterns("/identity-key-binding/*"); return registrationBean; } + + /** + * Gets the VCI Exchange filter. + * + * @return the VCI Exchange filter + */ + @Bean + public FilterRegistrationBean getVciExchangeFilter() { + FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); + registrationBean.setFilter(new VciExchangeFilter()); + registrationBean.addUrlPatterns("/vci-exchange/*"); + return registrationBean; + } } diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/IdentityWalletBindingController.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/IdentityWalletBindingController.java index 987da263877..96234fe0122 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/IdentityWalletBindingController.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/IdentityWalletBindingController.java @@ -21,6 +21,7 @@ import io.mosip.authentication.common.service.helper.AuditHelper; import io.mosip.authentication.common.service.helper.AuthTransactionHelper; import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; +import io.mosip.authentication.core.constant.AuditEvents; import io.mosip.authentication.core.constant.IdAuthCommonConstants; import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; import io.mosip.authentication.core.dto.ObjectWithMetadata; @@ -107,7 +108,7 @@ private void initKeyBindingAuthRequestBinder(WebDataBinder binder) { * @throws IdAuthenticationAppException the id authentication app exception * @throws IdAuthenticationDaoException the id authentication dao exception */ - @PostMapping(path = "/identity-key-binding/delegated/{IdP-LK}/{Auth-Partner-ID}/{API-Key}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(path = "/identity-key-binding/delegated/{IdP-LK}/{Auth-Partner-ID}/{OIDC-Client-Id}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) @Operation(summary = "Identity Key Binding Request", description = "to authenticate and bind key with the identity", tags = { "identity-wallet-binding-controller" }) @SecurityRequirement(name = "Authorization") @Parameter(in = ParameterIn.HEADER, name = "signature") @@ -118,8 +119,10 @@ private void initKeyBindingAuthRequestBinder(WebDataBinder binder) { @ApiResponse(responseCode = "403", description = "Forbidden" ,content = @Content(schema = @Schema(hidden = true))), @ApiResponse(responseCode = "404", description = "Not Found" ,content = @Content(schema = @Schema(hidden = true)))}) public IdentityKeyBindingResponseDto processIdKeyBinding(@Validated @RequestBody IdentityKeyBindingRequestDTO identityKeyBindingRequestDTO, - @ApiIgnore Errors errors, @PathVariable("IdP-LK") String mispLK,@PathVariable("Auth-Partner-ID") String partnerId, - @PathVariable("API-Key") String partnerApiKey, HttpServletRequest request) + @ApiIgnore Errors errors, @PathVariable("IdP-LK") String mispLK, + @PathVariable("Auth-Partner-ID") String partnerId, + @PathVariable("OIDC-Client-Id") String oidcClientId, + HttpServletRequest request) throws IdAuthenticationBusinessException, IdAuthenticationAppException, IdAuthenticationDaoException { if(request instanceof ObjectWithMetadata) { ObjectWithMetadata requestWrapperWithMetadata = (ObjectWithMetadata) request; @@ -136,7 +139,7 @@ public IdentityKeyBindingResponseDto processIdKeyBinding(@Validated @RequestBody DataValidationUtil.validate(errors); AuthResponseDTO authResponseDTO = keyIdentityFacade.authenticateIndividual(identityKeyBindingRequestDTO, partnerId, - partnerApiKey, requestWrapperWithMetadata); + oidcClientId, requestWrapperWithMetadata); IdentityKeyBindingResponseDto keyBindingResponseDto = new IdentityKeyBindingResponseDto(); Map metadata = requestWrapperWithMetadata.getMetadata(); @@ -144,13 +147,15 @@ public IdentityKeyBindingResponseDto processIdKeyBinding(@Validated @RequestBody metadata != null && metadata.get(IdAuthCommonConstants.IDENTITY_DATA) != null && metadata.get(IdAuthCommonConstants.IDENTITY_INFO) != null) { - keyBindingResponseDto = keyIdentityFacade.processIdentityKeyBinding(identityKeyBindingRequestDTO, authResponseDTO, - partnerId, partnerApiKey, metadata); + keyBindingResponseDto = keyIdentityFacade.processIdentityKeyBinding(identityKeyBindingRequestDTO, authResponseDTO, + partnerId, oidcClientId, metadata); } return keyBindingResponseDto; } catch (IDDataValidationException e) { mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processIdKeyBinding", e.getErrorTexts().isEmpty() ? "" : e.getErrorText()); + + auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.KEY_BINDIN_REQUEST_RESPONSE, identityKeyBindingRequestDTO, e); IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e); if(identityKeyBindingRequestDTO.getTransactionID() == null) identityKeyBindingRequestDTO.setTransactionID(IdAuthCommonConstants.NO_TRANSACTION_ID); @@ -159,6 +164,8 @@ public IdentityKeyBindingResponseDto processIdKeyBinding(@Validated @RequestBody } catch (IdAuthenticationBusinessException e) { mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processIdKeyBinding", e.getErrorTexts().isEmpty() ? "" : e.getErrorText()); + + auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.KEY_BINDIN_REQUEST_RESPONSE, identityKeyBindingRequestDTO, e); authTransactionHelper.setAuthTransactionEntityMetadata(e, authTxnBuilder, requestWrapperWithMetadata); authTransactionHelper.setAuthTransactionEntityMetadata(requestWrapperWithMetadata, authTxnBuilder); IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e); @@ -170,4 +177,4 @@ public IdentityKeyBindingResponseDto processIdKeyBinding(@Validated @RequestBody throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS); } } -} \ No newline at end of file +} diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/KycAuthController.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/KycAuthController.java index c14856954c7..9028c16a55d 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/KycAuthController.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/KycAuthController.java @@ -1,13 +1,19 @@ package io.mosip.authentication.service.kyc.controller; +import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED; + import java.util.Map; import java.util.Objects; import java.util.Optional; +import javax.annotation.PostConstruct; import javax.servlet.http.HttpServletRequest; import io.mosip.authentication.core.indauth.dto.*; + +import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.validation.Errors; import org.springframework.validation.annotation.Validated; @@ -21,6 +27,7 @@ import io.mosip.authentication.common.service.builder.AuthTransactionBuilder; import io.mosip.authentication.common.service.helper.AuditHelper; import io.mosip.authentication.common.service.helper.AuthTransactionHelper; +import io.mosip.authentication.common.service.kafka.impl.AuthenticationErrorEventingPublisher; import io.mosip.authentication.common.service.util.AuthTypeUtil; import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; import io.mosip.authentication.common.service.validator.AuthRequestValidator; @@ -98,12 +105,18 @@ public class KycAuthController { /** The KycExchangeRequestValidator */ @Autowired private KycExchangeRequestValidator kycExchangeValidator; + + @Autowired(required = false) + private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher; + + @Value("${"+ AUTHENTICATION_ERROR_EVENTING_ENABLED +":false}") + private boolean isEventingEnabled; /** * * @param binder the binder */ - @InitBinder("authRequestDTO") + @InitBinder("kycAuthRequestDTO") private void initKycAuthRequestBinder(WebDataBinder binder) { binder.setValidator(authRequestValidator); } @@ -125,6 +138,15 @@ private void initEKycBinder(WebDataBinder binder) { private void initKycExchangeBinder(WebDataBinder binder) { binder.setValidator(kycExchangeValidator); } + + @PostConstruct + public void init() { + if (isEventingEnabled) { + if (Objects.isNull(authenticationErrorEventingPublisher)) { + throw new BeanCreationException(AuthenticationErrorEventingPublisher.class.getName(), "Failed to create a bean"); + } + } + } /** @@ -194,6 +216,12 @@ public EKycAuthResponseDTO processKyc(@Validated @RequestBody EkycAuthRequestDTO mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processEKyc", e.getErrorTexts().isEmpty() ? "" : e.getErrorText()); + if (isEventingEnabled) { + if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) { + authenticationErrorEventingPublisher.notify(ekycAuthRequestDTO, request.getHeader("signature"), + partner, e, ekycAuthRequestDTO.getMetadata()); + } + } auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.EKYC_REQUEST_RESPONSE, ekycAuthRequestDTO, e); IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e); e.putMetadata(IdAuthCommonConstants.TRANSACTION_ID, ekycAuthRequestDTO.getTransactionID()); @@ -271,7 +299,13 @@ public KycAuthResponseDTO processKycAuth(@Validated @RequestBody KycAuthRequestD } catch (IdAuthenticationBusinessException e) { mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycAuth", e.getErrorTexts().isEmpty() ? "" : e.getErrorText()); - + + if (isEventingEnabled) { + if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) { + authenticationErrorEventingPublisher.notify(authRequestDTO, request.getHeader("signature"), + partner, e, authRequestDTO.getMetadata()); + } + } auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.KYC_REQUEST_RESPONSE, authRequestDTO, e); IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e); e.putMetadata(IdAuthCommonConstants.TRANSACTION_ID, authRequestDTO.getTransactionID()); diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/VCIController.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/VCIController.java new file mode 100644 index 00000000000..1bf86e24cd3 --- /dev/null +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/VCIController.java @@ -0,0 +1,165 @@ +package io.mosip.authentication.service.kyc.controller; + +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.validation.Errors; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import io.mosip.authentication.common.service.builder.AuthTransactionBuilder; +import io.mosip.authentication.common.service.helper.AuthTransactionHelper; +import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.dto.ObjectWithMetadata; +import io.mosip.authentication.core.exception.IDDataValidationException; +import io.mosip.authentication.core.exception.IdAuthenticationAppException; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.exception.IdAuthenticationDaoException; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeResponseDTO; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.partner.dto.PartnerDTO; +import io.mosip.authentication.core.spi.indauth.facade.VciFacade; +import io.mosip.authentication.core.spi.partner.service.PartnerService; +import io.mosip.authentication.core.util.DataValidationUtil; +import io.mosip.authentication.core.util.IdTypeUtil; +import io.mosip.authentication.service.kyc.validator.VciExchangeRequestValidator; +import io.mosip.kernel.core.logger.spi.Logger; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn; +import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.security.SecurityScheme; +import io.swagger.v3.oas.annotations.tags.Tag; +import springfox.documentation.annotations.ApiIgnore; + +/** + * The {@code VCIController} used to validate the issued authentication + * token and issue verifiable credentials after successful validation. + * + * @author Mahammed Taheer + */ +@RestController +@Tag(name = "vci-controller", description = "Verifiable Credential Issuance Controller") +@SecurityScheme(in = SecuritySchemeIn.HEADER, scheme = "basic", type = SecuritySchemeType.APIKEY, name = "Authorization") +public class VCIController { + + /** The mosipLogger. */ + private Logger mosipLogger = IdaLogger.getLogger(IdentityWalletBindingController.class); + + /** The vci facade. */ + @Autowired + private VciFacade vciFacade; + + @Autowired + private IdTypeUtil idTypeUtil; + + @Autowired + private AuthTransactionHelper authTransactionHelper; + + @Autowired + private PartnerService partnerService; + + /** The KycExchangeRequestValidator */ + @Autowired + private VciExchangeRequestValidator vciExchangeRequestValidator; + + /** + * + * @param binder the binder + */ + @InitBinder("vciExchangeRequestDTO") + private void initKeyBindingAuthRequestBinder(WebDataBinder binder) { + binder.setValidator(vciExchangeRequestValidator); + } + + /** + * Controller Method to validate the token returned after successful authentication and + * returns a Verifiable Credential. + * + * @param vciExchangeRequestDTO the VCI Exchange request DTO + * @param errors the errors + * @return kycAuthResponseDTO the kyc response DTO + * @throws IdAuthenticationBusinessException the id authentication business exception + * @throws IdAuthenticationAppException the id authentication app exception + * @throws IdAuthenticationDaoException the id authentication dao exception + */ + @PostMapping(path = "/vci-exchange/delegated/{IdP-LK}/{Auth-Partner-ID}/{OIDC-Client-Id}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + @Operation(summary = "Verifiable Credential Issuance Request", description = "to issue verifiable credential after token validation", tags = { "vci-controller" }) + @SecurityRequirement(name = "Authorization") + @Parameter(in = ParameterIn.HEADER, name = "signature") + @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Request authenticated successfully", + content = @Content(array = @ArraySchema(schema = @Schema(implementation = IdAuthenticationAppException.class)))), + @ApiResponse(responseCode = "201", description = "Created" ,content = @Content(schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "401", description = "Unauthorized" ,content = @Content(schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Forbidden" ,content = @Content(schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Not Found" ,content = @Content(schema = @Schema(hidden = true)))}) + public VciExchangeResponseDTO vciExchange(@Validated @RequestBody VciExchangeRequestDTO vciExchangeRequestDTO, + @ApiIgnore Errors errors, @PathVariable("IdP-LK") String idpLK, + @PathVariable("Auth-Partner-ID") String partnerId, + @PathVariable("OIDC-Client-Id") String oidcClientId, + HttpServletRequest request) + throws IdAuthenticationBusinessException, IdAuthenticationAppException, IdAuthenticationDaoException { + if(request instanceof ObjectWithMetadata) { + ObjectWithMetadata requestWrapperWithMetadata = (ObjectWithMetadata) request; + + Optional partner = partnerService.getPartner(partnerId, vciExchangeRequestDTO.getMetadata()); + AuthTransactionBuilder authTxnBuilder = authTransactionHelper + .createAndSetAuthTxnBuilderMetadataToRequest(vciExchangeRequestDTO, false, partner); + try { + + String idType = Objects.nonNull(vciExchangeRequestDTO.getIndividualIdType()) ? vciExchangeRequestDTO.getIndividualIdType() + : idTypeUtil.getIdType(vciExchangeRequestDTO.getIndividualId()).getType(); + vciExchangeRequestDTO.setIndividualIdType(idType); + vciExchangeRequestValidator.validateIdvId(vciExchangeRequestDTO.getIndividualId(), idType, errors); + DataValidationUtil.validate(errors); + + Map metadata = vciExchangeRequestDTO.getMetadata(); + VciExchangeResponseDTO vciExchangeResponseDTO = vciFacade.processVciExchange(vciExchangeRequestDTO, partnerId, + oidcClientId, metadata, requestWrapperWithMetadata); + + return vciExchangeResponseDTO; + } catch (IDDataValidationException e) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "vciExchange", + e.getErrorTexts().isEmpty() ? "" : e.getErrorText()); + + IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e); + if(vciExchangeRequestDTO.getTransactionID() == null) + vciExchangeRequestDTO.setTransactionID(IdAuthCommonConstants.NO_TRANSACTION_ID); + e.putMetadata(IdAuthCommonConstants.TRANSACTION_ID, vciExchangeRequestDTO.getTransactionID()); + throw authTransactionHelper.createDataValidationException(authTxnBuilder, e, requestWrapperWithMetadata); + } catch (IdAuthenticationBusinessException e) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "vciExchange", + e.getErrorTexts().isEmpty() ? "" : e.getErrorText()); + + authTransactionHelper.setAuthTransactionEntityMetadata(e, authTxnBuilder, requestWrapperWithMetadata); + authTransactionHelper.setAuthTransactionEntityMetadata(requestWrapperWithMetadata, authTxnBuilder); + IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e); + e.putMetadata(IdAuthCommonConstants.TRANSACTION_ID, vciExchangeRequestDTO.getTransactionID()); + throw new IdAuthenticationAppException(e.getErrorCode(), e.getErrorText(), e); + } + } else { + mosipLogger.error("Technical error. HttpServletRequest is not instanceof ObjectWithMetada."); + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS); + } + } +} diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/IdentityKeyBindingFacadeImpl.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/IdentityKeyBindingFacadeImpl.java index 4d5afefcecd..37b60e3cb82 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/IdentityKeyBindingFacadeImpl.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/IdentityKeyBindingFacadeImpl.java @@ -47,6 +47,8 @@ import io.mosip.authentication.core.spi.partner.service.PartnerService; import io.mosip.kernel.core.logger.spi.Logger; +import javax.validation.constraints.NotNull; + /** * * Facade for Identity Key Binding @@ -125,7 +127,7 @@ public AuthResponseDTO authenticateIndividual(AuthRequestDTO authRequest, String @SuppressWarnings("unchecked") @Override - public IdentityKeyBindingResponseDto processIdentityKeyBinding(IdentityKeyBindingRequestDTO identityKeyBindingRequestDTO, + public IdentityKeyBindingResponseDto processIdentityKeyBinding(@NotNull IdentityKeyBindingRequestDTO identityKeyBindingRequestDTO, AuthResponseDTO authResponseDTO, String partnerId, String oidcClientId, Map metadata) throws IdAuthenticationBusinessException { boolean status; @@ -144,14 +146,14 @@ public IdentityKeyBindingResponseDto processIdentityKeyBinding(IdentityKeyBindin status = keyBindingResponseEntry.getValue(); saveToTxnTable(identityKeyBindingRequestDTO, status, partnerId, token, authResponseDTO, keyBindingResponseDto, metadata); auditHelper.audit(AuditModules.IDENTITY_KEY_BINDING, AuditEvents.KEY_BINDIN_REQUEST_RESPONSE, - idHash, IdType.getIDTypeOrDefault(identityKeyBindingRequestDTO.getIndividualIdType()), + identityKeyBindingRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(identityKeyBindingRequestDTO.getIndividualIdType()), "Identity Key Binding status : " + status); return keyBindingResponseDto; } catch (IdAuthenticationBusinessException e) { status = false; saveToTxnTable(identityKeyBindingRequestDTO, status, partnerId, token, authResponseDTO, keyBindingResponseDto, metadata); auditHelper.audit(AuditModules.IDENTITY_KEY_BINDING, AuditEvents.KEY_BINDIN_REQUEST_RESPONSE, - idHash, IdType.getIDTypeOrDefault(identityKeyBindingRequestDTO.getIndividualIdType()), e); + identityKeyBindingRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(identityKeyBindingRequestDTO.getIndividualIdType()), e); throw e; } } diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/KycFacadeImpl.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/KycFacadeImpl.java index 1ab569fb4ca..c8c5c8db3c1 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/KycFacadeImpl.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/KycFacadeImpl.java @@ -29,7 +29,7 @@ import io.mosip.authentication.common.service.entity.KycTokenData; import io.mosip.authentication.common.service.entity.OIDCClientData; import io.mosip.authentication.common.service.helper.AuditHelper; -import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.helper.TokenValidationHelper; import io.mosip.authentication.common.service.integration.TokenIdManager; import io.mosip.authentication.common.service.repository.IdaUinHashSaltRepo; import io.mosip.authentication.common.service.repository.KycTokenDataRepository; @@ -73,6 +73,7 @@ import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; import io.mosip.authentication.core.spi.indauth.service.KycService; import io.mosip.authentication.core.spi.partner.service.PartnerService; +import io.mosip.authentication.service.kyc.util.ExchangeDataAttributesUtil; import io.mosip.kernel.core.logger.spi.Logger; import reactor.util.function.Tuple3; @@ -134,10 +135,10 @@ public class KycFacadeImpl implements KycFacade { private KycTokenDataRepository kycTokenDataRepo; @Autowired - private IdInfoHelper idInfoHelper; + private TokenValidationHelper tokenValidationHelper; @Autowired - private OIDCClientDataRepository oidcClientDataRepo; + private ExchangeDataAttributesUtil exchangeDataAttributesUtil; /* * (non-Javadoc) @@ -196,14 +197,14 @@ public EKycAuthResponseDTO processEKycAuth(@Nonnull EkycAuthRequestDTO kycAuthRe status = kycAuthResponse.getValue(); saveToTxnTable(kycAuthRequestDTO, status, partnerId, token, authResponseDTO, kycAuthResponseDTO, metadata, false); auditHelper.audit(AuditModules.EKYC_AUTH, AuditEvents.EKYC_REQUEST_RESPONSE, - idHash, IdType.getIDTypeOrDefault(kycAuthRequestDTO.getIndividualIdType()), - "kycAuthentication status : " + status); + kycAuthRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(kycAuthRequestDTO.getIndividualIdType()), + "kycAuthentication status : " + status); return kycAuthResponseDTO; } catch (IdAuthenticationBusinessException e) { status = false; saveToTxnTable(kycAuthRequestDTO, status, partnerId, token, authResponseDTO, kycAuthResponseDTO, metadata, false); auditHelper.audit(AuditModules.EKYC_AUTH, AuditEvents.EKYC_REQUEST_RESPONSE, - idHash, IdType.getIDTypeOrDefault(kycAuthRequestDTO.getIndividualIdType()), e); + kycAuthRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(kycAuthRequestDTO.getIndividualIdType()), e); throw e; } } @@ -329,14 +330,14 @@ public KycAuthResponseDTO processKycAuth(@Nonnull AuthRequestDTO kycAuthRequestD status = kycAuthResponse.getValue(); saveToTxnTable(kycAuthRequestDTO, status, partnerId, token, authResponseDTO, kycAuthResponseDTO, metadata, true); auditHelper.audit(AuditModules.KYC_AUTH, AuditEvents.KYC_REQUEST_RESPONSE, - idHash, IdType.getIDTypeOrDefault(kycAuthRequestDTO.getIndividualIdType()), + kycAuthRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(kycAuthRequestDTO.getIndividualIdType()), "kycAuthentication status : " + status); return kycAuthResponseDTO; } catch (IdAuthenticationBusinessException e) { status = false; saveToTxnTable(kycAuthRequestDTO, status, partnerId, token, authResponseDTO, kycAuthResponseDTO, metadata, true); auditHelper.audit(AuditModules.KYC_AUTH, AuditEvents.KYC_REQUEST_RESPONSE, - idHash, IdType.getIDTypeOrDefault(kycAuthRequestDTO.getIndividualIdType()), e); + kycAuthRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(kycAuthRequestDTO.getIndividualIdType()), e); throw e; } } @@ -382,32 +383,22 @@ public KycExchangeResponseDTO processKycExchange(KycExchangeRequestDTO kycExchan String oidcClientId, Map metadata, ObjectWithMetadata requestWithMetadata) throws IdAuthenticationBusinessException { String idHash = null; try { - idHash = securityManager.hash(kycExchangeRequestDTO.getIndividualId()); - mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchance", + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchange", "Processing Kyc Exchange request."); - String kycToken = kycExchangeRequestDTO.getKycToken(); - mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchance", - "Check Token Exists or not, associated with oidc client and active status."); - - Optional kycTokenDataOpt = kycTokenDataRepo.findByKycToken(kycToken); - if (!kycTokenDataOpt.isPresent()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchance", - "KYC Token not found: " + kycToken); - throw new IdAuthenticationBusinessException( - IdAuthenticationErrorConstants.KYC_TOKEN_NOT_FOUND.getErrorCode(), - IdAuthenticationErrorConstants.KYC_TOKEN_NOT_FOUND.getErrorMessage()); - } - KycTokenData kycTokenData = kycTokenDataOpt.get(); - validateKycToken(kycTokenData, oidcClientId, kycExchangeRequestDTO.getTransactionID()); - + String vciAuthToken = kycExchangeRequestDTO.getKycToken(); String idVid = kycExchangeRequestDTO.getIndividualId(); + String idvidHash = securityManager.hash(idVid); + + KycTokenData kycTokenData = tokenValidationHelper.findAndValidateIssuedToken(vciAuthToken, oidcClientId, + kycExchangeRequestDTO.getTransactionID(), idvidHash); + String idvIdType = kycExchangeRequestDTO.getIndividualIdType(); Optional policyForPartner = partnerService.getPolicyForPartner(partnerId, oidcClientId, metadata); Optional policyDtoOpt = policyForPartner.map(PartnerPolicyResponseDTO::getPolicy); if (!policyDtoOpt.isPresent()) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchance", + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchange", "Partner Policy not found: " + partnerId + ", client id: " + oidcClientId); throw new IdAuthenticationBusinessException( IdAuthenticationErrorConstants.PARTNER_POLICY_NOT_FOUND.getErrorCode(), @@ -415,15 +406,15 @@ public KycExchangeResponseDTO processKycExchange(KycExchangeRequestDTO kycExchan } List consentAttributes = kycExchangeRequestDTO.getConsentObtained(); - List allowedConsentAttributes = filterAllowedUserClaims(oidcClientId, consentAttributes); + List allowedConsentAttributes = exchangeDataAttributesUtil.filterAllowedUserClaims(oidcClientId, consentAttributes); PolicyDTO policyDto = policyDtoOpt.get(); List policyAllowedKycAttribs = Optional.ofNullable(policyDto.getAllowedKycAttributes()).stream() .flatMap(Collection::stream).map(KYCAttributes::getAttributeName).collect(Collectors.toList()); Set filterAttributes = new HashSet<>(); - mapConsentedAttributesToIdSchemaAttributes(allowedConsentAttributes, filterAttributes, policyAllowedKycAttribs); - Set policyAllowedAttributes = filterByPolicyAllowedAttributes(filterAttributes, policyAllowedKycAttribs); + exchangeDataAttributesUtil.mapConsentedAttributesToIdSchemaAttributes(allowedConsentAttributes, filterAttributes, policyAllowedKycAttribs); + Set policyAllowedAttributes = exchangeDataAttributesUtil.filterByPolicyAllowedAttributes(filterAttributes, policyAllowedKycAttribs); boolean isBioRequired = false; if (filterAttributes.contains(CbeffDocType.FACE.getType().value().toLowerCase()) || @@ -437,7 +428,7 @@ public KycExchangeResponseDTO processKycExchange(KycExchangeRequestDTO kycExchan Map> idInfo = IdInfoFetcher.getIdInfo(idResDTO); String token = idService.getToken(idResDTO); - String psuToken = kycTokenDataOpt.get().getPsuToken(); + String psuToken = kycTokenData.getPsuToken(); List locales = kycExchangeRequestDTO.getLocales(); if (locales.size() == 0) { locales.add(EnvUtil.getKycExchangeDefaultLanguage()); @@ -454,105 +445,23 @@ public KycExchangeResponseDTO processKycExchange(KycExchangeRequestDTO kycExchan kycExchangeResponseDTO.setId(kycExchangeRequestDTO.getId()); kycExchangeResponseDTO.setTransactionID(kycExchangeRequestDTO.getTransactionID()); kycExchangeResponseDTO.setVersion(kycExchangeRequestDTO.getVersion()); - kycExchangeResponseDTO.setResponseTime(getKycExchangeResponseTime(kycExchangeRequestDTO)); + kycExchangeResponseDTO.setResponseTime(exchangeDataAttributesUtil.getKycExchangeResponseTime(kycExchangeRequestDTO)); EncryptedKycRespDTO encryptedKycRespDTO = new EncryptedKycRespDTO(); encryptedKycRespDTO.setEncryptedKyc(respJson); kycExchangeResponseDTO.setResponse(encryptedKycRespDTO); saveToTxnTable(kycExchangeRequestDTO, false, true, partnerId, token, kycExchangeResponseDTO, requestWithMetadata); auditHelper.audit(AuditModules.KYC_EXCHANGE, AuditEvents.KYC_EXCHANGE_REQUEST_RESPONSE, - idHash, IdType.getIDTypeOrDefault(kycExchangeRequestDTO.getIndividualIdType()), + kycExchangeRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(kycExchangeRequestDTO.getIndividualIdType()), IdAuthCommonConstants.KYC_EXCHANGE_SUCCESS); return kycExchangeResponseDTO; } catch(IdAuthenticationBusinessException e) { auditHelper.audit(AuditModules.KYC_EXCHANGE, AuditEvents.KYC_EXCHANGE_REQUEST_RESPONSE, - idHash, IdType.getIDTypeOrDefault(kycExchangeRequestDTO.getIndividualIdType()), e); + kycExchangeRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(kycExchangeRequestDTO.getIndividualIdType()), e); throw e; } } - private void validateKycToken(KycTokenData kycTokenData, String oidcClientId, String reqTransactionId) - throws IdAuthenticationBusinessException { - String kycToken = kycTokenData.getKycToken(); - if (kycTokenData.getKycTokenStatus().equals(KycTokenStatusType.PROCESSED.getStatus())) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchance", - "KYC Token already processed: " + kycToken); - throw new IdAuthenticationBusinessException( - IdAuthenticationErrorConstants.KYC_TOKEN_ALREADY_PROCESSED.getErrorCode(), - IdAuthenticationErrorConstants.KYC_TOKEN_ALREADY_PROCESSED.getErrorMessage()); - } - if (!kycTokenData.getOidcClientId().equals(oidcClientId)) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchance", - "KYC Token does not belongs to the provided OIDC Client Id: " + kycToken); - throw new IdAuthenticationBusinessException( - IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_OIDC_CLIENT_ID.getErrorCode(), - IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_OIDC_CLIENT_ID.getErrorMessage()); - } - if (!kycTokenData.getRequestTransactionId().equals(reqTransactionId)) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchance", - "KYC Auth & KYC Exchange Transaction Ids are not same: " + kycToken); - throw new IdAuthenticationBusinessException( - IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_TRANSACTION_ID.getErrorCode(), - IdAuthenticationErrorConstants.KYC_TOKEN_INVALID_TRANSACTION_ID.getErrorMessage()); - } - - mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchance", - "KYC Token found, Check Token expire."); - LocalDateTime tokenIssuedDateTime = kycTokenData.getTokenIssuedDateTime(); - boolean isExpired = kycService.isKycTokenExpire(tokenIssuedDateTime, kycToken); - - if (isExpired) { - mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "checkKycTokenExpire", - "KYC Token expired."); - kycTokenData.setKycTokenStatus(KycTokenStatusType.EXPIRED.getStatus()); - kycTokenDataRepo.saveAndFlush(kycTokenData); - throw new IdAuthenticationBusinessException( - IdAuthenticationErrorConstants.KYC_TOKEN_EXPIRED.getErrorCode(), - IdAuthenticationErrorConstants.KYC_TOKEN_EXPIRED.getErrorMessage()); - } - } - - private void mapConsentedAttributesToIdSchemaAttributes(List consentAttributes, Set filterAttributes, - List policyAllowedKycAttribs) throws IdAuthenticationBusinessException { - - if(consentAttributes != null && !consentAttributes.isEmpty()) { - for (String attrib : consentAttributes) { - Collection idSchemaAttribute = idInfoHelper.getIdentityAttributesForIdName(attrib); - filterAttributes.addAll(idSchemaAttribute); - } - // removing individual id from consent if the claim is not allowed in policy. - if (!policyAllowedKycAttribs.contains(consentedIndividualIdAttributeName)) { - consentAttributes.remove(consentedIndividualIdAttributeName); - } - } - } - - private Set filterByPolicyAllowedAttributes(Set filterAttributes, List policyAllowedKycAttribs) { - return policyAllowedKycAttribs.stream() - .filter(attribute -> filterAttributes.contains(attribute)) - .collect(Collectors.toSet()); - } - - private String getKycExchangeResponseTime(KycExchangeRequestDTO kycExchangeRequestDTO) { - String dateTimePattern = EnvUtil.getDateTimePattern(); - return IdaRequestResponsConsumerUtil.getResponseTime(kycExchangeRequestDTO.getRequestTime(), dateTimePattern); - } - - private List filterAllowedUserClaims(String oidcClientId, List consentAttributes) { - mosipLogger.info(IdAuthCommonConstants.IDA, this.getClass().getSimpleName(), "processKycExchange", - "Checking for OIDC client allowed userclaims"); - Optional oidcClientData = oidcClientDataRepo.findByClientId(oidcClientId); - - List oidcClientAllowedUserClaims = List.of(oidcClientData.get().getUserClaims()) - .stream() - .map(String::toLowerCase) - .collect(Collectors.toList()); - - return consentAttributes.stream() - .filter(claim -> oidcClientAllowedUserClaims.contains(claim.toLowerCase())) - .collect(Collectors.toList()); - - } // Need to move below duplicate code to common to be used by OTPService and KycExchange. private void saveToTxnTable(KycExchangeRequestDTO kycExchangeRequestDTO, boolean isInternal, boolean status, String partnerId, String token, diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/VciFacadeImpl.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/VciFacadeImpl.java new file mode 100644 index 00000000000..14e836410e6 --- /dev/null +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/VciFacadeImpl.java @@ -0,0 +1,231 @@ +/** + * + */ +package io.mosip.authentication.service.kyc.facade; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import io.mosip.authentication.common.manager.IdAuthFraudAnalysisEventManager; +import io.mosip.authentication.common.service.builder.AuthTransactionBuilder; +import io.mosip.authentication.common.service.entity.AutnTxn; +import io.mosip.authentication.common.service.entity.KycTokenData; +import io.mosip.authentication.common.service.helper.AuditHelper; +import io.mosip.authentication.common.service.helper.TokenValidationHelper; +import io.mosip.authentication.common.service.integration.TokenIdManager; +import io.mosip.authentication.common.service.repository.IdaUinHashSaltRepo; +import io.mosip.authentication.common.service.repository.KycTokenDataRepository; +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.constant.AuditEvents; +import io.mosip.authentication.core.constant.AuditModules; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.constant.KycTokenStatusType; +import io.mosip.authentication.core.constant.RequestType; +import io.mosip.authentication.core.dto.ObjectWithMetadata; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.IdType; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.VCResponseDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeResponseDTO; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.partner.dto.KYCAttributes; +import io.mosip.authentication.core.partner.dto.PartnerDTO; +import io.mosip.authentication.core.partner.dto.PartnerPolicyResponseDTO; +import io.mosip.authentication.core.partner.dto.PolicyDTO; +import io.mosip.authentication.core.spi.bioauth.CbeffDocType; +import io.mosip.authentication.core.spi.id.service.IdService; +import io.mosip.authentication.core.spi.indauth.facade.VciFacade; +import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher; +import io.mosip.authentication.core.spi.partner.service.PartnerService; +import io.mosip.authentication.service.kyc.impl.VciServiceImpl; +import io.mosip.authentication.service.kyc.util.ExchangeDataAttributesUtil; +import io.mosip.kernel.core.logger.spi.Logger; + +/** + * + * + * Facade to Verifiable Credential details + * + * @author Mahammed Taheer + */ +@Component +public class VciFacadeImpl implements VciFacade { + + /** The mosip logger. */ + private static Logger mosipLogger = IdaLogger.getLogger(VciFacadeImpl.class); + + /** The env. */ + @Autowired + private EnvUtil env; + + /** The Id Info Service */ + @Autowired + private IdService idService; + + /** The AuditHelper */ + @Autowired + private AuditHelper auditHelper; + + @Autowired + private IdaUinHashSaltRepo uinHashSaltRepo; + + /** The TokenId manager */ + @Autowired + private TokenIdManager tokenIdManager; + + @Autowired + private IdAuthSecurityManager securityManager; + + @Autowired + private PartnerService partnerService; + + @Autowired + private IdAuthFraudAnalysisEventManager fraudEventManager; + + @Autowired + private VciServiceImpl vciServiceImpl; + + @Autowired + private TokenValidationHelper tokenValidationHelper; + + @Autowired + private KycTokenDataRepository kycTokenDataRepo; + + @Autowired + private ExchangeDataAttributesUtil exchangeDataAttributesUtil; + + @Override + public VciExchangeResponseDTO processVciExchange(VciExchangeRequestDTO vciExchangeRequestDTO, String partnerId, + String oidcClientId, Map metadata, ObjectWithMetadata requestWithMetadata) throws IdAuthenticationBusinessException { + String idvidHash = null; + try { + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processVciExchange", + "Processing VCI Exchange request."); + + String vciAuthToken = vciExchangeRequestDTO.getVcAuthToken(); + String idVid = vciExchangeRequestDTO.getIndividualId(); + idvidHash = securityManager.hash(idVid); + + KycTokenData kycTokenData = tokenValidationHelper.findAndValidateIssuedToken(vciAuthToken, oidcClientId, + vciExchangeRequestDTO.getTransactionID(), idvidHash); + + String idvIdType = vciExchangeRequestDTO.getIndividualIdType(); + Optional policyForPartner = partnerService.getPolicyForPartner(partnerId, oidcClientId, metadata); + Optional policyDtoOpt = policyForPartner.map(PartnerPolicyResponseDTO::getPolicy); + + if (!policyDtoOpt.isPresent()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycExchange", + "Partner Policy not found: " + partnerId + ", client id: " + oidcClientId); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.PARTNER_POLICY_NOT_FOUND.getErrorCode(), + IdAuthenticationErrorConstants.PARTNER_POLICY_NOT_FOUND.getErrorMessage()); + } + + // Will implement later the consent claims based on credential definition input + List consentAttributes = Collections.emptyList(); + List allowedConsentAttributes = exchangeDataAttributesUtil.filterAllowedUserClaims(oidcClientId, consentAttributes); + + PolicyDTO policyDto = policyDtoOpt.get(); + List policyAllowedKycAttribs = Optional.ofNullable(policyDto.getAllowedKycAttributes()).stream() + .flatMap(Collection::stream).map(KYCAttributes::getAttributeName).collect(Collectors.toList()); + + Set filterAttributes = new HashSet<>(); + exchangeDataAttributesUtil.mapConsentedAttributesToIdSchemaAttributes(allowedConsentAttributes, filterAttributes, policyAllowedKycAttribs); + Set policyAllowedAttributes = exchangeDataAttributesUtil.filterByPolicyAllowedAttributes(filterAttributes, policyAllowedKycAttribs); + + boolean isBioRequired = false; + if (filterAttributes.contains(CbeffDocType.FACE.getType().value().toLowerCase()) || + filterAttributes.contains(IdAuthCommonConstants.PHOTO.toLowerCase())) { + policyAllowedAttributes.add(CbeffDocType.FACE.getType().value().toLowerCase()); + isBioRequired = true; + } + + Map idResDTO = idService.processIdType(idvIdType, idVid, isBioRequired, + IdAuthCommonConstants.VCI_EXCHANGE_CONSUME_VID_DEFAULT, policyAllowedAttributes); + + String token = idService.getToken(idResDTO); + + vciServiceImpl.addCredSubjectId(vciExchangeRequestDTO.getCredSubjectId(), idvidHash, token, oidcClientId); + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processVciExchange", + "Added Credential Subject Id complete."); + + Map> idInfo = IdInfoFetcher.getIdInfo(idResDTO); + + String psuToken = kycTokenData.getPsuToken(); + List locales = vciExchangeRequestDTO.getLocales(); + if (Objects.isNull(locales) || locales.size() == 0) { + locales = new ArrayList<>(); // throws NullPointer if locales is null + locales.add(EnvUtil.getKycExchangeDefaultLanguage()); + } + + VCResponseDTO vcResponseDTO = vciServiceImpl.buildVerifiableCredentials(vciExchangeRequestDTO.getCredSubjectId(), vciExchangeRequestDTO.getVcFormat(), + idInfo, locales, policyAllowedAttributes, vciExchangeRequestDTO, psuToken); + + // update kyc token status + kycTokenData.setKycTokenStatus(KycTokenStatusType.PROCESSED.getStatus()); + kycTokenDataRepo.saveAndFlush(kycTokenData); + VciExchangeResponseDTO vciExchangeResponseDTO = new VciExchangeResponseDTO(); + vciExchangeResponseDTO.setId(vciExchangeRequestDTO.getId()); + vciExchangeResponseDTO.setTransactionID(vciExchangeRequestDTO.getTransactionID()); + vciExchangeResponseDTO.setVersion(vciExchangeRequestDTO.getVersion()); + vciExchangeResponseDTO.setResponseTime(exchangeDataAttributesUtil.getKycExchangeResponseTime(vciExchangeRequestDTO)); + vciExchangeResponseDTO.setResponse(vcResponseDTO); + saveToTxnTable(vciExchangeRequestDTO, false, true, partnerId, token, vciExchangeResponseDTO, requestWithMetadata); + auditHelper.audit(AuditModules.VCI_EXCHANGE, AuditEvents.VCI_EXCHANGE_REQUEST_RESPONSE, + vciExchangeRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(vciExchangeRequestDTO.getIndividualIdType()), + IdAuthCommonConstants.VCI_EXCHANGE_SUCCESS); + return vciExchangeResponseDTO; + } catch(IdAuthenticationBusinessException e) { + auditHelper.audit(AuditModules.VCI_EXCHANGE, AuditEvents.VCI_EXCHANGE_REQUEST_RESPONSE, + vciExchangeRequestDTO.getTransactionID(), IdType.getIDTypeOrDefault(vciExchangeRequestDTO.getIndividualIdType()), e); + throw e; + } + } + + // Need to move below duplicate code to common to be used by OTPService and KycExchange. + private void saveToTxnTable(VciExchangeRequestDTO vciExchangeRequestDTO, boolean isInternal, boolean status, String partnerId, String token, + VciExchangeResponseDTO vciExchangeResponseDTO, ObjectWithMetadata requestWithMetadata) + throws IdAuthenticationBusinessException { + if (token != null) { + boolean authTokenRequired = !isInternal + && EnvUtil.getAuthTokenRequired(); + String authTokenId = authTokenRequired ? tokenIdManager.generateTokenId(token, partnerId) : null; + saveTxn(vciExchangeRequestDTO, token, authTokenId, status, partnerId, isInternal, vciExchangeResponseDTO, requestWithMetadata); + } + } + + private void saveTxn(VciExchangeRequestDTO vciExchangeRequestDTO, String token, String authTokenId, + boolean status, String partnerId, boolean isInternal, VciExchangeResponseDTO vciExchangeResponseDTO, ObjectWithMetadata requestWithMetadata) + throws IdAuthenticationBusinessException { + Optional partner = isInternal ? Optional.empty() : partnerService.getPartner(partnerId, vciExchangeRequestDTO.getMetadata()); + AutnTxn authTxn = AuthTransactionBuilder.newInstance() + .withRequest(vciExchangeRequestDTO) + .addRequestType(RequestType.VCI_EXCHANGE_REQUEST) + .withAuthToken(authTokenId) + .withStatus(status) + .withToken(token) + .withPartner(partner) + .withInternal(isInternal) + .build(env,uinHashSaltRepo,securityManager); + fraudEventManager.analyseEvent(authTxn); + if(requestWithMetadata != null) { + requestWithMetadata.setMetadata(Map.of(AutnTxn.class.getSimpleName(), authTxn)); + } else { + idService.saveAutnTxn(authTxn); + } + } +} diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/filter/KycAuthFilter.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/filter/KycAuthFilter.java index de11d4f2ebc..426f3824b39 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/filter/KycAuthFilter.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/filter/KycAuthFilter.java @@ -59,6 +59,8 @@ protected void checkAllowedAuthTypeBasedOnPolicy(Map requestBody if (AuthTypeUtil.isKeyBindedToken(kycAuthRequestDTO)) { super.checkAllowedAuthTypeForKeyBindedToken(requestBody, authPolicies); } + + super.checkAllowedAuthTypeForPassword(requestBody, authPolicies); } catch (IOException e) { throw new IdAuthenticationAppException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS, e); } diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/filter/VciExchangeFilter.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/filter/VciExchangeFilter.java new file mode 100644 index 00000000000..54b6ff05667 --- /dev/null +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/filter/VciExchangeFilter.java @@ -0,0 +1,115 @@ +package io.mosip.authentication.service.kyc.filter; + +import java.util.List; +import java.util.Map; + +import org.springframework.stereotype.Component; + +import io.mosip.authentication.common.service.filter.IdAuthFilter; +import io.mosip.authentication.common.service.filter.ResettableStreamHttpServletRequest; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.exception.IdAuthenticationAppException; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.partner.dto.AuthPolicy; +import io.mosip.authentication.core.partner.dto.MispPolicyDTO; +import io.mosip.kernel.core.logger.spi.Logger; + +/** + * The Class VciExchangeFilter - used to validate the request and returns + * Verifiable Credentials as response. + * + * @author Mahammed Taheer + */ +@Component +public class VciExchangeFilter extends IdAuthFilter { + + private static Logger mosipLogger = IdaLogger.getLogger(VciExchangeFilter.class); + + /** The Constant KYC. */ + private static final String VCI_EXCHANGE = "vciexchange"; + + @Override + protected boolean isPartnerCertificateNeeded() { + return true; + } + + /* + * (non-Javadoc) + * + * @see io.mosip.authentication.service.filter.IdAuthFilter# + * checkAllowedAuthTypeBasedOnPolicy(java.util.Map, java.util.List) + */ + @Override + protected void checkAllowedAuthTypeBasedOnPolicy(Map requestBody, List authPolicies) + throws IdAuthenticationAppException { + if (!isAllowedAuthType(VCI_EXCHANGE, authPolicies)) { + throw new IdAuthenticationAppException(IdAuthenticationErrorConstants.UNAUTHORISED_VCI_EXCHANGE_PARTNER.getErrorCode(), + IdAuthenticationErrorConstants.UNAUTHORISED_VCI_EXCHANGE_PARTNER.getErrorMessage()); + + } + } + + /* (non-Javadoc) + * @see io.mosip.authentication.common.service.filter.IdAuthFilter#checkMandatoryAuthTypeBasedOnPolicy(java.util.Map, java.util.List) + */ + @Override + protected void checkMandatoryAuthTypeBasedOnPolicy(Map requestBody, + List mandatoryAuthPolicies) throws IdAuthenticationAppException { + // Nothing to do + } + + @Override + protected boolean isSigningRequired() { + return true; + } + + @Override + protected boolean isSignatureVerificationRequired() { + return true; + } + + @Override + protected boolean isTrustValidationRequired() { + return true; + } + + @Override + protected String fetchId(ResettableStreamHttpServletRequest requestWrapper, String attribute) { + return attribute + VCI_EXCHANGE; + } + + protected boolean needStoreAuthTransaction() { + return true; + } + + protected boolean needStoreAnonymousProfile() { + return true; + } + + @Override + protected boolean isMispPolicyValidationRequired() { + return true; + } + + @Override + protected boolean isCertificateValidationRequired() { + return true; + } + + @Override + protected boolean isAMRValidationRequired() { + return false; + } + + @Override + protected void checkMispPolicyAllowed(MispPolicyDTO mispPolicy) throws IdAuthenticationAppException { + // check whether policy is allowed for vci exchange or not. + if (!mispPolicy.isAllowVciRequestDelegation()) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getCanonicalName(), "checkMispPolicyAllowed", + "MISP Partner not allowed for the Auth Type - vci-exchange."); + throw new IdAuthenticationAppException(IdAuthenticationErrorConstants.VCI_EXCHANGE_NOT_ALLOWED.getErrorCode(), + String.format(IdAuthenticationErrorConstants.VCI_EXCHANGE_NOT_ALLOWED.getErrorMessage(), "VCI-EXCHANGE")); + } + } +} diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/impl/KycServiceImpl.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/impl/KycServiceImpl.java index bd30a80f40b..a2bf7d0196f 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/impl/KycServiceImpl.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/impl/KycServiceImpl.java @@ -4,6 +4,7 @@ import java.nio.ByteBuffer; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; +import java.time.temporal.ValueRange; import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.HashMap; @@ -78,6 +79,9 @@ public class KycServiceImpl implements KycService { @Value("${ida.idp.consented.address.attribute.name:address}") private String consentedAddressAttributeName; + @Value("${ida.idp.consented.name.attribute.name:name}") + private String consentedNameAttributeName; + @Value("${ida.idp.consented.individual_id.attribute.name:individual_id}") private String consentedIndividualAttributeName; @@ -438,9 +442,11 @@ public boolean isKycTokenExpire(LocalDateTime tokenIssuedDateTime, String kycTok LocalDateTime currentTime = LocalDateTime.now(); long diffSeconds = ChronoUnit.SECONDS.between(tokenIssuedDateTime, currentTime); + long adjustmentSeconds = EnvUtil.getKycTokenExpireTimeAdjustmentSeconds(); + ValueRange valueRange = ValueRange.of(0, adjustmentSeconds); - if (tokenIssuedDateTime != null && adjustmentSeconds < diffSeconds) { + if (tokenIssuedDateTime != null && !valueRange.isValidIntValue(diffSeconds)) { return true; } return false; @@ -449,8 +455,7 @@ public boolean isKycTokenExpire(LocalDateTime tokenIssuedDateTime, String kycTok @Override public String buildKycExchangeResponse(String subject, Map> idInfo, - List consentedAttributes, List consentedLocales, String idVid, KycExchangeRequestDTO kycExchangeRequestDTO) - throws IdAuthenticationBusinessException { + List consentedAttributes, List consentedLocales, String idVid, KycExchangeRequestDTO kycExchangeRequestDTO) throws IdAuthenticationBusinessException { mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "buildKycExchangeResponse", "Building claims response for PSU token: " + subject); @@ -545,6 +550,9 @@ private void addEntityForLangCodes(Map mappedConsentedLocales, M } } } else { + if (consentedAttribute.equals(consentedNameAttributeName)) { + addNameClaim(mappedConsentedLocales, idInfo, respMap, consentedAttribute, idSchemaAttributes); + } if (consentedAttribute.equals(consentedAddressAttributeName)) { if (mappedConsentedLocales.size() > 1) { for (String consentedLocale: mappedConsentedLocales.keySet()) { @@ -600,12 +608,14 @@ private void addFormattedAddress(List idSchemaAttributes, Map 0) addressMap.put(addressAttribute + localeAppendValue, identityInfoValue.toString()); } + if (addressMap.size() == 0) + return; + if (langCodeFound && addLocale) respMap.put(consentedAddressAttributeName + localeAppendValue, addressMap); else respMap.put(consentedAddressAttributeName, addressMap); } + private void addNameClaim(Map mappedConsentedLocales, Map> idInfo, + Map respMap, String consentedAttribute, List idSchemaAttributes) throws IdAuthenticationBusinessException{ + if(mappedConsentedLocales.size() > 1) { + for (String consentedLocale: mappedConsentedLocales.keySet()) { + String consentedLocaleValue = mappedConsentedLocales.get(consentedLocale); + StringBuilder nameBuffer = new StringBuilder(); + for (String idSchemaAttribute : idSchemaAttributes) { + List idInfoList = idInfo.get(idSchemaAttribute); + + if (Objects.isNull(idInfoList)) { + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "addEntityForLangCodes", + "Data not available in Identity Info for the claim. So not adding to response claims. Claim Name: " + idSchemaAttribute); + continue; + } + if (nameBuffer.length() > 0) { + nameBuffer.append(" "); + } + Map mappedLangCodes = langCodeMapping(idInfoList); + if (!mappedLangCodes.keySet().contains(consentedLocaleValue)) { + break; + } + for (IdentityInfoDTO identityInfo : idInfoList) { + String langCode = mappedLangCodes.get(consentedLocaleValue); + if (identityInfo.getLanguage().equalsIgnoreCase(langCode)) { + nameBuffer.append(identityInfo.getValue()); + } + } + } + if (nameBuffer.toString().trim().length() > 0) + respMap.put(consentedAttribute + IdAuthCommonConstants.CLAIMS_LANG_SEPERATOR + consentedLocaleValue, nameBuffer.toString()); + } + } else { + StringBuilder nameBuffer = new StringBuilder(); + for (String idSchemaAttribute : idSchemaAttributes) { + List idInfoList = idInfo.get(idSchemaAttribute); + + if (Objects.isNull(idInfoList)) { + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "addEntityForLangCodes", + "Data not available in Identity Info for the claim. So not adding to response claims. Claim Name: " + idSchemaAttribute); + continue; + } + if (nameBuffer.length() > 0) { + nameBuffer.append(" "); + } + Map mappedLangCodes = langCodeMapping(idInfoList); + List availableLangCodes = getAvailableLangCodes(mappedConsentedLocales, mappedLangCodes); + if (availableLangCodes.size() == 0) { + continue; + } + for (IdentityInfoDTO identityInfo : idInfoList) { + String langCode = mappedLangCodes.get(availableLangCodes.get(0)); + if (identityInfo.getLanguage().equalsIgnoreCase(langCode)) { + nameBuffer.append(identityInfo.getValue()); + } + } + } + if (nameBuffer.toString().trim().length() > 0) + respMap.put(consentedAttribute, nameBuffer.toString()); + } + } + private String convertJP2ToJpeg(String jp2Image) { try { ConvertRequestDto convertRequestDto = new ConvertRequestDto(); @@ -712,4 +786,4 @@ private String getFaceBDB(String faceCbeff) throws Exception { } return CryptoUtil.encodeBase64(birDataFromXMLType.get(0).getBdb()); } -} \ No newline at end of file +} diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/impl/VciServiceImpl.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/impl/VciServiceImpl.java new file mode 100644 index 00000000000..b3ce6019255 --- /dev/null +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/impl/VciServiceImpl.java @@ -0,0 +1,466 @@ +package io.mosip.authentication.service.kyc.impl; + +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.COLON; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.JWK_KEY_TYPE; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.PUBLIC_KEY_EXPONENT_KEY; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.PUBLIC_KEY_MODULUS_KEY; + +import java.io.IOException; +import java.math.BigInteger; +import java.net.URI; +import java.net.URISyntaxException; +import java.security.GeneralSecurityException; +import java.security.KeyFactory; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.RSAPublicKeySpec; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; + +import javax.annotation.PostConstruct; + +import org.json.simple.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import com.apicatalog.jsonld.document.JsonDocument; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.module.afterburner.AfterburnerModule; + +import foundation.identity.jsonld.ConfigurableDocumentLoader; +import foundation.identity.jsonld.JsonLDException; +import foundation.identity.jsonld.JsonLDObject; +import info.weboftrust.ldsignatures.LdProof; +import info.weboftrust.ldsignatures.canonicalizer.URDNA2015Canonicalizer; +import io.mosip.authentication.common.service.entity.CredSubjectIdStore; +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.impl.match.BioMatchType; +import io.mosip.authentication.common.service.repository.CredSubjectIdStoreRepository; +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.constant.VCFormats; +import io.mosip.authentication.core.constant.VCStatus; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.VCResponseDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.spi.bioauth.CbeffDocType; +import io.mosip.authentication.core.spi.indauth.service.VciService; +import io.mosip.authentication.core.util.CryptoUtil; +import io.mosip.authentication.service.kyc.util.VCSchemaProviderUtil; +import io.mosip.biometrics.util.ConvertRequestDto; +import io.mosip.biometrics.util.face.FaceDecoder; +import io.mosip.kernel.biometrics.constant.BiometricType; +import io.mosip.kernel.biometrics.entities.BIR; +import io.mosip.kernel.biometrics.spi.CbeffUtil; +import io.mosip.kernel.core.logger.spi.Logger; +import io.mosip.kernel.core.util.DateUtils; +import io.mosip.kernel.core.util.StringUtils; + +/** + * The implementation of Verifiable Credential Issuance service. + * + * @author Mahammed Taheer + */ + +@Service +public class VciServiceImpl implements VciService { + + /** The mosipLogger. */ + private Logger mosipLogger = IdaLogger.getLogger(VciServiceImpl.class); + + private static final ObjectMapper OBJECT_MAPPER; + static { + OBJECT_MAPPER = new ObjectMapper(); + OBJECT_MAPPER.registerModule(new AfterburnerModule()); + } + + @Value("${ida.idp.consented.individual_id.attribute.name:individual_id}") + private String consentedIndividualAttributeName; + + @Value("${mosip.ida.config.server.file.storage.uri:}") + private String configServerFileStorageUrl; + + @Value("#{${mosip.ida.vercred.context.url.map}}") + private Map vcContextUrlMap; + + @Value("${mosip.ida.vercred.context.uri:}") + private String vcContextUri; + + @Value("${mosip.ida.vercred.id.url:}") + private String verCredIdUrl; + + @Value("${ida.idp.consented.picture.attribute.prefix:data:image/jpeg;base64,}") + private String consentedPictureAttributePrefix; + + @Value("${mosip.ida.vercred.issuer.url:}") + private String verCredIssuer; + + @Value("${mosip.ida.vercred.proof.purpose:}") + private String proofPurpose; + + @Value("${mosip.ida.vercred.proof.type:}") + private String proofType; + + @Value("${mosip.ida.vercred.proof.verificationmethod:}") + private String verificationMethod; + + private ConfigurableDocumentLoader confDocumentLoader; + + private JSONObject vcContextJsonld; + + @Autowired + private IdAuthSecurityManager securityManager; + + @Autowired + private CredSubjectIdStoreRepository csidStoreRepo; + + @Autowired + private VCSchemaProviderUtil vcSchemaProviderUtil; + + /** The demo helper. */ + @Autowired + private IdInfoHelper idInfoHelper; + + @Autowired + private CbeffUtil cbeffUtil; + + @PostConstruct + private void init() throws IdAuthenticationBusinessException { + if(Objects.isNull(vcContextUrlMap)){ + mosipLogger.warn(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "VciServiceImpl::init", + "Warning - Verifiable Credential Context URL Map not configured, VC generation may fail."); + confDocumentLoader = new ConfigurableDocumentLoader(); + confDocumentLoader.setEnableHttps(true); + confDocumentLoader.setEnableHttp(true); + confDocumentLoader.setEnableFile(false); + } else { + Map jsonDocumentCacheMap = new HashMap (); + vcContextUrlMap.keySet().stream().forEach(contextUrl -> { + String localConfigUri = vcContextUrlMap.get(contextUrl); + JsonDocument jsonDocument = vcSchemaProviderUtil.getVCContextSchema(configServerFileStorageUrl, localConfigUri); + try { + jsonDocumentCacheMap.put(new URI(contextUrl), jsonDocument); + } catch (URISyntaxException e) { + mosipLogger.warn(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "VciServiceImpl::init", + "Warning - Verifiable Credential URI not able to add to cacheMap."); + } + }); + confDocumentLoader = new ConfigurableDocumentLoader(jsonDocumentCacheMap); + confDocumentLoader.setEnableHttps(false); + confDocumentLoader.setEnableHttp(false); + confDocumentLoader.setEnableFile(false); + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "VciServiceImpl::init", + "Added cache for the list of configured URL Map: " + jsonDocumentCacheMap.keySet().toString()); + } + vcContextJsonld = vcSchemaProviderUtil.getVCContextData(configServerFileStorageUrl, vcContextUri, OBJECT_MAPPER); + } + + @Override + public void addCredSubjectId(String credSubjectId, String idVidHash, String tokenId, String oidcClientId) + throws IdAuthenticationBusinessException { + + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "addCredSubjectId", + "Add Cred Subject Id for Id/Vid:" + idVidHash); + String[] didArray = StringUtils.split(credSubjectId, COLON); + String identityJwk = new String(CryptoUtil.decodeBase64(didArray[2])); + JSONObject jsonObject = null; + try { + jsonObject = OBJECT_MAPPER.readValue(identityJwk, JSONObject.class); + } catch (IOException ioe) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "addCredSubjectId", + "Error parsing Identity JWK", ioe); + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS, ioe); + } + + String identityKeyHash = getPublicKeyHash(jsonObject); + List credSubjectIdList = csidStoreRepo.findAllByCsidKeyHash(identityKeyHash); + // Case 0: key not exists. List size is zero + if (credSubjectIdList.size() == 0) { + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "addCredSubjectId", + "Input Key not present, adding the did jwk in the store."); + addCredSubjectId(credSubjectId, idVidHash, tokenId, oidcClientId, identityKeyHash); + return; + } + + // Case 1: key exists but mapped to same id/vid and same token id + boolean sameIdVid = credSubjectIdList.stream().anyMatch(credSubId -> credSubId.getIdVidHash().equals(idVidHash) && + credSubId.getTokenId().equals(tokenId)); + if (sameIdVid) { + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "addCredSubjectId", + "Input Key already available and mapped to same id/vid and token id."); + return; + } + // Case 2: key exists but mapped to different id/vid and same token id. + boolean diffIdVidSameToken = credSubjectIdList.stream().anyMatch(credSubId -> !credSubId.getIdVidHash().equals(idVidHash) && + credSubId.getTokenId().equals(tokenId)); + if (diffIdVidSameToken) { + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "addCredSubjectId", + "Input Key already available and mapped to different id/vid but mapped to same token id. " + + "So, adding new entry in store."); + addCredSubjectId(credSubjectId, idVidHash, tokenId, oidcClientId, identityKeyHash); + return; + } + + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "addCredSubjectId", + "Input Key already available and mapped to different id/vid & token id. " + + "Not allowed to map to input id/vid."); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.KEY_ALREADY_MAPPED_ERROR.getErrorCode(), + IdAuthenticationErrorConstants.KEY_ALREADY_MAPPED_ERROR.getErrorMessage()); + + } + + private String getPublicKeyHash(JSONObject jsonObject) throws IdAuthenticationBusinessException{ + + try { + String publicKeyExponent = jsonObject.get(PUBLIC_KEY_EXPONENT_KEY).toString(); + String publicKeyModulus = jsonObject.get(PUBLIC_KEY_MODULUS_KEY).toString(); + String keyType = jsonObject.get(JWK_KEY_TYPE).toString(); + if (keyType.equalsIgnoreCase(IdAuthCommonConstants.ALGORITHM_RSA)) { + KeyFactory keyfactory = KeyFactory.getInstance(IdAuthCommonConstants.ALGORITHM_RSA); + BigInteger modulus = new BigInteger(1, CryptoUtil.decodeBase64Url(publicKeyModulus)); + BigInteger exponent = new BigInteger(1, CryptoUtil.decodeBase64Url(publicKeyExponent)); + PublicKey rsaKey = keyfactory.generatePublic(new RSAPublicKeySpec(modulus, exponent)); + return IdAuthSecurityManager.generateHashAndDigestAsPlainText(rsaKey.getEncoded()); + } + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "getPublicKeyHash", + "Not Supported Key type."); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.KEY_TYPE_NOT_SUPPORT.getErrorCode(), + IdAuthenticationErrorConstants.KEY_TYPE_NOT_SUPPORT.getErrorMessage()); + } catch (InvalidKeySpecException | NoSuchAlgorithmException e) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "getPublicKeyHash", + "Error Building Public Key Object.", e); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.CREATE_VCI_PUBLIC_KEY_OBJECT_ERROR.getErrorCode(), + IdAuthenticationErrorConstants.CREATE_VCI_PUBLIC_KEY_OBJECT_ERROR.getErrorMessage()); + } + } + + private void addCredSubjectId(String credSubjectId, String idVidHash, String tokenId, + String oidcClientId, String keyHash) { + + String uuid = UUID.randomUUID().toString(); + CredSubjectIdStore credSubjectIdStore = new CredSubjectIdStore(); + credSubjectIdStore.setId(uuid); + credSubjectIdStore.setIdVidHash(idVidHash); + credSubjectIdStore.setTokenId(tokenId); + credSubjectIdStore.setCredSubjectId(credSubjectId); + credSubjectIdStore.setOidcClientId(oidcClientId); + credSubjectIdStore.setCsidKeyHash(keyHash); + credSubjectIdStore.setCsidStatus(VCStatus.ACTIVE.getStatus()); + credSubjectIdStore.setCreatedBy(EnvUtil.getAppId()); + credSubjectIdStore.setCrDTimes(DateUtils.getUTCCurrentDateTime()); + csidStoreRepo.saveAndFlush(credSubjectIdStore); + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "addCredSubjectId", + "Credential subject Id details Saved."); + } + + @Override + public VCResponseDTO buildVerifiableCredentials(String credSubjectId, String vcFormat, + Map> idInfo, List locales, Set allowedAttributes, + VciExchangeRequestDTO vciExchangeRequestDTO, String psuToken) throws IdAuthenticationBusinessException { + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "buildVerifiableCredentials", + "Building Verifiable Credentials for format: " + vcFormat); + + switch (VCFormats.valueOf(vcFormat.toUpperCase())) { + case LDP_VC: + JsonLDObject ldObject = generateLdpVc(credSubjectId, idInfo, locales, allowedAttributes, vciExchangeRequestDTO, psuToken); + VCResponseDTO vcResponseDTO = new VCResponseDTO<>(); + vcResponseDTO.setVerifiableCredentials(ldObject); + return vcResponseDTO; + case JWT_VC_JSON: + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.VCI_NOT_SUPPORTED_ERROR); + case JWT_VC_JSON_LD: + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.VCI_NOT_SUPPORTED_ERROR); + default: + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.VCI_NOT_SUPPORTED_ERROR); + } + } + + private JsonLDObject generateLdpVc(String credSubjectId, Map> idInfo, + List locales, Set allowedAttributes, VciExchangeRequestDTO vciExchangeRequestDTO, + String psuToken) throws IdAuthenticationBusinessException { + + Map credSubjectMap = getCredSubjectMap(credSubjectId, idInfo, locales, allowedAttributes, vciExchangeRequestDTO); + try { + Map verCredJsonObject = new HashMap<>(); + + // @Context + Object contextObj = vcContextJsonld.get("context"); + verCredJsonObject.put(IdAuthCommonConstants.VC_AT_CONTEXT, contextObj); + + // vc type + verCredJsonObject.put(IdAuthCommonConstants.VC_TYPE, vciExchangeRequestDTO.getCredentialsDefinition().getType()); + + // vc id + String vcId = UUID.randomUUID().toString(); + verCredJsonObject.put(IdAuthCommonConstants.VC_ID, verCredIdUrl + vcId); + + // vc issuer + verCredJsonObject.put(IdAuthCommonConstants.VC_ISSUER, verCredIssuer); + + // vc issuance date + DateTimeFormatter format = DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern()); + LocalDateTime localdatetime = LocalDateTime.parse(DateUtils.getUTCCurrentDateTimeString(EnvUtil.getDateTimePattern()), format); + verCredJsonObject.put(IdAuthCommonConstants.VC_ISSUANCE_DATE, DateUtils.formatToISOString(localdatetime)); + + // vc credentialSubject + verCredJsonObject.put(IdAuthCommonConstants.CREDENTIALSUBJECT, credSubjectMap); + + // Build the Json LD Object. + JsonLDObject vcJsonLdObject = JsonLDObject.fromJsonObject(verCredJsonObject); + vcJsonLdObject.setDocumentLoader(confDocumentLoader); + + // vc proof + Date created = Date.from(localdatetime.atZone(ZoneId.systemDefault()).toInstant()); + LdProof vcLdProof = LdProof.builder() + .defaultContexts(false) + .defaultTypes(false) + .type(proofType) + .created(created) + .proofPurpose(proofPurpose) + .verificationMethod(new URI(verificationMethod)) + .build(); + + URDNA2015Canonicalizer canonicalizer = new URDNA2015Canonicalizer(); + byte[] vcSignBytes = canonicalizer.canonicalize(vcLdProof, vcJsonLdObject); + String vcEncodedData = CryptoUtil.encodeBase64Url(vcSignBytes); + + mosipLogger.debug(IdAuthCommonConstants.SESSION_ID, this.getClass().getCanonicalName(), "generateLdpVc", + "Hash value for the generated VC: " + vcEncodedData); + + String jws = securityManager.jwsSignWithPayload(vcEncodedData); + + LdProof ldProofWithJWS = LdProof.builder() + .base(vcLdProof) + .defaultContexts(false) + .jws(jws) + .build(); + + ldProofWithJWS.addToJsonLDObject(vcJsonLdObject); + mosipLogger.info(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "generateLdpVc", + "Verifiable Credential Generation completed for the provided data."); + return vcJsonLdObject; + } catch (IOException | GeneralSecurityException | JsonLDException | URISyntaxException e) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "generateLdpVc", + "Error Building Ldp VC.", e); + throw new IdAuthenticationBusinessException( + IdAuthenticationErrorConstants.LDP_VC_GENERATION_FAILED.getErrorCode(), + IdAuthenticationErrorConstants.LDP_VC_GENERATION_FAILED.getErrorMessage()); + } + } + + private Map getCredSubjectMap(String credSubjectId, Map> idInfo, + List locales, Set allowedAttributes, VciExchangeRequestDTO vciExchangeRequestDTO) + throws IdAuthenticationBusinessException { + Map credSubjectMap = new HashMap<>(); + + credSubjectMap.put(IdAuthCommonConstants.VC_ID, credSubjectId); + + for (String attrib : allowedAttributes) { + if (consentedIndividualAttributeName.equals(attrib)) { + credSubjectMap.put(vciExchangeRequestDTO.getIndividualIdType(), vciExchangeRequestDTO.getIndividualId()); + continue; + } + + if (attrib.equalsIgnoreCase(BiometricType.FACE.value())) { + Map faceEntityInfoMap = idInfoHelper.getIdEntityInfoMap(BioMatchType.FACE, idInfo, null); + if (Objects.nonNull(faceEntityInfoMap)) { + try { + String face = convertJP2ToJpeg(getFaceBDB(faceEntityInfoMap.get(CbeffDocType.FACE.getType().value()))); + if (Objects.nonNull(face)) + credSubjectMap.put(attrib, consentedPictureAttributePrefix + face); + } catch (Exception e) { + // Not throwing any exception because others claims will be returned without photo. + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "", + "Error Adding photo to the claims. " + e.getMessage(), e); + } + + } + continue; + } + List idSchemaAttributes = idInfoHelper.getIdentityAttributesForIdName(attrib); + for (String idSchemaAttribute : idSchemaAttributes) { + List idInfoList = idInfo.get(idSchemaAttribute); + if (Objects.isNull(idInfoList)) + continue; + if (idInfoList.size() == 1) { + IdentityInfoDTO identityInfo = idInfoList.get(0); + if (Objects.isNull(identityInfo.getLanguage())) { + String value = identityInfo.getValue(); + if (Objects.nonNull(value) && (value.trim().length() > 0)) + credSubjectMap.put(idSchemaAttribute, value); + } + else { + Map valueMap = new HashMap<>(); + String lang = identityInfo.getLanguage(); + if (locales.contains(lang)) { + String value = identityInfo.getValue(); + if (Objects.nonNull(value) && (value.trim().length() > 0)) { + valueMap.put(IdAuthCommonConstants.LANGUAGE_STRING, lang); + valueMap.put(IdAuthCommonConstants.VALUE_STRING, value); + credSubjectMap.put(idSchemaAttribute, valueMap); + } + } + } + continue; + } + List> valueList = new ArrayList<>(); + for (IdentityInfoDTO identityInfo : idInfoList) { + Map valueMap = new HashMap<>(); + String lang = identityInfo.getLanguage(); + if (locales.contains(lang)) { + String value = identityInfo.getValue(); + if (Objects.nonNull(value) && (value.trim().length() > 0)) { + valueMap.put(IdAuthCommonConstants.LANGUAGE_STRING, identityInfo.getLanguage()); + valueMap.put(IdAuthCommonConstants.VALUE_STRING, identityInfo.getValue()); + valueList.add(valueMap); + } + } + } + if (valueList.size() > 0) + credSubjectMap.put(idSchemaAttribute, valueList); + } + } + return credSubjectMap; + } + + private String getFaceBDB(String faceCbeff) throws Exception { + List birDataFromXMLType = cbeffUtil.getBIRDataFromXMLType(faceCbeff.getBytes(), CbeffDocType.FACE.getName()); + if(birDataFromXMLType.isEmpty()) { + //This is unlikely as if empty the exception would have been thrown already + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS); + } + return CryptoUtil.encodeBase64(birDataFromXMLType.get(0).getBdb()); + } + + private String convertJP2ToJpeg(String jp2Image) { + try { + ConvertRequestDto convertRequestDto = new ConvertRequestDto(); + convertRequestDto.setVersion(IdAuthCommonConstants.FACE_ISO_NUMBER); + convertRequestDto.setInputBytes(CryptoUtil.decodeBase64(jp2Image)); + byte[] image = FaceDecoder.convertFaceISOToImageBytes(convertRequestDto); + return CryptoUtil.encodeBase64(image); + } catch(Exception exp) { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "convertJP2ToJpeg", + "Error Converting JP2 To JPEG. " + exp.getMessage(), exp); + } + return null; + } +} diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/util/ExchangeDataAttributesUtil.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/util/ExchangeDataAttributesUtil.java new file mode 100644 index 00000000000..477ce9b5568 --- /dev/null +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/util/ExchangeDataAttributesUtil.java @@ -0,0 +1,93 @@ +package io.mosip.authentication.service.kyc.util; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import io.mosip.authentication.common.service.entity.OIDCClientData; +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.repository.OIDCClientDataRepository; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.BaseRequestDTO; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.kernel.core.logger.spi.Logger; + +/** + * Utility class to filter the consented attribute and policy allowed attributes. + * + * @author Mahammed Taheer + */ + +@Component +public class ExchangeDataAttributesUtil { + + /** The mosip logger. */ + private static Logger mosipLogger = IdaLogger.getLogger(ExchangeDataAttributesUtil.class); + + @Value("${ida.idp.consented.individual_id.attribute.name:individual_id}") + private String consentedIndividualIdAttributeName; + + @Autowired + private IdInfoHelper idInfoHelper; + + @Autowired + private OIDCClientDataRepository oidcClientDataRepo; + + public void mapConsentedAttributesToIdSchemaAttributes(List consentAttributes, Set filterAttributes, + List policyAllowedKycAttribs) throws IdAuthenticationBusinessException { + + if(consentAttributes != null && !consentAttributes.isEmpty()) { + for (String attrib : consentAttributes) { + Collection idSchemaAttribute = idInfoHelper.getIdentityAttributesForIdName(attrib); + filterAttributes.addAll(idSchemaAttribute); + } + // removing individual id from consent if the claim is not allowed in policy. + if (!policyAllowedKycAttribs.contains(consentedIndividualIdAttributeName)) { + consentAttributes.remove(consentedIndividualIdAttributeName); + } + } + } + + public Set filterByPolicyAllowedAttributes(Set filterAttributes, List policyAllowedKycAttribs) { + return policyAllowedKycAttribs.stream() + .filter(attribute -> filterAttributes.contains(attribute)) + .collect(Collectors.toSet()); + } + + public String getKycExchangeResponseTime(BaseRequestDTO authRequestDTO) { + String dateTimePattern = EnvUtil.getDateTimePattern(); + return IdaRequestResponsConsumerUtil.getResponseTime(authRequestDTO.getRequestTime(), dateTimePattern); + } + + public List filterAllowedUserClaims(String oidcClientId, List consentAttributes) { + mosipLogger.info(IdAuthCommonConstants.IDA, this.getClass().getSimpleName(), "filterAllowedUserClaims", + "Checking for OIDC client allowed userclaims"); + Optional oidcClientData = oidcClientDataRepo.findByClientId(oidcClientId); + if(oidcClientData.isEmpty()) { + return List.of(); + } + + List oidcClientAllowedUserClaims = Stream.of(oidcClientData.get().getUserClaims()) + .collect(Collectors.toList()); + + if (consentAttributes.isEmpty()) { + return oidcClientAllowedUserClaims; + } + + return consentAttributes.stream() + .filter(claim -> oidcClientAllowedUserClaims.contains(claim.toLowerCase())) + .collect(Collectors.toList()); + + } + +} diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/util/VCSchemaProviderUtil.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/util/VCSchemaProviderUtil.java new file mode 100644 index 00000000000..bc8a3c1fddc --- /dev/null +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/util/VCSchemaProviderUtil.java @@ -0,0 +1,62 @@ +package io.mosip.authentication.service.kyc.util; + +import java.io.IOException; +import java.io.StringReader; + +import org.json.simple.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; + +import com.apicatalog.jsonld.JsonLdError; +import com.apicatalog.jsonld.document.JsonDocument; +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.exception.IdAuthUncheckedException; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.kernel.core.logger.spi.Logger; + +/** + * This class fetches the Verifiable Credentials schema & @Context data. + * + * @author Mahammed Taheer + * + */ +@Component +public class VCSchemaProviderUtil { + + private static Logger logger = IdaLogger.getLogger(VCSchemaProviderUtil.class); + + @Autowired + RestTemplate restTemplate; + + public JsonDocument getVCContextSchema(String configServerFileStorageUrl, String uri) { + try { + String vcContextJson = restTemplate.getForObject(configServerFileStorageUrl + uri, String.class); + JsonDocument jsonDocument = JsonDocument.of(new StringReader(vcContextJson)); + return jsonDocument; + } catch (JsonLdError e) { + logger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "getVCContextSchema", + "Error while getting VC Context Schema Json Document.", e ); + throw new IdAuthUncheckedException(IdAuthenticationErrorConstants.DOWNLOAD_ERROR.getErrorCode(), + IdAuthenticationErrorConstants.DOWNLOAD_ERROR.getErrorMessage()); + } + } + + public JSONObject getVCContextData(String configServerFileStorageURL, String uri, ObjectMapper objectMapper) + throws IdAuthenticationBusinessException { + try { + String vcContextData = restTemplate.getForObject(configServerFileStorageURL + uri, String.class); + JSONObject jsonObject = objectMapper.readValue(vcContextData, JSONObject.class); + return jsonObject; + } catch (IOException e) { + logger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "getVCContextData", + "error while getting VC Context Json.", e); + throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.DOWNLOAD_ERROR.getErrorCode(), + IdAuthenticationErrorConstants.DOWNLOAD_ERROR.getErrorMessage()); + } + } +} diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/IdentityKeyBindingRequestValidator.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/IdentityKeyBindingRequestValidator.java index 56c8d47033d..4025230af0b 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/IdentityKeyBindingRequestValidator.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/IdentityKeyBindingRequestValidator.java @@ -29,9 +29,7 @@ * The Class For IdentityKeyBindingRequestValidator extending the * BaseAuthRequestValidator{@link BaseAuthRequestValidator}} * - * @author Prem Kumar - * @author Dinesh Karuppiah.T - * + * @author Mahammed Taheer * */ diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/KycExchangeRequestValidator.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/KycExchangeRequestValidator.java index 0bf007f705a..bcd69d94748 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/KycExchangeRequestValidator.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/KycExchangeRequestValidator.java @@ -61,9 +61,10 @@ public void validate(Object target, Errors errors) { validateKycToken(kycExchangeRequestDTO.getKycToken(), errors, IdAuthCommonConstants.KYC_TOKEN); } - if (!errors.hasErrors()) { + // commented below validation because end user can provide nil consent. + /* if (!errors.hasErrors()) { validateConsentObtainedList(kycExchangeRequestDTO.getConsentObtained(), errors, IdAuthCommonConstants.CONSENT_OBTAINED); - } + } */ if (!errors.hasErrors()) { validateTxnId(kycExchangeRequestDTO.getTransactionID(), errors, IdAuthCommonConstants.TRANSACTION_ID); diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidator.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidator.java new file mode 100644 index 00000000000..5f212decbc4 --- /dev/null +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidator.java @@ -0,0 +1,211 @@ +package io.mosip.authentication.service.kyc.validator; + +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.SESSION_ID; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.PUBLIC_KEY_EXPONENT_KEY; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.PUBLIC_KEY_MODULUS_KEY; +import static io.mosip.authentication.core.constant.IdAuthCommonConstants.COLON; + +import java.io.IOException; +import java.util.List; +import java.util.stream.Stream; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.module.afterburner.AfterburnerModule; + +import io.mosip.authentication.common.service.validator.AuthRequestValidator; +import io.mosip.authentication.common.service.validator.BaseAuthRequestValidator; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; +import io.mosip.authentication.core.constant.VCFormats; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; +import io.mosip.authentication.core.logger.IdaLogger; +import io.mosip.authentication.core.util.CryptoUtil; +import io.mosip.kernel.core.logger.spi.Logger; +import io.mosip.kernel.core.util.StringUtils; +import net.minidev.json.JSONObject; + +/** + * The Class For VciExchangeRequestValidator extending the + * BaseAuthRequestValidator{@link BaseAuthRequestValidator}} + * + * @author Mahammed Taheer + * + * + */ + +@Component +public class VciExchangeRequestValidator extends AuthRequestValidator { + + /** The mosip logger. */ + private static Logger mosipLogger = IdaLogger.getLogger(VciExchangeRequestValidator.class); + + private static final ObjectMapper OBJECT_MAPPER; + + static { + OBJECT_MAPPER = new ObjectMapper(); + OBJECT_MAPPER.registerModule(new AfterburnerModule()); + } + + @Value("#{'${mosip.ida.vci.supported.cred.types:}'.split(',')}") + private List supportedCredTypes; + + /* + * (non-Javadoc) + * + * @see io.mosip.authentication.service.impl.indauth.validator. + * BaseAuthRequestValidator#supports(java.lang.Class) + */ + @Override + public boolean supports(Class clazz) { + return VciExchangeRequestDTO.class.equals(clazz); + } + + /* + * (non-Javadoc) + * + * @see io.mosip.authentication.service.impl.indauth.validator. + * BaseAuthRequestValidator#validate(java.lang.Object, + * org.springframework.validation.Errors) + */ + @Override + public void validate(Object target, Errors errors) { + VciExchangeRequestDTO vciExchangeRequestDTO = (VciExchangeRequestDTO) target; + if (vciExchangeRequestDTO != null) { + if (!errors.hasErrors()) { + validateReqTime(vciExchangeRequestDTO.getRequestTime(), errors, IdAuthCommonConstants.REQ_TIME); + } + + if (!errors.hasErrors()) { + validateTxnId(vciExchangeRequestDTO.getTransactionID(), errors, IdAuthCommonConstants.TRANSACTION_ID); + } + + if (!errors.hasErrors()) { + validateAuthToken(vciExchangeRequestDTO.getVcAuthToken(), errors, IdAuthCommonConstants.VC_AUTH_TOKEN); + } + + if (!errors.hasErrors()) { + validateCredSubjectId(vciExchangeRequestDTO.getCredSubjectId(), errors, IdAuthCommonConstants.CREDENTIAL_SUBJECT_ID); + } + + if (!errors.hasErrors()) { + validateCredSubjectIdDIDFormat(vciExchangeRequestDTO.getCredSubjectId(), errors, IdAuthCommonConstants.CREDENTIAL_SUBJECT_ID); + } + + if (!errors.hasErrors()) { + validateVCFormat(vciExchangeRequestDTO.getVcFormat(), errors, IdAuthCommonConstants.VC_FORMAT); + } + + if (!errors.hasErrors()) { + validateAllowedVCFormats(vciExchangeRequestDTO.getVcFormat(), errors, IdAuthCommonConstants.VC_FORMAT); + } + + if (!errors.hasErrors()) { + validateCredentialType(vciExchangeRequestDTO.getCredentialsDefinition().getType(), errors, IdAuthCommonConstants.VC_CREDENTIAL_DEF); + } + + } else { + mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), IdAuthCommonConstants.VALIDATE, + IdAuthCommonConstants.INVALID_INPUT_PARAMETER + IdAuthCommonConstants.REQUEST); + errors.rejectValue(IdAuthCommonConstants.REQUEST, IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorCode(), + String.format(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorMessage(), IdAuthCommonConstants.REQUEST)); + } + + } + + private void validateAuthToken(String kycToken, Errors errors, String paramName) { + + if (kycToken == null || StringUtils.isEmpty(kycToken.trim())) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + MISSING_INPUT_PARAMETER + paramName); + errors.rejectValue(paramName, IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { paramName }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + } + + private void validateCredSubjectId(String credSubjectId, Errors errors, String paramName) { + if (credSubjectId == null || StringUtils.isEmpty(credSubjectId.trim())) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + MISSING_INPUT_PARAMETER + paramName); + errors.rejectValue(paramName, IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { paramName }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + } + + private void validateVCFormat(String vcFormat, Errors errors, String paramName) { + if (vcFormat == null || StringUtils.isEmpty(vcFormat.trim())) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + MISSING_INPUT_PARAMETER + paramName); + errors.rejectValue(paramName, IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { paramName }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + } + + private void validateCredentialType(List credentialType, Errors errors, String paramName) { + if (credentialType == null || credentialType.isEmpty()) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + MISSING_INPUT_PARAMETER + paramName + "/type" ); + errors.rejectValue(paramName, IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { paramName + "/type" }, + IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } else { + if(!supportedCredTypes.containsAll(credentialType)) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + MISSING_INPUT_PARAMETER + paramName + "/type" ); + errors.rejectValue(paramName, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { paramName + "/type" }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + } + + private void validateCredSubjectIdDIDFormat(String credSubjectId, Errors errors, String paramName) { + String[] didArray = StringUtils.split(credSubjectId, COLON); + if (didArray.length != 3) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + "Invalid DID Format input for credential subject ID: " + credSubjectId); + errors.rejectValue(paramName, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { paramName }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } else { + String identityJwk = new String(CryptoUtil.decodeBase64(didArray[2])); + try { + JSONObject jsonObject = OBJECT_MAPPER.readValue(identityJwk, JSONObject.class); + validatePublicKeyAttributes(jsonObject, errors, PUBLIC_KEY_MODULUS_KEY, paramName); + validatePublicKeyAttributes(jsonObject, errors, PUBLIC_KEY_EXPONENT_KEY, paramName); + } catch (IOException ioe) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + "Error formating Identity JWK", ioe); + errors.rejectValue(paramName, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { paramName }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } + } + + private void validatePublicKeyAttributes(JSONObject jsonObject, Errors errors, String publicKeyAttribute, String paramName) { + String value = jsonObject.getAsString(publicKeyAttribute); + if (value == null || StringUtils.isEmpty(value.trim())) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, MISSING_INPUT_PARAMETER + publicKeyAttribute); + errors.rejectValue(paramName, IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(), + new Object[] { paramName }, IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage()); + } + } + + private void validateAllowedVCFormats(String vcFormat, Errors errors, String paramName) { + boolean allowed = Stream.of(VCFormats.values()).filter(t -> t.getFormat().equalsIgnoreCase(vcFormat)).findAny().isPresent(); + if (!allowed) { + mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE, + "Not Supported VC Format: " + vcFormat); + errors.rejectValue(paramName, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(), + new Object[] { paramName }, + IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage()); + } + } +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/controller/AuthControllerTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/controller/AuthControllerTest.java index adad249faf5..54d9aa0b5fc 100644 --- a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/controller/AuthControllerTest.java +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/controller/AuthControllerTest.java @@ -5,7 +5,16 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Optional; +import io.mosip.authentication.common.service.builder.AuthTransactionBuilder; +import io.mosip.authentication.common.service.helper.AuthTransactionHelper; +import io.mosip.authentication.common.service.util.TestHttpServletRequest; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.partner.dto.PartnerDTO; +import io.mosip.authentication.core.spi.indauth.facade.AuthFacade; +import io.mosip.authentication.core.spi.partner.service.PartnerService; +import io.mosip.authentication.core.util.IdTypeUtil; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -53,7 +62,6 @@ * * @author Prem Kumar */ -@Ignore @RunWith(SpringRunner.class) @WebMvcTest @ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class }) @@ -62,9 +70,9 @@ public class AuthControllerTest { @Mock private RestHelper restHelper; - @Autowired + @Mock EnvUtil env; - + @Autowired Environment environment; @@ -92,17 +100,31 @@ public class AuthControllerTest { @Mock private AuthRequestValidator authRequestValidator; + @Mock + private IdTypeUtil idTypeUtil; + + @Mock + private AuthTransactionHelper authTransactionHelper; + + @Mock + private PartnerService partnerService; + Errors error = new BindException(AuthRequestDTO.class, "authReqDTO"); Errors errors = new BindException(EkycAuthRequestDTO.class, "kycAuthReqDTO"); + TestHttpServletRequest requestWithMetadata = new TestHttpServletRequest(); + @Before public void before() { ReflectionTestUtils.setField(env, "env", environment); - ReflectionTestUtils.setField(auditFactory, "env", env); + //ReflectionTestUtils.setField(auditFactory, "env", env); ReflectionTestUtils.setField(restFactory, "env", env); ReflectionTestUtils.invokeMethod(authController, "initAuthRequestBinder", binder); ReflectionTestUtils.setField(authController, "authFacade", authFacade); ReflectionTestUtils.setField(authFacade, "env", env); + + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_DATA, "identity data"); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_INFO, "identity info"); } /* @@ -116,7 +138,17 @@ public void showRequestValidator() authReqDTO.setIndividualIdType(IdType.UIN.getType()); Errors error = new BindException(authReqDTO, "authReqDTO"); error.rejectValue("id", "errorCode", "defaultMessage"); - authController.authenticateIndividual(authReqDTO, error, "123456", "123456","1234567", null); + TestHttpServletRequest requestWithMetadata = new TestHttpServletRequest(); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_DATA, "identity data"); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_INFO, "identity info"); + Optional partner = Optional.empty(); + Mockito.when(partnerService.getPartner("partnerId", authReqDTO.getMetadata())).thenReturn(partner); + Mockito.when(authTransactionHelper.createAndSetAuthTxnBuilderMetadataToRequest(authReqDTO, !true, partner)) + .thenReturn(AuthTransactionBuilder.newInstance()); + Mockito.when(authTransactionHelper.createDataValidationException(Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(new IdAuthenticationAppException(IdAuthenticationErrorConstants.DATA_VALIDATION_FAILED)); + + authController.authenticateIndividual(authReqDTO, error, "123456", "123456","1234567", requestWithMetadata); } @@ -125,9 +157,17 @@ public void authenticationFailed() throws IdAuthenticationAppException, IdAuthenticationBusinessException, IdAuthenticationDaoException { AuthRequestDTO authReqDTO = new AuthRequestDTO(); authReqDTO.setIndividualIdType(IdType.UIN.getType()); + Optional partner = Optional.empty(); + AuthTransactionBuilder authTransactionBuilder = AuthTransactionBuilder.newInstance(); + Mockito.when(partnerService.getPartner("partnerId", authReqDTO.getMetadata())).thenReturn(partner); + Mockito.when(authTransactionHelper.createAndSetAuthTxnBuilderMetadataToRequest(authReqDTO, !true, partner)) + .thenReturn(authTransactionBuilder); + Mockito.when(authTransactionHelper.createUnableToProcessException(Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(new IdAuthenticationAppException( IdAuthenticationErrorConstants.UNABLE_TO_PROCESS)); Mockito.when(authFacade.authenticateIndividual(Mockito.any(), Mockito.anyBoolean(), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean(), Mockito.any())) .thenThrow(new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UIN_DEACTIVATED)); - authController.authenticateIndividual(authReqDTO, error, "123456", "123456","1234567", null); + + authController.authenticateIndividual(authReqDTO, error, "123456", "123456","1234567", requestWithMetadata); } @@ -137,7 +177,7 @@ public void authenticationSuccess() AuthRequestDTO authReqDTO = new AuthRequestDTO(); authReqDTO.setIndividualIdType(IdType.UIN.getType()); Mockito.when(authFacade.authenticateIndividual(authReqDTO, true, "123456", "12345", true, new TestObjectWithMetadata())).thenReturn(new AuthResponseDTO()); - authController.authenticateIndividual(authReqDTO, error, "123456", "123456","1234567", null); + authController.authenticateIndividual(authReqDTO, error, "123456", "123456","1234567", requestWithMetadata); } @@ -145,21 +185,21 @@ public void authenticationSuccess() public void TestValidOtpRequest() throws IdAuthenticationAppException, IdAuthenticationBusinessException, IdAuthenticationDaoException { AuthRequestDTO authRequestDTO = getRequestDto(); - authController.authenticateIndividual(authRequestDTO, error, "123456", "123456","1234567", null); + authController.authenticateIndividual(authRequestDTO, error, "123456", "123456","1234567", requestWithMetadata); } @Test public void TestValidDemoRequest() throws IdAuthenticationAppException, IdAuthenticationBusinessException, IdAuthenticationDaoException { AuthRequestDTO authRequestDTO = getRequestDto(); - authController.authenticateIndividual(authRequestDTO, error, "123456", "123456","1234567", null); + authController.authenticateIndividual(authRequestDTO, error, "123456", "123456","1234567", requestWithMetadata); } @Test public void TestValidPinRequest() throws IdAuthenticationAppException, IdAuthenticationBusinessException, IdAuthenticationDaoException { AuthRequestDTO authRequestDTO = getRequestDto(); - authController.authenticateIndividual(authRequestDTO, error, "123456", "123456","1234567", null); + authController.authenticateIndividual(authRequestDTO, error, "123456", "123456","1234567", requestWithMetadata); } @Test @@ -194,7 +234,7 @@ public void TestValidBioFingerPrintRequest() request.setBiometrics(bioIdentityList); authRequestDTO.setRequest(request); - authController.authenticateIndividual(authRequestDTO, error, "123456", "123456","1234567", null); + authController.authenticateIndividual(authRequestDTO, error, "123456", "123456","1234567", requestWithMetadata); } private AuthRequestDTO getRequestDto() { @@ -203,7 +243,7 @@ private AuthRequestDTO getRequestDto() { authRequestDTO.setIndividualId("274390482564"); authRequestDTO.setIndividualIdType(IdType.UIN.getType()); authRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.of("+0530")) // offset - .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + .format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")).toString()); authRequestDTO.setTransactionID("1234567890"); authRequestDTO.setVersion("1.0"); return authRequestDTO; diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/IdentityWalletBindingControllerTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/IdentityWalletBindingControllerTest.java new file mode 100644 index 00000000000..7b0a475f39a --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/IdentityWalletBindingControllerTest.java @@ -0,0 +1,166 @@ +package io.mosip.authentication.service.kyc.controller; + + +import io.mosip.authentication.common.service.helper.AuditHelper; +import io.mosip.authentication.common.service.helper.AuthTransactionHelper; +import io.mosip.authentication.common.service.util.TestHttpServletRequest; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.exception.IdAuthenticationAppException; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.exception.IdAuthenticationDaoException; +import io.mosip.authentication.core.indauth.dto.*; +import io.mosip.authentication.core.spi.indauth.facade.IdentityKeyBindingFacade; +import io.mosip.authentication.core.spi.partner.service.PartnerService; +import io.mosip.authentication.core.util.IdTypeUtil; +import io.mosip.authentication.service.kyc.validator.IdentityKeyBindingRequestValidator; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.validation.BindException; +import org.springframework.validation.Errors; + +@RunWith(SpringRunner.class) +public class IdentityWalletBindingControllerTest { + + /** The auth facade. */ + @Mock + IdentityKeyBindingFacade keyIdentityFacade; + + @Mock + AuditHelper auditHelper; + + @Mock + IdTypeUtil idTypeUtil; + + @Mock + AuthTransactionHelper authTransactionHelper; + + @Mock + PartnerService partnerService; + + /** The KycExchangeRequestValidator */ + @Mock + IdentityKeyBindingRequestValidator identityKeyBindingRequestValidator; + + @InjectMocks + IdentityWalletBindingController identityWalletBindingController; + + Errors errors = new BindException(IdentityKeyBindingRequestDTO.class, "identityKeyBindingRequestDTO"); + + + IdentityKeyBindingDTO identityKeyBindingDTO; + + IdentityKeyBindingRequestDTO identityKeyBindingRequestDTO; + + AuthResponseDTO authResponseDTO; + + IdentityKeyBindingResponseDto keyBindingResponseDto; + + IdentityKeyBindingRespDto identityKeyBindingRespDto; + + @Before + public void before() { + identityKeyBindingDTO = new IdentityKeyBindingDTO(); + identityKeyBindingDTO.setPublicKeyJWK(null); + identityKeyBindingDTO.setAuthFactorType("WLA"); + + RequestDTO requestDTO = new RequestDTO(); + requestDTO.setDemographics(null); + requestDTO.setBiometrics(null); + requestDTO.setOtp(null); + requestDTO.setStaticPin(null); + requestDTO.setTimestamp(null); + + identityKeyBindingRequestDTO = new IdentityKeyBindingRequestDTO(); + + identityKeyBindingRequestDTO.setIdentityKeyBinding(identityKeyBindingDTO); + + identityKeyBindingRequestDTO.setRequest(requestDTO); + identityKeyBindingRequestDTO.setConsentObtained(false); + identityKeyBindingRequestDTO.setRequestHMAC(null); + identityKeyBindingRequestDTO.setRequestSessionKey(null); + identityKeyBindingRequestDTO.setMetadata(null); + identityKeyBindingRequestDTO.setIndividualIdType("UIN"); + + + keyBindingResponseDto = new IdentityKeyBindingResponseDto(); + + IdentityKeyBindingRespDto identityKeyBindingRespDto = new IdentityKeyBindingRespDto(); + identityKeyBindingRespDto.setIdentityCertificate(null); + identityKeyBindingRespDto.setBindingAuthStatus(true); + identityKeyBindingRespDto.setAuthToken("token"); + keyBindingResponseDto.setResponse(identityKeyBindingRespDto); + + authResponseDTO= new AuthResponseDTO(); + authResponseDTO.setId("123"); + authResponseDTO.setResponseTime("123"); + authResponseDTO.setResponse(null); + + } + + @Test + public void processIdKeyBindingTest() throws IdAuthenticationBusinessException, IdAuthenticationDaoException, IdAuthenticationAppException { + + + Mockito.when(partnerService.getPartner(Mockito.anyString(),Mockito.anyMap())).thenReturn(null); + Mockito.when(authTransactionHelper.createAndSetAuthTxnBuilderMetadataToRequest(Mockito.any(),Mockito.anyBoolean(),Mockito.any())).thenReturn(null); + + TestHttpServletRequest requestWithMetadata = new TestHttpServletRequest(); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_DATA, "identity data");; + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_INFO, "identity info"); + + Mockito.when(keyIdentityFacade.authenticateIndividual(Mockito.any(),Mockito.anyString(),Mockito.anyString(),Mockito.any())).thenReturn(authResponseDTO); + + Mockito.when(keyIdentityFacade.processIdentityKeyBinding(Mockito.any(),Mockito.any(),Mockito.anyString(),Mockito.anyString(),Mockito.any())).thenReturn(keyBindingResponseDto); + IdentityKeyBindingResponseDto identityKeyBindingResponseDto = identityWalletBindingController.processIdKeyBinding(identityKeyBindingRequestDTO, errors, "123", "123", "123", requestWithMetadata); + Assert.assertEquals(keyBindingResponseDto,identityKeyBindingResponseDto); + } + + @Test + public void processIdKeyBindingWithInvalidDetails_thenFail() throws IdAuthenticationBusinessException, IdAuthenticationDaoException, IdAuthenticationAppException { + + Mockito.when(partnerService.getPartner(Mockito.anyString(),Mockito.anyMap())).thenReturn(null); + Mockito.when(authTransactionHelper.createAndSetAuthTxnBuilderMetadataToRequest(Mockito.any(),Mockito.anyBoolean(),Mockito.any())).thenReturn(null); + //Mockito.when(identityKeyBindingRequestValidator.validateIdvId(Mockito.anyString(),Mockito.anyString(),errors)).thenReturn(null); + + TestHttpServletRequest requestWithMetadata = new TestHttpServletRequest(); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_DATA, "identity data");; + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_INFO, "identity info"); + + Mockito.when(keyIdentityFacade.authenticateIndividual(Mockito.any(),Mockito.anyString(),Mockito.anyString(),Mockito.any())).thenThrow(IdAuthenticationBusinessException.class); + + keyBindingResponseDto.setResponse(identityKeyBindingRespDto); + Mockito.when(keyIdentityFacade.processIdentityKeyBinding(Mockito.any(),Mockito.any(),Mockito.anyString(),Mockito.anyString(),Mockito.any())).thenReturn(keyBindingResponseDto); + Mockito.when(authTransactionHelper.createDataValidationException(Mockito.any(),Mockito.any(),Mockito.any())).thenThrow(IdAuthenticationAppException.class); + try{ + Errors errors = new BindException(identityKeyBindingRequestDTO, "identityKeyBindingRequestDTO"); + errors.rejectValue("id", "errorCode", "defaultMessage"); + IdentityKeyBindingResponseDto identityKeyBindingResponseDto = identityWalletBindingController.processIdKeyBinding(identityKeyBindingRequestDTO, errors, "123", "123", "123", requestWithMetadata); + Assert.fail(); + }catch (Exception e){} + + } + + @Test + public void processIdKeyBindingTest2() throws IdAuthenticationBusinessException, IdAuthenticationDaoException, IdAuthenticationAppException { + Mockito.when(partnerService.getPartner(Mockito.anyString(),Mockito.anyMap())).thenReturn(null); + Mockito.when(authTransactionHelper.createAndSetAuthTxnBuilderMetadataToRequest(Mockito.any(),Mockito.anyBoolean(),Mockito.any())).thenReturn(null); + + TestHttpServletRequest requestWithMetadata = new TestHttpServletRequest(); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_DATA, "identity data");; + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_INFO, "identity info"); + + Mockito.when(keyIdentityFacade.authenticateIndividual(Mockito.any(),Mockito.anyString(),Mockito.anyString(),Mockito.any())).thenThrow(new IdAuthenticationBusinessException("IDA-IKB-004","error")); + Mockito.when(keyIdentityFacade.processIdentityKeyBinding(Mockito.any(),Mockito.any(),Mockito.anyString(),Mockito.anyString(),Mockito.any())).thenReturn(keyBindingResponseDto); + try{ + IdentityKeyBindingResponseDto identityKeyBindingResponseDto = identityWalletBindingController.processIdKeyBinding(identityKeyBindingRequestDTO, errors, "123", "123", "123", requestWithMetadata); + Assert.fail(); + }catch (Exception e){} + } + +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/KycControllerTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/KycControllerTest.java index b9351e8e2e6..e6f2c717e0c 100644 --- a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/KycControllerTest.java +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/KycControllerTest.java @@ -283,7 +283,7 @@ public void processKycFailure1() throws IdAuthenticationBusinessException, IdAut kycAuthController.processKyc(kycAuthReqDTO, errors, "1635497344579", "1635497344579", "1635497344579", new TestHttpServletRequest()); } - @Test(expected = IdAuthenticationAppException.class) + @Test public void processKycFailure2() throws IdAuthenticationBusinessException, IdAuthenticationAppException, IdAuthenticationDaoException, Exception { @@ -293,6 +293,6 @@ public void processKycFailure2() throws IdAuthenticationBusinessException, IdAut requestWithMetadata.setMetadata(new HashMap<>()); Mockito.when(kycFacade.authenticateIndividual(kycAuthReqDTO, true, "1635497344579", "1635497344579", requestWithMetadata)).thenThrow(new IdAuthenticationBusinessException()); Mockito.when(kycFacade.processEKycAuth(kycAuthReqDTO, authResponseDTO, "1635497344579", requestWithMetadata.getMetadata())).thenReturn(kycAuthResponseDTO); - kycAuthController.processKyc(kycAuthReqDTO, errors, "1635497344579", "1635497344579", "1635497344579", requestWithMetadata); + kycAuthController.processKyc(kycAuthReqDTO, errors, "1635497344579", "1635497344579", "1635497344579", new TestHttpServletRequest()); } } diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/VCIControllerTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/VCIControllerTest.java new file mode 100644 index 00000000000..189d8b6612a --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/controller/VCIControllerTest.java @@ -0,0 +1,161 @@ +package io.mosip.authentication.service.kyc.controller; + +import io.mosip.authentication.common.service.builder.AuthTransactionBuilder; +import io.mosip.authentication.common.service.helper.AuthTransactionHelper; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.common.service.util.TestHttpServletRequest; +import io.mosip.authentication.core.constant.IdAuthCommonConstants; +import io.mosip.authentication.core.exception.IDDataValidationException; +import io.mosip.authentication.core.exception.IdAuthenticationAppException; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.IdType; +import io.mosip.authentication.core.indauth.dto.VciCredentialsDefinitionRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeResponseDTO; +import io.mosip.authentication.core.partner.dto.PartnerDTO; +import io.mosip.authentication.core.spi.indauth.facade.VciFacade; +import io.mosip.authentication.core.spi.partner.service.PartnerService; +import io.mosip.authentication.core.util.IdTypeUtil; +import io.mosip.authentication.service.kyc.controller.VCIController; +import io.mosip.authentication.service.kyc.validator.VciExchangeRequestValidator; +import org.apache.struts.mock.MockHttpServletRequest; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestContext; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.validation.BeanPropertyBindingResult; +import org.springframework.validation.Errors; +import org.springframework.web.context.WebApplicationContext; + +import java.time.Instant; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.util.Arrays; +import java.util.Optional; + + +@RunWith(SpringRunner.class) +@WebMvcTest(value = VCIController.class) +@ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class }) +@Import(EnvUtil.class) +public class VCIControllerTest { + + @Mock + private VciFacade vciFacade; + + @Mock + private IdTypeUtil idTypeUtil; + + @Mock + private AuthTransactionHelper authTransactionHelper; + + @Mock + private PartnerService partnerService; + + @Mock + private VciExchangeRequestValidator vciExchangeRequestValidator; + + @InjectMocks + VCIController vciController; + + + @Test + public void delegatedVCExchange_withValidInput_thenPass() throws Exception { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.UTC) + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + vciExchangeRequestDTO.setTransactionID("transactio"); + vciExchangeRequestDTO.setVcFormat("ldp_vc"); + vciExchangeRequestDTO.setVcAuthToken("vc-auth-token"); + vciExchangeRequestDTO.setCredSubjectId("did:jwk:eyJrdHkiOiJSU0EiLCJlIjoiQVFBQiIsInVzZSI6InNpZyIsImtpZCI6Inc4VUY3QnE0dDFSeVMxdFJTOHhvVllHUjMySVdiMFZyU3I4M0dEdno3d28iLCJhbGciOiJSUzI1NiIsIm4iOiJ5SGY1RjZYMFI5RDNxWm5WaUJORDZRV25pUmVnR2hjQ3NqakVJSENlTWp1UWJHek1LaFB6aFZVWGNtaTBMbGVQVWdUdlhjOWlrRmNnTXM3ckFhckI1dlJEcTh1Mjd2WHNBVjdiOUlZaVVGY3U1ZFZpdTd0Q0F1N0V5cXlLWVlUX20xMzhlZjQxVmU4X29LZVNvT0RRaGxyc0RJTmltX0JwWHBvc0xQVV96MXpfODNxX0ZRU05ydDE2dGhHa0hZeUZsRnhxZnNWZElPTkdoMzRFY3dubFZUY0lQUE5xZVY2RkJ3MENlR2NuaUlSRDZVMzVCbFNnT2loaHE2dl9LTll1aktJS2hmOERLY1AzWHY3Yy00ZUcwQ1Q2eFNGdDBpbzlvVGRQT0ZJNEt4RlJ0eGNIa3NxV2FsN1ZON3p5QUlNblJrMlJDbXRZLVUyVkVDSVgydzJOSlEifQ=="); + VciCredentialsDefinitionRequestDTO vciCredentialsDefinitionRequestDTO = new VciCredentialsDefinitionRequestDTO(); + vciCredentialsDefinitionRequestDTO.setType(Arrays.asList("VerifiableCredential", "MOSIPVerifiableCredential")); + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + + TestHttpServletRequest requestWithMetadata = new TestHttpServletRequest(); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_DATA, "identity data"); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_INFO, "identity info"); + + VciExchangeResponseDTO vciExchangeResponseDTO = new VciExchangeResponseDTO(); + + vciExchangeRequestDTO.setIndividualIdType(IdType.UIN.getType()); + Optional partner = Optional.empty(); + Mockito.when(partnerService.getPartner("partnerId", vciExchangeRequestDTO.getMetadata())).thenReturn(partner); + Mockito.when(authTransactionHelper.createAndSetAuthTxnBuilderMetadataToRequest(vciExchangeRequestDTO, !false, partner)) + .thenReturn(AuthTransactionBuilder.newInstance()); + + Mockito.when(vciFacade.processVciExchange(vciExchangeRequestDTO, "auth-partner-id", + "oidc-client-id", vciExchangeRequestDTO.getMetadata(), requestWithMetadata)).thenReturn(vciExchangeResponseDTO); + + vciExchangeResponseDTO = vciController.vciExchange(vciExchangeRequestDTO, errors, "license-key", "auth-partner-id", + "oidc-client-id", requestWithMetadata); + + Assert.assertNotNull(vciExchangeResponseDTO); + } + + @Test(expected = IdAuthenticationBusinessException.class) + public void delegatedVCExchange_withInvalidInput_thenFail() throws Exception { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciController.vciExchange(vciExchangeRequestDTO, errors, "license-key", "auth-partner-id", + "oidc-client-id", new MockHttpServletRequest()); + } + + @Test(expected = IdAuthenticationAppException.class) + public void delegatedVCExchange_withInternalError_thenFail() throws Exception { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + TestHttpServletRequest requestWithMetadata = new TestHttpServletRequest(); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_DATA, "identity data"); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_INFO, "identity info"); + + vciExchangeRequestDTO.setIndividualIdType(IdType.UIN.getType()); + AuthTransactionBuilder authTxnBuilder = AuthTransactionBuilder.newInstance(); + Optional partner = Optional.empty(); + Mockito.when(partnerService.getPartner("partnerId", vciExchangeRequestDTO.getMetadata())).thenReturn(partner); + Mockito.when(authTransactionHelper.createAndSetAuthTxnBuilderMetadataToRequest(vciExchangeRequestDTO, !false, partner)) + .thenReturn(authTxnBuilder); + IDDataValidationException idDataValidationException = new IDDataValidationException("error-code","error-message"); + Mockito.when(authTransactionHelper.createDataValidationException(null, idDataValidationException, requestWithMetadata)) + .thenReturn(new IdAuthenticationAppException()); + + Mockito.when(vciFacade.processVciExchange(vciExchangeRequestDTO, "auth-partner-id", + "oidc-client-id", vciExchangeRequestDTO.getMetadata(), requestWithMetadata)) + .thenThrow(idDataValidationException); + + vciController.vciExchange(vciExchangeRequestDTO, errors, "license-key", "auth-partner-id", + "oidc-client-id", requestWithMetadata); + } + + @Test(expected = IdAuthenticationAppException.class) + public void delegatedVCIExchange_withInternalError2_thenFail() throws Exception { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + TestHttpServletRequest requestWithMetadata = new TestHttpServletRequest(); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_DATA, "identity data"); + requestWithMetadata.putMetadata(IdAuthCommonConstants.IDENTITY_INFO, "identity info"); + + vciExchangeRequestDTO.setIndividualIdType(IdType.UIN.getType()); + AuthTransactionBuilder authTxnBuilder = AuthTransactionBuilder.newInstance(); + Optional partner = Optional.empty(); + Mockito.when(partnerService.getPartner("partnerId", vciExchangeRequestDTO.getMetadata())).thenReturn(partner); + Mockito.when(authTransactionHelper.createAndSetAuthTxnBuilderMetadataToRequest(vciExchangeRequestDTO, !false, partner)) + .thenReturn(authTxnBuilder); + IdAuthenticationBusinessException idAuthenticationBusinessException = new IdAuthenticationBusinessException("error-code","error-message"); + Mockito.when(vciFacade.processVciExchange(vciExchangeRequestDTO, "auth-partner-id", + "oidc-client-id", vciExchangeRequestDTO.getMetadata(), requestWithMetadata)) + .thenThrow(idAuthenticationBusinessException); + + vciController.vciExchange(vciExchangeRequestDTO, errors, "license-key", "auth-partner-id", + "oidc-client-id", requestWithMetadata); + } +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/facade/KycFacadeImplTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/facade/KycFacadeImplTest.java index 9262bbd7fbf..fea03013825 100644 --- a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/facade/KycFacadeImplTest.java +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/facade/KycFacadeImplTest.java @@ -311,6 +311,7 @@ private String signJwt(String individualId, X509Certificate certificate, boolean } @Test + @Ignore public void authenticateIndividualTest() throws IdAuthenticationBusinessException, IdAuthenticationDaoException, Exception { String partnerData = "{\"policyId\":\"21\",\"policyName\":\"policy 1635497343191\",\"policyDescription\":\"Auth Policy\",\"policyStatus\":true,\"partnerId\":\"1635497344579\",\"partnerName\":\"1635497344579\",\"certificateData\":\"data\",\"policyExpiresOn\":\"2022-12-11T06:12:52.994Z\",\"apiKeyExpiresOn\":\"2022-12-11T06:12:52.994Z\",\"mispExpiresOn\":\"2022-12-11T06:12:52.994Z\",\"policy\":{\"allowedAuthTypes\":[{\"authType\":\"otp\",\"authSubType\":\"\",\"mandatory\":true},{\"authType\":\"demo\",\"authSubType\":\"\",\"mandatory\":false},{\"authType\":\"bio\",\"authSubType\":\"FINGER\",\"mandatory\":true},{\"authType\":\"bio\",\"authSubType\":\"IRIS\",\"mandatory\":false},{\"authType\":\"bio\",\"authSubType\":\"FACE\",\"mandatory\":false},{\"authType\":\"kyc\",\"authSubType\":\"\",\"mandatory\":false}],\"allowedKycAttributes\":[{\"attributeName\":\"fullName\",\"required\":true},{\"attributeName\":\"dateOfBirth\",\"required\":true},{\"attributeName\":\"gender\",\"required\":true},{\"attributeName\":\"phone\",\"required\":true},{\"attributeName\":\"email\",\"required\":true},{\"attributeName\":\"addressLine1\",\"required\":true},{\"attributeName\":\"addressLine2\",\"required\":true},{\"attributeName\":\"addressLine3\",\"required\":true},{\"attributeName\":\"location1\",\"required\":true},{\"attributeName\":\"location2\",\"required\":true},{\"attributeName\":\"location3\",\"required\":true},{\"attributeName\":\"postalCode\",\"required\":false},{\"attributeName\":\"photo\",\"required\":true}],\"authTokenType\":\"Partner\"}}"; PartnerPolicyResponseDTO partnerPolicyResponseDTO = mapper.readValue(partnerData, PartnerPolicyResponseDTO.class); @@ -413,6 +414,7 @@ public void authenticateIndividualTest() throws IdAuthenticationBusinessExceptio } @Test + @Ignore public void authenticateIndividualTest_kycAttribHasPhoto() throws IdAuthenticationBusinessException, IdAuthenticationDaoException, Exception { String partnerData = "{\"policyId\":\"21\",\"policyName\":\"policy 1635497343191\",\"policyDescription\":\"Auth Policy\",\"policyStatus\":true,\"partnerId\":\"1635497344579\",\"partnerName\":\"1635497344579\",\"certificateData\":\"data\",\"policyExpiresOn\":\"2022-12-11T06:12:52.994Z\",\"apiKeyExpiresOn\":\"2022-12-11T06:12:52.994Z\",\"mispExpiresOn\":\"2022-12-11T06:12:52.994Z\",\"policy\":{\"allowedAuthTypes\":[{\"authType\":\"otp\",\"authSubType\":\"\",\"mandatory\":true},{\"authType\":\"demo\",\"authSubType\":\"\",\"mandatory\":false},{\"authType\":\"bio\",\"authSubType\":\"FINGER\",\"mandatory\":true},{\"authType\":\"bio\",\"authSubType\":\"IRIS\",\"mandatory\":false},{\"authType\":\"bio\",\"authSubType\":\"FACE\",\"mandatory\":false},{\"authType\":\"kyc\",\"authSubType\":\"\",\"mandatory\":false}],\"allowedKycAttributes\":[{\"attributeName\":\"fullName\",\"required\":true},{\"attributeName\":\"dateOfBirth\",\"required\":true},{\"attributeName\":\"gender\",\"required\":true},{\"attributeName\":\"phone\",\"required\":true},{\"attributeName\":\"email\",\"required\":true},{\"attributeName\":\"addressLine1\",\"required\":true},{\"attributeName\":\"addressLine2\",\"required\":true},{\"attributeName\":\"addressLine3\",\"required\":true},{\"attributeName\":\"location1\",\"required\":true},{\"attributeName\":\"location2\",\"required\":true},{\"attributeName\":\"location3\",\"required\":true},{\"attributeName\":\"postalCode\",\"required\":false},{\"attributeName\":\"photo\",\"required\":true}],\"authTokenType\":\"Partner\"}}"; PartnerPolicyResponseDTO partnerPolicyResponseDTO = mapper.readValue(partnerData, PartnerPolicyResponseDTO.class); @@ -515,6 +517,7 @@ public void authenticateIndividualTest_kycAttribHasPhoto() throws IdAuthenticati } @Test + @Ignore public void kycAuthenticateIndividualTest() throws IdAuthenticationBusinessException, IdAuthenticationDaoException, Exception { String partnerData = "{\"policyId\":\"21\",\"policyName\":\"policy 1635497343191\",\"policyDescription\":\"Auth Policy\",\"policyStatus\":true,\"partnerId\":\"1635497344579\",\"partnerName\":\"1635497344579\",\"certificateData\":\"data\",\"policyExpiresOn\":\"2022-12-11T06:12:52.994Z\",\"apiKeyExpiresOn\":\"2022-12-11T06:12:52.994Z\",\"mispExpiresOn\":\"2022-12-11T06:12:52.994Z\",\"policy\":{\"allowedAuthTypes\":[{\"authType\":\"otp\",\"authSubType\":\"\",\"mandatory\":true},{\"authType\":\"demo\",\"authSubType\":\"\",\"mandatory\":false},{\"authType\":\"bio\",\"authSubType\":\"FINGER\",\"mandatory\":true},{\"authType\":\"bio\",\"authSubType\":\"IRIS\",\"mandatory\":false},{\"authType\":\"bio\",\"authSubType\":\"FACE\",\"mandatory\":false},{\"authType\":\"kyc\",\"authSubType\":\"\",\"mandatory\":false}],\"allowedKycAttributes\":[{\"attributeName\":\"fullName\",\"required\":true},{\"attributeName\":\"dateOfBirth\",\"required\":true},{\"attributeName\":\"gender\",\"required\":true},{\"attributeName\":\"phone\",\"required\":true},{\"attributeName\":\"email\",\"required\":true},{\"attributeName\":\"addressLine1\",\"required\":true},{\"attributeName\":\"addressLine2\",\"required\":true},{\"attributeName\":\"addressLine3\",\"required\":true},{\"attributeName\":\"location1\",\"required\":true},{\"attributeName\":\"location2\",\"required\":true},{\"attributeName\":\"location3\",\"required\":true},{\"attributeName\":\"postalCode\",\"required\":false},{\"attributeName\":\"photo\",\"required\":true}],\"authTokenType\":\"Partner\"}}"; PartnerPolicyResponseDTO partnerPolicyResponseDTO = mapper.readValue(partnerData, PartnerPolicyResponseDTO.class); @@ -618,6 +621,7 @@ public void kycAuthenticateIndividualTest() throws IdAuthenticationBusinessExcep @Test + @Ignore public void processKycAuthValid() throws IdAuthenticationBusinessException, JsonProcessingException { Map mapData = new HashMap<>(); mapData.put("uin", "863537"); @@ -713,6 +717,7 @@ public void processKycAuthValid() throws IdAuthenticationBusinessException, Json } @Test + @Ignore public void processKycAuth_EncryptionException() throws IdAuthenticationBusinessException, JsonProcessingException { Map mapData = new HashMap<>(); mapData.put("uin", "863537"); @@ -813,6 +818,7 @@ public void processKycAuth_EncryptionException() throws IdAuthenticationBusiness } @Test(expected = IdAuthenticationBusinessException.class) + @Ignore public void processKycAuthException1() throws IdAuthenticationBusinessException, JsonProcessingException { EkycAuthRequestDTO kycAuthRequestDTO = new EkycAuthRequestDTO(); Map kycReqMetadata = new HashMap<>(); diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/facade/VciFacadeImplTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/facade/VciFacadeImplTest.java new file mode 100644 index 00000000000..835294d8bec --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/facade/VciFacadeImplTest.java @@ -0,0 +1,179 @@ +package io.mosip.authentication.service.kyc.facade; + + + +import io.mosip.authentication.common.manager.IdAuthFraudAnalysisEventManager; +import io.mosip.authentication.common.service.entity.AutnTxn; +import io.mosip.authentication.common.service.entity.KycTokenData; +import io.mosip.authentication.common.service.helper.AuditHelper; +import io.mosip.authentication.common.service.helper.TokenValidationHelper; +import io.mosip.authentication.common.service.integration.TokenIdManager; +import io.mosip.authentication.common.service.repository.IdaUinHashSaltRepo; +import io.mosip.authentication.common.service.repository.KycTokenDataRepository; +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.common.service.util.TestObjectWithMetadata; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.VciCredentialsDefinitionRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; +import io.mosip.authentication.core.partner.dto.*; +import io.mosip.authentication.core.spi.id.service.IdService; +import io.mosip.authentication.core.spi.partner.service.PartnerService; +import io.mosip.authentication.service.kyc.impl.VciServiceImpl; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; + +import java.util.*; + +@RunWith(SpringRunner.class) +@Import(EnvUtil.class) +public class VciFacadeImplTest { + + @Autowired + EnvUtil env; + + @Mock + EnvUtil envMock; + + @Mock + IdService idService; + + /** The AuditHelper */ + @Mock + AuditHelper auditHelper; + + @Mock + IdaUinHashSaltRepo uinHashSaltRepo; + + @Mock + TokenIdManager tokenIdManager; + + @Mock + IdAuthSecurityManager securityManager; + + @Mock + PartnerService partnerService; + + @Mock + IdAuthFraudAnalysisEventManager fraudEventManager; + + @Mock + VciServiceImpl vciServiceImpl; + + @Mock + TokenValidationHelper tokenValidationHelper; + + @Mock + KycTokenDataRepository kycTokenDataRepo; + + @InjectMocks + VciFacadeImpl vciFacadeImpl; + + @Test + public void processVciExchangeTestWithInvalidDetails_ThenFail() throws IdAuthenticationBusinessException { + + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setId("12345678901234567890123456789012"); + vciExchangeRequestDTO.setMetadata(new HashMap<>()) ; + vciExchangeRequestDTO.setRequestTime("2019-07-15T12:00:00.000Z"); + vciExchangeRequestDTO.setVcAuthToken("12345678901234567890123456789012"); + vciExchangeRequestDTO.setCredSubjectId("12345678901234567890123456789012"); + vciExchangeRequestDTO.setVcFormat("WLA"); + vciExchangeRequestDTO.setIndividualId("1234567890"); + vciExchangeRequestDTO.setIndividualIdType("UIN"); + + VciCredentialsDefinitionRequestDTO vciCredentialsDefinitionRequestDTO = new VciCredentialsDefinitionRequestDTO(); + vciCredentialsDefinitionRequestDTO.setContext(List.of("https://www.w3.org/2018/credentials/v1")); + vciCredentialsDefinitionRequestDTO.setType(List.of("VerifiableCredential")); + vciCredentialsDefinitionRequestDTO.setCredentialSubject(new HashMap<>()); + + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + + Map metaData=new HashMap<>(); + + try{ + vciFacadeImpl.processVciExchange(vciExchangeRequestDTO,"1234567890","12345",metaData,new TestObjectWithMetadata()); + }catch(IdAuthenticationBusinessException e){ + Assert.assertEquals("IDA-KYE-006",e.getErrorCode()); + } + } + + @Test + public void processVciExchangeTestWithInValidTxnDetails_ThenFail() throws IdAuthenticationBusinessException { + ReflectionTestUtils.setField(vciFacadeImpl, "tokenValidationHelper", tokenValidationHelper); + + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setId("12345678901234567890123456789012"); + vciExchangeRequestDTO.setMetadata(new HashMap<>()) ; + vciExchangeRequestDTO.setRequestTime("2019-07-15T12:00:00.000Z"); + vciExchangeRequestDTO.setVcAuthToken("12345678901234567890123456789012"); + vciExchangeRequestDTO.setCredSubjectId("12345678901234567890123456789012"); + vciExchangeRequestDTO.setVcFormat("WLA"); + vciExchangeRequestDTO.setIndividualId("1234567890"); + vciExchangeRequestDTO.setIndividualIdType("UIN"); + vciExchangeRequestDTO.setTransactionID("12345"); + + VciCredentialsDefinitionRequestDTO vciCredentialsDefinitionRequestDTO = new VciCredentialsDefinitionRequestDTO(); + vciCredentialsDefinitionRequestDTO.setContext(List.of("https://www.w3.org/2018/credentials/v1")); + vciCredentialsDefinitionRequestDTO.setType(List.of("VerifiableCredential")); + vciCredentialsDefinitionRequestDTO.setCredentialSubject(new HashMap<>()); + + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + + Map metaData=new HashMap<>(); + + PartnerPolicyResponseDTO partnerPolicyResponseDTO = new PartnerPolicyResponseDTO(); + partnerPolicyResponseDTO.setMispPolicyId("1234567890"); + + MispPolicyDTO mispPolicyDTO = new MispPolicyDTO(); + mispPolicyDTO.setAllowKeyBindingDelegation(true); + mispPolicyDTO.setAllowKycRequestDelegation(true); + mispPolicyDTO.setAllowOTPRequestDelegation(true); + + PolicyDTO policyDTO = new PolicyDTO(); + + List listOfPolicy=new ArrayList<>(); + + AuthPolicy authPolicy=new AuthPolicy(); + authPolicy.setAuthType("OTP"); + authPolicy.setAuthSubType("OTP"); + authPolicy.setMandatory(false); + + listOfPolicy.add(authPolicy); + + policyDTO.setAllowedAuthTypes(listOfPolicy); + policyDTO.setAuthTokenType("OTP"); + + partnerPolicyResponseDTO.setPolicy(policyDTO); + partnerPolicyResponseDTO.setMispPolicy(mispPolicyDTO); + partnerPolicyResponseDTO.setPartnerId("1234567890"); + + KycTokenData kycTokenData = new KycTokenData(); + kycTokenData.setPsuToken("1234567890"); + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("1234567890"); + Mockito.when(tokenValidationHelper.findAndValidateIssuedToken("12345678901234567890123456789012","12345","12345","1234567890")).thenReturn(kycTokenData); + Mockito.when(partnerService.getPolicyForPartner(Mockito.anyString(),Mockito.anyString(),Mockito.anyMap())).thenReturn(Optional.of(partnerPolicyResponseDTO)); + Mockito.when(idService.getToken(Mockito.any())).thenReturn("token"); + Mockito.when(tokenIdManager.generateTokenId(Mockito.anyString(),Mockito.anyString())).thenReturn("1234567890"); + + EnvUtil.setAuthTokenRequired(true); + PartnerDTO partnerDTO= new PartnerDTO(); + partnerDTO.setPartnerId("12345"); + partnerDTO.setPartnerName("relyingPartyId"); + Mockito.when(partnerService.getPartner(Mockito.anyString(),Mockito.anyMap())).thenReturn(Optional.of(partnerDTO)); + try{ + vciFacadeImpl.processVciExchange(vciExchangeRequestDTO,"1234567890","12345",metaData,new TestObjectWithMetadata()); + }catch (Exception e){ + } + + } +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/filter/KycAuthFilterTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/filter/KycAuthFilterTest.java new file mode 100644 index 00000000000..8047c54161c --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/filter/KycAuthFilterTest.java @@ -0,0 +1,58 @@ +package io.mosip.authentication.service.kyc.filter; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.exception.IdAuthenticationAppException; +import io.mosip.authentication.core.partner.dto.AuthPolicy; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestContext; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.web.context.WebApplicationContext; + +import java.lang.reflect.UndeclaredThrowableException; +import java.util.Collections; +import java.util.HashMap; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +@RunWith(SpringRunner.class) +@WebMvcTest +@ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class }) +@Import(EnvUtil.class) +public class KycAuthFilterTest { + @Autowired + EnvUtil env; + KycAuthFilter kyAuthFilter = new KycAuthFilter(); + @Autowired + ObjectMapper mapper; + + @Before + public void before() { + ReflectionTestUtils.setField(kyAuthFilter, "mapper", mapper); + ReflectionTestUtils.setField(kyAuthFilter, "env", env); + } + @Test + public void checkAllowedAuthTypeBasedOnPolicyTest() { + AuthPolicy authPolicy = new AuthPolicy(); + authPolicy.setAuthType("demo"); + authPolicy.setMandatory(true); + try { + ReflectionTestUtils.invokeMethod(kyAuthFilter, "checkAllowedAuthTypeBasedOnPolicy", new HashMap<>(), Collections.singletonList(authPolicy)); + } catch (UndeclaredThrowableException e) { + String detailMessage = e.getUndeclaredThrowable().getMessage(); + String[] error = detailMessage.split("-->"); + assertEquals("IDA-MPA-025", error[0].trim()); + assertEquals("Partner is unauthorised for KYC-Auth", error[1].trim()); + assertTrue(e.getCause().getClass().equals(IdAuthenticationAppException.class)); + } + } + +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/filter/KycExchangeFilterTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/filter/KycExchangeFilterTest.java new file mode 100644 index 00000000000..ec668900b72 --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/filter/KycExchangeFilterTest.java @@ -0,0 +1,68 @@ +package io.mosip.authentication.service.kyc.filter; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.exception.IdAuthenticationAppException; +import io.mosip.authentication.core.partner.dto.AuthPolicy; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestContext; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.web.context.WebApplicationContext; +import java.lang.reflect.UndeclaredThrowableException; +import java.util.Collections; +import java.util.HashMap; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +@RunWith(SpringRunner.class) +@WebMvcTest +@ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class }) +@Import(EnvUtil.class) +public class KycExchangeFilterTest { + @Autowired + EnvUtil env; + KycExchangeFilter kycExchangeFilter = new KycExchangeFilter(); + @Autowired + ObjectMapper mapper; + + byte[] key = {48, -126, 1, 34, 48, 13, 6, 9, 42, -122, 72, -122, -9, 13, 1, 1, 1, 5, 0, 3, -126, 1, 15, 0, 48, + -126, 1, 10, 2, -126, 1, 1, 0, -56, 41, -49, 92, 30, -78, 87, 22, -103, -23, -14, 106, -89, 84, -73, 51, + -69, -10, 75, -88, 94, 23, -106, -67, -4, 53, -91, -74, -64, 101, 70, 113, 100, 14, 67, 22, -27, -121, -45, + -11, -107, 64, -56, -101, 97, 62, 64, 65, 57, -18, -47, 96, -88, 38, -77, 107, 125, 39, -52, -83, -67, -27, + -20, -9, 27, -15, 69, 78, 74, -36, -114, 20, -121, -119, -55, 26, -50, -69, 16, -21, 84, 6, 66, 117, -39, 0, + 17, -39, -15, 49, -114, -101, -106, -113, -98, -81, 3, 18, -109, -122, -57, -19, 27, 2, 53, 8, -53, -11, + -73, -84, 9, 55, -33, 8, -93, 16, -103, -4, 117, -35, -63, 43, -97, -74, 48, 101, -108, 38, -54, 18, -36, + 105, -39, 21, 117, -81, 42, -15, -95, 79, -124, -59, -128, 64, 82, 85, -68, -79, 24, -84, 25, -113, 125, + -17, -20, -57, 50, -63, -13, -79, -60, 81, -104, 111, -84, 62, 123, -40, 12, -7, 65, -5, 23, 3, -91, -17, 2, + 49, -56, 73, 35, 46, -97, 38, -18, 14, 10, 26, 11, 122, 124, 124, -20, -110, -9, 26, 122, 59, 74, -123, -86, + 97, 0, 48, -14, 65, -50, -49, 40, 90, 65, 127, 75, 110, -76, 127, -41, 80, 6, 30, 61, -4, 27, -63, -100, + 115, -79, -87, 107, 66, 73, -14, 13, -98, -108, 55, 26, 58, -72, -103, -35, 46, -15, 45, 23, 84, 93, 31, 44, + -112, -41, 95, 22, 14, -114, 15, 2, 3, 1, 0, 1}; + @Before + public void before() { + ReflectionTestUtils.setField(kycExchangeFilter, "mapper", mapper); + ReflectionTestUtils.setField(kycExchangeFilter, "env", env); + } + @Test + public void checkAllowedAuthTypeBasedOnPolicyTest() { + AuthPolicy authPolicy = new AuthPolicy(); + authPolicy.setAuthType("demo"); + authPolicy.setMandatory(true); + try { + ReflectionTestUtils.invokeMethod(kycExchangeFilter, "checkAllowedAuthTypeBasedOnPolicy", new HashMap<>(), Collections.singletonList(authPolicy)); + } catch (UndeclaredThrowableException e) { + String detailMessage = e.getUndeclaredThrowable().getMessage(); + String[] error = detailMessage.split("-->"); + assertEquals("IDA-MPA-026", error[0].trim()); + assertEquals("Partner is unauthorised for KYC-Exchange", error[1].trim()); + assertTrue(e.getCause().getClass().equals(IdAuthenticationAppException.class)); + } + } +} + \ No newline at end of file diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/filter/VciExchangeFilterTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/filter/VciExchangeFilterTest.java new file mode 100644 index 00000000000..d42ceb356be --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/filter/VciExchangeFilterTest.java @@ -0,0 +1,69 @@ +package io.mosip.authentication.service.kyc.filter; + +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.exception.IdAuthenticationAppException; +import io.mosip.authentication.core.partner.dto.AuthPolicy; +import io.mosip.authentication.core.partner.dto.MispPolicyDTO; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestContext; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.web.context.WebApplicationContext; + +import java.util.Arrays; + +@RunWith(SpringRunner.class) +@WebMvcTest +@ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class }) +@Import(EnvUtil.class) +public class VciExchangeFilterTest { + + VciExchangeFilter vciExchangeFilter = new VciExchangeFilter(); + + @Test + public void test_defaultMethods() { + Assert.assertTrue(vciExchangeFilter.isPartnerCertificateNeeded()); + Assert.assertTrue(vciExchangeFilter.isSigningRequired()); + Assert.assertTrue(vciExchangeFilter.isSignatureVerificationRequired()); + Assert.assertTrue(vciExchangeFilter.isTrustValidationRequired()); + Assert.assertTrue(vciExchangeFilter.needStoreAuthTransaction()); + Assert.assertTrue(vciExchangeFilter.needStoreAnonymousProfile()); + Assert.assertTrue(vciExchangeFilter.isMispPolicyValidationRequired()); + Assert.assertTrue(vciExchangeFilter.isCertificateValidationRequired()); + Assert.assertFalse(vciExchangeFilter.isAMRValidationRequired()); + } + + @Test + public void test_checkAllowedAuthTypeBasedOnPolicy_withValidPolicy_thenPass() throws IdAuthenticationAppException { + AuthPolicy authPolicy = new AuthPolicy(); + authPolicy.setAuthType("vciexchange"); + vciExchangeFilter.checkAllowedAuthTypeBasedOnPolicy(null, Arrays.asList(authPolicy)); + } + + @Test(expected = IdAuthenticationAppException.class) + public void test_checkAllowedAuthTypeBasedOnPolicy_withInvalidPolicy_thenFail() throws IdAuthenticationAppException { + AuthPolicy authPolicy = new AuthPolicy(); + authPolicy.setAuthType("kycexchange"); + vciExchangeFilter.checkAllowedAuthTypeBasedOnPolicy(null, Arrays.asList(authPolicy)); + } + + @Test(expected = IdAuthenticationAppException.class) + public void test_checkMispPolicyAllowed_withInvalidPolicy_thenFail() + throws IdAuthenticationAppException { + MispPolicyDTO mispPolicyDTO = new MispPolicyDTO(); + mispPolicyDTO.setAllowVciRequestDelegation(false); + vciExchangeFilter.checkMispPolicyAllowed(mispPolicyDTO); + } + + @Test + public void test_checkMispPolicyAllowed_withValidPolicy_thenPass() + throws IdAuthenticationAppException { + MispPolicyDTO mispPolicyDTO = new MispPolicyDTO(); + mispPolicyDTO.setAllowVciRequestDelegation(true); + vciExchangeFilter.checkMispPolicyAllowed(mispPolicyDTO); + } +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/IdentityKeyBindingServiceImplTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/IdentityKeyBindingServiceImplTest.java new file mode 100644 index 00000000000..c0f79787770 --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/IdentityKeyBindingServiceImplTest.java @@ -0,0 +1,159 @@ +package io.mosip.authentication.service.kyc.impl; + +import io.mosip.authentication.common.service.config.IDAMappingConfig; +import io.mosip.authentication.common.service.repository.IdentityBindingCertificateRepository; +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.IdentityKeyBindingDTO; +import io.mosip.authentication.core.indauth.dto.IdentityKeyBindingRequestDTO; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; +import java.security.cert.CertificateEncodingException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RunWith(SpringRunner.class) +public class IdentityKeyBindingServiceImplTest { + + @Mock + IDAMappingConfig idMappingConfig; + + @Mock + IdentityBindingCertificateRepository bindingCertificateRepo; + + @Mock + IdAuthSecurityManager securityManager; + + @InjectMocks + IdentityKeyBindingServiceImpl identityKeyBindingServiceImpl; + + Map pubblicKeyMap; + + @Before + public void initialize() { + pubblicKeyMap = new HashMap<>(); + pubblicKeyMap.put("n", "isAXe1AStinOg3KSCyTDAvu38KRS7ZmKv3Etmt7lSy3SPEg1jOqycdpL4YfFf2uh4rrUEMwsizyIlvWrN6C_ytEx8Non6noXnYfuuePRvL6kaTGdd_lbrC7eh1FI2c2cPzWRTq-CMBCSAdxmjD6PIqaVk5WtliU4qt27F5xfo7lG8lMlREgLb7u0HB9W7B8PjxvWmZ6cDle6eSnb1zOxAAFzB-GbGhRpPF-6ki25mdUrWJGlEkXGSCW1SohSM3YKPJW_xY6_520XdSeHFS9X84f6BXEz_fYTQcBPiNKaxObRkqZ-24PnRzy5vOytjeEnwusenBUHtri4aj1rKkTmIQ"); + pubblicKeyMap.put("e", "AQAB"); + pubblicKeyMap.put("kid", "zcbgDyrQdhwLlaEPW_JeKTE5CiUCMLdDvftRC5Y8h8U"); + pubblicKeyMap.put("alg", "RS256"); + pubblicKeyMap.put("exp", "exp"); + } + + + + @Test + public void isPublicKeyBindedWithValidDetails_thenPass() throws IdAuthenticationBusinessException { + + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("idVidHash"); + Mockito.when(bindingCertificateRepo.countPublicKeysByIdHash(Mockito.anyString(),Mockito.any())).thenReturn(1); + + boolean flag=identityKeyBindingServiceImpl.isPublicKeyBinded("idVid", pubblicKeyMap); + Assert.assertTrue(flag); + + } + + @Test + public void createAndSaveKeyBindingCertificateWithValidDetails_thenPass() throws CertificateEncodingException, IdAuthenticationBusinessException { + + ReflectionTestUtils.setField(identityKeyBindingServiceImpl,"defaultLangCode","eng"); + IdentityKeyBindingDTO identityKeyBindingDTO=new IdentityKeyBindingDTO(); + identityKeyBindingDTO.setPublicKeyJWK(pubblicKeyMap); + + IdentityKeyBindingRequestDTO identityKeyBindingRequestDTO=new IdentityKeyBindingRequestDTO(); + identityKeyBindingRequestDTO.setIdentityKeyBinding(identityKeyBindingDTO); + + Map> identityInfo=new HashMap<>(); + List identityInfoDTOList=new ArrayList<>(); + IdentityInfoDTO identityInfoDTO=new IdentityInfoDTO(); + identityInfoDTO.setLanguage("eng"); + identityInfoDTO.setValue("value"); + identityInfoDTOList.add(identityInfoDTO); + identityInfo.put("name",identityInfoDTOList); + + Map.Entry certificateEntry=Map.entry("certThumbprint","certificateData"); + + Mockito.when(securityManager.generateKeyBindingCertificate(Mockito.any(),Mockito.any())).thenReturn(certificateEntry); + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("idVidHash"); + List names=new ArrayList<>(); + names.add("name"); + Mockito.when(idMappingConfig.getName()).thenReturn(names); + + identityKeyBindingServiceImpl.createAndSaveKeyBindingCertificate(identityKeyBindingRequestDTO,identityInfo,"token","partnerId"); + + } + + @Test + public void createAndSaveKeyBindingCertificateWithInValidIdentityName_thenFail() throws CertificateEncodingException, IdAuthenticationBusinessException { + + ReflectionTestUtils.setField(identityKeyBindingServiceImpl,"defaultLangCode","eng"); + IdentityKeyBindingDTO identityKeyBindingDTO=new IdentityKeyBindingDTO(); + identityKeyBindingDTO.setPublicKeyJWK(pubblicKeyMap); + + IdentityKeyBindingRequestDTO identityKeyBindingRequestDTO=new IdentityKeyBindingRequestDTO(); + identityKeyBindingRequestDTO.setIdentityKeyBinding(identityKeyBindingDTO); + + Map> identityInfo=new HashMap<>(); + List identityInfoDTOList=new ArrayList<>(); + IdentityInfoDTO identityInfoDTO=new IdentityInfoDTO(); + identityInfoDTO.setLanguage("eng"); + identityInfoDTO.setValue("value"); + identityInfoDTOList.add(identityInfoDTO); + identityInfo.put("name",identityInfoDTOList); + + Map.Entry certificateEntry=Map.entry("certThumbprint","certificateData"); + + Mockito.when(securityManager.generateKeyBindingCertificate(Mockito.any(),Mockito.any())).thenReturn(certificateEntry); + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("idVidHash"); + List names=new ArrayList<>(); + names.add("name"); + + try{ + identityKeyBindingServiceImpl.createAndSaveKeyBindingCertificate(identityKeyBindingRequestDTO,identityInfo,"token","partnerId"); + Assert.fail(); + }catch (IdAuthenticationBusinessException e){ + Assert.assertEquals("IDA-IKB-004",e.getErrorCode()); + } + } + + @Test + public void createAndSaveKeyBindingCertificateWithInValidCertificateEntry_thenFail() throws CertificateEncodingException, IdAuthenticationBusinessException { + + ReflectionTestUtils.setField(identityKeyBindingServiceImpl,"defaultLangCode","eng"); + IdentityKeyBindingDTO identityKeyBindingDTO=new IdentityKeyBindingDTO(); + identityKeyBindingDTO.setPublicKeyJWK(pubblicKeyMap); + + IdentityKeyBindingRequestDTO identityKeyBindingRequestDTO=new IdentityKeyBindingRequestDTO(); + identityKeyBindingRequestDTO.setIdentityKeyBinding(identityKeyBindingDTO); + + Map> identityInfo=new HashMap<>(); + List identityInfoDTOList=new ArrayList<>(); + IdentityInfoDTO identityInfoDTO=new IdentityInfoDTO(); + identityInfoDTO.setLanguage("eng"); + identityInfoDTO.setValue("value"); + identityInfoDTOList.add(identityInfoDTO); + identityInfo.put("name",identityInfoDTOList); + + Mockito.when(securityManager.generateKeyBindingCertificate(Mockito.any(),Mockito.any())).thenThrow(CertificateEncodingException.class); + Mockito.when(securityManager.hash(Mockito.anyString())).thenReturn("idVidHash"); + List names=new ArrayList<>(); + names.add("name"); + Mockito.when(idMappingConfig.getName()).thenReturn(names); + + try{ + identityKeyBindingServiceImpl.createAndSaveKeyBindingCertificate(identityKeyBindingRequestDTO,identityInfo,"token","partnerId"); + Assert.fail(); + }catch (IdAuthenticationBusinessException e){ + Assert.assertEquals("IDA-IKB-005",e.getErrorCode()); + } + } +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/KycServiceImplTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/KycServiceImplTest.java index ceccb543fbd..bf2ee7e978e 100644 --- a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/KycServiceImplTest.java +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/KycServiceImplTest.java @@ -1,12 +1,14 @@ package io.mosip.authentication.service.kyc.impl; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; @@ -19,6 +21,7 @@ import java.util.Set; import java.util.stream.Collectors; +import org.apache.commons.codec.DecoderException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,19 +44,23 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.mosip.authentication.common.service.config.IDAMappingConfig; +import io.mosip.authentication.common.service.entity.KycTokenData; import io.mosip.authentication.common.service.factory.IDAMappingFactory; import io.mosip.authentication.common.service.helper.IdInfoHelper; import io.mosip.authentication.common.service.impl.IdInfoFetcherImpl; import io.mosip.authentication.common.service.impl.match.BioMatchType; +import io.mosip.authentication.common.service.repository.KycTokenDataRepository; +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; import io.mosip.authentication.common.service.util.EnvUtil; import io.mosip.authentication.core.constant.IdAuthCommonConstants; import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants; import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; import io.mosip.authentication.core.exception.IdAuthenticationDaoException; -import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; import io.mosip.authentication.core.indauth.dto.EKycResponseDTO; -import io.mosip.authentication.core.spi.bioauth.CbeffDocType; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.KycExchangeRequestDTO; import io.mosip.authentication.core.spi.indauth.match.MappingConfig; +import io.mosip.authentication.core.util.CryptoUtil; import io.mosip.kernel.cbeffutil.impl.CbeffImpl; /** @@ -102,6 +109,12 @@ public class KycServiceImplTest { @Autowired private ObjectMapper mapper; + @Mock + private KycTokenDataRepository kycTokenDataRepo; + + @Mock + private IdAuthSecurityManager securityManager; + @Value("${sample.demo.entity}") String value; @@ -126,6 +139,8 @@ public void before() throws IdAuthenticationDaoException { ReflectionTestUtils.setField(idInfoHelper2, "idMappingConfig", idMappingConfig); ReflectionTestUtils.setField(idinfoFetcher, "cbeffUtil", new CbeffImpl()); ReflectionTestUtils.setField(idinfoFetcher, "environment", env); + ReflectionTestUtils.setField(kycServiceImpl2, "cbeffUtil", new CbeffImpl()); + idInfo = getIdInfo("12232323121"); } @@ -692,4 +707,299 @@ public void testGetKycInfo_photo_withPhotoNotInAllowedKycAttrib() throws IdAuthe Map expected = Map.of(); assertTrue(kycInfo.entrySet().containsAll(expected.entrySet())); } + + @Test + public void generateAndSaveKycTokenTest() throws DecoderException { + String idHash = "73616d706c65496448617368"; + String authToken = "testAuthToken"; + String oidcClientId = "sampleOidcClientId"; + String requestTime = "2023-10-19T12:35:57.835Z"; + String tokenGenerationTime = "2023-10-19T12:35:57.835Z"; + String reqTransactionId = "abc1234"; + String resKycToken = "sampleKycToken"; + KycTokenData kycTokenData = new KycTokenData(); + + Mockito.when(securityManager.generateKeyedHash(Mockito.any())).thenReturn(resKycToken); + Mockito.when(kycTokenDataRepo.saveAndFlush(kycTokenData)).thenReturn(null); + + String kycToken = ReflectionTestUtils.invokeMethod(kycServiceImpl2, "generateAndSaveKycToken", idHash, authToken, oidcClientId, requestTime, + tokenGenerationTime, reqTransactionId); + assertEquals(kycToken, resKycToken); + } + + @Test + public void isKycTokenExpireTest() { + LocalDateTime currentTime = LocalDateTime.now(); + LocalDateTime tokenIssuedTime = currentTime.minusSeconds(20); + String dummyToken = "dummyToken"; + boolean valid = ReflectionTestUtils.invokeMethod(kycServiceImpl2, "isKycTokenExpire", tokenIssuedTime, dummyToken); + assertFalse(valid); + } + + @Test + public void isKycTokenExpireTokenExpiredTest() { + LocalDateTime currentTime = LocalDateTime.now(); + LocalDateTime tokenIssuedTime = currentTime.plusSeconds(310); + String dummyToken = "dummyToken"; + boolean valid = ReflectionTestUtils.invokeMethod(kycServiceImpl2, "isKycTokenExpire", tokenIssuedTime, dummyToken); + assertTrue(valid); + } + + @Test + public void buildKycExchangeResponseTest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name", "gender", "dob", "address", "individual_id", "sub"); + List consentedLocales = Arrays.asList("ara"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[]{}); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedFaceAttributeName", "picture"); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper2); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + Map faceMap = prepareFaceData(idInfo); + Mockito.when(idInfoHelper.getIdEntityInfoMap(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(faceMap); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + private Map prepareFaceData(Map> idInfo) { + String faceData = "<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<BIR xmlns="http://standards.iso.org/iso-iec/19785/-3/ed-2/">
    <Version>
        <Major>1</Major>
        <Minor>1</Minor>
    </Version>
    <CBEFFVersion>
        <Major>1</Major>
        <Minor>1</Minor>
    </CBEFFVersion>
    <BIRInfo>
        <Integrity>false</Integrity>
    </BIRInfo>
	<BIR>
        <BIRInfo>
            <Integrity>false</Integrity>
        </BIRInfo>
        <BDBInfo>
            <FormatOwner>257</FormatOwner>
            <FormatType>8</FormatType>
            <CreationDate>2019-01-29T19:11:33.434+05:30</CreationDate>
            <Type>Face</Type>
            <Level>Raw</Level>
            <Purpose>Enroll</Purpose>
            <Quality>95</Quality>
        </BDBInfo>
        <BDB>/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxMTEhUQEhIVFRUSFRASEBUQEhAQFRgWFRYWFxcVGBUYHSogGBolHRUVITEhJSkrLi4uFx8zODMtNygtLisBCgoKDg0OGhAQGSsdHR0rKysrMS0tKzcrLTcvLS0rLS0tLS0xKy0tKy0tKy0tKy01LSsrLS0tKysrLSstLS0tLf/AABEIAOEA4QMBIgACEQEDEQH/xAAcAAEAAQUBAQAAAAAAAAAAAAAABAMFBgcIAgH/xABEEAABAwIEAgcFBQUECwAAAAABAAIDBBEFEiExBkEHE1FhcYGRIjJyobEUQlJi0RUjM7LBc4KSkwg0NUNEVGODotLx/8QAGQEBAAMBAQAAAAAAAAAAAAAAAAIDBAEF/8QAJhEBAQACAQQCAQQDAAAAAAAAAAECEQMSITFREzJBIlKRoRRhcf/aAAwDAQACEQMRAD8A3iiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAix3jLjGmw6Nr5y4l5tHHGAXu7bXIAA7SsRg6aaVzwDTTNYd3kxm3flB1CDaCKLhmIxVEbZoXh7HC4LTf8A+FSkBERAREQEREBERAREQEREBERAREQEREBERARFDp8UhfI+FkrDJGbSMDhmad9QghcV8SQ0EPXzXIuGta2xc4nkFqLG+l6slJFMxkDORI62T1Psj0KidLvEH2qtMDDeKmuwW2Mn3z5beRWHxxriUi4zcV4i/wB6un8nkfRQv2tVB3Wfap8w2PWv/VemsC8ujR3S5u40qns6qpENXGbezVxZyPhe0gg96tNfVskeDHTMgFiC2F0jmnsNnk2PgvhjXwtQ0unC3FM+HyiSJxMZI66In2Xjw5O71uDBelrD5yGvc6Fx0tK3S/xDRaGe1QKiJHLHYUE7XtD2ODmnUFpBB8wqi5T4U40rMPdeGS7PvwyXdGfAfdPeF0jwjxNFX0zKmPTNdrmOIzNcNC0rqK9oiICIiAiIgIiICIiAiIgIiICIiAiIgLlji6qf+0at7Xua7r5RmY4tNgcu47hZdEHjXD8zmGshDoyWvDngWI31Oh8lz5x/LTuxGd9IQYnOaQW6tLi1uct7s10rsWiM8+3clS2KDG5V2yKKSa0ry4qi2RfS9B6JXglfC9U3PXR9co0rVVLl4cghyRrwx7m+65w+FxH0UzLdUpY0cXfAOOK6jIMNQ4tG8cpMkZ8jt5WW9OjvpDixEGNwEVQ0XdHe4cPxMJ3C5syKXhNa6mmjqYjZ8L2vbqRe24PcRceaOadgIsc4E4qZiNMKhrcjgSyRl72cO/sWRrrgiIgIiICIiAiIgIiICIiAvEzMzS3a4I9QvaIOTuLcIko6uWmlGocXsNrBzHElrx3HUeRVpDllPStVOkxSpzknI5sbL8mtAIA7rknzWNQU9za29reey4kNeqgeti4XwnTdU1kkYc63tO1BuewrFMc4SqIHEsYZIrnK5mrgOxw3Vc5cbdLLx5SbWlr17D18gw+d3uwynwjef6KfT8P1TzYU8n95hb63UuqI6qCXLyASbAEnsAJPos9wXgDZ9S7/ALbD9Xfosuo8JhiH7uNre8DX1VWXPjPHdZjw5Xz2acGFVB2p5v8AJl/RV4sAqnGwp5B8TCwf+S3IWqk5qh/kX0n8E9tSVfD1RCM72ezzLSHW8bKE+MELbtSwEEHY3BWsMWo+pmdHyvdvgdlZx8nV5V58fT4WF0WU93NfZAORUqoaoL4lcqb06AIQKSZ4PvzbfC0BbTXKPBtPVPq4oKSd8MkrrZmucGgAXLnAbiw5rqqmY4MaHuzODWhzrWuQNTbkuoqiIiAiIgIiICIiAiIgIiICj4gx5jeI3ZX5TkP5uV+5SEQcncSVE0lXM6qFp81pRly6t0GngApPDdHnnjb+YE+Wqznp4rY2zxwCGPrHxtkfL/vLBzg0eGjvmsW6Pm3qWeDz8lDO6lWYd7G0KbD9FPZQKTTjRSmheba9CREZRBVHUgspQS6jtLSCaNU/s6uDiqTl3bmlukp1HlhV1cFHlC7K5YsdQFg/GsPuP7y0/VZ9XBYdxRFmid+WzvRX8V7xTyTswGrF1Fk02UuZRnNW1jbE6CMKMtY6pPu0zCPF8gsPlf5Lf6596EMWMNeacn2Kljhb/qMF2/IOXQS6iIiICIiAiIgIiICIiAiIgIiINA9P0NsQhk/HTNaP7kkhP84Vo6Ov9Yb8L/6LNf8ASBwt7209S1ji2LrGSOA0aH5dT5tC1PhFNPIT1JcCLD2SQdTa2ihnNyp4XVdDwyADUgeJAXsV8W3Ws/xtWrKXgCpe0GorC38oL5CPUgLxP0dRjatN/wA0X6OWL48P3f02fJn+3+23o5WuF2kEdxBX260hLg1fRXlp5i9rBmJjcdhvdjlLwjivGJ2OdDaRrNHO6tnjvzKXg/Ms0Tn/ABZW4yVaq/H6aLSSeNp7C4X9FqWjxXFK9zoWzOAb/E2jDeWthdXSl4BgbrUTve7mI7NHqbkrvwzH7X+D5bl9Z/LMn8c0H/MN9HfoqEnGtCf+Ib6O/RWiHhnDRoYie90j/wChCkHgvD3j2YiPhll/9k1x/wCzfJfSnV8WUZ2nb81aKnGKZ4cOuZYgg69qi8ScBsjY6Sne45RcsfY6DsKsmC8NMni617nDMXBoblGxtrcdqtxxw1uVVllnvVi1yuFyAQbEjQqNKNCq2O4E6neADmDhdptY6ciqB28lpnedmepfDVc6Koglb70c0LhbueLjzFx5rrhct8J8NSvkimkGWJskbnXvcta4EgDyK6ZwzEY5254zcA2NxYg9iTKXsXGzuloiLqIiIgIiICIiAiIgIiICIiDG+ken6zDKtg3MLy3xGoWoOBqQRVErOwMLb66Os7+q3vjFN1kEsVr545G28WlardTtEtNO0AGWkayS1x7cDspNj4jXuVfLP01ZxX9UX50Bf1hJs2JheQNC42JAvyGi1BPxU/O0NfmcS5zm5fZAGoF+Yst1UrXOFwR7TcrgRcEd6xtvRvTB+cAkXvlLiBvt4LLjnhJr8tOeGdu54XCqomRwx1IJ6t8Qke15vYFmYi/govR7RhtIxzRYSl8trW0cTYeio8fVD3NioQ4dZVObGGsFgyIEZjbwG6y6mp2xsaxos2Noa3wAsucuU12/KXHLvv8AhhWEwMp66qp7WM+Woj10I+8B4E381cIoRJOyJ2gJ15XtyUXj2lc0RYhECZKV13gfeiOjh5K40cTKqNlRE7RwDmkbg9nim/GVNecY1p0gYg6OrmjbGTazYg32Ws23HMbrOujRjpqFxmGrJXNifzy5Wm1+wEkK8V3DcU5D5wJHBuW5a0G3eQLlVvsjI2BjPZaNmgkN9NlP5sd+Ffw5e1uxluWEuP4Hn5FYbw8y1LF3h7v8T3H+qvXHWK5IOqGr5v3cbeeuhKiQU/Vxsj/A1rfQKOP1/wCpZfZZOKYbsa78Jt6rGsCpOtqY4+ReL+A1P0WW8SD9we4tVr4JpPadN2Xa0+O6vxy1hVOU3lGw7tFoox3dwWX8BwFsUhP3pPoAFh+EMABcdyth8NQ5adv5rv17yq+CfqT5r+ldERFrZRERAREQEREBERAREQEREBak41wqoopzUxtM1LI8u6tts8T5PfygfdJAPiVttWnimHNTP/LZ3oVHL61LH7Rq+k6QIGizopwezqXFSzx7I8WpqGokcdAXsMbR4k8lcaWbRXKlkWC3H03yZe1k4YwKfrHV1aQ6okGVjR7sTPwjsWUPFmqNPWhup5KnNijSNFC25XaUkk09b6HUG4IKxA8PVdHI5+HytMTyXOgl90E/h7Fkjam6q9cuy2OWSsZfjuKjQ0Ebu9s4A+aizYhismgp4or83Pz29FljnqPK5SmU9RG433WJ0HDjmyfaamQzTcr+63wCmVKudQ5Wuc6qW7fKOpPCy4xGH5YjqHbhT6GFsQEbW2FrDs7/ADUSD2pnO5N0HirxNTWDbak2HmVK+kZ7XfBoHTPbCzn7x/C3mVs2GMNaGjZoAHgFbOHcGbTRgDV7rGR3aezwCuy08eHTGfkz6qIiKxWIiICIiAiIgIiICIiAiIgKnPEHNcw7OBB8wqiINVuaY5HRu3Y4tPkdCp7agNbmJ0Cm8d0WWRtQNn+w/wCIbH0+iwnGMTs3ID4rByYay03YZ7x2lV3EjdspPfdRmY2zmx3k7T6K4wcPPLWlj4hcAkubnOvmvUvDdSBdssX+UP1Ue3tLutz8fcPdj08yvcPErhq+PTuvdV2YVV852jwjA+pXv9mSE2kka5vMFjQfUJqHdcKWubIMzT4jmkr1ixqOomc1uwNvEK6NxVjhvZNO7V53qz4jUBjSefJVK3E2jbVY7VTukdbvU5FeVZ50W4QJHmd4uGe0L7Zjt6brYeJYFBOQ6RntNcHBzSWOuO0jfzVq6OqLq6QG1s5J8hoPoVlC14TWLJne4iIpoiIiAiIgIiICIiAiIgIiICIrJxJxXSULM9TM1p+6we1I7uawalBe14fK0buA8SAue+MOmOpqCWUgNPFtmNnSu7ydm+Autd1uKzym8s8rz+eR5+V0HWPEElPNA+J88bcwOUl7dHcjv2rRD5CXFpsSCQSDcG3MHmFrew7Ash4fxO1o3H4SfoquXHc2s48tXTdGFNLomEH7o+Si45WzRkNY8j5qDgGL5Yw2+oVLEa7OSfqsV8tu+ydhOIyPdkkN7jQ96uz2WWIQy5SDzGu6vLsWGXU8kNrDjf8AFd6q3PkNtLKRXTZnEqM1lz23U5FdqjqVVuI2OldswX8TyCudPhTrXdoOzmrdxnHakeBsMvpdTx1vSGW9bZRw700Rsa2KemLWtAaHQuDrAaatO/qtp4Dj9PWRiWnkDwdxs4dzmnUFcc3VxwXHJ6WQSwSOY4dh37iOYWxldkItW9H3S3HVOZTVTermdZrXiwje7kD+En0W0kBERAREQEREBERAREQERUquobGx0jjZrGuc4nsAuUGEdK/HIw+DqoiDUzgiIb5G7GR3hfQcyucKqofK4ySvc97t3PJcT5qdxNjT62qlqnknO45AfusB9lo7NPqrcgoPCp3UiQKORqgBSKOEvexjfec5rW+JKRwC2qz/AKO+E3GRtU9pDWg9WHbkn73go55TGbqWGNyul3qMCewAxEnQZm8723CiuMrfeY4dvsn9FnktLYXXqnPJYOpu6WAhzz7sbj2+y7b+ikxYTUybRuA/NYD5rYDV9XOp3oYdS8JO3keB3N1PqrpBhrI/daPHc+qvEhUOROq06ZEGoasY4rhzU0o/KT6LK5mLW3GvEdy6mh5XbK/6tb+qt45beyvksk7sDC9gKq2NenNW1iUQSCCCQQQQRoQRsV0B0QdJH2oChq3ATtFoXk260Dl8Y+a0CQlPO5j2yMJa5hDmkaEEbFB2qiwfor41GIU+WQj7RDYSgaZhyeB3rOEBERAREQEREBF8c4AEnQDUkrRPGPSFUzTvFNO+KBpys6uzS633i7fXsug3sStT9OPFzWUwoYJWl87rT5HAlsTdSDbbMbDwuta1WOVUgIfUzOB3DppCPS6xiuYc5J57IKbV9K8Ar0g+OCokahVyFTBAc0nYOaT4A6oNp8DcGMLWTTtzOdZwa7ZoO2nMrZkdOGiwGytWCTiwts4NI8CFfAvN5Mrle70ePGYzspGG6hTQWKurQvssIIVe1mlpaV9JX2dmUqiXqTj5IVGeVUkeo0j12I1jPHWP/ZosjD+9lBDfyt5uWpgOZV34sxL7RVSSX9kHq2fC3T5m5Vput/Hh04sPJn1ZPS8lfC5V4qUkZney3vVitGDC42C9dU0d5VR7h7rNuZVWGBBK4Xx+WgqmVMdxlPtt5PYd2ldW4Di8dVBHUxG7ZGgjuPMHvC5S+zA6ELLeB+MpsNDmMAkicQ4xvJFjzLTyug6QRQcDxEVFPFUBuUTMbIAdxmF7KcgIiICIiChX/wAKT4H/AMpXLg/hN8kRBQKgYly80RBbl6CIg+uUebZfUQrffCf8KH+yi/lCy9q+IvMz8vSw8KrVUCIq1i3YkrY5EU4hVF6h1nuP+B/0KIpRGtEfqV8KIvSec9Q7jxCm417oREEKkVxgREEpq+v2REHS/A3+z6T+wi/lCviIgIiICIiD/9mRXao6lVbiNjpXbMF/E8grnT4U613aDs5q3cZx2pHgbDL6XU8db0hlvW2UcO9NEbGtinpi1rQGh0Lg6wGmrTv6raeA4/T1kYlp5A8HcbOHc5p1BXHN1ccFxyelkEsEjmOHYd+4jmFsZXZCLVvR90tx1TmU1U3q5nWa14sI3u5A/hJ9FtJAREQEREBERAREQEREBEVKrqGxsdI42axrnOJ7ALlBhHSvxyMPg6qIg1M4IiG+Ruxkd4X0HMrnCqqHyuMkr3Pe7dzyXE+ancTY0+tqpap5JzuOQH7rAfZaOzT6q3IKDwqd1IkCjkaoAUijhL3sY33nOa1viSkcAtqs/wCjvhNxkbVPaQ1oPVh25J+94KOeUxm6lhjcrpd6jAnsAMRJ0GZvO9tworjK33mOHb7J/RZ5LS2F16pzyWDqbulgIc8+7G49vsu2/opMWE1Mm0bgPzWA+a2A1fVzqd6GHUvCTt5HgdzdT6q6QYayP3Wjx3PqrxIVDkTqtOmRBqGrGOK4c1NKPyk+iyuZi1txrxHcupoeV2yv+rW/qreOW3sr5LJO7AwvYCqtjXpzVtYlEEgggkEEEEaEEbFdAdEHSR9qAoatwE4=</BDB>
    </BIR>
</BIR>
"; + List identityList = new ArrayList<>(); + IdentityInfoDTO identityInfoDTO = new IdentityInfoDTO(); + identityInfoDTO.setLanguage(null); + identityInfoDTO.setValue(new String(CryptoUtil.decodeBase64Url(faceData))); + identityList.add(identityInfoDTO); + idInfo.put("Face", identityList); + return Map.of("Face", new String(CryptoUtil.decodeBase64Url(faceData))); + } + + @Test + public void buildKycExchangeResponseWithFaceDataTest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name", "gender", "dob", "address", "individual_id", "picture", "sub"); + List consentedLocales = Arrays.asList("ara"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[]{}); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedFaceAttributeName", "picture"); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + Map faceMap = prepareFaceData(idInfo); + Mockito.when(idInfoHelper.getIdEntityInfoMap(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(faceMap); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + @Test + public void buildKycExchangeResponseTypeJWETest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name", "gender", "dob", "address", "individual_id", "sub"); + List consentedLocales = Arrays.asList("ara"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + kycExchangeRequestDTO.setRespType("JWE"); + Map metadata = Map.of("PARTNER_CERTIFICATE", "DUMMY-X509-CERTIFICATE"); + kycExchangeRequestDTO.setMetadata(metadata); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[]{}); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedFaceAttributeName", "picture"); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper2); + ReflectionTestUtils.setField(kycServiceImpl2, "jweResponseType", "JWE"); + + String resKycToken = "responseJWEToken"; + String dummyTokenData = "dummyJWTTokenData"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(dummyTokenData); + Map faceMap = prepareFaceData(idInfo); + Mockito.when(idInfoHelper.getIdEntityInfoMap(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(faceMap); + Mockito.when(securityManager.jwtEncrypt(Mockito.anyString(), Mockito.anyString())).thenReturn(resKycToken); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + @Test + public void buildKycExchangeNoLangTest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name", "gender", "dob", "address", "individual_id", "sub"); + List consentedLocales = List.of(); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + @Test + public void buildKycExchangeNoFaceDataTest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name", "gender", "dob", "address", "individual_id", "picture", "sub"); + List consentedLocales = List.of("ara"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[]{}); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedFaceAttributeName", "picture"); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + @Test + public void buildKycExchangeNoFullnameDataTest() throws IdAuthenticationBusinessException { + + idInfo.remove("fullName"); + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name", "gender", "dob", "address", "individual_id", "sub"); + List consentedLocales = List.of("ara"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[]{}); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedFaceAttributeName", "picture"); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper2); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + Map faceMap = prepareFaceData(idInfo); + Mockito.when(idInfoHelper.getIdEntityInfoMap(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(faceMap); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + @Test + public void buildKycExchangeResponseMultiLangTest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name", "gender", "dob", "address", "phone", "individual_id", "sub"); + List consentedLocales = Arrays.asList("ara", "fre"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[]{}); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedFaceAttributeName", "picture"); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper2); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + Map faceMap = prepareFaceData(idInfo); + Mockito.when(idInfoHelper.getIdEntityInfoMap(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(faceMap); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + @Test + public void buildKycExchangeResponseMultiLangAddressAttributesTest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name", "gender", "dob", "address", "phone", "individual_id", "sub"); + List consentedLocales = Arrays.asList("ara", "fre"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[] {"street_address","locality"}); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedFaceAttributeName", "picture"); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper2); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + Map faceMap = prepareFaceData(idInfo); + Mockito.when(idInfoHelper.getIdEntityInfoMap(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(faceMap); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + @Test + public void buildKycExchangeResponseAddressAttributesTest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name", "gender", "dob", "address", "phone", "individual_id", "sub"); + List consentedLocales = Arrays.asList("ara"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[] {"street_address","locality"}); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper2); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + @Test + public void buildKycExchangeTwoNameAttributesTest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name"); + List consentedLocales = List.of("ara"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedNameAttributeName", "name"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[]{}); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + List attributes = List.of("middleName", "lastName"); + Mockito.when(idInfoHelper.getIdentityAttributesForIdName(Mockito.anyString())).thenReturn(attributes); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } + + @Test + public void buildKycExchangeTwoNameAttributesMultiLangTest() throws IdAuthenticationBusinessException { + + String dummySubject = "dummyPSUToken"; + List consentedAttributes = Arrays.asList("name"); + List consentedLocales = List.of("ara", "fre"); + String idVid = "12232323121"; + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedIndividualAttributeName", "individual_id"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedAddressAttributeName", "address"); + ReflectionTestUtils.setField(kycServiceImpl2, "consentedNameAttributeName", "name"); + ReflectionTestUtils.setField(kycServiceImpl2, "addressSubsetAttributes", new String[]{}); + ReflectionTestUtils.setField(kycServiceImpl2, "idInfoHelper", idInfoHelper); + + String resKycToken = "responseJWTToken"; + Mockito.when(securityManager.signWithPayload(Mockito.anyString())).thenReturn(resKycToken); + List attributes = List.of("middleName", "lastName"); + Mockito.when(idInfoHelper.getIdentityAttributesForIdName(Mockito.anyString())).thenReturn(attributes); + + String response = kycServiceImpl2.buildKycExchangeResponse(dummySubject, idInfo, consentedAttributes, consentedLocales, idVid, kycExchangeRequestDTO); + assertEquals(response, resKycToken); + } } \ No newline at end of file diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/VciServiceImplTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/VciServiceImplTest.java new file mode 100644 index 00000000000..8ae4b80c7eb --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/impl/VciServiceImplTest.java @@ -0,0 +1,347 @@ +package io.mosip.authentication.service.kyc.impl; + +import com.fasterxml.jackson.databind.ObjectMapper; +import foundation.identity.jsonld.ConfigurableDocumentLoader; +import foundation.identity.jsonld.JsonLDException; +import info.weboftrust.ldsignatures.LdProof; +import info.weboftrust.ldsignatures.canonicalizer.URDNA2015Canonicalizer; +import io.mosip.authentication.common.service.entity.CredSubjectIdStore; +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.repository.CredSubjectIdStoreRepository; +import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; +import io.mosip.authentication.core.indauth.dto.VciCredentialsDefinitionRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; +import io.mosip.authentication.service.kyc.util.VCSchemaProviderUtil; +import io.mosip.kernel.biometrics.entities.BIR; +import io.mosip.kernel.biometrics.spi.CbeffUtil; +import org.json.simple.JSONObject; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; + +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.*; + +@RunWith(SpringRunner.class) +@Import(EnvUtil.class) +public class VciServiceImplTest { + + @Mock + JSONObject vcContextJsonld; + + @Autowired + EnvUtil envUtil; + + @Mock + IdAuthSecurityManager securityManager; + + @Mock + CredSubjectIdStoreRepository csidStoreRepo; + + @Mock + LdProof.Builder builder; + + @Mock + URDNA2015Canonicalizer urdna2015Canonicalizer; + + @Mock + VCSchemaProviderUtil vcSchemaProviderUtil; + + /** The demo helper. */ + @Mock + IdInfoHelper idInfoHelper; + + @Mock + CbeffUtil cbeffUtil; + + @Mock + ObjectMapper objectMapper=new ObjectMapper(); + + @InjectMocks + VciServiceImpl vciServiceImpl; + + VciCredentialsDefinitionRequestDTO vciCredentialsDefinitionRequestDTO; + + VciExchangeRequestDTO vciExchangeRequestDTO; + + IdentityInfoDTO identityInfoDTO; + + List locale; + + Map> idInfo; + + String credSubjectId; + + + @Before + public void beforeTest(){ + + identityInfoDTO=new IdentityInfoDTO(); + identityInfoDTO.setLanguage("eng"); + identityInfoDTO.setValue("value"); + List list=new ArrayList<>(); + list.add(identityInfoDTO); + idInfo =new HashMap<>(); + idInfo.put("name",list); + + locale=new ArrayList<>(); + locale.add("eng"); + + vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setId("12345678901234567890123456789012"); + vciExchangeRequestDTO.setMetadata(new HashMap<>()) ; + vciExchangeRequestDTO.setRequestTime("2019-07-15T12:00:00.000Z"); + vciExchangeRequestDTO.setVcAuthToken("12345678901234567890123456789012"); + vciExchangeRequestDTO.setCredSubjectId("12345678901234567890123456789012"); + vciExchangeRequestDTO.setVcFormat("WLA"); + vciExchangeRequestDTO.setIndividualId("1234567890"); + vciExchangeRequestDTO.setIndividualIdType("UIN"); + + vciCredentialsDefinitionRequestDTO = new VciCredentialsDefinitionRequestDTO(); + vciCredentialsDefinitionRequestDTO.setContext(List.of("https://www.w3.org/2018/credentials/v1")); + vciCredentialsDefinitionRequestDTO.setType(List.of("VerifiableCredential")); + vciCredentialsDefinitionRequestDTO.setCredentialSubject(new HashMap<>()); + credSubjectId="12345:54321:ewogICAgImt0eSI6ICJSU0EiLAogICAgImUiOiAiQVFBQiIsCiAgICAidXNlIjogInNpZyIsCiAgICAia2lkIjogInBicy1GY1B6N1Jwbm42UUI1WG8xLWxrdVBEWHlxRlBZUzB5V296S0VpUjgiLAogICAgImFsZyI6ICJSUzI1NiIsCiAgICAibiI6ICJzSzhLTE55d0JoVVloYWhIREpTN0lPNkN2SkYxeTNmX0xsTEJvTV81eGFvcXVPckxDb084R0llaWJ1ai1YOWV0S3d1SkoycTdjdzRnTEJocXFOd2x3T2ZTOXZ2X1BnRTZkTTYtSDkxVVgtbGljQzh6YUFDSkdCV1N2TlVjSmtSNFJpOW5laGQ3NmRMSTJ5SDdlYVh3N0lRVERyMDVtSFFyR1ZaNVBVZTRMR3haZlVqcmxQUGttcTZfUTBIbk5RN1ZGTjVFLUxDejNvUWtKbHl4OTQyenhJdk5TV2V1enNMQU5xZWdSQzVWd3YtWlJtNmgxb1BNSWY1MThoZHdwaEhqeU5fRGs5djExYV8yT2VaNzd0T3Ria0RUaUxtamVLS1dTNXZldW1rOWMzTkw4OU00LS1yMFJMZ0Jrb3k1X0RMNHNmRXpSRnZYWVF0eHI4c3R1aURaRFEiCn0="; + + } + + @Test + public void addCredSubjectIdTestWithInvalidCredSubjectId_thenFail() throws IdAuthenticationBusinessException { + + try{ + vciServiceImpl.addCredSubjectId("12345:54321:MTIzNDU2Nzg5MA==","hash","123456789","12"); + }catch (IdAuthenticationBusinessException e){ + Assert.assertEquals("IDA-MLC-007",e.getErrorCode()); + } + } + + @Test + public void addCredSubjectIdTestWithValidDetailsAndWithoutSubIdList_thenPass() throws IdAuthenticationBusinessException { + vciServiceImpl.addCredSubjectId(credSubjectId,"hash","123456789","12"); + + } + + @Test + public void addCredSubjectIdTestWithValidDetailsWithSameVid_thenPass() throws IdAuthenticationBusinessException { + + List credSubjectIdList = new ArrayList<>(); + CredSubjectIdStore credSubjectIdStore=new CredSubjectIdStore(); + credSubjectIdStore.setCredSubjectId("12345"); + credSubjectIdStore.setId("12345"); + credSubjectIdStore.setIdVidHash("hash"); + credSubjectIdList.add(credSubjectIdStore); + credSubjectIdStore.setTokenId("token"); + Mockito.when(csidStoreRepo.findAllByCsidKeyHash(Mockito.anyString())).thenReturn(credSubjectIdList); + vciServiceImpl.addCredSubjectId(credSubjectId,"hash","token","12"); + + } + + @Test + public void addCredSubjectIdTestWithValidDetailsWithDiffSameVid_thenPass() throws IdAuthenticationBusinessException { + + List credSubjectIdList = new ArrayList<>(); + CredSubjectIdStore credSubjectIdStore=new CredSubjectIdStore(); + credSubjectIdStore.setCredSubjectId("12345"); + credSubjectIdStore.setId("12345"); + credSubjectIdStore.setIdVidHash("hash"); + credSubjectIdList.add(credSubjectIdStore); + credSubjectIdStore.setTokenId("token"); + Mockito.when(csidStoreRepo.findAllByCsidKeyHash(Mockito.anyString())).thenReturn(credSubjectIdList); + vciServiceImpl.addCredSubjectId(credSubjectId,"hashe","token","12"); + + } + + //TODO builder need to be fixed + @Test + public void buildVerifiableCredentialsTest() throws IdAuthenticationBusinessException, JsonLDException, GeneralSecurityException, IOException { + ReflectionTestUtils.setField(vciServiceImpl, "consentedIndividualAttributeName", "name"); + ReflectionTestUtils.setField(vciServiceImpl, "proofPurpose", "purpose"); + ReflectionTestUtils.setField(vciServiceImpl, "proofType", "proofType"); + ReflectionTestUtils.setField(vciServiceImpl,"verificationMethod","verificationMethod"); + ReflectionTestUtils.setField(vciServiceImpl,"confDocumentLoader",new ConfigurableDocumentLoader()); + Set allowedAttribute =new HashSet<>(); + allowedAttribute.add("name"); + + VciCredentialsDefinitionRequestDTO vciCredentialsDefinitionRequestDTO = new VciCredentialsDefinitionRequestDTO(); + vciCredentialsDefinitionRequestDTO.setContext(List.of("https://www.w3.org/2018/credentials/v1")); + vciCredentialsDefinitionRequestDTO.setType(List.of("VerifiableCredential")); + vciCredentialsDefinitionRequestDTO.setCredentialSubject(new HashMap<>()); + + + EnvUtil.setDateTimePattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + + // Create a mock of the LdProof.Builder class + LdProof.Builder builderMock = Mockito.mock(LdProof.Builder.class,"RETURNS_SELF"); + + Mockito.when(builderMock.defaultContexts(Mockito.anyBoolean())).thenReturn(builderMock); + Mockito.when(builderMock.defaultTypes(Mockito.anyBoolean())).thenReturn(builderMock); + Mockito.when(builderMock.type(Mockito.anyString())).thenReturn(builderMock); + Mockito.when(builderMock.created(Mockito.any())).thenReturn(builderMock); + Mockito.when(builderMock.proofPurpose("purpose")).thenReturn(builderMock); + Mockito.when(builderMock.verificationMethod(Mockito.any())).thenReturn(builderMock); + + + LdProof ldProofMock = Mockito.mock(LdProof.class); + Mockito.when(builderMock.build()).thenReturn(ldProofMock); + + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + Mockito.when( vcContextJsonld.get("context")).thenReturn(new Object()); + Mockito.when(urdna2015Canonicalizer.canonicalize(Mockito.any(),Mockito.any())).thenReturn(new byte[4]); + + try{ + vciServiceImpl.buildVerifiableCredentials(credSubjectId,"ldp_vc" ,idInfo, locale, allowedAttribute, vciExchangeRequestDTO,"pusutokdn"); + }catch (Exception e){} + + } + + @Test + public void buildVerifiableCredentialswithjwt_vc_jsonTest() throws IdAuthenticationBusinessException { + + Set allowedAttribute =new HashSet<>(); + allowedAttribute.add("name"); + + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + Mockito.when( vcContextJsonld.get("context")).thenReturn(new Object()); + + try{ + vciServiceImpl.buildVerifiableCredentials(credSubjectId,"jwt_vc_json" ,idInfo, locale, allowedAttribute, vciExchangeRequestDTO,"pusutokdn"); + }catch (Exception e){} + + } + + @Test + public void buildVerifiableCredentialswithjwt_vc_jsonldTest() throws IdAuthenticationBusinessException { + + Set allowedAttribute =new HashSet<>(); + allowedAttribute.add("name"); + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + Mockito.when( vcContextJsonld.get("context")).thenReturn(new Object()); + + try{ + vciServiceImpl.buildVerifiableCredentials(credSubjectId,"jwt_vc_json-ld" ,idInfo, locale, allowedAttribute, vciExchangeRequestDTO,"pusutokdn"); + }catch (Exception e){} + + } + + @Test + public void buildVerifiableCredentialsWithFaceTest() throws Exception { + ReflectionTestUtils.setField(vciServiceImpl, "consentedIndividualAttributeName", "name"); + ReflectionTestUtils.setField(vciServiceImpl, "proofPurpose", "purpose"); + ReflectionTestUtils.setField(vciServiceImpl, "proofType", "proofType"); + ReflectionTestUtils.setField(vciServiceImpl,"verificationMethod","verificationMethod"); + ReflectionTestUtils.setField(vciServiceImpl,"confDocumentLoader",new ConfigurableDocumentLoader()); + + Set allowedAttribute =new HashSet<>(); + allowedAttribute.add("face"); + + EnvUtil.setDateTimePattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + Mockito.when( vcContextJsonld.get("context")).thenReturn(new Object()); + Mockito.when(urdna2015Canonicalizer.canonicalize(Mockito.any(),Mockito.any())).thenReturn(new byte[4]); + + List birDataFromXMLType =new ArrayList<>(); + BIR bir=new BIR(); + bir.setBdb(new byte[4]); + birDataFromXMLType.add(bir); + Mockito.when(cbeffUtil.getBIRDataFromXMLType(Mockito.any(),Mockito.anyString())).thenReturn(birDataFromXMLType); + Map faceEntityInfoMap = new HashMap<>(); + faceEntityInfoMap.put("Face","face"); + Mockito.when(idInfoHelper.getIdEntityInfoMap(Mockito.any(),Mockito.anyMap(),Mockito.any())).thenReturn(faceEntityInfoMap); + try{ + vciServiceImpl.buildVerifiableCredentials(credSubjectId,"ldp_vc" ,idInfo, locale, allowedAttribute, vciExchangeRequestDTO,"pusutokdn"); + }catch (Exception e){} + + } + + @Test + public void buildVerifiableCredentialsWithIdScemaTest() throws Exception { + ReflectionTestUtils.setField(vciServiceImpl, "consentedIndividualAttributeName", "name"); + ReflectionTestUtils.setField(vciServiceImpl, "proofPurpose", "purpose"); + ReflectionTestUtils.setField(vciServiceImpl, "proofType", "proofType"); + ReflectionTestUtils.setField(vciServiceImpl,"verificationMethod","verificationMethod"); + ReflectionTestUtils.setField(vciServiceImpl,"confDocumentLoader",new ConfigurableDocumentLoader()); + IdentityInfoDTO identityInfoDTO=new IdentityInfoDTO(); + identityInfoDTO.setLanguage("eng"); + identityInfoDTO.setValue("value"); + List list=new ArrayList<>(); + list.add(identityInfoDTO); + Map> idInfo =new HashMap<>(); + idInfo.put("info",list); + + List locale=new ArrayList<>(); + locale.add("eng"); + + Set allowedAttribute =new HashSet<>(); + allowedAttribute.add("id"); + + EnvUtil.setDateTimePattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + Mockito.when( vcContextJsonld.get("context")).thenReturn(new Object()); + Mockito.when(urdna2015Canonicalizer.canonicalize(Mockito.any(),Mockito.any())).thenReturn(new byte[4]); + + + List idInfoHelperList = new ArrayList<>(); + idInfoHelperList.add("info"); + Mockito.when(idInfoHelper.getIdentityAttributesForIdName(Mockito.anyString())).thenReturn(idInfoHelperList); + try{ + vciServiceImpl.buildVerifiableCredentials(credSubjectId,"ldp_vc" ,idInfo, locale, allowedAttribute, vciExchangeRequestDTO,"pusutokdn"); + }catch (Exception e){} + + } + + + @Test + public void buildVerifiableCredentialsWithInfoListTest() throws Exception { + ReflectionTestUtils.setField(vciServiceImpl, "consentedIndividualAttributeName", "name"); + ReflectionTestUtils.setField(vciServiceImpl, "proofPurpose", "purpose"); + ReflectionTestUtils.setField(vciServiceImpl, "proofType", "proofType"); + ReflectionTestUtils.setField(vciServiceImpl,"verificationMethod","verificationMethod"); + ReflectionTestUtils.setField(vciServiceImpl,"confDocumentLoader",new ConfigurableDocumentLoader()); + IdentityInfoDTO identityInfoDTO=new IdentityInfoDTO(); + identityInfoDTO.setLanguage("eng"); + identityInfoDTO.setValue("value"); + List list=new ArrayList<>(); + list.add(identityInfoDTO); + identityInfoDTO=new IdentityInfoDTO(); + identityInfoDTO.setLanguage("hin"); + identityInfoDTO.setValue("value"); + list.add(identityInfoDTO); + Map> idInfo =new HashMap<>(); + idInfo.put("info",list); + + List locale=new ArrayList<>(); + locale.add("eng"); + + Set allowedAttribute =new HashSet<>(); + allowedAttribute.add("id"); + + EnvUtil.setDateTimePattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + Mockito.when( vcContextJsonld.get("context")).thenReturn(new Object()); + Mockito.when(urdna2015Canonicalizer.canonicalize(Mockito.any(),Mockito.any())).thenReturn(new byte[4]); + + + List idInfoHelperList = new ArrayList<>(); + idInfoHelperList.add("info"); + Mockito.when(idInfoHelper.getIdentityAttributesForIdName(Mockito.anyString())).thenReturn(idInfoHelperList); + try{ + vciServiceImpl.buildVerifiableCredentials(credSubjectId,"ldp_vc" ,idInfo, locale, allowedAttribute, vciExchangeRequestDTO,"pusutokdn"); + }catch (Exception e){} + + } +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/util/ExchangeDataAttributesUtilTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/util/ExchangeDataAttributesUtilTest.java new file mode 100644 index 00000000000..3527f410bac --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/util/ExchangeDataAttributesUtilTest.java @@ -0,0 +1,137 @@ +package io.mosip.authentication.service.kyc.util; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestContext; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.web.context.WebApplicationContext; + +import io.mosip.authentication.common.service.entity.OIDCClientData; +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.repository.OIDCClientDataRepository; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import io.mosip.authentication.core.indauth.dto.BaseRequestDTO; + +@WebMvcTest +@ContextConfiguration(classes = {TestContext.class, WebApplicationContext.class}) +@RunWith(SpringRunner.class) +@Import(EnvUtil.class) +@TestPropertySource(locations="classpath:application.properties") +public class ExchangeDataAttributesUtilTest { + + @Autowired + EnvUtil env; + + @Mock + private IdInfoHelper idInfoHelper; + + @Mock + private OIDCClientDataRepository oidcClientDataRepo; + + @InjectMocks + private ExchangeDataAttributesUtil exchangeDataAttributesUtil; + + @Before + public void before() { + // + } + + + @Test + public void mapConsentedAttributesToIdSchemaAttributesTest() throws IdAuthenticationBusinessException { + List consentAttributes = Arrays.asList("name", "gender", "dob", "address"); + List policyAttributes = Arrays.asList("name", "gender", "dob", "address", "picture", "individual_id"); + Set exFilterAttributes = Set.of("fullname", "gender", "dob", "address"); + + Mockito.when(idInfoHelper.getIdentityAttributesForIdName("name")).thenReturn(Arrays.asList("fullname")); + Mockito.when(idInfoHelper.getIdentityAttributesForIdName("gender")).thenReturn(Arrays.asList("gender")); + Mockito.when(idInfoHelper.getIdentityAttributesForIdName("dob")).thenReturn(Arrays.asList("dob")); + Mockito.when(idInfoHelper.getIdentityAttributesForIdName("address")).thenReturn(Arrays.asList("address")); + + ReflectionTestUtils.setField(exchangeDataAttributesUtil, "consentedIndividualIdAttributeName", "individual_id"); + Set filterAttributes = new HashSet<>(); + exchangeDataAttributesUtil.mapConsentedAttributesToIdSchemaAttributes(consentAttributes, filterAttributes, policyAttributes); + assertEquals(exFilterAttributes, filterAttributes); + } + + @Test + public void mapConsentedAttributesToIdSchemaAttributesNoIndividualIdTest() throws IdAuthenticationBusinessException { + List consentAttributes = new ArrayList<>(); + consentAttributes.add("name"); + consentAttributes.add("gender"); + consentAttributes.add("dob"); + consentAttributes.add("address"); + consentAttributes.add("individual_id"); + + List policyAttributes = Arrays.asList("name", "gender", "dob", "address", "picture"); + List exConsentAttributes = Arrays.asList("name", "gender", "dob", "address"); + + ReflectionTestUtils.setField(exchangeDataAttributesUtil, "consentedIndividualIdAttributeName", "individual_id"); + Set filterAttributes = new HashSet<>(); + exchangeDataAttributesUtil.mapConsentedAttributesToIdSchemaAttributes(consentAttributes, filterAttributes, policyAttributes); + assertEquals(consentAttributes, exConsentAttributes); + } + + @Test + public void filterByPolicyAllowedAttributesTest() { + List policyAttributes = Arrays.asList("name", "gender", "dob", "address", "picture", "individual_id"); + Set filterAttributes = Set.of("name", "gender", "dob", "address"); + + Set resFilterAttributes = exchangeDataAttributesUtil.filterByPolicyAllowedAttributes(filterAttributes, policyAttributes); + assertEquals(filterAttributes, resFilterAttributes); + } + + @Test + public void getKycExchangeResponseTimeTest() { + BaseRequestDTO authRequestDTO = new BaseRequestDTO(); + authRequestDTO.setRequestTime("2023-10-19T12:35:57.835Z"); + String resValue = exchangeDataAttributesUtil.getKycExchangeResponseTime(authRequestDTO); + assertNotNull(resValue); + } + + @Test + public void filterAllowedUserClaimsTest() { + List consentAttributes = Arrays.asList("name", "gender", "dob", "address"); + String oidcClientId = "sampleOidcClientId"; + OIDCClientData clientData = new OIDCClientData(); + clientData.setUserClaims(new String [] {"name","gender","dob","address"}); + + Mockito.when(oidcClientDataRepo.findByClientId(oidcClientId)).thenReturn(Optional.of(clientData)); + List resAttributes = exchangeDataAttributesUtil.filterAllowedUserClaims(oidcClientId, consentAttributes); + assertEquals(consentAttributes, resAttributes); + } + + @Test + public void filterAllowedUserClaimsNoConsentAttributesTest() { + List exAttributes = Arrays.asList("name", "gender", "dob"); + String oidcClientId = "sampleOidcClientId"; + OIDCClientData clientData = new OIDCClientData(); + clientData.setUserClaims(new String [] {"name","gender","dob"}); + + Mockito.when(oidcClientDataRepo.findByClientId(oidcClientId)).thenReturn(Optional.of(clientData)); + List resAttributes = exchangeDataAttributesUtil.filterAllowedUserClaims(oidcClientId, Collections.emptyList()); + assertEquals(exAttributes, resAttributes); + } +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/util/VCSchemaProviderUtilTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/util/VCSchemaProviderUtilTest.java new file mode 100644 index 00000000000..60db674d8e8 --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/util/VCSchemaProviderUtilTest.java @@ -0,0 +1,101 @@ +package io.mosip.authentication.service.kyc.util; + +import com.apicatalog.jsonld.JsonLdError; +import com.apicatalog.jsonld.document.JsonDocument; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.mosip.authentication.core.exception.IdAuthUncheckedException; +import io.mosip.authentication.core.exception.IdAuthenticationBusinessException; +import org.json.simple.JSONObject; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.web.client.RestTemplate; + +import java.io.IOException; +import java.io.StringReader; +import java.util.Map; + +@RunWith(MockitoJUnitRunner.class) +public class VCSchemaProviderUtilTest { + + @InjectMocks + private VCSchemaProviderUtil vcSchemaProviderUtil; + + @Mock + private RestTemplate restTemplate; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + } + + @Test + public void testGetVCContextSchema() { + String configServerFileStorageUrl = "http://example.com"; + String uri = "vc-context-schema.json"; + String vcContextJson = "{\"vc\": \"context\"}"; + JsonDocument expectedJsonDocument = null; + try { + expectedJsonDocument = JsonDocument.of(new StringReader(vcContextJson)); + } catch (JsonLdError e) { + throw new RuntimeException(e); + } + + Mockito.when(restTemplate.getForObject(configServerFileStorageUrl + uri, String.class)) + .thenReturn(vcContextJson); + JsonDocument result = vcSchemaProviderUtil.getVCContextSchema(configServerFileStorageUrl, uri); + Assert.assertEquals(expectedJsonDocument.getJsonContent(), result.getJsonContent()); + Mockito.verify(restTemplate).getForObject(configServerFileStorageUrl + uri, String.class); + } + + @Test + public void testGetVCContextSchema_throwsException() { + String configServerFileStorageUrl = "http://example.com"; + String uri = "vc-context-schema.json"; + String vcContextJson = ""; + Mockito.when(restTemplate.getForObject(configServerFileStorageUrl + uri, String.class)) + .thenReturn(vcContextJson); + Assert.assertThrows(IdAuthUncheckedException.class,()->vcSchemaProviderUtil.getVCContextSchema(configServerFileStorageUrl, uri)); + } + + @Test + public void testGetVCContextData() throws IdAuthenticationBusinessException { + String configServerFileStorageUrl = "http://example.com"; + String uri = "/vc-context-data.json"; + String vcContextData = "{\"vc\": \"data\"}"; + ObjectMapper objectMapper = new ObjectMapper(); + Map expectedMap; + + try { + expectedMap = objectMapper.readValue(vcContextData, new TypeReference>(){}); + } catch (IOException e) { + Assert.fail("Error parsing JSON: " + e.getMessage()); + return; + } + + JSONObject expectedJsonObject = new JSONObject(expectedMap); + Mockito.when(restTemplate.getForObject(configServerFileStorageUrl + uri, String.class)) + .thenReturn(vcContextData); + JSONObject result = vcSchemaProviderUtil.getVCContextData(configServerFileStorageUrl, uri, objectMapper); + Assert.assertEquals(expectedJsonObject, result); + Mockito.verify(restTemplate).getForObject(configServerFileStorageUrl + uri, String.class); + } + + @Test + public void testGetVCContextData_throwsException() throws IdAuthenticationBusinessException{ + String configServerFileStorageUrl = "http://example.com"; + String uri = "/vc-context-data.json"; + String vcContextData = ""; + Mockito.when(restTemplate.getForObject(configServerFileStorageUrl + uri, String.class)) + .thenReturn(vcContextData); + Assert.assertThrows(IdAuthenticationBusinessException.class,()->vcSchemaProviderUtil.getVCContextData(configServerFileStorageUrl,uri, new ObjectMapper())); + } + +} \ No newline at end of file diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/IdentityKeyBindingRequestValidatorTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/IdentityKeyBindingRequestValidatorTest.java new file mode 100644 index 00000000000..f6fd4047003 --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/IdentityKeyBindingRequestValidatorTest.java @@ -0,0 +1,59 @@ +package io.mosip.authentication.service.kyc.validator; + + +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.core.indauth.dto.IdentityKeyBindingRequestDTO; +import io.mosip.authentication.core.indauth.dto.RequestDTO; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.validation.BeanPropertyBindingResult; +import org.springframework.validation.BindException; +import org.springframework.validation.Errors; + +import static org.mockito.Mockito.mock; + +@RunWith(SpringRunner.class) +public class IdentityKeyBindingRequestValidatorTest { + + @Mock + IdInfoHelper idInfoHelper; + + @Mock + Errors errors; + + @InjectMocks + IdentityKeyBindingRequestValidator identityKeyBindingRequestValidator; + + @Test + public void validateWithValidDetails_thenPass(){ + + IdentityKeyBindingRequestDTO identityKeyBindingRequestDTO = new IdentityKeyBindingRequestDTO(); + identityKeyBindingRequestDTO.setIdentityKeyBinding(null); + identityKeyBindingRequestDTO.setIndividualIdType("UIN"); + identityKeyBindingRequestDTO.setIndividualId("123456789012"); + RequestDTO requestDTO = new RequestDTO(); + requestDTO.setBiometrics(null); + requestDTO.setOtp("123456"); + requestDTO.setTimestamp("2019-02-20T10:00:00.000Z"); + identityKeyBindingRequestDTO.setRequest(requestDTO); + //Mockito.when(errors.hasErrors()).thenReturn(false); + Errors errors = new BeanPropertyBindingResult(identityKeyBindingRequestDTO, "identityKeyBindingRequestDTO"); + //Mockito.when(idInfoHelper.isMatchtypeEnabled(Mockito.any())).thenReturn(Boolean.TRUE); + identityKeyBindingRequestValidator.validate(identityKeyBindingRequestDTO, errors); + + } + + @Test + public void testValidateWithInvalidTarget() { + IdentityKeyBindingRequestDTO identityKeyBindingRequestDTO = new IdentityKeyBindingRequestDTO(); + errors = new BeanPropertyBindingResult(identityKeyBindingRequestDTO, "target"); + identityKeyBindingRequestValidator.validate(null, errors); + Assert.assertTrue(errors.hasErrors()); + } +} diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/KycAuthRequestValidatorTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/KycAuthRequestValidatorTest.java index 48bff6eb27d..c6fe2f1613d 100644 --- a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/KycAuthRequestValidatorTest.java +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/KycAuthRequestValidatorTest.java @@ -22,6 +22,7 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestContext; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.validation.BeanPropertyBindingResult; @@ -34,10 +35,10 @@ import io.mosip.authentication.common.service.integration.MasterDataManager; import io.mosip.authentication.common.service.util.EnvUtil; import io.mosip.authentication.common.service.validator.AuthRequestValidator; +import io.mosip.authentication.core.indauth.dto.EkycAuthRequestDTO; import io.mosip.authentication.core.indauth.dto.IdType; import io.mosip.authentication.core.indauth.dto.IdentityDTO; import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO; -import io.mosip.authentication.core.indauth.dto.EkycAuthRequestDTO; import io.mosip.authentication.core.indauth.dto.RequestDTO; import io.mosip.kernel.logger.logback.appender.RollingFileAppender; import io.mosip.kernel.pinvalidator.impl.PinValidatorImpl; @@ -51,6 +52,7 @@ @WebMvcTest @ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class }) @Import(EnvUtil.class) +@TestPropertySource(locations="classpath:application.properties") public class KycAuthRequestValidatorTest { @Mock diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/KycExchangeRequestValidatorTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/KycExchangeRequestValidatorTest.java new file mode 100644 index 00000000000..ba9b619a332 --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/KycExchangeRequestValidatorTest.java @@ -0,0 +1,114 @@ +package io.mosip.authentication.service.kyc.validator; + +import io.mosip.authentication.common.service.helper.IdInfoHelper; +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.common.service.validator.AuthRequestValidator; +import io.mosip.authentication.core.indauth.dto.KycExchangeRequestDTO; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestContext; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.validation.BeanPropertyBindingResult; +import org.springframework.validation.Errors; +import org.springframework.web.context.WebApplicationContext; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +@RunWith(SpringRunner.class) +@WebMvcTest +@ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class }) +@Import(EnvUtil.class) +public class KycExchangeRequestValidatorTest { + @InjectMocks + KycExchangeRequestValidator kycExchangeRequestValidator; + @Mock + IdInfoHelper idInfoHelper; + @InjectMocks + AuthRequestValidator authRequestValidator; + @Before + public void before() { + ReflectionTestUtils.setField(kycExchangeRequestValidator, "idInfoHelper", idInfoHelper); + ReflectionTestUtils.setField(authRequestValidator, "idInfoHelper", idInfoHelper); + } + @Test + public void testSupportTrue() { + assertTrue(kycExchangeRequestValidator.supports(KycExchangeRequestDTO.class)); + } + @Test + public void testSupportFalse() { + assertFalse(kycExchangeRequestValidator.supports(KycAuthRequestValidator.class)); + } + @Test + @Ignore + public void testValidate_ValidRequest_NoErrors() { + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + kycExchangeRequestDTO.setId("id"); + kycExchangeRequestDTO.setRequestTime(ZonedDateTime.now() + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + kycExchangeRequestDTO.setKycToken("token"); + kycExchangeRequestDTO.setTransactionID("1234567890"); + List consentObtained=new ArrayList<>(); + consentObtained.add("phone"); + consentObtained.add("email"); + kycExchangeRequestDTO.setConsentObtained(consentObtained); + List locales=new ArrayList<>(); + locales.add("en"); + kycExchangeRequestDTO.setLocales(locales); + kycExchangeRequestDTO.setRespType("abc"); + Map metadata=new HashMap<>(); + kycExchangeRequestDTO.setMetadata(metadata); + Errors errors = new BeanPropertyBindingResult(kycExchangeRequestDTO, "kycExchangeRequestDTO"); + Mockito.when(idInfoHelper.isMatchtypeEnabled(Mockito.any())).thenReturn(Boolean.TRUE); + kycExchangeRequestValidator.validate(kycExchangeRequestDTO, errors); + Assert.assertFalse(errors.hasErrors()); + } + @Test + public void testValidate_NullRequest_InvalidInputParameterError() { + KycExchangeRequestDTO kycExchangeRequestDTO = new KycExchangeRequestDTO(); + Errors errors = new BeanPropertyBindingResult(kycExchangeRequestDTO, "kycExchangeRequestDTO"); + kycExchangeRequestValidator.validate(kycExchangeRequestDTO, errors); + Mockito.when(idInfoHelper.isMatchtypeEnabled(Mockito.any())).thenReturn(Boolean.TRUE); + Assert.assertTrue(errors.hasErrors()); + Assert.assertEquals("IDA-MLC-006", errors.getFieldError().getCode()); + } + @Test + public void testValidate_InvalidKycToken_MissingInputParameterError() { + KycExchangeRequestDTO request = new KycExchangeRequestDTO(); + request.setRequestTime("2023-10-31 10:00:00"); + request.setKycToken(null); + request.setTransactionID("1234567890"); + Errors errors = new BeanPropertyBindingResult(request, "kycExchangeRequestDTO"); + kycExchangeRequestValidator.validate(request, errors); + Mockito.when(idInfoHelper.isMatchtypeEnabled(Mockito.any())).thenReturn(Boolean.TRUE); + Assert.assertTrue(errors.hasErrors()); + Assert.assertEquals("IDA-MLC-009", errors.getFieldError().getCode()); + } + @Test + public void testValidate_EmptyConsentObtainedList_MissingInputParameterError() { + KycExchangeRequestDTO request = new KycExchangeRequestDTO(); + request.setRequestTime("2023-10-31 10:00:00"); + request.setKycToken("exampleToken"); + request.setTransactionID("exampleTransactionID"); + request.setConsentObtained(new ArrayList<>()); + Errors errors = new BeanPropertyBindingResult(request, "kycExchangeRequestDTO"); + Mockito.when(idInfoHelper.isMatchtypeEnabled(Mockito.any())).thenReturn(Boolean.TRUE); + kycExchangeRequestValidator.validate(request, errors); + Assert.assertTrue(errors.hasErrors()); + Assert.assertEquals("IDA-MLC-009", errors.getFieldError().getCode()); + } +} \ No newline at end of file diff --git a/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidatorTest.java b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidatorTest.java new file mode 100644 index 00000000000..0a69dd9d754 --- /dev/null +++ b/authentication/authentication-service/src/test/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidatorTest.java @@ -0,0 +1,198 @@ +package io.mosip.authentication.service.kyc.validator; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.time.Instant; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.util.Arrays; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestContext; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.validation.BeanPropertyBindingResult; +import org.springframework.validation.Errors; +import org.springframework.web.context.WebApplicationContext; + +import io.mosip.authentication.common.service.util.EnvUtil; +import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciCredentialsDefinitionRequestDTO; +import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO; + +@RunWith(SpringRunner.class) +@WebMvcTest +@ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class }) +@Import(EnvUtil.class) +@TestPropertySource(locations="classpath:application.properties") +public class VciExchangeRequestValidatorTest { + + @InjectMocks + VciExchangeRequestValidator vciExchangeRequestValidator; + + @Before + public void before() { + ReflectionTestUtils.setField(vciExchangeRequestValidator, "supportedCredTypes", + Arrays.asList("VerifiableCredential","MOSIPVerifiableCredential")); + } + + @Test + public void test_supports_withValidInput_thenPass() { + Assert.assertTrue(vciExchangeRequestValidator.supports(VciExchangeRequestDTO.class)); + } + + @Test + public void test_supports_withInvalidInput_thenFail() { + Assert.assertFalse(vciExchangeRequestValidator.supports(KycAuthRequestDTO.class)); + } + + @Test + public void test_validate_withValidInput_thenPass() { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.UTC) + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + vciExchangeRequestDTO.setTransactionID("transactio"); + vciExchangeRequestDTO.setVcFormat("ldp_vc"); + vciExchangeRequestDTO.setVcAuthToken("vc-auth-token"); + vciExchangeRequestDTO.setCredSubjectId("did:jwk:eyJrdHkiOiJSU0EiLCJlIjoiQVFBQiIsInVzZSI6InNpZyIsImtpZCI6Inc4VUY3QnE0dDFSeVMxdFJTOHhvVllHUjMySVdiMFZyU3I4M0dEdno3d28iLCJhbGciOiJSUzI1NiIsIm4iOiJ5SGY1RjZYMFI5RDNxWm5WaUJORDZRV25pUmVnR2hjQ3NqakVJSENlTWp1UWJHek1LaFB6aFZVWGNtaTBMbGVQVWdUdlhjOWlrRmNnTXM3ckFhckI1dlJEcTh1Mjd2WHNBVjdiOUlZaVVGY3U1ZFZpdTd0Q0F1N0V5cXlLWVlUX20xMzhlZjQxVmU4X29LZVNvT0RRaGxyc0RJTmltX0JwWHBvc0xQVV96MXpfODNxX0ZRU05ydDE2dGhHa0hZeUZsRnhxZnNWZElPTkdoMzRFY3dubFZUY0lQUE5xZVY2RkJ3MENlR2NuaUlSRDZVMzVCbFNnT2loaHE2dl9LTll1aktJS2hmOERLY1AzWHY3Yy00ZUcwQ1Q2eFNGdDBpbzlvVGRQT0ZJNEt4RlJ0eGNIa3NxV2FsN1ZON3p5QUlNblJrMlJDbXRZLVUyVkVDSVgydzJOSlEifQ=="); + VciCredentialsDefinitionRequestDTO vciCredentialsDefinitionRequestDTO = new VciCredentialsDefinitionRequestDTO(); + vciCredentialsDefinitionRequestDTO.setType(Arrays.asList("VerifiableCredential", "MOSIPVerifiableCredential")); + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertFalse(errors.hasErrors()); + } + + @Test + public void test_validate_withInvalidDIDAsCredentialSubjectId_thenFail() { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.UTC) + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + vciExchangeRequestDTO.setTransactionID("transactio"); + vciExchangeRequestDTO.setVcFormat("ldp_vc"); + vciExchangeRequestDTO.setVcAuthToken("vc-auth-token"); + vciExchangeRequestDTO.setCredSubjectId("QUlNblJrMlJDbXRZLVUyVkVDSVgydzJOSlE"); + VciCredentialsDefinitionRequestDTO vciCredentialsDefinitionRequestDTO = new VciCredentialsDefinitionRequestDTO(); + vciCredentialsDefinitionRequestDTO.setType(Arrays.asList("VerifiableCredential", "MOSIPVerifiableCredential")); + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("credSubjectId")); + } + + @Test + public void test_validate_withInvalidRequestTime_thenFail() { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("requestTime")); + } + + @Test + public void test_validate_withInvalidTxnId_thenFail() { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.UTC) + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("transactionID")); + } + + @Test + public void test_validate_withInvalidAuthToken_thenFail() { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.UTC) + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + vciExchangeRequestDTO.setTransactionID("transactio"); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("vcAuthToken")); + } + + @Test + public void test_validate_withInvalidCredSubjectId_thenFail() { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.UTC) + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + vciExchangeRequestDTO.setTransactionID("transactio"); + vciExchangeRequestDTO.setVcAuthToken("vc-auth-token"); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("credSubjectId")); + } + + @Test + public void test_validate_withInvalidPublicKeyComponentInDID_thenFail() { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.UTC) + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + vciExchangeRequestDTO.setTransactionID("transactio"); + vciExchangeRequestDTO.setVcAuthToken("vc-auth-token"); + vciExchangeRequestDTO.setCredSubjectId("did:jwk:eyJrdHkiOiJSU0EiLCJlIjoiQVFBQiIsInVzZSI6InNpZyIsImtpZCI6Inc4VUY3QnE0dDFSeVMxdFJTOHhvVllHUjMySVdiMFZyU3I4M0dEdno3d28iLCJhbGciOiJSUzI1NiJ9"); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("credSubjectId")); + } + + @Test + public void test_validate_withInvalidCredentialFormat_thenFail() { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.UTC) + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + vciExchangeRequestDTO.setTransactionID("transactio"); + vciExchangeRequestDTO.setVcAuthToken("vc-auth-token"); + vciExchangeRequestDTO.setCredSubjectId("did:jwk:eyJrdHkiOiJSU0EiLCJlIjoiQVFBQiIsInVzZSI6InNpZyIsImtpZCI6Inc4VUY3QnE0dDFSeVMxdFJTOHhvVllHUjMySVdiMFZyU3I4M0dEdno3d28iLCJhbGciOiJSUzI1NiIsIm4iOiJ5SGY1RjZYMFI5RDNxWm5WaUJORDZRV25pUmVnR2hjQ3NqakVJSENlTWp1UWJHek1LaFB6aFZVWGNtaTBMbGVQVWdUdlhjOWlrRmNnTXM3ckFhckI1dlJEcTh1Mjd2WHNBVjdiOUlZaVVGY3U1ZFZpdTd0Q0F1N0V5cXlLWVlUX20xMzhlZjQxVmU4X29LZVNvT0RRaGxyc0RJTmltX0JwWHBvc0xQVV96MXpfODNxX0ZRU05ydDE2dGhHa0hZeUZsRnhxZnNWZElPTkdoMzRFY3dubFZUY0lQUE5xZVY2RkJ3MENlR2NuaUlSRDZVMzVCbFNnT2loaHE2dl9LTll1aktJS2hmOERLY1AzWHY3Yy00ZUcwQ1Q2eFNGdDBpbzlvVGRQT0ZJNEt4RlJ0eGNIa3NxV2FsN1ZON3p5QUlNblJrMlJDbXRZLVUyVkVDSVgydzJOSlEifQ=="); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("vcFormat")); + + vciExchangeRequestDTO.setVcFormat("tt"); + errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("vcFormat")); + } + + @Test + public void test_validate_withInvalidCredentialType_thenFail() { + VciExchangeRequestDTO vciExchangeRequestDTO = new VciExchangeRequestDTO(); + vciExchangeRequestDTO.setRequestTime(Instant.now().atOffset(ZoneOffset.UTC) + .format(DateTimeFormatter.ofPattern(EnvUtil.getDateTimePattern())).toString()); + vciExchangeRequestDTO.setTransactionID("transactio"); + vciExchangeRequestDTO.setVcAuthToken("vc-auth-token"); + vciExchangeRequestDTO.setVcFormat("ldp_vc"); + vciExchangeRequestDTO.setCredSubjectId("did:jwk:eyJrdHkiOiJSU0EiLCJlIjoiQVFBQiIsInVzZSI6InNpZyIsImtpZCI6Inc4VUY3QnE0dDFSeVMxdFJTOHhvVllHUjMySVdiMFZyU3I4M0dEdno3d28iLCJhbGciOiJSUzI1NiIsIm4iOiJ5SGY1RjZYMFI5RDNxWm5WaUJORDZRV25pUmVnR2hjQ3NqakVJSENlTWp1UWJHek1LaFB6aFZVWGNtaTBMbGVQVWdUdlhjOWlrRmNnTXM3ckFhckI1dlJEcTh1Mjd2WHNBVjdiOUlZaVVGY3U1ZFZpdTd0Q0F1N0V5cXlLWVlUX20xMzhlZjQxVmU4X29LZVNvT0RRaGxyc0RJTmltX0JwWHBvc0xQVV96MXpfODNxX0ZRU05ydDE2dGhHa0hZeUZsRnhxZnNWZElPTkdoMzRFY3dubFZUY0lQUE5xZVY2RkJ3MENlR2NuaUlSRDZVMzVCbFNnT2loaHE2dl9LTll1aktJS2hmOERLY1AzWHY3Yy00ZUcwQ1Q2eFNGdDBpbzlvVGRQT0ZJNEt4RlJ0eGNIa3NxV2FsN1ZON3p5QUlNblJrMlJDbXRZLVUyVkVDSVgydzJOSlEifQ=="); + VciCredentialsDefinitionRequestDTO vciCredentialsDefinitionRequestDTO = new VciCredentialsDefinitionRequestDTO(); + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + Errors errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("credentialsDefinition")); + + + vciCredentialsDefinitionRequestDTO = new VciCredentialsDefinitionRequestDTO(); + vciCredentialsDefinitionRequestDTO.setType(Arrays.asList("VerifiableCredentialssss", "MOSIPVerifiableCredential")); + vciExchangeRequestDTO.setCredentialsDefinition(vciCredentialsDefinitionRequestDTO); + errors = new BeanPropertyBindingResult(vciExchangeRequestDTO, "vciExchangeRequestDTO"); + vciExchangeRequestValidator.validate(vciExchangeRequestDTO, errors); + assertTrue(errors.hasErrors()); + assertTrue(errors.hasFieldErrors("credentialsDefinition")); + } + +} diff --git a/authentication/authentication-service/src/test/resources/application.properties b/authentication/authentication-service/src/test/resources/application.properties index 015d4f7db80..72e0f18f6ad 100644 --- a/authentication/authentication-service/src/test/resources/application.properties +++ b/authentication/authentication-service/src/test/resources/application.properties @@ -624,7 +624,7 @@ ida.id.attribute.separator.fullAddress=, mosip.date-of-birth.pattern=yyyy/MM/dd -sample.demo.entity={ "id": "mosip.id.read", "ver": "1.0", "timestamp": "", "err": "", "status": "SUCCCESSFUL", "errmsg": "", "responseCode": "OK", "uin": "7867780967875678", "response": { "identity": { "fullName": [{ "language": "ara", "label": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0627\u0648\u0644", "value": "\u0627\u0628\u0631\u0627\u0647\u064A\u0645" }, { "language": "fre", "label": "Prénom", "value": "Ibrahim" }], "middleName": [{ "language": "ara", "label": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0623\u0648\u0633\u0637", "value": "\u0628\u0646" }, { "language": "fre", "label": "deuxičme nom", "value": "Ibn" }], "lastName": [{ "language": "ara", "label": "\u0627\u0644\u0643\u0646\u064A\u0629", "value": "\u0639\u0644\u064A" }, { "language": "fre", "label": "nom de famille", "value": "Ali" }], "dateOfBirth": [{ "label": "\u062A\u0627\u0631\u064A\u062E \u0627\u0644\u0648\u0644\u0627\u062F\u0629", "value": "16/04/1955" }, { "label": "date de naissance", "value": "16/04/1955" }], "gender": [{ "language": "ara", "label": "\u062C\u0646\u0633", "value": "\u0627\u0644\u0630\u0643\u0631" }, { "language": "fre", "label": "le sexe", "value": "mâle" }], "addressLine1": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 1", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 1" }, { "language": "fre", "label": "Adresse 1", "value": "exemple d'adresse ligne 1" }], "addressLine2": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 2", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 2" }, { "language": "fre", "label": "Adresse 2", "value": "exemple d'adresse ligne 2" }], "addressLine3": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 3", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 3" }, { "language": "fre", "label": "Adresse 3", "value": "exemple d'adresse ligne 3" }], "region": [{ "label": "Région", "value": "Tanger-Tétouan-Al Hoceima" }], "province": [{ "language": "ara", "label": "\u0627\u0644\u0645\u062D\u0627\u0641\u0638\u0629", "value": "\u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633" }, { "language": "fre", "label": "province", "value": "Fčs-Meknčs" }], "city": [{ "language": "ara", "label": "\u0645\u062F\u064A\u0646\u0629", "value": "\u0641\u0627\u0633-\u0627\u0644\u062F\u0627\u0631 \u0627\u0644\u0628\u064A\u0636\u0627\u0621" }, { "language": "fre", "label": "ville", "value": "Casablanca" }], "pinCode": [{ "language": "ara", "label": "\u0645\u062F\u064A\u0646\u0629", "value": "600001" }, { "language": "fre", "label": "ville", "value": "600001" }], "localAdministrativeAuthority": [{ "language": "ara", "label": "\u0627\u0644\u0647\u064A\u0626\u0629 \u0627\u0644\u0625\u062F\u0627\u0631\u064A\u0629 \u0627\u0644\u0645\u062D\u0644\u064A\u0629", "value": "\u0637\u0646\u062C\u0629 - \u062A\u0637\u0648\u0627\u0646 - \u0627\u0644\u062D\u0633\u064A\u0645\u0629" }, { "language": "fre", "label": "Autorité administrative locale", "value": "Tanger-Tétouan-Al Hoceima" }], "phone": [{ "language": "", "label": "\u0631\u0642\u0645 \u0627\u0644\u0647\u0627\u062A\u0641 \u0627\u0644\u0645\u062D\u0645\u0648\u0644", "value": "+212-5398-12345" }, { "language": "fre", "label": "numéro de portable", "value": "+212-5398-12345" }], "face": [{ "label": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0627\u064A\u0645\u064A\u0644", "value": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxMTEhUQEhIVFRUSFRASEBUQEhAQFRgWFRYWFxcVGBUYHSogGBolHRUVITEhJSkrLi4uFx8zODMtNygtLisBCgoKDg0OGhAQGSsdHR0rKysrMS0tKzcrLTcvLS0rLS0tLS0xKy0tKy0tKy0tKy01LSsrLS0tKysrLSstLS0tLf/AABEIAOEA4QMBIgACEQEDEQH/xAAcAAEAAQUBAQAAAAAAAAAAAAAABAMFBgcIAgH/xABEEAABAwIEAgcFBQUECwAAAAABAAIDBBEFEiExBkEHE1FhcYGRIjJyobEUQlJi0RUjM7LBc4KSkwg0NUNEVGODotLx/8QAGQEBAAMBAQAAAAAAAAAAAAAAAAIDBAEF/8QAJhEBAQACAQQCAQQDAAAAAAAAAAECEQMSITFREzJBIlKRoRRhcf/aAAwDAQACEQMRAD8A3iiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAix3jLjGmw6Nr5y4l5tHHGAXu7bXIAA7SsRg6aaVzwDTTNYd3kxm3flB1CDaCKLhmIxVEbZoXh7HC4LTf8A+FSkBERAREQEREBERAREQEREBERAREQEREBERARFDp8UhfI+FkrDJGbSMDhmad9QghcV8SQ0EPXzXIuGta2xc4nkFqLG+l6slJFMxkDORI62T1Psj0KidLvEH2qtMDDeKmuwW2Mn3z5beRWHxxriUi4zcV4i/wB6un8nkfRQv2tVB3Wfap8w2PWv/VemsC8ujR3S5u40qns6qpENXGbezVxZyPhe0gg96tNfVskeDHTMgFiC2F0jmnsNnk2PgvhjXwtQ0unC3FM+HyiSJxMZI66In2Xjw5O71uDBelrD5yGvc6Fx0tK3S/xDRaGe1QKiJHLHYUE7XtD2ODmnUFpBB8wqi5T4U40rMPdeGS7PvwyXdGfAfdPeF0jwjxNFX0zKmPTNdrmOIzNcNC0rqK9oiICIiAiIgIiICIiAiIgIiICIiAiIgLlji6qf+0at7Xua7r5RmY4tNgcu47hZdEHjXD8zmGshDoyWvDngWI31Oh8lz5x/LTuxGd9IQYnOaQW6tLi1uct7s10rsWiM8+3clS2KDG5V2yKKSa0ry4qi2RfS9B6JXglfC9U3PXR9co0rVVLl4cghyRrwx7m+65w+FxH0UzLdUpY0cXfAOOK6jIMNQ4tG8cpMkZ8jt5WW9OjvpDixEGNwEVQ0XdHe4cPxMJ3C5syKXhNa6mmjqYjZ8L2vbqRe24PcRceaOadgIsc4E4qZiNMKhrcjgSyRl72cO/sWRrrgiIgIiICIiAiIgIiICIiAvEzMzS3a4I9QvaIOTuLcIko6uWmlGocXsNrBzHElrx3HUeRVpDllPStVOkxSpzknI5sbL8mtAIA7rknzWNQU9za29reey4kNeqgeti4XwnTdU1kkYc63tO1BuewrFMc4SqIHEsYZIrnK5mrgOxw3Vc5cbdLLx5SbWlr17D18gw+d3uwynwjef6KfT8P1TzYU8n95hb63UuqI6qCXLyASbAEnsAJPos9wXgDZ9S7/ALbD9Xfosuo8JhiH7uNre8DX1VWXPjPHdZjw5Xz2acGFVB2p5v8AJl/RV4sAqnGwp5B8TCwf+S3IWqk5qh/kX0n8E9tSVfD1RCM72ezzLSHW8bKE+MELbtSwEEHY3BWsMWo+pmdHyvdvgdlZx8nV5V58fT4WF0WU93NfZAORUqoaoL4lcqb06AIQKSZ4PvzbfC0BbTXKPBtPVPq4oKSd8MkrrZmucGgAXLnAbiw5rqqmY4MaHuzODWhzrWuQNTbkuoqiIiAiIgIiICIiAiIgIiICj4gx5jeI3ZX5TkP5uV+5SEQcncSVE0lXM6qFp81pRly6t0GngApPDdHnnjb+YE+Wqznp4rY2zxwCGPrHxtkfL/vLBzg0eGjvmsW6Pm3qWeDz8lDO6lWYd7G0KbD9FPZQKTTjRSmheba9CREZRBVHUgspQS6jtLSCaNU/s6uDiqTl3bmlukp1HlhV1cFHlC7K5YsdQFg/GsPuP7y0/VZ9XBYdxRFmid+WzvRX8V7xTyTswGrF1Fk02UuZRnNW1jbE6CMKMtY6pPu0zCPF8gsPlf5Lf6596EMWMNeacn2Kljhb/qMF2/IOXQS6iIiICIiAiIgIiICIiAiIgIiINA9P0NsQhk/HTNaP7kkhP84Vo6Ov9Yb8L/6LNf8ASBwt7209S1ji2LrGSOA0aH5dT5tC1PhFNPIT1JcCLD2SQdTa2ihnNyp4XVdDwyADUgeJAXsV8W3Ws/xtWrKXgCpe0GorC38oL5CPUgLxP0dRjatN/wA0X6OWL48P3f02fJn+3+23o5WuF2kEdxBX260hLg1fRXlp5i9rBmJjcdhvdjlLwjivGJ2OdDaRrNHO6tnjvzKXg/Ms0Tn/ABZW4yVaq/H6aLSSeNp7C4X9FqWjxXFK9zoWzOAb/E2jDeWthdXSl4BgbrUTve7mI7NHqbkrvwzH7X+D5bl9Z/LMn8c0H/MN9HfoqEnGtCf+Ib6O/RWiHhnDRoYie90j/wChCkHgvD3j2YiPhll/9k1x/wCzfJfSnV8WUZ2nb81aKnGKZ4cOuZYgg69qi8ScBsjY6Sne45RcsfY6DsKsmC8NMni617nDMXBoblGxtrcdqtxxw1uVVllnvVi1yuFyAQbEjQqNKNCq2O4E6neADmDhdptY6ciqB28lpnedmepfDVc6Koglb70c0LhbueLjzFx5rrhct8J8NSvkimkGWJskbnXvcta4EgDyK6ZwzEY5254zcA2NxYg9iTKXsXGzuloiLqIiIgIiICIiAiIgIiICIiDG+ken6zDKtg3MLy3xGoWoOBqQRVErOwMLb66Os7+q3vjFN1kEsVr545G28WlardTtEtNO0AGWkayS1x7cDspNj4jXuVfLP01ZxX9UX50Bf1hJs2JheQNC42JAvyGi1BPxU/O0NfmcS5zm5fZAGoF+Yst1UrXOFwR7TcrgRcEd6xtvRvTB+cAkXvlLiBvt4LLjnhJr8tOeGdu54XCqomRwx1IJ6t8Qke15vYFmYi/govR7RhtIxzRYSl8trW0cTYeio8fVD3NioQ4dZVObGGsFgyIEZjbwG6y6mp2xsaxos2Noa3wAsucuU12/KXHLvv8AhhWEwMp66qp7WM+Woj10I+8B4E381cIoRJOyJ2gJ15XtyUXj2lc0RYhECZKV13gfeiOjh5K40cTKqNlRE7RwDmkbg9nim/GVNecY1p0gYg6OrmjbGTazYg32Ws23HMbrOujRjpqFxmGrJXNifzy5Wm1+wEkK8V3DcU5D5wJHBuW5a0G3eQLlVvsjI2BjPZaNmgkN9NlP5sd+Ffw5e1uxluWEuP4Hn5FYbw8y1LF3h7v8T3H+qvXHWK5IOqGr5v3cbeeuhKiQU/Vxsj/A1rfQKOP1/wCpZfZZOKYbsa78Jt6rGsCpOtqY4+ReL+A1P0WW8SD9we4tVr4JpPadN2Xa0+O6vxy1hVOU3lGw7tFoox3dwWX8BwFsUhP3pPoAFh+EMABcdyth8NQ5adv5rv17yq+CfqT5r+ldERFrZRERAREQEREBERAREQEREBak41wqoopzUxtM1LI8u6tts8T5PfygfdJAPiVttWnimHNTP/LZ3oVHL61LH7Rq+k6QIGizopwezqXFSzx7I8WpqGokcdAXsMbR4k8lcaWbRXKlkWC3H03yZe1k4YwKfrHV1aQ6okGVjR7sTPwjsWUPFmqNPWhup5KnNijSNFC25XaUkk09b6HUG4IKxA8PVdHI5+HytMTyXOgl90E/h7Fkjam6q9cuy2OWSsZfjuKjQ0Ebu9s4A+aizYhismgp4or83Pz29FljnqPK5SmU9RG433WJ0HDjmyfaamQzTcr+63wCmVKudQ5Wuc6qW7fKOpPCy4xGH5YjqHbhT6GFsQEbW2FrDs7/ADUSD2pnO5N0HirxNTWDbak2HmVK+kZ7XfBoHTPbCzn7x/C3mVs2GMNaGjZoAHgFbOHcGbTRgDV7rGR3aezwCuy08eHTGfkz6qIiKxWIiICIiAiIgIiICIiAiIgKnPEHNcw7OBB8wqiINVuaY5HRu3Y4tPkdCp7agNbmJ0Cm8d0WWRtQNn+w/wCIbH0+iwnGMTs3ID4rByYay03YZ7x2lV3EjdspPfdRmY2zmx3k7T6K4wcPPLWlj4hcAkubnOvmvUvDdSBdssX+UP1Ue3tLutz8fcPdj08yvcPErhq+PTuvdV2YVV852jwjA+pXv9mSE2kka5vMFjQfUJqHdcKWubIMzT4jmkr1ixqOomc1uwNvEK6NxVjhvZNO7V53qz4jUBjSefJVK3E2jbVY7VTukdbvU5FeVZ50W4QJHmd4uGe0L7Zjt6brYeJYFBOQ6RntNcHBzSWOuO0jfzVq6OqLq6QG1s5J8hoPoVlC14TWLJne4iIpoiIiAiIgIiICIiAiIgIiICIrJxJxXSULM9TM1p+6we1I7uawalBe14fK0buA8SAue+MOmOpqCWUgNPFtmNnSu7ydm+Autd1uKzym8s8rz+eR5+V0HWPEElPNA+J88bcwOUl7dHcjv2rRD5CXFpsSCQSDcG3MHmFrew7Ash4fxO1o3H4SfoquXHc2s48tXTdGFNLomEH7o+Si45WzRkNY8j5qDgGL5Yw2+oVLEa7OSfqsV8tu+ydhOIyPdkkN7jQ96uz2WWIQy5SDzGu6vLsWGXU8kNrDjf8AFd6q3PkNtLKRXTZnEqM1lz23U5FdqjqVVuI2OldswX8TyCudPhTrXdoOzmrdxnHakeBsMvpdTx1vSGW9bZRw700Rsa2KemLWtAaHQuDrAaatO/qtp4Dj9PWRiWnkDwdxs4dzmnUFcc3VxwXHJ6WQSwSOY4dh37iOYWxldkItW9H3S3HVOZTVTermdZrXiwje7kD+En0W0kBERAREQEREBERAREQERUquobGx0jjZrGuc4nsAuUGEdK/HIw+DqoiDUzgiIb5G7GR3hfQcyucKqofK4ySvc97t3PJcT5qdxNjT62qlqnknO45AfusB9lo7NPqrcgoPCp3UiQKORqgBSKOEvexjfec5rW+JKRwC2qz/AKO+E3GRtU9pDWg9WHbkn73go55TGbqWGNyul3qMCewAxEnQZm8723CiuMrfeY4dvsn9FnktLYXXqnPJYOpu6WAhzz7sbj2+y7b+ikxYTUybRuA/NYD5rYDV9XOp3oYdS8JO3keB3N1PqrpBhrI/daPHc+qvEhUOROq06ZEGoasY4rhzU0o/KT6LK5mLW3GvEdy6mh5XbK/6tb+qt45beyvksk7sDC9gKq2NenNW1iUQSCCCQQQQRoQRsV0B0QdJH2oChq3ATtFoXk260Dl8Y+a0CQlPO5j2yMJa5hDmkaEEbFB2qiwfor41GIU+WQj7RDYSgaZhyeB3rOEBERAREQEREBF8c4AEnQDUkrRPGPSFUzTvFNO+KBpys6uzS633i7fXsug3sStT9OPFzWUwoYJWl87rT5HAlsTdSDbbMbDwuta1WOVUgIfUzOB3DppCPS6xiuYc5J57IKbV9K8Ar0g+OCokahVyFTBAc0nYOaT4A6oNp8DcGMLWTTtzOdZwa7ZoO2nMrZkdOGiwGytWCTiwts4NI8CFfAvN5Mrle70ePGYzspGG6hTQWKurQvssIIVe1mlpaV9JX2dmUqiXqTj5IVGeVUkeo0j12I1jPHWP/ZosjD+9lBDfyt5uWpgOZV34sxL7RVSSX9kHq2fC3T5m5Vput/Hh04sPJn1ZPS8lfC5V4qUkZney3vVitGDC42C9dU0d5VR7h7rNuZVWGBBK4Xx+WgqmVMdxlPtt5PYd2ldW4Di8dVBHUxG7ZGgjuPMHvC5S+zA6ELLeB+MpsNDmMAkicQ4xvJFjzLTyug6QRQcDxEVFPFUBuUTMbIAdxmF7KcgIiICIiChX/wAKT4H/AMpXLg/hN8kRBQKgYly80RBbl6CIg+uUebZfUQrffCf8KH+yi/lCy9q+IvMz8vSw8KrVUCIq1i3YkrY5EU4hVF6h1nuP+B/0KIpRGtEfqV8KIvSec9Q7jxCm417oREEKkVxgREEpq+v2REHS/A3+z6T+wi/lCviIgIiICIiD/9mRXao6lVbiNjpXbMF/E8grnT4U613aDs5q3cZx2pHgbDL6XU8db0hlvW2UcO9NEbGtinpi1rQGh0Lg6wGmrTv6raeA4/T1kYlp5A8HcbOHc5p1BXHN1ccFxyelkEsEjmOHYd+4jmFsZXZCLVvR90tx1TmU1U3q5nWa14sI3u5A/hJ9FtJAREQEREBERAREQEREBEVKrqGxsdI42axrnOJ7ALlBhHSvxyMPg6qIg1M4IiG+Ruxkd4X0HMrnCqqHyuMkr3Pe7dzyXE+ancTY0+tqpap5JzuOQH7rAfZaOzT6q3IKDwqd1IkCjkaoAUijhL3sY33nOa1viSkcAtqs/wCjvhNxkbVPaQ1oPVh25J+94KOeUxm6lhjcrpd6jAnsAMRJ0GZvO9tworjK33mOHb7J/RZ5LS2F16pzyWDqbulgIc8+7G49vsu2/opMWE1Mm0bgPzWA+a2A1fVzqd6GHUvCTt5HgdzdT6q6QYayP3Wjx3PqrxIVDkTqtOmRBqGrGOK4c1NKPyk+iyuZi1txrxHcupoeV2yv+rW/qreOW3sr5LJO7AwvYCqtjXpzVtYlEEgggkEEEEaEEbFdAdEHSR9qAoatwE4=" }], "emailId": [{ "language": "ara", "label": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0627\u064A\u0645\u064A\u0644", "value": "sample@samplamail.com" }, { "language": "fre", "label": "identifiant email", "value": "sample@samplamail.com" }], "CNEOrPINNumber": [{ "language": "ara", "label": "\u0631\u0642\u0645 CNE / PIN", "value": "AB453625" }, { "language": "fre", "label": "Numéro CNE / PIN", "value": "AB453625" }], "parentOrGuardianName": [{ "language": "ara", "label": "\u0627\u0633\u0645 \u0648\u0644\u064A \u0627\u0644\u0623\u0645\u0631 / \u0627\u0644\u0648\u0635\u064A", "value": "\u0633\u0644\u0645\u0649" }, { "language": "fre", "label": "Nom du parent / tuteur", "value": "salma" }], "parentOrGuardianRIDOrUIN": [{ "language": "ara", "label": "\u0627\u0644\u0648\u0627\u0644\u062F / \u0627\u0644\u0648\u0635\u064A RID / UIN", "value": "123456789123" }, { "language": "fre", "label": "parent / tuteur RID / UIN", "value": "123456789123" }], "leftEye": [{ "language": "ara", "label": "\u0627\u0644\u0639\u064A\u0646 \u0627\u0644\u064A\u0633\u0631\u0649", "value": "hashed_fileName.png" }, { "language": "fre", "label": "oeil gauche", "value": "hashed_fileName.png" }], "rightEye": [{ "language": "ara", "label": "\u0627\u0644\u0639\u064A\u0646 \u0627\u0644\u064A\u0645\u0646\u0649", "value": "hashed_fileName.png" }, { "language": "fre", "label": "l'\u0153il droit", "value": "hashed_fileName.png" }], "leftSlap": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 1", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biométrique 1", "value": "hashed_fileName.png" }], "rightSlap": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 2", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biométrique 2", "value": "hashed_fileName.png" }], "thumbs": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 3", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biométrique 3", "value": "hashed_fileName.png" }] } } } +sample.demo.entity={ "id": "mosip.id.read", "ver": "1.0", "timestamp": "", "err": "", "status": "SUCCCESSFUL", "errmsg": "", "responseCode": "OK", "uin": "7867780967875678", "response": { "identity": { "fullName": [{ "language": "ara", "label": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0627\u0648\u0644", "value": "\u0627\u0628\u0631\u0627\u0647\u064A\u0645" }, { "language": "fre", "label": "Prďż˝nom", "value": "Ibrahim" }], "middleName": [{ "language": "ara", "label": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0623\u0648\u0633\u0637", "value": "\u0628\u0646" }, { "language": "fre", "label": "deuxiďż˝me nom", "value": "Ibn" }], "lastName": [{ "language": "ara", "label": "\u0627\u0644\u0643\u0646\u064A\u0629", "value": "\u0639\u0644\u064A" }, { "language": "fre", "label": "nom de famille", "value": "Ali" }], "dateOfBirth": [{ "label": "\u062A\u0627\u0631\u064A\u062E \u0627\u0644\u0648\u0644\u0627\u062F\u0629", "value": "16/04/1955" }, { "label": "date de naissance", "value": "16/04/1955" }], "gender": [{ "language": "ara", "label": "\u062C\u0646\u0633", "value": "\u0627\u0644\u0630\u0643\u0631" }, { "language": "fre", "label": "le sexe", "value": "mďż˝le" }], "addressLine1": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 1", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 1" }, { "language": "fre", "label": "Adresse 1", "value": "exemple d'adresse ligne 1" }], "addressLine2": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 2", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 2" }, { "language": "fre", "label": "Adresse 2", "value": "exemple d'adresse ligne 2" }], "addressLine3": [{ "language": "ara", "label": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0633\u0637\u0631 3", "value": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0639\u064A\u0646\u0629 \u0633\u0637\u0631 3" }, { "language": "fre", "label": "Adresse 3", "value": "exemple d'adresse ligne 3" }], "region": [{ "label": "Rďż˝gion", "value": "Tanger-Tďż˝touan-Al Hoceima" }], "province": [{ "language": "ara", "label": "\u0627\u0644\u0645\u062D\u0627\u0641\u0638\u0629", "value": "\u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633" }, { "language": "fre", "label": "province", "value": "Fďż˝s-Meknďż˝s" }], "city": [{ "language": "ara", "label": "\u0645\u062F\u064A\u0646\u0629", "value": "\u0641\u0627\u0633-\u0627\u0644\u062F\u0627\u0631 \u0627\u0644\u0628\u064A\u0636\u0627\u0621" }, { "language": "fre", "label": "ville", "value": "Casablanca" }], "pinCode": [{ "language": "ara", "label": "\u0645\u062F\u064A\u0646\u0629", "value": "600001" }, { "language": "fre", "label": "ville", "value": "600001" }], "localAdministrativeAuthority": [{ "language": "ara", "label": "\u0627\u0644\u0647\u064A\u0626\u0629 \u0627\u0644\u0625\u062F\u0627\u0631\u064A\u0629 \u0627\u0644\u0645\u062D\u0644\u064A\u0629", "value": "\u0637\u0646\u062C\u0629 - \u062A\u0637\u0648\u0627\u0646 - \u0627\u0644\u062D\u0633\u064A\u0645\u0629" }, { "language": "fre", "label": "Autoritďż˝ administrative locale", "value": "Tanger-Tďż˝touan-Al Hoceima" }], "phone": [{ "label": "\u0631\u0642\u0645 \u0627\u0644\u0647\u0627\u062A\u0641 \u0627\u0644\u0645\u062D\u0645\u0648\u0644", "value": "+212-5398-12345" }, { "label": "numďż˝ro de portable", "value": "+212-5398-12345" }], "face": [{ "label": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0627\u064A\u0645\u064A\u0644", "value": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxMTEhUQEhIVFRUSFRASEBUQEhAQFRgWFRYWFxcVGBUYHSogGBolHRUVITEhJSkrLi4uFx8zODMtNygtLisBCgoKDg0OGhAQGSsdHR0rKysrMS0tKzcrLTcvLS0rLS0tLS0xKy0tKy0tKy0tKy01LSsrLS0tKysrLSstLS0tLf/AABEIAOEA4QMBIgACEQEDEQH/xAAcAAEAAQUBAQAAAAAAAAAAAAAABAMFBgcIAgH/xABEEAABAwIEAgcFBQUECwAAAAABAAIDBBEFEiExBkEHE1FhcYGRIjJyobEUQlJi0RUjM7LBc4KSkwg0NUNEVGODotLx/8QAGQEBAAMBAQAAAAAAAAAAAAAAAAIDBAEF/8QAJhEBAQACAQQCAQQDAAAAAAAAAAECEQMSITFREzJBIlKRoRRhcf/aAAwDAQACEQMRAD8A3iiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAix3jLjGmw6Nr5y4l5tHHGAXu7bXIAA7SsRg6aaVzwDTTNYd3kxm3flB1CDaCKLhmIxVEbZoXh7HC4LTf8A+FSkBERAREQEREBERAREQEREBERAREQEREBERARFDp8UhfI+FkrDJGbSMDhmad9QghcV8SQ0EPXzXIuGta2xc4nkFqLG+l6slJFMxkDORI62T1Psj0KidLvEH2qtMDDeKmuwW2Mn3z5beRWHxxriUi4zcV4i/wB6un8nkfRQv2tVB3Wfap8w2PWv/VemsC8ujR3S5u40qns6qpENXGbezVxZyPhe0gg96tNfVskeDHTMgFiC2F0jmnsNnk2PgvhjXwtQ0unC3FM+HyiSJxMZI66In2Xjw5O71uDBelrD5yGvc6Fx0tK3S/xDRaGe1QKiJHLHYUE7XtD2ODmnUFpBB8wqi5T4U40rMPdeGS7PvwyXdGfAfdPeF0jwjxNFX0zKmPTNdrmOIzNcNC0rqK9oiICIiAiIgIiICIiAiIgIiICIiAiIgLlji6qf+0at7Xua7r5RmY4tNgcu47hZdEHjXD8zmGshDoyWvDngWI31Oh8lz5x/LTuxGd9IQYnOaQW6tLi1uct7s10rsWiM8+3clS2KDG5V2yKKSa0ry4qi2RfS9B6JXglfC9U3PXR9co0rVVLl4cghyRrwx7m+65w+FxH0UzLdUpY0cXfAOOK6jIMNQ4tG8cpMkZ8jt5WW9OjvpDixEGNwEVQ0XdHe4cPxMJ3C5syKXhNa6mmjqYjZ8L2vbqRe24PcRceaOadgIsc4E4qZiNMKhrcjgSyRl72cO/sWRrrgiIgIiICIiAiIgIiICIiAvEzMzS3a4I9QvaIOTuLcIko6uWmlGocXsNrBzHElrx3HUeRVpDllPStVOkxSpzknI5sbL8mtAIA7rknzWNQU9za29reey4kNeqgeti4XwnTdU1kkYc63tO1BuewrFMc4SqIHEsYZIrnK5mrgOxw3Vc5cbdLLx5SbWlr17D18gw+d3uwynwjef6KfT8P1TzYU8n95hb63UuqI6qCXLyASbAEnsAJPos9wXgDZ9S7/ALbD9Xfosuo8JhiH7uNre8DX1VWXPjPHdZjw5Xz2acGFVB2p5v8AJl/RV4sAqnGwp5B8TCwf+S3IWqk5qh/kX0n8E9tSVfD1RCM72ezzLSHW8bKE+MELbtSwEEHY3BWsMWo+pmdHyvdvgdlZx8nV5V58fT4WF0WU93NfZAORUqoaoL4lcqb06AIQKSZ4PvzbfC0BbTXKPBtPVPq4oKSd8MkrrZmucGgAXLnAbiw5rqqmY4MaHuzODWhzrWuQNTbkuoqiIiAiIgIiICIiAiIgIiICj4gx5jeI3ZX5TkP5uV+5SEQcncSVE0lXM6qFp81pRly6t0GngApPDdHnnjb+YE+Wqznp4rY2zxwCGPrHxtkfL/vLBzg0eGjvmsW6Pm3qWeDz8lDO6lWYd7G0KbD9FPZQKTTjRSmheba9CREZRBVHUgspQS6jtLSCaNU/s6uDiqTl3bmlukp1HlhV1cFHlC7K5YsdQFg/GsPuP7y0/VZ9XBYdxRFmid+WzvRX8V7xTyTswGrF1Fk02UuZRnNW1jbE6CMKMtY6pPu0zCPF8gsPlf5Lf6596EMWMNeacn2Kljhb/qMF2/IOXQS6iIiICIiAiIgIiICIiAiIgIiINA9P0NsQhk/HTNaP7kkhP84Vo6Ov9Yb8L/6LNf8ASBwt7209S1ji2LrGSOA0aH5dT5tC1PhFNPIT1JcCLD2SQdTa2ihnNyp4XVdDwyADUgeJAXsV8W3Ws/xtWrKXgCpe0GorC38oL5CPUgLxP0dRjatN/wA0X6OWL48P3f02fJn+3+23o5WuF2kEdxBX260hLg1fRXlp5i9rBmJjcdhvdjlLwjivGJ2OdDaRrNHO6tnjvzKXg/Ms0Tn/ABZW4yVaq/H6aLSSeNp7C4X9FqWjxXFK9zoWzOAb/E2jDeWthdXSl4BgbrUTve7mI7NHqbkrvwzH7X+D5bl9Z/LMn8c0H/MN9HfoqEnGtCf+Ib6O/RWiHhnDRoYie90j/wChCkHgvD3j2YiPhll/9k1x/wCzfJfSnV8WUZ2nb81aKnGKZ4cOuZYgg69qi8ScBsjY6Sne45RcsfY6DsKsmC8NMni617nDMXBoblGxtrcdqtxxw1uVVllnvVi1yuFyAQbEjQqNKNCq2O4E6neADmDhdptY6ciqB28lpnedmepfDVc6Koglb70c0LhbueLjzFx5rrhct8J8NSvkimkGWJskbnXvcta4EgDyK6ZwzEY5254zcA2NxYg9iTKXsXGzuloiLqIiIgIiICIiAiIgIiICIiDG+ken6zDKtg3MLy3xGoWoOBqQRVErOwMLb66Os7+q3vjFN1kEsVr545G28WlardTtEtNO0AGWkayS1x7cDspNj4jXuVfLP01ZxX9UX50Bf1hJs2JheQNC42JAvyGi1BPxU/O0NfmcS5zm5fZAGoF+Yst1UrXOFwR7TcrgRcEd6xtvRvTB+cAkXvlLiBvt4LLjnhJr8tOeGdu54XCqomRwx1IJ6t8Qke15vYFmYi/govR7RhtIxzRYSl8trW0cTYeio8fVD3NioQ4dZVObGGsFgyIEZjbwG6y6mp2xsaxos2Noa3wAsucuU12/KXHLvv8AhhWEwMp66qp7WM+Woj10I+8B4E381cIoRJOyJ2gJ15XtyUXj2lc0RYhECZKV13gfeiOjh5K40cTKqNlRE7RwDmkbg9nim/GVNecY1p0gYg6OrmjbGTazYg32Ws23HMbrOujRjpqFxmGrJXNifzy5Wm1+wEkK8V3DcU5D5wJHBuW5a0G3eQLlVvsjI2BjPZaNmgkN9NlP5sd+Ffw5e1uxluWEuP4Hn5FYbw8y1LF3h7v8T3H+qvXHWK5IOqGr5v3cbeeuhKiQU/Vxsj/A1rfQKOP1/wCpZfZZOKYbsa78Jt6rGsCpOtqY4+ReL+A1P0WW8SD9we4tVr4JpPadN2Xa0+O6vxy1hVOU3lGw7tFoox3dwWX8BwFsUhP3pPoAFh+EMABcdyth8NQ5adv5rv17yq+CfqT5r+ldERFrZRERAREQEREBERAREQEREBak41wqoopzUxtM1LI8u6tts8T5PfygfdJAPiVttWnimHNTP/LZ3oVHL61LH7Rq+k6QIGizopwezqXFSzx7I8WpqGokcdAXsMbR4k8lcaWbRXKlkWC3H03yZe1k4YwKfrHV1aQ6okGVjR7sTPwjsWUPFmqNPWhup5KnNijSNFC25XaUkk09b6HUG4IKxA8PVdHI5+HytMTyXOgl90E/h7Fkjam6q9cuy2OWSsZfjuKjQ0Ebu9s4A+aizYhismgp4or83Pz29FljnqPK5SmU9RG433WJ0HDjmyfaamQzTcr+63wCmVKudQ5Wuc6qW7fKOpPCy4xGH5YjqHbhT6GFsQEbW2FrDs7/ADUSD2pnO5N0HirxNTWDbak2HmVK+kZ7XfBoHTPbCzn7x/C3mVs2GMNaGjZoAHgFbOHcGbTRgDV7rGR3aezwCuy08eHTGfkz6qIiKxWIiICIiAiIgIiICIiAiIgKnPEHNcw7OBB8wqiINVuaY5HRu3Y4tPkdCp7agNbmJ0Cm8d0WWRtQNn+w/wCIbH0+iwnGMTs3ID4rByYay03YZ7x2lV3EjdspPfdRmY2zmx3k7T6K4wcPPLWlj4hcAkubnOvmvUvDdSBdssX+UP1Ue3tLutz8fcPdj08yvcPErhq+PTuvdV2YVV852jwjA+pXv9mSE2kka5vMFjQfUJqHdcKWubIMzT4jmkr1ixqOomc1uwNvEK6NxVjhvZNO7V53qz4jUBjSefJVK3E2jbVY7VTukdbvU5FeVZ50W4QJHmd4uGe0L7Zjt6brYeJYFBOQ6RntNcHBzSWOuO0jfzVq6OqLq6QG1s5J8hoPoVlC14TWLJne4iIpoiIiAiIgIiICIiAiIgIiICIrJxJxXSULM9TM1p+6we1I7uawalBe14fK0buA8SAue+MOmOpqCWUgNPFtmNnSu7ydm+Autd1uKzym8s8rz+eR5+V0HWPEElPNA+J88bcwOUl7dHcjv2rRD5CXFpsSCQSDcG3MHmFrew7Ash4fxO1o3H4SfoquXHc2s48tXTdGFNLomEH7o+Si45WzRkNY8j5qDgGL5Yw2+oVLEa7OSfqsV8tu+ydhOIyPdkkN7jQ96uz2WWIQy5SDzGu6vLsWGXU8kNrDjf8AFd6q3PkNtLKRXTZnEqM1lz23U5FdqjqVVuI2OldswX8TyCudPhTrXdoOzmrdxnHakeBsMvpdTx1vSGW9bZRw700Rsa2KemLWtAaHQuDrAaatO/qtp4Dj9PWRiWnkDwdxs4dzmnUFcc3VxwXHJ6WQSwSOY4dh37iOYWxldkItW9H3S3HVOZTVTermdZrXiwje7kD+En0W0kBERAREQEREBERAREQERUquobGx0jjZrGuc4nsAuUGEdK/HIw+DqoiDUzgiIb5G7GR3hfQcyucKqofK4ySvc97t3PJcT5qdxNjT62qlqnknO45AfusB9lo7NPqrcgoPCp3UiQKORqgBSKOEvexjfec5rW+JKRwC2qz/AKO+E3GRtU9pDWg9WHbkn73go55TGbqWGNyul3qMCewAxEnQZm8723CiuMrfeY4dvsn9FnktLYXXqnPJYOpu6WAhzz7sbj2+y7b+ikxYTUybRuA/NYD5rYDV9XOp3oYdS8JO3keB3N1PqrpBhrI/daPHc+qvEhUOROq06ZEGoasY4rhzU0o/KT6LK5mLW3GvEdy6mh5XbK/6tb+qt45beyvksk7sDC9gKq2NenNW1iUQSCCCQQQQRoQRsV0B0QdJH2oChq3ATtFoXk260Dl8Y+a0CQlPO5j2yMJa5hDmkaEEbFB2qiwfor41GIU+WQj7RDYSgaZhyeB3rOEBERAREQEREBF8c4AEnQDUkrRPGPSFUzTvFNO+KBpys6uzS633i7fXsug3sStT9OPFzWUwoYJWl87rT5HAlsTdSDbbMbDwuta1WOVUgIfUzOB3DppCPS6xiuYc5J57IKbV9K8Ar0g+OCokahVyFTBAc0nYOaT4A6oNp8DcGMLWTTtzOdZwa7ZoO2nMrZkdOGiwGytWCTiwts4NI8CFfAvN5Mrle70ePGYzspGG6hTQWKurQvssIIVe1mlpaV9JX2dmUqiXqTj5IVGeVUkeo0j12I1jPHWP/ZosjD+9lBDfyt5uWpgOZV34sxL7RVSSX9kHq2fC3T5m5Vput/Hh04sPJn1ZPS8lfC5V4qUkZney3vVitGDC42C9dU0d5VR7h7rNuZVWGBBK4Xx+WgqmVMdxlPtt5PYd2ldW4Di8dVBHUxG7ZGgjuPMHvC5S+zA6ELLeB+MpsNDmMAkicQ4xvJFjzLTyug6QRQcDxEVFPFUBuUTMbIAdxmF7KcgIiICIiChX/wAKT4H/AMpXLg/hN8kRBQKgYly80RBbl6CIg+uUebZfUQrffCf8KH+yi/lCy9q+IvMz8vSw8KrVUCIq1i3YkrY5EU4hVF6h1nuP+B/0KIpRGtEfqV8KIvSec9Q7jxCm417oREEKkVxgREEpq+v2REHS/A3+z6T+wi/lCviIgIiICIiD/9mRXao6lVbiNjpXbMF/E8grnT4U613aDs5q3cZx2pHgbDL6XU8db0hlvW2UcO9NEbGtinpi1rQGh0Lg6wGmrTv6raeA4/T1kYlp5A8HcbOHc5p1BXHN1ccFxyelkEsEjmOHYd+4jmFsZXZCLVvR90tx1TmU1U3q5nWa14sI3u5A/hJ9FtJAREQEREBERAREQEREBEVKrqGxsdI42axrnOJ7ALlBhHSvxyMPg6qIg1M4IiG+Ruxkd4X0HMrnCqqHyuMkr3Pe7dzyXE+ancTY0+tqpap5JzuOQH7rAfZaOzT6q3IKDwqd1IkCjkaoAUijhL3sY33nOa1viSkcAtqs/wCjvhNxkbVPaQ1oPVh25J+94KOeUxm6lhjcrpd6jAnsAMRJ0GZvO9tworjK33mOHb7J/RZ5LS2F16pzyWDqbulgIc8+7G49vsu2/opMWE1Mm0bgPzWA+a2A1fVzqd6GHUvCTt5HgdzdT6q6QYayP3Wjx3PqrxIVDkTqtOmRBqGrGOK4c1NKPyk+iyuZi1txrxHcupoeV2yv+rW/qreOW3sr5LJO7AwvYCqtjXpzVtYlEEgggkEEEEaEEbFdAdEHSR9qAoatwE4=" }], "emailId": [{ "language": "ara", "label": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0627\u064A\u0645\u064A\u0644", "value": "sample@samplamail.com" }, { "language": "fre", "label": "identifiant email", "value": "sample@samplamail.com" }], "CNEOrPINNumber": [{ "language": "ara", "label": "\u0631\u0642\u0645 CNE / PIN", "value": "AB453625" }, { "language": "fre", "label": "Numďż˝ro CNE / PIN", "value": "AB453625" }], "parentOrGuardianName": [{ "language": "ara", "label": "\u0627\u0633\u0645 \u0648\u0644\u064A \u0627\u0644\u0623\u0645\u0631 / \u0627\u0644\u0648\u0635\u064A", "value": "\u0633\u0644\u0645\u0649" }, { "language": "fre", "label": "Nom du parent / tuteur", "value": "salma" }], "parentOrGuardianRIDOrUIN": [{ "language": "ara", "label": "\u0627\u0644\u0648\u0627\u0644\u062F / \u0627\u0644\u0648\u0635\u064A RID / UIN", "value": "123456789123" }, { "language": "fre", "label": "parent / tuteur RID / UIN", "value": "123456789123" }], "leftEye": [{ "language": "ara", "label": "\u0627\u0644\u0639\u064A\u0646 \u0627\u0644\u064A\u0633\u0631\u0649", "value": "hashed_fileName.png" }, { "language": "fre", "label": "oeil gauche", "value": "hashed_fileName.png" }], "rightEye": [{ "language": "ara", "label": "\u0627\u0644\u0639\u064A\u0646 \u0627\u0644\u064A\u0645\u0646\u0649", "value": "hashed_fileName.png" }, { "language": "fre", "label": "l'\u0153il droit", "value": "hashed_fileName.png" }], "leftSlap": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 1", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biomďż˝trique 1", "value": "hashed_fileName.png" }], "rightSlap": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 2", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biomďż˝trique 2", "value": "hashed_fileName.png" }], "thumbs": [{ "language": "ara", "label": "\u0627\u0644\u0628\u064A\u0648\u0645\u062A\u0631\u064A\u0629 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A 3", "value": "hashed_fileName.png" }, { "language": "fre", "label": "analyse biomďż˝trique 3", "value": "hashed_fileName.png" }] } } } # Limit the number of async threads created in IDRepo services. This count is divided into 4 thread groups configured in IdRepoConfig.class mosip.ida.active-async-thread-count=100 diff --git a/authentication/authentication-service/src/test/resources/ida-mapping.json b/authentication/authentication-service/src/test/resources/ida-mapping.json index e02c70e36cb..0be491bfc95 100644 --- a/authentication/authentication-service/src/test/resources/ida-mapping.json +++ b/authentication/authentication-service/src/test/resources/ida-mapping.json @@ -1,123 +1,132 @@ -{ - "identity": { - "IDSchemaVersion": { - "value": "IDSchemaVersion" - }, - "name": { - "value": "fullName" - }, - "name2": { - "value": "firstName,lastName" - }, - "gender": { - "value": "gender" - }, - "dob": { - "value": "dateOfBirth" - }, - "age": { - "value": "age" - }, - "introducerRID": { - "value": "introducerRID" - }, - "introducerUIN": { - "value": "introducerUIN" - }, - "introducerVID": { - "value": "introducerVID" - }, - "introducerName": { - "value": "introducerName" - }, - "phone": { - "value": "phone" - }, - "phoneNumber": { - "value": "phone" - }, - "email": { - "value": "email" - }, - "emailId": { - "value": "email" - }, - "uin": { - "value": "UIN" - }, - "individualBiometrics": { - "value": "individualBiometrics" - }, - "introducerBiometrics": { - "value": "introducerBiometrics" - }, - "individualAuthBiometrics": { - "value": "individualAuthBiometrics" - }, - "officerBiometricFileName": { - "value": "officerBiometricFileName" - }, - "supervisorBiometricFileName": { - "value": "supervisorBiometricFileName" - }, - "residenceStatus": { - "value": "residenceStatus" - }, - "preferredLanguage": { - "value": "preferredLang" - }, - "locationHierarchyForProfiling": { - "value": "zone,postalCode" - }, - "addressLine1": { - "value": "addressLine1" - }, - "addressLine2": { - "value": "addressLine2" - }, - "addressLine3": { - "value": "addressLine3" - }, - "location1": { - "value": "city" - }, - "location2": { - "value": "region" - }, - "location3": { - "value": "province" - }, - "postalCode": { - "value": "postalCode" - }, - "location4": { - "value": "zone" - }, - "fullAddress": { - "value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode" - } - }, - "metaInfo": { - "value": "metaInfo" - }, - "audits": { - "value": "audits" - }, - "documents": { - "poa": { - "value": "proofOfAddress" - }, - "poi": { - "value": "proofOfIdentity" - }, - "por": { - "value": "proofOfRelationship" - }, - "pob": { - "value": "proofOfDateOfBirth" - }, - "poe": { - "value": "proofOfException" - } - } +{ + "identity": { + "IDSchemaVersion": { + "value": "IDSchemaVersion" + }, + "name": { + "value": "fullName" + }, + "name2": { + "value": "firstName,lastName" + }, + "gender": { + "value": "gender" + }, + "dob": { + "value": "dateOfBirth" + }, + "age": { + "value": "age" + }, + "introducerRID": { + "value": "introducerRID" + }, + "introducerUIN": { + "value": "introducerUIN" + }, + "introducerVID": { + "value": "introducerVID" + }, + "introducerName": { + "value": "introducerName" + }, + "phone": { + "value": "phone" + }, + "phoneNumber": { + "value": "phone" + }, + "email": { + "value": "email" + }, + "emailId": { + "value": "email" + }, + "uin": { + "value": "UIN" + }, + "individualBiometrics": { + "value": "individualBiometrics" + }, + "introducerBiometrics": { + "value": "introducerBiometrics" + }, + "individualAuthBiometrics": { + "value": "individualAuthBiometrics" + }, + "officerBiometricFileName": { + "value": "officerBiometricFileName" + }, + "supervisorBiometricFileName": { + "value": "supervisorBiometricFileName" + }, + "residenceStatus": { + "value": "residenceStatus" + }, + "preferredLanguage": { + "value": "preferredLang" + }, + "locationHierarchyForProfiling": { + "value": "zone,postalCode" + }, + "addressLine1": { + "value": "addressLine1" + }, + "addressLine2": { + "value": "addressLine2" + }, + "addressLine3": { + "value": "addressLine3" + }, + "location1": { + "value": "city" + }, + "location2": { + "value": "region" + }, + "location3": { + "value": "province" + }, + "postalCode": { + "value": "postalCode" + }, + "location4": { + "value": "zone" + }, + "fullAddress": { + "value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode" + }, + "address": { + "value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode" + }, + "street_address": { + "value": "addressLine1,addressLine2,addressLine3" + }, + "locality": { + "value": "city" + } + }, + "metaInfo": { + "value": "metaInfo" + }, + "audits": { + "value": "audits" + }, + "documents": { + "poa": { + "value": "proofOfAddress" + }, + "poi": { + "value": "proofOfIdentity" + }, + "por": { + "value": "proofOfRelationship" + }, + "pob": { + "value": "proofOfDateOfBirth" + }, + "poe": { + "value": "proofOfException" + } + } } \ No newline at end of file diff --git a/authentication/esignet-integration-impl/pom.xml b/authentication/esignet-integration-impl/pom.xml index df26e8253c0..9d3075594d6 100644 --- a/authentication/esignet-integration-impl/pom.xml +++ b/authentication/esignet-integration-impl/pom.xml @@ -1,67 +1,77 @@ - - 4.0.0 - - - io.mosip.authentication - authentication-parent - 1.2.1-SNAPSHOT - - - esignet-integration-impl - esignet-integration-impl - e-Signet Integration Implementation Library - - - 11 - - - - - junit - junit - 4.13.1 - test - - - - org.projectlombok - lombok - 1.18.22 - compile - - - - io.mosip.esignet - esignet-integration-api - 1.0.0-SNAPSHOT - provided - - - - io.mosip.kernel - kernel-keymanager-service - 1.2.1-SNAPSHOT - provided - lib - - - org.springframework.cloud - spring-cloud-starter-sleuth - - - org.springframework.security - spring-security-test - - - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - test - - - + + 4.0.0 + + + io.mosip.authentication + authentication-parent + 1.2.1.0 + + 1.2.1.0 + esignet-integration-impl + esignet-integration-impl + e-Signet Integration Implementation Library + + + 11 + + + + + junit + junit + 4.13.1 + test + + + + org.projectlombok + lombok + 1.18.22 + compile + + + io.mosip.esignet + esignet-core + 1.3.0 + provided + + + io.mosip.esignet + esignet-integration-api + 1.3.0 + provided + + + + io.mosip.kernel + kernel-keymanager-service + ${kernel-keymanager-service.version} + provided + lib + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.security + spring-security-test + + + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + test + + + info.weboftrust + ld-signatures-java + 1.0.0 + + + \ No newline at end of file diff --git a/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/CredentialDefinitionDTO.java b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/CredentialDefinitionDTO.java new file mode 100644 index 00000000000..af7a0a38848 --- /dev/null +++ b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/CredentialDefinitionDTO.java @@ -0,0 +1,20 @@ +package io.mosip.authentication.esignet.integration.dto; + +import java.util.List; +import java.util.Map; + +import lombok.Data; + +@Data +public class CredentialDefinitionDTO { + + /** */ + private Map credentialSubject; + + /** */ + private List type; + + /** */ + private List context; + +} diff --git a/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaKycAuthRequest.java b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaKycAuthRequest.java index 086d71af66e..1465bb7129b 100644 --- a/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaKycAuthRequest.java +++ b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaKycAuthRequest.java @@ -37,6 +37,7 @@ public static class AuthRequest { private String timestamp; private List biometrics; private List keyBindedTokens; + private String password; } @Data diff --git a/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaVcExchangeRequest.java b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaVcExchangeRequest.java new file mode 100644 index 00000000000..62360a9b436 --- /dev/null +++ b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaVcExchangeRequest.java @@ -0,0 +1,40 @@ +package io.mosip.authentication.esignet.integration.dto; + +import java.util.List; +import java.util.Map; + +import javax.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class IdaVcExchangeRequest { + + @NotNull + private String vcAuthToken; + + /** The Variable to hold value of Credential Subject Id */ + @NotNull + private String credSubjectId; + + /** The Variable to hold value of VC Format type */ + @NotNull + private String vcFormat; + + /** The Variable to hold value of list of user selected locales */ + private List locales; + + private Map metadata; + + private String id; + + private String version; + + private String individualId; + + private String transactionID; + + private String requestTime; + + private CredentialDefinitionDTO credentialsDefinition; + +} diff --git a/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaVcExchangeResponse.java b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaVcExchangeResponse.java new file mode 100644 index 00000000000..7d3b9d97699 --- /dev/null +++ b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/dto/IdaVcExchangeResponse.java @@ -0,0 +1,9 @@ +package io.mosip.authentication.esignet.integration.dto; + +import lombok.Data; + +@Data +public class IdaVcExchangeResponse { + + private T verifiableCredentials; +} diff --git a/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/helper/VCITransactionHelper.java b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/helper/VCITransactionHelper.java new file mode 100644 index 00000000000..f8d607161f7 --- /dev/null +++ b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/helper/VCITransactionHelper.java @@ -0,0 +1,30 @@ +package io.mosip.authentication.esignet.integration.helper; + +import java.util.Map; + +import io.mosip.esignet.core.dto.OIDCTransaction; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cache.CacheManager; +import org.springframework.stereotype.Component; + +@Component +public class VCITransactionHelper { + + @Autowired + CacheManager cacheManager; + + @Value("${mosip.esignet.ida.vci-user-info-cache}") + private String userinfoCache; + + @SuppressWarnings("unchecked") + public OIDCTransaction getOAuthTransaction(String accessTokenHash) throws Exception { + if (cacheManager.getCache(userinfoCache) != null) { + return cacheManager.getCache(userinfoCache).get(accessTokenHash, OIDCTransaction.class); //NOSONAR getCache() will not be returning null here. + } + throw new Exception("cache_missing"); + } + + + +} diff --git a/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/service/HelperService.java b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/service/HelperService.java index d87772d670e..5a95185da93 100644 --- a/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/service/HelperService.java +++ b/authentication/esignet-integration-impl/src/main/java/io/mosip/authentication/esignet/integration/service/HelperService.java @@ -47,6 +47,7 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; @@ -71,10 +72,12 @@ public class HelperService { public static final String BINDING_TRANSACTION = "bindingtransaction"; private static Base64.Encoder urlSafeEncoder; private static Base64.Decoder urlSafeDecoder; + private static SecureRandom secureRandom; static { urlSafeEncoder = Base64.getUrlEncoder().withoutPadding(); urlSafeDecoder = Base64.getUrlDecoder(); + secureRandom = new SecureRandom(); } @Value("${mosip.esignet.authenticator.ida-send-otp-id:mosip.identity.otp}") @@ -256,6 +259,8 @@ private void buildAuthRequest(AuthChallenge authChallenge, IdaKycAuthRequest.Aut list.add(keyBindedToken); authRequest.setKeyBindedTokens(list); break; + case "PWD" : authRequest.setPassword(authChallenge.getChallenge()); + break; default: throw new NotImplementedException("KYC auth not implemented"); } @@ -264,7 +269,7 @@ private void buildAuthRequest(AuthChallenge authChallenge, IdaKycAuthRequest.Aut protected static String generateTransactionId(int length) { StringBuilder builder = new StringBuilder(); for(int i=0; i getVerifiableCredentialWithLinkedDataProof(VCRequestDto vcRequestDto, String holderId, + Map identityDetails) throws VCIExchangeException { + log.info("Started to created the VCIssuance"); + try { + OIDCTransaction transaction = vciTransactionHelper + .getOAuthTransaction(identityDetails.get(ACCESS_TOKEN_HASH).toString()); + String individualId = getIndividualId(transaction.getIndividualId()); + IdaVcExchangeRequest idaVciExchangeRequest = new IdaVcExchangeRequest(); + CredentialDefinitionDTO vciCred = new CredentialDefinitionDTO(); + idaVciExchangeRequest.setId(vciExchangeId);// Configuration + idaVciExchangeRequest.setVersion(vciExchangeVersion);// Configuration + idaVciExchangeRequest.setRequestTime(HelperService.getUTCDateTime()); + idaVciExchangeRequest.setTransactionID(transaction.getAuthTransactionId());// Cache input + idaVciExchangeRequest.setVcAuthToken(transaction.getKycToken()); // Cache input + idaVciExchangeRequest.setIndividualId(individualId); + idaVciExchangeRequest.setCredSubjectId(holderId); + idaVciExchangeRequest.setVcFormat(vcRequestDto.getFormat()); + idaVciExchangeRequest.setLocales(convertLangCodesToISO3LanguageCodes(transaction.getClaimsLocales())); + vciCred.setCredentialSubject(vcRequestDto.getCredentialSubject()); + vciCred.setType(vcRequestDto.getType()); + vciCred.setContext(vcRequestDto.getContext()); + idaVciExchangeRequest.setCredentialsDefinition(vciCred); + + String requestBody = objectMapper.writeValueAsString(idaVciExchangeRequest); + RequestEntity requestEntity = RequestEntity + .post(UriComponentsBuilder.fromUriString(vciExchangeUrl) + .pathSegment(transaction.getRelyingPartyId(), + identityDetails.get(CLIENT_ID).toString()) + .build().toUri()) + .contentType(MediaType.APPLICATION_JSON_UTF8) + .header(SIGNATURE_HEADER_NAME, helperService.getRequestSignature(requestBody)) + .header(AUTHORIZATION_HEADER_NAME, AUTHORIZATION_HEADER_NAME).body(requestBody); + + ResponseEntity>> responseEntity = restTemplate.exchange( + requestEntity, new ParameterizedTypeReference>>() {}); + if (responseEntity.getStatusCode().is2xxSuccessful() && responseEntity.getBody() != null) { + IdaResponseWrapper> responseWrapper = responseEntity.getBody(); + if (responseWrapper.getResponse() != null) { + VCResult vCResult = new VCResult(); + vCResult.setCredential(responseWrapper.getResponse().getVerifiableCredentials()); + vCResult.setFormat(vcRequestDto.getFormat()); + return vCResult; + } + log.error("Errors in response received from IDA VCI Exchange: {}", responseWrapper.getErrors()); + throw new VCIExchangeException(CollectionUtils.isEmpty(responseWrapper.getErrors()) ? + ErrorConstants.DATA_EXCHANGE_FAILED : responseWrapper.getErrors().get(0).getErrorCode()); + } + log.error("Error response received from IDA (VCI-exchange) with status : {}", responseEntity.getStatusCode()); + } catch (Exception e) { + log.error("IDA Vci-exchange failed ", e); + } + throw new VCIExchangeException(); + } + + @Override + public VCResult getVerifiableCredential(VCRequestDto vcRequestDto, String holderId, + Map identityDetails) throws VCIExchangeException { + throw new VCIExchangeException(ErrorConstants.NOT_IMPLEMENTED); + } + + protected String getIndividualId(String encryptedIndividualId) throws Exception { + if (!storeIndividualId) + return null; + return secureIndividualId ? decryptIndividualId(encryptedIndividualId) : encryptedIndividualId; + } + + private String decryptIndividualId(String encryptedIndividualId) throws Exception { + try { + Cipher cipher = Cipher.getInstance(aesECBTransformation); + byte[] decodedBytes = b64Decode(encryptedIndividualId); + cipher.init(Cipher.DECRYPT_MODE, getSecretKeyFromHSM()); + return new String(cipher.doFinal(decodedBytes, 0, decodedBytes.length)); + } catch (Exception e) { + log.error("Error Cipher Operations of provided secret data.", e); + throw new Exception(AES_CIPHER_FAILED); + } + } + + private Key getSecretKeyFromHSM() throws Exception { + String keyAlias = getKeyAlias(OIDC_SERVICE_APP_ID, cacheSecretKeyRefId); + if (Objects.nonNull(keyAlias)) { + return keyStore.getSymmetricKey(keyAlias); + } + throw new Exception(NO_UNIQUE_ALIAS); + } + + private String getKeyAlias(String keyAppId, String keyRefId) throws Exception { + Map> keyAliasMap = dbHelper.getKeyAliases(keyAppId, keyRefId, + LocalDateTime.now(ZoneOffset.UTC)); + List currentKeyAliases = keyAliasMap.get(KeymanagerConstant.CURRENTKEYALIAS); + if (!currentKeyAliases.isEmpty() && currentKeyAliases.size() == 1) { + return currentKeyAliases.get(0).getAlias(); + } + log.error("CurrentKeyAlias is not unique. KeyAlias count: {}", currentKeyAliases.size()); + throw new Exception(NO_UNIQUE_ALIAS); + } + + private byte[] b64Decode(String value) { + return urlSafeDecoder.decode(value); + }; + + //Converts an array of two-letter language codes to their corresponding ISO 639-2/T language codes. + private List convertLangCodesToISO3LanguageCodes(String[] langCodes) { + if(langCodes == null || langCodes.length == 0) + return List.of("eng"); + return Arrays.stream(langCodes) + .map(langCode -> { + try { + return new Locale(langCode).getISO3Language(); + } catch (MissingResourceException ex) {} + return null; + }) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + } +} diff --git a/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/helper/AuthTransactionHelperTest.java b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/helper/AuthTransactionHelperTest.java new file mode 100644 index 00000000000..a959bd35fdb --- /dev/null +++ b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/helper/AuthTransactionHelperTest.java @@ -0,0 +1,46 @@ +package io.mosip.authentication.esignet.integration.helper; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.mosip.esignet.core.dto.ResponseWrapper; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.RequestEntity; +import org.springframework.http.ResponseEntity; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.web.client.RestTemplate; +import static org.mockito.Mockito.when; + +@RunWith(MockitoJUnitRunner.class) +public class AuthTransactionHelperTest { + + @Mock + ObjectMapper objectMapper; + + @Mock + RestTemplate restTemplate; + + @InjectMocks + AuthTransactionHelper authTransactionHelper; + + @Test + public void GetAuthTokenWithValidDetails_thenPass() throws Exception { + ReflectionTestUtils.setField(authTransactionHelper, "authTokenUrl", "test"); + ReflectionTestUtils.setField(authTransactionHelper, "clientId", "test"); + ReflectionTestUtils.setField(authTransactionHelper,"secretKey","test"); + ReflectionTestUtils.setField(authTransactionHelper,"appId","test"); String expectedAuthToken = "testAuthToken"; + + ResponseEntity responseEntity = ResponseEntity.ok() + .header("authorization", expectedAuthToken) + .build(); + when(restTemplate.exchange(Mockito.any(RequestEntity.class), Mockito.any(ParameterizedTypeReference.class))) + .thenReturn(responseEntity); + String authToken = authTransactionHelper.getAuthToken(); + Assert.assertEquals(expectedAuthToken, authToken); + } +} diff --git a/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/helper/VCITransactionHelperTest.java b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/helper/VCITransactionHelperTest.java new file mode 100644 index 00000000000..28e309785bb --- /dev/null +++ b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/helper/VCITransactionHelperTest.java @@ -0,0 +1,49 @@ +package io.mosip.authentication.esignet.integration.helper; + +import io.mosip.esignet.core.dto.OIDCTransaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.cache.Cache; +import org.springframework.cache.CacheManager; +import org.springframework.cache.support.NoOpCache; +import org.springframework.test.util.ReflectionTestUtils; + +@RunWith(MockitoJUnitRunner.class) +public class VCITransactionHelperTest { + + @Mock + CacheManager cacheManager; + + @Mock + Cache cache=new NoOpCache("test"); + + @InjectMocks + VCITransactionHelper vciTransactionHelper; + + @Test + public void getOAuthTransactionWithValidDetails_thenPass() throws Exception { + ReflectionTestUtils.setField(vciTransactionHelper, "userinfoCache", "test"); + OIDCTransaction oidcTransaction = new OIDCTransaction(); + oidcTransaction.setTransactionId("test"); + Mockito.when(cacheManager.getCache(Mockito.anyString())).thenReturn(cache); + Mockito.when(cache.get("test",OIDCTransaction.class)).thenReturn(oidcTransaction); + vciTransactionHelper.getOAuthTransaction("test"); + + } + + @Test + public void getOAuthTransactionWithInValidDetails_thenFail() { + try{ + vciTransactionHelper.getOAuthTransaction("test"); + }catch (Exception e){ + assert(e.getMessage().equals("cache_missing")); + } + + + } + +} diff --git a/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/HelperServiceTest.java b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/HelperServiceTest.java index 8528d4b3d91..7e66a33a45e 100644 --- a/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/HelperServiceTest.java +++ b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/HelperServiceTest.java @@ -170,6 +170,27 @@ public void setAuthRequest_withOTPChallengeType_thenPass() throws Exception { Assert.assertNotNull(idaKycAuthRequest.getThumbprint()); } + @Test + public void setAuthRequest_withPWDChallengeType_thenPass() throws Exception { + List challengeList = new ArrayList<>(); + AuthChallenge authChallenge = new AuthChallenge(); + authChallenge.setChallenge("password"); + authChallenge.setAuthFactorType("pwd"); + authChallenge.setFormat("numeric"); + challengeList.add(authChallenge); + + Mockito.when(restTemplate.getForObject("https://test/test", String.class)).thenReturn("test-certificate"); + Mockito.when(keymanagerUtil.convertToCertificate(Mockito.any(String.class))).thenReturn(TestUtil.getCertificate()); + Mockito.when(cryptoCore.asymmetricEncrypt(Mockito.any(), Mockito.any())).thenReturn("test".getBytes()); + + IdaKycAuthRequest idaKycAuthRequest = new IdaKycAuthRequest(); + helperService.setAuthRequest(challengeList, idaKycAuthRequest); + Assert.assertNotNull(idaKycAuthRequest.getRequest()); + Assert.assertNotNull(idaKycAuthRequest.getRequestSessionKey()); + Assert.assertNotNull(idaKycAuthRequest.getRequestHMAC()); + Assert.assertNotNull(idaKycAuthRequest.getThumbprint()); + } + @Test public void setAuthRequest_withPINChallengeType_thenPass() throws Exception { List challengeList = new ArrayList<>(); diff --git a/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaAuditPluginImplTest.java b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaAuditPluginImplTest.java new file mode 100644 index 00000000000..ceda8fd7c41 --- /dev/null +++ b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaAuditPluginImplTest.java @@ -0,0 +1,160 @@ +package io.mosip.authentication.esignet.integration.service; + +import io.mosip.esignet.api.dto.AuditDTO; +import io.mosip.esignet.api.util.Action; +import io.mosip.esignet.api.util.ActionStatus; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.junit.MockitoJUnitRunner; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.mosip.authentication.esignet.integration.dto.AuditResponse; +import io.mosip.authentication.esignet.integration.helper.AuthTransactionHelper; +import io.mosip.kernel.core.http.ResponseWrapper; +import org.mockito.*; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.*; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.web.client.RestTemplate; +import static org.mockito.ArgumentMatchers.*; + +@RunWith(MockitoJUnitRunner.class) +public class IdaAuditPluginImplTest { + @InjectMocks + private IdaAuditPluginImpl idaAuditPlugin; + @Mock + private AuthTransactionHelper authTransactionHelper; + @Mock + private ObjectMapper objectMapper; + @Mock + private RestTemplate restTemplate; + @Test + public void logAudit_WithValidDetails_ThenPass() { + Action action = Action.AUTHENTICATE; + ActionStatus status = ActionStatus.SUCCESS; + AuditDTO auditDTO = new AuditDTO(); + try { + idaAuditPlugin.logAudit(action, status, auditDTO, null); + Assert.assertTrue(true); + } catch (Exception e) { + Assert.fail(); + } + } + @Test + public void logAudit_WithThrowable_ThenPass() { + Action action = Action.GENERATE_TOKEN; + ActionStatus status = ActionStatus.SUCCESS; + AuditDTO auditDTO = new AuditDTO(); + Throwable throwable = new RuntimeException("Test Exception"); + try { + idaAuditPlugin.logAudit(action, status, auditDTO, throwable); + Assert.assertTrue(true); + } catch (Exception e) { + Assert.fail(); + } + } + @Test + public void logAudit_WithUsername_WithValidDetails_ThenPass() { + String username = "username"; + Action action = Action.OIDC_CLIENT_UPDATE; + ActionStatus status = ActionStatus.SUCCESS; + AuditDTO auditDTO = new AuditDTO(); + try { + idaAuditPlugin.logAudit(username, action, status, auditDTO, null); + Assert.assertTrue(true); + } catch (Exception e) { + Assert.fail(); + } + } + + @Test + public void logAudit_WithUsername_WithThrowable() throws Exception { + String username = "username"; + Action action = Action.GENERATE_TOKEN; + ActionStatus status = ActionStatus.SUCCESS; + AuditDTO auditDTO = new AuditDTO(); + Throwable throwable = new RuntimeException("Test Exception"); + try { + idaAuditPlugin.logAudit(username,action, status, auditDTO, throwable); + Assert.assertTrue(true); + } catch (Exception e) { + Assert.fail(); + } + } + @Test + public void logAudit_WithValidStatus_ThenPass() throws Exception { + ReflectionTestUtils.setField(idaAuditPlugin, "auditManagerUrl", "auditManagerUrl"); + String username = "username"; + Action action = Action.SAVE_CONSENT; + ActionStatus status = ActionStatus.SUCCESS; + AuditDTO auditDTO = new AuditDTO(); + ResponseWrapper mockresponseWrapper = new ResponseWrapper<>(); + ResponseEntity responseEntity = ResponseEntity.ok(mockresponseWrapper); + ParameterizedTypeReference responseType = + new ParameterizedTypeReference() { + }; + Mockito.when(authTransactionHelper.getAuthToken()).thenReturn("authToken"); + Mockito.when(objectMapper.writeValueAsString(any())).thenReturn("requestBody"); + Mockito.when(restTemplate.exchange( + Mockito.any(RequestEntity.class), + Mockito.eq(responseType) + )).thenReturn(responseEntity); + try { + idaAuditPlugin.logAudit(username,action, status, auditDTO, null); + Assert.assertTrue(true); + } catch (Exception e) { + Assert.fail(); + } + } + @Test + public void logAudit_WithUnauthorizedStatus_ThenPass() throws Exception { + ReflectionTestUtils.setField(idaAuditPlugin, "auditManagerUrl", "auditManagerUrl"); + String username = "username"; + Action action = Action.SAVE_CONSENT; + ActionStatus status = ActionStatus.SUCCESS; + AuditDTO auditDTO = new AuditDTO(); + ResponseWrapper mockresponseWrapper = new ResponseWrapper<>(); + ResponseEntity responseEntity = ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(mockresponseWrapper); + ParameterizedTypeReference responseType = + new ParameterizedTypeReference() { + }; + Mockito.when(authTransactionHelper.getAuthToken()).thenReturn("authToken"); + Mockito.when(objectMapper.writeValueAsString(any())).thenReturn("requestBody"); + Mockito.when(restTemplate.exchange( + Mockito.any(RequestEntity.class), + Mockito.eq(responseType) + )).thenReturn(responseEntity); + try { + idaAuditPlugin.logAudit(username,action, status, auditDTO, null); + Assert.assertTrue(true); + } catch (Exception e) { + Assert.fail(); + } + } + @Test + public void logAudit_WithForbiddenStatus_ThenPass() throws Exception { + ReflectionTestUtils.setField(idaAuditPlugin, "auditManagerUrl", "auditManagerUrl"); + String username = "username"; + Action action = Action.SAVE_CONSENT; + ActionStatus status = ActionStatus.SUCCESS; + AuditDTO auditDTO = new AuditDTO(); + ResponseWrapper mockresponseWrapper = new ResponseWrapper<>(); + ResponseEntity responseEntity = ResponseEntity.status(HttpStatus.FORBIDDEN).body(mockresponseWrapper); + ParameterizedTypeReference responseType = + new ParameterizedTypeReference() { + }; + Mockito.when(authTransactionHelper.getAuthToken()).thenReturn("authToken"); + Mockito.when(objectMapper.writeValueAsString(any())).thenReturn("requestBody"); + Mockito.when(restTemplate.exchange( + Mockito.any(RequestEntity.class), + Mockito.eq(responseType) + )).thenReturn(responseEntity); + try { + idaAuditPlugin.logAudit(username,action, status, auditDTO, null); + Assert.assertTrue(true); + } catch (Exception e) { + Assert.fail(); + } + } +} \ No newline at end of file diff --git a/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaAuthenticatorImplTest.java b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaAuthenticatorImplTest.java index f0f68e4be7a..cad47ce0a5a 100644 --- a/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaAuthenticatorImplTest.java +++ b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaAuthenticatorImplTest.java @@ -248,6 +248,41 @@ public void doKycExchange_withValidDetails_thenPass() throws Exception { Assert.assertEquals(idaKycExchangeResponse.getEncryptedKyc(), kycExchangeResult.getEncryptedKyc()); } + + @Test + public void doKycExchange_withValidDetailsEmptyAcceptedClaims_thenPass() throws Exception { + KycExchangeDto kycExchangeDto = new KycExchangeDto(); + kycExchangeDto.setIndividualId("IND1234"); + kycExchangeDto.setKycToken("KYCT123"); + kycExchangeDto.setTransactionId("TRAN123"); + List acceptedClaims = List.of(); + kycExchangeDto.setAcceptedClaims(acceptedClaims); + String[] claimsLacales = new String[] { "claims", "locales" }; + kycExchangeDto.setClaimsLocales(claimsLacales); + + Mockito.when(mapper.writeValueAsString(Mockito.any())).thenReturn("value"); + + IdaKycExchangeResponse idaKycExchangeResponse = new IdaKycExchangeResponse(); + idaKycExchangeResponse.setEncryptedKyc("ENCRKYC123"); + + IdaResponseWrapper idaResponseWrapper = new IdaResponseWrapper<>(); + idaResponseWrapper.setResponse(idaKycExchangeResponse); + idaResponseWrapper.setTransactionID("TRAN123"); + idaResponseWrapper.setVersion("VER1"); + + ResponseEntity> responseEntity = new ResponseEntity>( + idaResponseWrapper, HttpStatus.OK); + + Mockito.when(restTemplate.exchange(Mockito.>any(), + Mockito.>>any())) + .thenReturn(responseEntity); + + KycExchangeResult kycExchangeResult = idaAuthenticatorImpl.doKycExchange("relyingPartyId", "clientId", + kycExchangeDto); + + Assert.assertEquals(idaKycExchangeResponse.getEncryptedKyc(), kycExchangeResult.getEncryptedKyc()); + } + @Test public void doKycExchange_withInvalidDetails_thenFail() throws Exception { KycExchangeDto kycExchangeDto = new KycExchangeDto(); diff --git a/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaVCIssuancePluginImplTest.java b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaVCIssuancePluginImplTest.java new file mode 100644 index 00000000000..fe3bb52f8c6 --- /dev/null +++ b/authentication/esignet-integration-impl/src/test/java/io/mosip/authentication/esignet/integration/service/IdaVCIssuancePluginImplTest.java @@ -0,0 +1,281 @@ +package io.mosip.authentication.esignet.integration.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import foundation.identity.jsonld.JsonLDObject; +import io.mosip.authentication.esignet.integration.dto.IdaResponseWrapper; +import io.mosip.authentication.esignet.integration.dto.IdaVcExchangeRequest; +import io.mosip.authentication.esignet.integration.dto.IdaVcExchangeResponse; +import io.mosip.authentication.esignet.integration.helper.VCITransactionHelper; +import io.mosip.esignet.api.dto.VCRequestDto; +import io.mosip.esignet.api.dto.VCResult; +import io.mosip.esignet.core.constants.ErrorConstants; +import io.mosip.esignet.core.dto.OIDCTransaction; +import io.mosip.esignet.core.exception.EsignetException; +import io.mosip.esignet.core.util.IdentityProviderUtil; +import io.mosip.kernel.core.keymanager.spi.KeyStore; +import io.mosip.kernel.keymanagerservice.entity.KeyAlias; +import io.mosip.kernel.keymanagerservice.helper.KeymanagerDBHelper; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.RequestEntity; +import org.springframework.http.ResponseEntity; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.web.client.RestTemplate; + +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; +import java.nio.charset.StandardCharsets; +import java.security.Key; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static io.mosip.kernel.keymanagerservice.constant.KeymanagerConstant.CURRENTKEYALIAS; + +@RunWith(MockitoJUnitRunner.class) +public class IdaVCIssuancePluginImplTest { + + @Mock + VCITransactionHelper vciTransactionHelper; + + @Mock + ObjectMapper objectMapper; + + @Mock + RestTemplate restTemplate; + + @Mock + HelperService helperService; + + @Mock + KeymanagerDBHelper keymanagerDBHelper; + + @Mock + KeyStore keyStore; + + @InjectMocks + IdaVCIssuancePluginImpl idaVCIssuancePlugin=new IdaVCIssuancePluginImpl(); + + @Test + public void getVerifiableCredentialWithLinkedDataProof_withValidDetails_thenPass() throws Exception { + + ReflectionTestUtils.setField(idaVCIssuancePlugin,"vciExchangeUrl","http://example.com"); + + VCRequestDto vcRequestDto = new VCRequestDto(); + vcRequestDto.setFormat("ldp_vc"); + vcRequestDto.setContext(Arrays.asList("context1","context2")); + vcRequestDto.setType(Arrays.asList("VerifiableCredential")); + vcRequestDto.setCredentialSubject(Map.of("subject1","subject1","subject2","subject2")); + + OIDCTransaction oidcTransaction = new OIDCTransaction(); + oidcTransaction.setIndividualId("individualId"); + oidcTransaction.setKycToken("kycToken"); + oidcTransaction.setAuthTransactionId("authTransactionId"); + oidcTransaction.setRelyingPartyId("relyingPartyId"); + oidcTransaction.setClaimsLocales(new String[]{"en-US", "en", "en-CA", "fr-FR", "fr-CA"}); + + IdaResponseWrapper> mockResponseWrapper = new IdaResponseWrapper<>(); + IdaVcExchangeResponse mockResponse = new IdaVcExchangeResponse<>(); + JsonLDObject jsonLDObject = new JsonLDObject(); + jsonLDObject.setJsonObjectKeyValue("key", "value"); + mockResponse.setVerifiableCredentials(jsonLDObject); + mockResponseWrapper.setResponse(mockResponse); + mockResponseWrapper.setId("id"); + mockResponseWrapper.setVersion("version"); + mockResponseWrapper.setTransactionID("transactionID"); + + ResponseEntity>> mockResponseEntity = ResponseEntity.ok(mockResponseWrapper); + ParameterizedTypeReference>> responseType = + new ParameterizedTypeReference>>() { + }; + + Mockito.when(vciTransactionHelper.getOAuthTransaction(Mockito.any())).thenReturn(oidcTransaction); + Mockito.when(objectMapper.writeValueAsString(Mockito.any(IdaVcExchangeRequest.class))).thenReturn("jsonString"); + Mockito.when(restTemplate.exchange( + Mockito.any(RequestEntity.class), + Mockito.eq(responseType) + )).thenReturn(mockResponseEntity); + + VCResult result=idaVCIssuancePlugin.getVerifiableCredentialWithLinkedDataProof(vcRequestDto,"holderId",Map.of("accessTokenHash","ACCESS_TOKEN_HASH","client_id","CLIENT_ID")); + Assert.assertNotNull(result.getCredential()); + Assert.assertEquals(jsonLDObject,result.getCredential()); + Assert.assertEquals(result.getFormat(),"ldp_vc"); + } + + @Test + public void getVerifiableCredentialWithLinkedDataProof_withValidDetailsAndStoreIndividualId_thenPass() throws Exception { + + ReflectionTestUtils.setField(idaVCIssuancePlugin,"vciExchangeUrl","http://example.com"); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"storeIndividualId",true); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"secureIndividualId",true); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"aesECBTransformation","AES/ECB/PKCS5Padding"); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"cacheSecretKeyRefId","cacheSecretKeyRefId"); + + VCRequestDto vcRequestDto = new VCRequestDto(); + vcRequestDto.setFormat("ldp_vc"); + vcRequestDto.setContext(Arrays.asList("context1","context2")); + vcRequestDto.setType(Arrays.asList("VerifiableCredential")); + vcRequestDto.setCredentialSubject(Map.of("subject1","subject1","subject2","subject2")); + + KeyGenerator generator = KeyGenerator.getInstance("AES"); + generator.init(256); + SecretKey key = generator.generateKey(); + String individualId = encryptIndividualId("individual-id",key); + + OIDCTransaction oidcTransaction = new OIDCTransaction(); + oidcTransaction.setIndividualId(individualId); + oidcTransaction.setKycToken("kycToken"); + oidcTransaction.setAuthTransactionId("authTransactionId"); + oidcTransaction.setRelyingPartyId("relyingPartyId"); + + Map> keyaliasesMap = new HashMap<>(); + KeyAlias keyAlias = new KeyAlias(); + keyAlias.setAlias("test"); + keyaliasesMap.put(CURRENTKEYALIAS, Arrays.asList(keyAlias)); + Mockito.when(keymanagerDBHelper.getKeyAliases(Mockito.anyString(), Mockito.anyString(), Mockito.any(LocalDateTime.class))).thenReturn(keyaliasesMap); + Mockito.when(keyStore.getSymmetricKey(Mockito.anyString())).thenReturn(key, key); + + IdaResponseWrapper> mockResponseWrapper = new IdaResponseWrapper<>(); + IdaVcExchangeResponse mockResponse = new IdaVcExchangeResponse<>(); + JsonLDObject jsonLDObject = new JsonLDObject(); + jsonLDObject.setJsonObjectKeyValue("key", "value"); + mockResponse.setVerifiableCredentials(jsonLDObject); + mockResponseWrapper.setResponse(mockResponse); + mockResponseWrapper.setId("id"); + mockResponseWrapper.setVersion("version"); + mockResponseWrapper.setTransactionID("transactionID"); + + ResponseEntity>> mockResponseEntity = ResponseEntity.ok(mockResponseWrapper); + ParameterizedTypeReference>> responseType = + new ParameterizedTypeReference>>() { + }; + + Mockito.when(vciTransactionHelper.getOAuthTransaction(Mockito.any())).thenReturn(oidcTransaction); + Mockito.when(objectMapper.writeValueAsString(Mockito.any())).thenReturn("jsonString"); + Mockito.when(restTemplate.exchange( + Mockito.any(RequestEntity.class), + Mockito.eq(responseType) + )).thenReturn(mockResponseEntity); + + VCResult result=idaVCIssuancePlugin.getVerifiableCredentialWithLinkedDataProof(vcRequestDto,"holderId",Map.of("accessTokenHash","ACCESS_TOKEN_HASH","client_id","CLIENT_ID")); + Assert.assertNotNull(result.getCredential()); + Assert.assertEquals(jsonLDObject,result.getCredential()); + Assert.assertEquals(result.getFormat(),"ldp_vc"); + Mockito.verify(keymanagerDBHelper).getKeyAliases(Mockito.anyString(), Mockito.anyString(), Mockito.any(LocalDateTime.class)); + } + + @Test + public void getVerifiableCredentialWithLinkedDataProof_withInValidIndividualId_thenFail() throws Exception { + + ReflectionTestUtils.setField(idaVCIssuancePlugin,"vciExchangeUrl","http://example.com"); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"storeIndividualId",true); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"secureIndividualId",true); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"aesECBTransformation","AES/ECB/PKCS5Padding"); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"cacheSecretKeyRefId","cacheSecretKeyRefId"); + + VCRequestDto vcRequestDto = new VCRequestDto(); + vcRequestDto.setFormat("ld_vc"); + vcRequestDto.setContext(Arrays.asList("context1","context2")); + vcRequestDto.setType(Arrays.asList("VerifiableCredential")); + vcRequestDto.setCredentialSubject(Map.of("subject1","subject1","subject2","subject2")); + + OIDCTransaction oidcTransaction = new OIDCTransaction(); + oidcTransaction.setIndividualId("individualId"); + oidcTransaction.setKycToken("kycToken"); + oidcTransaction.setAuthTransactionId("authTransactionId"); + oidcTransaction.setRelyingPartyId("relyingPartyId"); + + Mockito.when(vciTransactionHelper.getOAuthTransaction(Mockito.any())).thenReturn(oidcTransaction); + try{ + VCResult result= idaVCIssuancePlugin.getVerifiableCredentialWithLinkedDataProof(vcRequestDto,"holderId",Map.of("accessTokenHash","ACCESS_TOKEN_HASH","client_id","CLIENT_ID")); + Assert.fail(); + }catch (Exception e) + { + Assert.assertEquals("vci_exchange_failed",e.getMessage()); + } + } + + @Test + public void getVerifiableCredentialWithLinkedDataProof_withInVlidResponse_thenFail() throws Exception { + + ReflectionTestUtils.setField(idaVCIssuancePlugin,"vciExchangeUrl","http://example.com"); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"storeIndividualId",true); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"secureIndividualId",true); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"aesECBTransformation","AES/ECB/PKCS5Padding"); + ReflectionTestUtils.setField(idaVCIssuancePlugin,"cacheSecretKeyRefId","cacheSecretKeyRefId"); + + VCRequestDto vcRequestDto = new VCRequestDto(); + vcRequestDto.setFormat("ldp_vc"); + vcRequestDto.setContext(Arrays.asList("context1","context2")); + vcRequestDto.setType(Arrays.asList("VerifiableCredential")); + vcRequestDto.setCredentialSubject(Map.of("subject1","subject1","subject2","subject2")); + + KeyGenerator generator = KeyGenerator.getInstance("AES"); + generator.init(256); + SecretKey key = generator.generateKey(); + String individualId = encryptIndividualId("individual-id",key); + + OIDCTransaction oidcTransaction = new OIDCTransaction(); + oidcTransaction.setIndividualId(individualId); + oidcTransaction.setKycToken("kycToken"); + oidcTransaction.setAuthTransactionId("authTransactionId"); + oidcTransaction.setRelyingPartyId("relyingPartyId"); + + Map> keyaliasesMap = new HashMap<>(); + KeyAlias keyAlias = new KeyAlias(); + keyAlias.setAlias("test"); + keyaliasesMap.put(CURRENTKEYALIAS, Arrays.asList(keyAlias)); + Mockito.when(vciTransactionHelper.getOAuthTransaction(Mockito.any())).thenReturn(oidcTransaction); + Mockito.when(objectMapper.writeValueAsString(Mockito.any())).thenReturn("jsonString"); + Mockito.when(keymanagerDBHelper.getKeyAliases(Mockito.anyString(), Mockito.anyString(), Mockito.any(LocalDateTime.class))).thenReturn(keyaliasesMap); + Mockito.when(keyStore.getSymmetricKey(Mockito.anyString())).thenReturn(key, key); + + IdaResponseWrapper> mockResponseWrapper = new IdaResponseWrapper<>(); + IdaVcExchangeResponse mockResponse = new IdaVcExchangeResponse<>(); + JsonLDObject jsonLDObject = new JsonLDObject(); + jsonLDObject.setJsonObjectKeyValue("key", "value"); + mockResponse.setVerifiableCredentials(jsonLDObject); + mockResponseWrapper.setResponse(null); + mockResponseWrapper.setId("id"); + mockResponseWrapper.setVersion("version"); + mockResponseWrapper.setTransactionID("transactionID"); + + ResponseEntity>> mockResponseEntity = ResponseEntity.ok(mockResponseWrapper); + ParameterizedTypeReference>> responseType = + new ParameterizedTypeReference>>() { + }; + Mockito.when(restTemplate.exchange( + Mockito.any(RequestEntity.class), + Mockito.eq(responseType) + )).thenReturn(mockResponseEntity); + + try{ + VCResult result= idaVCIssuancePlugin.getVerifiableCredentialWithLinkedDataProof(vcRequestDto,"holderId",Map.of("accessTokenHash","ACCESS_TOKEN_HASH","client_id","CLIENT_ID")); + Assert.fail(); + }catch (Exception e) + { + Assert.assertEquals("vci_exchange_failed",e.getMessage()); + } + } + + private String encryptIndividualId(String individualId, Key key) { + try { + Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding"); + byte[] secretDataBytes = individualId.getBytes(StandardCharsets.UTF_8); + cipher.init(Cipher.ENCRYPT_MODE,key); + return IdentityProviderUtil.b64Encode(cipher.doFinal(secretDataBytes, 0, secretDataBytes.length)); + } catch(Exception e) { + throw new EsignetException(ErrorConstants.AES_CIPHER_FAILED); + } + } + +} diff --git a/authentication/pom.xml b/authentication/pom.xml index 2e03e2c5d38..94527af6bbc 100644 --- a/authentication/pom.xml +++ b/authentication/pom.xml @@ -5,7 +5,7 @@ io.mosip.authentication authentication-parent - 1.2.1-SNAPSHOT + 1.2.1.0 pom id-authentication @@ -54,6 +54,10 @@ false + + danubetech-maven-public + https://repo.danubetech.com/repository/maven-public/ + @@ -89,9 +93,9 @@ UTF-8 - 1.2.1-SNAPSHOT + 1.2.0.1 ${kernel.parent.version} - ${kernel.parent.version} + 1.2.0.1 ${kernel.parent.version} ${kernel.parent.version} ${kernel.parent.version} @@ -101,22 +105,22 @@ ${kernel.parent.version} ${kernel.parent.version} ${kernel.parent.version} - 1.2.1-SNAPSHOT + 1.2.0.1 ${kernel.parent.version} ${kernel.parent.version} - 1.2.1-SNAPSHOT + 1.2.0.1 20180130 - ${kernel.parent.version} + 1.2.0.1 ${kernel.parent.version} ${kernel.parent.version} - ${kernel.parent.version} + 1.2.0.1 11 11 3.8.0 3.2.0 - 2.9.2 + 2.10.0 0.8.5 3.7.0.1746 2.0.0 @@ -217,6 +221,22 @@ + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + io.mosip.kernel kernel-core @@ -426,16 +446,6 @@ - - diff --git a/db_release_scripts/mosip_ida/deploy.properties b/db_release_scripts/mosip_ida/deploy.properties deleted file mode 100644 index f3bb4178a76..00000000000 --- a/db_release_scripts/mosip_ida/deploy.properties +++ /dev/null @@ -1,12 +0,0 @@ -DB_SERVERIP= -DB_PORT=30090 -SU_USER=postgres -DEFAULT_DB_NAME=postgres -MOSIP_DB_NAME=mosip_ida -SYSADMIN_USER=sysadmin -BASEPATH=/home/madmin/database_release -LOG_PATH=/home/madmin/logs/ -ALTER_SCRIPT_FLAG=1 -ALTER_SCRIPT_FILENAME=ida-scripts_release.sql -REVOKE_SCRIPT_FLAG=1 -REVOKE_SCRIPT_FILENAME=ida-scripts_revoke.sql diff --git a/db_release_scripts/mosip_ida/deploy.sh b/db_release_scripts/mosip_ida/deploy.sh deleted file mode 100644 index 611f507a7fb..00000000000 --- a/db_release_scripts/mosip_ida/deploy.sh +++ /dev/null @@ -1,92 +0,0 @@ -### -- --------------------------------------------------------------------------------------------------------- -### -- Script Name : IDA Release DB deploy -### -- Deploy Module : MOSIP IDA -### -- Purpose : To deploy IDA Database alter scripts for the release. -### -- Create By : Sadanandegowda -### -- Created Date : 25-Oct-2019 -### -- -### -- Modified Date Modified By Comments / Remarks -### -- ----------------------------------------------------------------------------------------------------------- - -### -- ----------------------------------------------------------------------------------------------------------- - -#########Properties file ############# -set -e -properties_file="$1" -release_version="$2" - echo `date "+%m/%d/%Y %H:%M:%S"` ": Properties File Name - $properties_file" - echo `date "+%m/%d/%Y %H:%M:%S"` ": DB Deploymnet Version - $release_version" -#properties_file="./app.properties" -if [ -f "$properties_file" ] -then - echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found." - while IFS='=' read -r key value - do - key=$(echo $key | tr '.' '_') - eval ${key}=\${value} - done < "$properties_file" -else - echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument." -fi -echo `date "+%m/%d/%Y %H:%M:%S"` ": ------------------ Database server and service status check for ${MOSIP_DB_NAME}------------------------" - -today=`date '+%d%m%Y_%H%M%S'`; -LOG="${LOG_PATH}${MOSIP_DB_NAME}-release-${release_version}-${today}.log" -touch $LOG - -SERVICE=$(PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "select count(1) from pg_roles where rolname IN('sysadmin')";exit; > /dev/null) - -if [ "$SERVICE" -eq 0 ] || [ "$SERVICE" -eq 1 ] -then -echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server and service is up and running" | tee -a $LOG 2>&1 -else -echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server or service is not running" | tee -a $LOG 2>&1 -fi - -echo `date "+%m/%d/%Y %H:%M:%S"` ": ----------------------------------------------------------------------------------------" - -echo `date "+%m/%d/%Y %H:%M:%S"` ": Started sourcing the $MOSIP_DB_NAME Database Alter scripts" | tee -a $LOG 2>&1 - -echo `date "+%m/%d/%Y %H:%M:%S"` ": Database Alter scripts are sourcing from :$BASEPATH/$MOSIP_DB_NAME/" | tee -a $LOG 2>&1 - -#========================================DB Alter Scripts deployment process begins on IDMAP DB SERVER================================== - -echo `date "+%m/%d/%Y %H:%M:%S"` ": Alter scripts deployment on $MOSIP_DB_NAME database is started....Deployment Version...$release_version" | tee -a $LOG 2>&1 - -ALTER_SCRIPT_FILENAME_VERSION="sql/${release_version}_${ALTER_SCRIPT_FILENAME}" - -echo `date "+%m/%d/%Y %H:%M:%S"` ": Alter scripts file which is considered for release deployment - $ALTER_SCRIPT_FILENAME_VERSION" | tee -a $LOG 2>&1 - -cd /$BASEPATH/$MOSIP_DB_NAME/ - -pwd | tee -a $LOG 2>&1 - -CONN=$(PGPASSWORD=$SYSADMIN_PWD psql --username=$SYSADMIN_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit; >> $LOG 2>&1) - -if [ ${CONN} == 0 ] -then - echo `date "+%m/%d/%Y %H:%M:%S"` ": No active database connections exist on ${MOSIP_DB_NAME}" | tee -a $LOG 2>&1 -else - echo `date "+%m/%d/%Y %H:%M:%S"` ": Active connections exist on the database server and active connection will be terminated for DB deployment." | tee -a $LOG 2>&1 -fi - -if [ ${ALTER_SCRIPT_FLAG} == 1 ] -then - echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying Alter scripts for ${MOSIP_DB_NAME} database" | tee -a $LOG 2>&1 - PGPASSWORD=$SYSADMIN_PWD psql --username=$SYSADMIN_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $ALTER_SCRIPT_FILENAME_VERSION >> $LOG 2>&1 -else - echo `date "+%m/%d/%Y %H:%M:%S"` ": There are no alter scripts available for this deployment at ${MOSIP_DB_NAME}" | tee -a $LOG 2>&1 -fi - -if [ $(grep -c ERROR $LOG) -ne 0 ] -then - echo `date "+%m/%d/%Y %H:%M:%S"` ": Database Alter scripts deployment version $release_version is completed with ERRORS, Please check the logs for more information" | tee -a $LOG 2>&1 - echo `date "+%m/%d/%Y %H:%M:%S"` ": END of Alter scripts MOSIP database deployment" | tee -a $LOG 2>&1 -else - echo `date "+%m/%d/%Y %H:%M:%S"` ": Database Alter scripts deployment version $release_version completed successfully, Please check the logs for more information" | tee -a $LOG 2>&1 - echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP \"${MOSIP_DB_NAME}\" database alter scripts deployment" | tee -a $LOG 2>&1 -fi - -echo "******************************************"`date "+%m/%d/%Y %H:%M:%S"` "*****************************************************" >> $LOG 2>&1 - - diff --git a/db_release_scripts/mosip_ida/revoke.sh b/db_release_scripts/mosip_ida/revoke.sh deleted file mode 100644 index 1402058d641..00000000000 --- a/db_release_scripts/mosip_ida/revoke.sh +++ /dev/null @@ -1,92 +0,0 @@ -### -- --------------------------------------------------------------------------------------------------------- -### -- Script Name : IDA Revoke DB deploy -### -- Deploy Module : MOSIP IDA -### -- Purpose : To revoke IDA Database alter scripts for the release. -### -- Create By : Sadanandegowda -### -- Created Date : 25-Oct-2019 -### -- -### -- Modified Date Modified By Comments / Remarks -### -- ----------------------------------------------------------------------------------------------------------- - -### -- ----------------------------------------------------------------------------------------------------------- - -#########Properties file ############# -set -e -properties_file="$1" -revoke_version="$2" - echo `date "+%m/%d/%Y %H:%M:%S"` ": $properties_file" - echo `date "+%m/%d/%Y %H:%M:%S"` ": DB Revoke Version - $revoke_version" -#properties_file="./app.properties" -if [ -f "$properties_file" ] -then - echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found." - while IFS='=' read -r key value - do - key=$(echo $key | tr '.' '_') - eval ${key}=\${value} - done < "$properties_file" -else - echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument." -fi -echo `date "+%m/%d/%Y %H:%M:%S"` ": ------------------ Database server and service status check for ${MOSIP_DB_NAME}------------------------" - -today=`date '+%d%m%Y_%H%M%S'`; -LOG="${LOG_PATH}${MOSIP_DB_NAME}-revoke-${today}.log" -touch $LOG - -SERVICE=$(PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "select count(1) from pg_roles where rolname IN('sysadmin')";exit; > /dev/null) - -if [ "$SERVICE" -eq 0 ] || [ "$SERVICE" -eq 1 ] -then -echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server and service is up and running" | tee -a $LOG 2>&1 -else -echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server or service is not running" | tee -a $LOG 2>&1 -fi - -echo `date "+%m/%d/%Y %H:%M:%S"` ": ----------------------------------------------------------------------------------------" - -echo `date "+%m/%d/%Y %H:%M:%S"` ": Started sourcing the $MOSIP_DB_NAME Database Deployment Revoke scripts" | tee -a $LOG 2>&1 - -echo `date "+%m/%d/%Y %H:%M:%S"` ": Database revoke scripts are sourcing from :$BASEPATH/$MOSIP_DB_NAME/alter-scripts" | tee -a $LOG 2>&1 - -#========================================DB Alter Scripts deployment process begins on IDMAP DB SERVER================================== - -echo `date "+%m/%d/%Y %H:%M:%S"` ": Revoke scripts for DB deployment on $MOSIP_DB_NAME database is started....Revoke Version...$revoke_version" | tee -a $LOG 2>&1 - -REVOKE_SCRIPT_FILENAME_VERSION="sql/${revoke_version}_${REVOKE_SCRIPT_FILENAME}" - -echo `date "+%m/%d/%Y %H:%M:%S"` ": Alter scripts file which is considered for deployment revoke - $REVOKE_SCRIPT_FILENAME_VERSION" | tee -a $LOG 2>&1 - -cd /$BASEPATH/$MOSIP_DB_NAME/ - -pwd | tee -a $LOG 2>&1 - -CONN=$(PGPASSWORD=$SYSADMIN_PWD psql --username=$SYSADMIN_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit; >> $LOG 2>&1) - -if [ ${CONN} == 0 ] -then - echo `date "+%m/%d/%Y %H:%M:%S"` ": No active database connections exist on ${MOSIP_DB_NAME}" | tee -a $LOG 2>&1 -else - echo `date "+%m/%d/%Y %H:%M:%S"` ": Active connections exist on the database server and active connection will be terminated for DB deployment." | tee -a $LOG 2>&1 -fi - -if [ ${REVOKE_SCRIPT_FLAG} == 1 ] -then - echo `date "+%m/%d/%Y %H:%M:%S"` ": Executing revoke scripts for ${MOSIP_DB_NAME} database" | tee -a $LOG 2>&1 - PGPASSWORD=$SYSADMIN_PWD psql --username=$SYSADMIN_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $REVOKE_SCRIPT_FILENAME_VERSION >> $LOG 2>&1 -else - echo `date "+%m/%d/%Y %H:%M:%S"` ": There are no revoke scripts available for this deployment at ${MOSIP_DB_NAME}" | tee -a $LOG 2>&1 -fi - -if [ $(grep -c ERROR $LOG) -ne 0 ] -then - echo `date "+%m/%d/%Y %H:%M:%S"` ": Database deployment revoke version $revoke_version is completed with ERRORS, Please check the logs for more information" | tee -a $LOG 2>&1 - echo `date "+%m/%d/%Y %H:%M:%S"` ": END of Alter scripts MOSIP database deployment" | tee -a $LOG 2>&1 -else - echo `date "+%m/%d/%Y %H:%M:%S"` ": Database deployment revoke version $revoke_version completed successfully, Please check the logs for more information" | tee -a $LOG 2>&1 - echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP \"${MOSIP_DB_NAME}\" database deployment revoke" | tee -a $LOG 2>&1 -fi - -echo "******************************************"`date "+%m/%d/%Y %H:%M:%S"` "*****************************************************" >> $LOG 2>&1 - - diff --git a/db_release_scripts/mosip_ida/sql/1.1.0_release.sql b/db_release_scripts/mosip_ida/sql/1.1.0_release.sql deleted file mode 100644 index 67be4d6aa13..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.1.0_release.sql +++ /dev/null @@ -1,38 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name: mosip_ida --- Release Version : 1.1 --- Purpose : Database Alter scripts for the release for ID Authentication DB. --- Create By : Sadanandegowda DM --- Created Date : May-2020 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- - -\c mosip_ida sysadmin - ----------------- KEY MANAGER DDL DEPLOYMENT ------------------ - -\ir ../ddl/ida-key_alias.sql -\ir ../ddl/ida-key_store.sql -\ir ../ddl/ida-key_policy_def.sql -\ir ../ddl/ida-key_policy_def_h.sql - -\ir ../ddl/ida-identity_cache.sql -\ir ../ddl/ida-data_encrypt_keystore.sql - - --------------- Level 1 data load scripts ------------------------ - ------ TRUNCATE ida.key_policy_def TABLE Data and It's reference Data and COPY Data from CSV file ----- -TRUNCATE TABLE ida.key_policy_def cascade ; - -\COPY ida.key_policy_def (app_id,key_validity_duration,is_active,cr_by,cr_dtimes) FROM './dml/ida-key_policy_def.csv' delimiter ',' HEADER csv; - - ------ TRUNCATE ida.key_policy_def_h TABLE Data and It's reference Data and COPY Data from CSV file ----- -TRUNCATE TABLE ida.key_policy_def_h cascade ; - -\COPY ida.key_policy_def_h (app_id,key_validity_duration,is_active,cr_by,cr_dtimes,eff_dtimes) FROM './dml/ida-key_policy_def_h.csv' delimiter ',' HEADER csv; - - ----------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/db_release_scripts/mosip_ida/sql/1.1.0_revoke.sql b/db_release_scripts/mosip_ida/sql/1.1.0_revoke.sql deleted file mode 100644 index 6f16edd83d3..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.1.0_revoke.sql +++ /dev/null @@ -1,21 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name: mosip_ida --- Release Version : 1.1 --- Purpose : Revoking Database Alter deployement done for release in ID Authentication DB. --- Create By : Sadanandegowda DM --- Created Date : May-2020 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- - -\c mosip_ida sysadmin - -DROP TABLE IF EXISTS ida.key_alias; -DROP TABLE IF EXISTS ida.key_store; -DROP TABLE IF EXISTS ida.key_policy_def; -DROP TABLE IF EXISTS ida.key_policy_def_h; - -DROP TABLE IF EXISTS ida.identity_cache; -DROP TABLE IF EXISTS ida.data_encrypt_keystore; - --- ------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/db_release_scripts/mosip_ida/sql/1.1.3_release.sql b/db_release_scripts/mosip_ida/sql/1.1.3_release.sql deleted file mode 100644 index fce33f9864c..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.1.3_release.sql +++ /dev/null @@ -1,18 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name : mosip_ida --- Release Version : 1.1.3 --- Purpose : Database Alter scripts for the release for ID Authentication DB. --- Create By : Sadanandegowda DM --- Created Date : Nov-2020 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- - -\c mosip_ida sysadmin - ------------------------------- ID Auth Alter Scripts Deploymnet ------------------------------------ - -ALTER TABLE ida.auth_transaction ADD COLUMN IF NOT EXISTS request_signature character varying; -ALTER TABLE ida.auth_transaction ADD COLUMN IF NOT EXISTS response_signature character varying; - ------------------------------------------------------------------------------------------------------ \ No newline at end of file diff --git a/db_release_scripts/mosip_ida/sql/1.1.3_revoke.sql b/db_release_scripts/mosip_ida/sql/1.1.3_revoke.sql deleted file mode 100644 index 407ef35d842..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.1.3_revoke.sql +++ /dev/null @@ -1,13 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name: mosip_ida --- Release Version : 1.1.3 --- Purpose : Revoking Database Alter deployement done for release in ID Authentication DB. --- Create By : Sadanandegowda DM --- Created Date : Nov-2020 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- - -\c mosip_ida sysadmin - --- ------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/db_release_scripts/mosip_ida/sql/1.1.4_release.sql b/db_release_scripts/mosip_ida/sql/1.1.4_release.sql deleted file mode 100644 index 0c76eef90a1..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.1.4_release.sql +++ /dev/null @@ -1,17 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name : mosip_ida --- Release Version : 1.1.4 --- Purpose : Database Alter scripts for the release for ID Authentication DB. --- Create By : Sadanandegowda DM --- Created Date : Dec-2020 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- - -\c mosip_ida sysadmin - ----------------- KEY MANAGER DDL DEPLOYMENT ------------------ - -\ir ../ddl/ida-ca_cert_store.sql - ----------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/db_release_scripts/mosip_ida/sql/1.1.4_revoke.sql b/db_release_scripts/mosip_ida/sql/1.1.4_revoke.sql deleted file mode 100644 index 77d891410a5..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.1.4_revoke.sql +++ /dev/null @@ -1,14 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name: mosip_ida --- Release Version : 1.1.4 --- Purpose : Revoking Database Alter deployement done for release in ID Authentication DB. --- Create By : Sadanandegowda DM --- Created Date : Sep-2020 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- - -\c mosip_ida sysadmin - -DROP TABLE IF EXISTS ida.ca_cert_store; --- ------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/db_release_scripts/mosip_ida/sql/1.1.5_release.sql b/db_release_scripts/mosip_ida/sql/1.1.5_release.sql deleted file mode 100644 index f8c4d2832b4..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.1.5_release.sql +++ /dev/null @@ -1,69 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name : mosip_ida --- Release Version : 1.1.5 --- Purpose : Database Alter scripts for the release for ID Authentication DB. --- Create By : Sadanandegowda DM --- Created Date : Jan-2021 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- --- Jan-2021 Ram Bhatt Set is_deleted flag to not null and default false --- Feb-2021 Ram Bhatt Added hotlist table in ida --- Feb-2021 Ram Bhatt Changed size of auth_type_code from 32 to 128 --- Mar-2021 Ram Bhatt Reverting is_deleted not null changes ----------------------------------------------------------------------------------------------------- -\c mosip_ida sysadmin - ----------------- KEY MANAGER DDL DEPLOYMENT ------------------ - -\ir ../ddl/ida-credential_event_store.sql - - -\ir ../ddl/ida-batch_job_execution.sql -\ir ../ddl/ida-batch_job_execution_context.sql -\ir ../ddl/ida-batch_job_execution_params.sql -\ir ../ddl/ida-batch_job_instance.sql -\ir ../ddl/ida-batch_step_execution.sql -\ir ../ddl/ida-batch_step_execution_context.sql - -\ir ../ddl/ida-fk.sql - ----------------------------------------------------------------------------------------------------- - ---------- --------------ALTER TABLE SCRIPT DEPLOYMENT ------------------------------------------------ - ---ALTER TABLE ida.auth_transaction ALTER COLUMN is_deleted SET NOT NULL; ---ALTER TABLE ida.identity_cache ALTER COLUMN is_deleted SET NOT NULL; ---ALTER TABLE ida.key_policy_def_h ALTER COLUMN is_deleted SET NOT NULL; ---ALTER TABLE ida.key_policy_def ALTER COLUMN is_deleted SET NOT NULL; ---ALTER TABLE ida.key_store ALTER COLUMN is_deleted SET NOT NULL; ---ALTER TABLE ida.key_alias ALTER COLUMN is_deleted SET NOT NULL; ---ALTER TABLE ida.uin_auth_lock ALTER COLUMN is_deleted SET NOT NULL; ---ALTER TABLE ida.otp_transaction ALTER COLUMN is_deleted SET NOT NULL; ---ALTER TABLE ida.credential_event_store ALTER COLUMN is_deleted SET NOT NULL; ---ALTER TABLE ida.ca_cert_store ALTER COLUMN is_deleted SET NOT NULL; - ---ALTER TABLE ida.auth_transaction ALTER COLUMN is_deleted SET DEFAULT FALSE; ---ALTER TABLE ida.identity_cache ALTER COLUMN is_deleted SET DEFAULT FALSE; ---ALTER TABLE ida.key_policy_def_h ALTER COLUMN is_deleted SET DEFAULT FALSE; ---ALTER TABLE ida.key_policy_def ALTER COLUMN is_deleted SET DEFAULT FALSE; ---ALTER TABLE ida.key_store ALTER COLUMN is_deleted SET DEFAULT FALSE; ---ALTER TABLE ida.key_alias ALTER COLUMN is_deleted SET DEFAULT FALSE; ---ALTER TABLE ida.uin_auth_lock ALTER COLUMN is_deleted SET DEFAULT FALSE; ---ALTER TABLE ida.otp_transaction ALTER COLUMN is_deleted SET DEFAULT FALSE; ---ALTER TABLE ida.credential_event_store ALTER COLUMN is_deleted SET DEFAULT FALSE; ---ALTER TABLE ida.ca_cert_store ALTER COLUMN is_deleted SET DEFAULT FALSE; -------------------------------------------------------------------------------------------------------- ---------------------------------------HOTLISTING TABLE DEPLOYMENT----------------------------------------- - -\ir ../ddl/ida-hotlist_cache.sql - ----------------------------------------------------------------------------------------------------------- ---------------------------------------AUTH TYPE CODE SIZE CHANGE----------------------------------------- - - -ALTER TABLE ida.auth_transaction ALTER COLUMN auth_type_code TYPE character varying(128); - ----------------------------------------------------------------------------------------------------------- - - diff --git a/db_release_scripts/mosip_ida/sql/1.1.5_revoke.sql b/db_release_scripts/mosip_ida/sql/1.1.5_revoke.sql deleted file mode 100644 index 0c8f7947ea9..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.1.5_revoke.sql +++ /dev/null @@ -1,15 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name: mosip_ida --- Release Version : 1.1.5 --- Purpose : Revoking Database Alter deployement done for release in ID Authentication DB. --- Create By : Sadanandegowda DM --- Created Date : Sep-2020 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- - -\c mosip_ida sysadmin - -DROP TABLE IF EXISTS ida.credential_event_store; - --- ------------------------------------------------------------------------------------------------- diff --git a/db_release_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1_revoke.sql b/db_release_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1_revoke.sql deleted file mode 100644 index c2fe3b98215..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1_revoke.sql +++ /dev/null @@ -1,22 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name: mosip_ida --- Release Version : 1.1.5 --- Purpose : Revoking Database Alter deployement done for release in ID Authentication DB. --- Create By : Ram Bhatt --- Created Date : Apr-2021 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- --- Apr-2021 Ram Bhatt create tables to store partner details --- Sep-2021 Loganathan Sekar create anonymous_profile table -------------------------------------------------------------------------------------------------- - -\c mosip_ida sysadmin - -ALTER TABLE ida.misp_license_data DROP COLUMN policy_id; - -ALTER TABLE ida.partner_mapping ALTER COLUMN api_key_id TYPE varchar(36); - -DROP TABLE IF EXISTS ida.oidc_client_data CASCADE; - -DROP TABLE IF EXISTS ida.kyc_token_store CASCADE; \ No newline at end of file diff --git a/db_release_scripts/mosip_ida/sql/1.2.0.1-B3_to_1.2.0.1-B2_revoke.sql b/db_release_scripts/mosip_ida/sql/1.2.0.1-B3_to_1.2.0.1-B2_revoke.sql deleted file mode 100644 index 1bff942e6bf..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.2.0.1-B3_to_1.2.0.1-B2_revoke.sql +++ /dev/null @@ -1,20 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name : mosip_ida --- Release Version : 1.2 --- Purpose : Database Alter scripts for the release for ID Authentication DB. --- Create By : Ram Bhatt --- Created Date : Apr-2021 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------- -\c mosip_ida sysadmin - -ALTER TABLE ida.kyc_token_store DROP COLUMN request_trn_id; - -DROP TABLE IF EXISTS ida.ident_binding_cert_store CASCADE; - -DELETE FROM ida.key_policy_def WHERE app_id='IDA_KYC_EXCHANGE'; - -DELETE FROM ida.key_policy_def WHERE app_id='IDA_KEY_BINDING' - diff --git a/db_release_scripts/mosip_ida/sql/1.2.0_release.sql b/db_release_scripts/mosip_ida/sql/1.2.0_release.sql deleted file mode 100644 index 66684f4aeaa..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.2.0_release.sql +++ /dev/null @@ -1,69 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name : mosip_ida --- Release Version : 1.1.2 --- Purpose : Database Alter scripts for the release for ID Authentication DB. --- Create By : Sadanandegowda DM --- Created Date : Sep-2020 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- - -DROP TABLE IF EXISTS ida.api_key_data CASCADE; -DROP TABLE IF EXISTS ida.partner_data CASCADE; -DROP TABLE IF EXISTS ida.partner_mapping CASCADE; -DROP TABLE IF EXISTS ida.policy_data CASCADE; -DROP TABLE IF EXISTS ida.misp_license_data CASCADE; -ALTER TABLE ida.uin_auth_lock ADD COLUMN unlock_expiry_datetime timestamp; -------------------------------------------------------------------------------------------------------- - -\ir ../ddl/ida-api_key_data.sql -\ir ../ddl/ida-partner_data.sql -\ir ../ddl/ida-partner_mapping.sql -\ir ../ddl/ida-policy_data.sql - - -\ir ../ddl/ida-misp_license_data.sql ----------------------------------------------------------------------------------------------------------- - -\ir ../ddl/ida-anonymous_profile.sql - -ALTER TABLE ida.identity_cache ADD COLUMN identity_expiry timestamp; --------------------------------------------------------------------------------------------------------------- - -CREATE INDEX ind_akd_apkeyid ON ida.api_key_data (api_key_id); -CREATE INDEX ind_pm_pid ON ida.partner_mapping (partner_id); -CREATE INDEX ind_pd_pid ON ida.partner_data (partner_id); -CREATE INDEX ind_mld_lk ON ida.misp_license_data (license_key); -CREATE INDEX ind_pd_pyid ON ida.policy_data (policy_id); -CREATE INDEX ind_reqtrnid_dtimes_tknid ON ida.auth_transaction (request_trn_id, request_dtimes, token_id, cr_dtimes, auth_type_code); -CREATE INDEX ind_ces_id ON ida.credential_event_store (cr_dtimes); -CREATE INDEX ind_hc_idhsh_etp ON ida.hotlist_cache (id_hash, expiry_timestamp); -CREATE INDEX ind_id ON ida.identity_cache (id); -CREATE INDEX ind_otphsh ON ida.otp_transaction (otp_hash,status_code); -CREATE INDEX ind_ual_id ON ida.uin_auth_lock (token_id); -CREATE INDEX ind_uhs_id ON ida.uin_hash_salt (id); - - ------------------------------------------------------------------------------------------------------------ -ALTER TABLE ida.key_alias ADD COLUMN cert_thumbprint character varying(100); -ALTER TABLE ida.ca_cert_store ADD CONSTRAINT cert_thumbprint_unique UNIQUE (cert_thumbprint,partner_domain); - - - --------------------------------------------------------------------------------------------------------------- -ALTER TABLE ida.key_alias ADD COLUMN uni_ident character varying(50); -ALTER TABLE ida.key_alias ADD CONSTRAINT uni_ident_const UNIQUE (uni_ident); - -ALTER TABLE ida.key_policy_def ADD COLUMN pre_expire_days smallint; -ALTER TABLE ida.key_policy_def ADD COLUMN access_allowed character varying(1024); - -ALTER TABLE ida.key_policy_def_h ADD COLUMN pre_expire_days smallint; -ALTER TABLE ida.key_policy_def_h ADD COLUMN access_allowed character varying(1024); ---------------------------------------------------------------------------------------------------------------- - -ALTER TABLE ida.uin_auth_lock ALTER COLUMN is_deleted SET DEFAULT FALSE; - - -update ida.key_policy_def set pre_expire_days=90, access_allowed='NA' where app_id='ROOT'; -update ida.key_policy_def set pre_expire_days=30, access_allowed='NA' where app_id='BASE'; -update ida.key_policy_def set pre_expire_days=60, access_allowed='NA' where app_id='IDA'; diff --git a/db_release_scripts/mosip_ida/sql/1.2.0_revoke.sql b/db_release_scripts/mosip_ida/sql/1.2.0_revoke.sql deleted file mode 100644 index e1771d4d242..00000000000 --- a/db_release_scripts/mosip_ida/sql/1.2.0_revoke.sql +++ /dev/null @@ -1,30 +0,0 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name: mosip_ida --- Release Version : 1.1.5 --- Purpose : Revoking Database Alter deployement done for release in ID Authentication DB. --- Create By : Ram Bhatt --- Created Date : Apr-2021 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- --- Apr-2021 Ram Bhatt create tables to store partner details --- Sep-2021 Loganathan Sekar create anonymous_profile table -------------------------------------------------------------------------------------------------- - -\c mosip_ida sysadmin - -ALTER TABLE ida.uin_auth_lock DROP COLUMN unlock_expiry_datetime; - --- ------------------------------------------------------------------------------------------------- - - -DROP TABLE IF EXISTS ida.partner_data; -DROP TABLE IF EXISTS ida.policy_data; -DROP TABLE IF EXISTS ida.api_key_data; -DROP TABLE IF EXISTS ida.partner_mapping; - -DROP TABLE IF EXISTS ida.misp_license_data; - ------------------------------------------------------------------------------------------------ - -DROP TABLE IF EXISTS ida.anonymous_profile; diff --git a/db_scripts/mosip_ida/ddl.sql b/db_scripts/mosip_ida/ddl.sql index 64e5c0a73e0..3890ea0955d 100644 --- a/db_scripts/mosip_ida/ddl.sql +++ b/db_scripts/mosip_ida/ddl.sql @@ -28,4 +28,5 @@ \ir ddl/ida-anonymous_profile.sql \ir ddl/ida-ident_binding_cert_store.sql \ir ddl/ida-kyc_token_store.sql -\ir ddl/ida-oidc_client_data.sql \ No newline at end of file +\ir ddl/ida-oidc_client_data.sql +\ir ddl/ida-cred_subject_id_store.sql \ No newline at end of file diff --git a/db_scripts/mosip_ida/ddl/ida-cred_subject_id_store.sql b/db_scripts/mosip_ida/ddl/ida-cred_subject_id_store.sql new file mode 100644 index 00000000000..355d7276782 --- /dev/null +++ b/db_scripts/mosip_ida/ddl/ida-cred_subject_id_store.sql @@ -0,0 +1,32 @@ +CREATE TABLE ida.cred_subject_id_store( + id character varying(36) NOT NULL, + id_vid_hash character varying(128) NOT NULL, + token_id character varying(128) NOT NULL, + cred_subject_id character varying(2000) NOT NULL, + csid_key_hash character varying(128) NOT NULL, + oidc_client_id character varying(128), + csid_status character varying(36), + cr_by character varying(256) NOT NULL, + cr_dtimes timestamp NOT NULL, + upd_by character varying(256), + upd_dtimes timestamp, + is_deleted boolean DEFAULT FALSE, + del_dtimes timestamp, + CONSTRAINT key_hash_unique UNIQUE (id_vid_hash, csid_key_hash) +); +COMMENT ON TABLE ida.cred_subject_id_store IS 'Credential Subject Id Store: To store and maintain the input credential subject ids to identify the individual.'; +COMMENT ON COLUMN ida.cred_subject_id_store.id IS 'ID: Id is a unique identifier (UUID) used to map uniqueness to the credential subject id.'; +COMMENT ON COLUMN ida.cred_subject_id_store.id_vid_hash IS 'IdVidHash: SHA 256 Hash value of the Id/VID.'; +COMMENT ON COLUMN ida.cred_subject_id_store.token_id IS 'Token ID: Token ID generated in reference to UIN/VID'; +COMMENT ON COLUMN ida.cred_subject_id_store.cred_subject_id IS 'Credential Subject ID : DID format holder id.'; +COMMENT ON COLUMN ida.cred_subject_id_store.csid_key_hash IS 'Credential Subject ID Public Key Hash: Derived hash value of the public key.'; +COMMENT ON COLUMN ida.cred_subject_id_store.oidc_client_id IS 'OIDC Client ID: An Id assigned to specific OIDC Client.'; +COMMENT ON COLUMN ida.cred_subject_id_store.csid_status IS 'Credential Subject Id Status: To identify the current status of the credential subject id.'; +COMMENT ON COLUMN ida.cred_subject_id_store.cr_by IS 'Created By : ID or name of the user who create / insert record'; +COMMENT ON COLUMN ida.cred_subject_id_store.cr_dtimes IS 'Created DateTimestamp : Date and Timestamp when the record is created/inserted'; +COMMENT ON COLUMN ida.cred_subject_id_store.upd_by IS 'Updated By : ID or name of the user who update the record with new values'; +COMMENT ON COLUMN ida.cred_subject_id_store.upd_dtimes IS 'Updated DateTimestamp : Date and Timestamp when any of the fields in the record is updated with new values.'; +COMMENT ON COLUMN ida.cred_subject_id_store.is_deleted IS 'IS_Deleted : Flag to mark whether the record is Soft deleted.'; +COMMENT ON COLUMN ida.cred_subject_id_store.del_dtimes IS 'Deleted DateTimestamp : Date and Timestamp when the record is soft deleted with is_deleted=TRUE'; + +CREATE INDEX ind_csid_key_hash ON ida.cred_subject_id_store (csid_key_hash); \ No newline at end of file diff --git a/db_scripts/mosip_ida/ddl/ida-credential_event_store.sql b/db_scripts/mosip_ida/ddl/ida-credential_event_store.sql index c589b421f24..f2cc8474bec 100644 --- a/db_scripts/mosip_ida/ddl/ida-credential_event_store.sql +++ b/db_scripts/mosip_ida/ddl/ida-credential_event_store.sql @@ -18,7 +18,7 @@ CREATE TABLE ida.credential_event_store( event_id character varying(36) NOT NULL, event_topic character varying(256) NOT NULL, - credential_transaction_id character varying(36) NOT NULL, + credential_transaction_id character varying(64) NOT NULL, publisher character varying(128), published_on_dtimes timestamp, event_object character varying, diff --git a/db_scripts/mosip_ida/ddl/ida-otp_transaction.sql b/db_scripts/mosip_ida/ddl/ida-otp_transaction.sql index 8dc9662eb95..b8bd882b92f 100644 --- a/db_scripts/mosip_ida/ddl/ida-otp_transaction.sql +++ b/db_scripts/mosip_ida/ddl/ida-otp_transaction.sql @@ -32,7 +32,7 @@ CREATE TABLE ida.otp_transaction( ); -- ddl-end -- --index section starts---- -CREATE INDEX ind_otphsh ON ida.otp_transaction (otp_hash,status_code); +CREATE INDEX ind_refid ON ida.otp_transaction (ref_id,status_code); --index section ends------ COMMENT ON TABLE ida.otp_transaction IS 'OTP Transaction: All OTP related data and validation details are maintained here for ID Authentication module.'; -- ddl-end -- diff --git a/db_scripts/mosip_ida/deploy.sh b/db_scripts/mosip_ida/deploy.sh index 36df1a987ce..b781c6f4d3e 100644 --- a/db_scripts/mosip_ida/deploy.sh +++ b/db_scripts/mosip_ida/deploy.sh @@ -17,31 +17,32 @@ fi ## Terminate existing connections echo "Terminating active connections" -CONN=$(PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit;) +CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit;) echo "Terminated connections" ## Drop db and role echo "Dropping DB" -PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql + echo "Dropping user" -PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql ## Create users echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users" -PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\' +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\' ## Create DB echo "Creating DB" -PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql -PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql ## Grants -PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql ## Populate tables if [ ${DML_FLAG} == 1 ] then echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database" - PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f dml.sql + PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f dml.sql fi diff --git a/db_scripts/mosip_ida/dml/ida-key_policy_def.csv b/db_scripts/mosip_ida/dml/ida-key_policy_def.csv index 7e807a194be..f370690ba33 100644 --- a/db_scripts/mosip_ida/dml/ida-key_policy_def.csv +++ b/db_scripts/mosip_ida/dml/ida-key_policy_def.csv @@ -3,4 +3,5 @@ IDA,1095,TRUE,mosipadmin,now(),60,NA ROOT,1826,TRUE,mosipadmin,now(),90,NA BASE,730,TRUE,mosipadmin,now(),30,NA IDA_KEY_BINDING,1095,TRUE,mosipadmin,now(),60,NA -IDA_KYC_EXCHANGE,1095,TRUE,mosipadmin,now(),60,NA \ No newline at end of file +IDA_KYC_EXCHANGE,1095,TRUE,mosipadmin,now(),60,NA +IDA_VCI_EXCHANGE,1095,TRUE,mosipadmin,now(),60,NA \ No newline at end of file diff --git a/db_release_scripts/README.MD b/db_upgrade_scripts/README.MD similarity index 100% rename from db_release_scripts/README.MD rename to db_upgrade_scripts/README.MD diff --git a/db_upgrade_scripts/mosip_ida/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql b/db_upgrade_scripts/mosip_ida/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql new file mode 100644 index 00000000000..3ed43408f22 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql @@ -0,0 +1,40 @@ +\c mosip_ida + +REASSIGN OWNED BY postgres TO sysadmin; + +GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA ida TO sysadmin; + +ALTER TABLE ida.uin_auth_lock DROP COLUMN unlock_expiry_datetime; + +-- ------------------------------------------------------------------------------------------------- + + +DROP TABLE IF EXISTS ida.partner_data; +DROP TABLE IF EXISTS ida.policy_data; +DROP TABLE IF EXISTS ida.api_key_data; +DROP TABLE IF EXISTS ida.partner_mapping; + +DROP TABLE IF EXISTS ida.misp_license_data; + +----------------------------------------------------------------------------------------------- + +DROP TABLE IF EXISTS ida.anonymous_profile; + + +------------------------------------------------------------------------------- + +ALTER TABLE ida.identity_cache DROP COLUMN identity_expiry; +ALTER TABLE ida.ca_cert_store DROP CONSTRAINT cert_thumbprint_unique; + +ALTER TABLE ida.key_alias DROP COLUMN uni_ident; +ALTER TABLE ida.key_alias DROP CONSTRAINT uni_ident_const; + +ALTER TABLE ida.key_policy_def DROP COLUMN pre_expire_days; +ALTER TABLE ida.key_policy_def DROP COLUMN access_allowed; + +ALTER TABLE ida.key_policy_def DROP COLUMN pre_expire_days; +ALTER TABLE ida.key_policy_def DROP COLUMN access_allowed; + + +---------------------------------------------------------- + diff --git a/db_upgrade_scripts/mosip_ida/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql b/db_upgrade_scripts/mosip_ida/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql new file mode 100644 index 00000000000..61344dd4876 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql @@ -0,0 +1,200 @@ +\c mosip_ida + +REASSIGN OWNED BY sysadmin TO postgres; + +REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA ida FROM idauser; + +REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA ida FROM sysadmin; + +GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON ALL TABLES IN SCHEMA ida TO idauser; + +GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA ida TO postgres; + +DROP TABLE IF EXISTS ida.api_key_data CASCADE; +DROP TABLE IF EXISTS ida.partner_data CASCADE; +DROP TABLE IF EXISTS ida.partner_mapping CASCADE; +DROP TABLE IF EXISTS ida.policy_data CASCADE; +DROP TABLE IF EXISTS ida.misp_license_data CASCADE; +ALTER TABLE ida.uin_auth_lock ADD COLUMN unlock_expiry_datetime timestamp; +------------------------------------------------------------------------------------------------------- + +-- object: ida.api_key_data | type: TABLE -- +CREATE TABLE ida.api_key_data ( + api_key_id character varying(36) NOT NULL, + api_key_commence_on timestamp NOT NULL, + api_key_expires_on timestamp, + api_key_status character varying(36) NOT NULL, + cr_by character varying(256) NOT NULL, + cr_dtimes timestamp NOT NULL, + upd_by character varying(256), + upd_dtimes timestamp, + is_deleted bool DEFAULT false, + del_dtimes timestamp, + CONSTRAINT api_key_data_pk PRIMARY KEY (api_key_id) + +); + +GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE + ON ida.api_key_data + TO idauser; + +--index section starts---- +CREATE INDEX ind_akd_apkeyid ON ida.api_key_data (api_key_id); +--index section ends------ + + + +-- object: ida.partner_data | type: TABLE -- +CREATE TABLE ida.partner_data ( + partner_id character varying(36) NOT NULL, + partner_name character varying(128) NOT NULL, + certificate_data bytea , + partner_status character varying(36) NOT NULL, + cr_by character varying(256) NOT NULL, + cr_dtimes timestamp NOT NULL, + upd_by character varying(256), + upd_dtimes timestamp, + is_deleted boolean DEFAULT false, + del_dtimes timestamp, + CONSTRAINT partner_data_pk PRIMARY KEY (partner_id) + +); + +GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE + ON ida.partner_data + TO idauser; +--index section starts---- +CREATE INDEX ind_pd_pid ON ida.partner_data (partner_id); +--index section ends------ + + + + +-- object: ida.partner_mapping | type: TABLE -- +CREATE TABLE ida.partner_mapping ( + partner_id character varying(36) NOT NULL, + policy_id character varying(36) NOT NULL, + api_key_id character varying(36) NOT NULL, + cr_by character varying(256) NOT NULL, + cr_dtimes timestamp NOT NULL, + upd_by character varying(256), + upd_dtimes timestamp, + is_deleted bool DEFAULT false, + del_dtimes timestamp, + CONSTRAINT partner_mapping_pk PRIMARY KEY (partner_id,policy_id,api_key_id) + +); + +GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE + ON ida.partner_mapping + TO idauser; +--index section starts---- +CREATE INDEX ind_pm_pid ON ida.partner_mapping (partner_id); +--index section ends------ + + + +-- object: ida.policy_data | type: TABLE -- +CREATE TABLE ida.policy_data ( + policy_id character varying(36) NOT NULL, + policy_data bytea NOT NULL, + policy_name character varying(128) NOT NULL, + policy_status character varying(36) NOT NULL, + policy_description character varying(256), + policy_commence_on timestamp NOT NULL, + policy_expires_on timestamp, + cr_by character varying(256) NOT NULL, + cr_dtimes timestamp NOT NULL, + upd_by character varying(256), + upd_dtimes timestamp, + is_deleted bool DEFAULT false, + del_dtimes timestamp, + CONSTRAINT policy_data_pk PRIMARY KEY (policy_id) + +); + +GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE + ON ida.policy_data + TO idauser; + +--index section starts---- +CREATE INDEX ind_pl_pid ON ida.policy_data (policy_id); +--index section ends------ + + +-- object: ida.misp_license_data | type: TABLE -- +CREATE TABLE ida.misp_license_data ( + misp_id character varying(36) NOT NULL, + license_key character varying(128) NOT NULL, + misp_commence_on timestamp NOT NULL, + misp_expires_on timestamp, + misp_status character varying(36) NOT NULL, + cr_by character varying(256) NOT NULL, + cr_dtimes timestamp NOT NULL, + upd_by character varying(256), + upd_dtimes timestamp, + is_deleted bool DEFAULT false, + del_dtimes timestamp, + CONSTRAINT misp_license_data_pk PRIMARY KEY (misp_id) + +); + +GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE + ON ida.misp_license_data + TO idauser; +--index section starts---- +CREATE INDEX ind_mld_lk ON ida.misp_license_data (license_key); +--index section ends------ + + + +-- object: ida.anonymous_profile | type: TABLE -- +-- DROP TABLE IF EXISTS ida.anonymous_profile CASCADE; +CREATE TABLE ida.anonymous_profile( + id character varying(36) NOT NULL, + profile character varying NOT NULL, + cr_by character varying(256) NOT NULL, + cr_dtimes timestamp NOT NULL, + upd_by character varying(256), + upd_dtimes timestamp, + is_deleted boolean DEFAULT FALSE, + del_dtimes timestamp, + CONSTRAINT pk_profile PRIMARY KEY (id) +); + +GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE + ON ida.anonymous_profile + TO idauser; +-- ddl-end -- +COMMENT ON TABLE ida.anonymous_profile IS 'anonymous_profile: Anonymous profiling information for reporting purpose.'; +COMMENT ON COLUMN ida.anonymous_profile.id IS 'Reference ID: System generated id for references in the system.'; +COMMENT ON COLUMN ida.anonymous_profile.profile IS 'Profile : Contains complete anonymous profile data generated by ID-Repository and stored in plain json text format.'; +COMMENT ON COLUMN ida.anonymous_profile.cr_by IS 'Created By : ID or name of the user who create / insert record'; +COMMENT ON COLUMN ida.anonymous_profile.cr_dtimes IS 'Created DateTimestamp : Date and Timestamp when the record is created/inserted'; +COMMENT ON COLUMN ida.anonymous_profile.upd_by IS 'Updated By : ID or name of the user who update the record with new values'; +COMMENT ON COLUMN ida.anonymous_profile.upd_dtimes IS 'Updated DateTimestamp : Date and Timestamp when any of the fields in the record is updated with new values.'; +COMMENT ON COLUMN ida.anonymous_profile.is_deleted IS 'IS_Deleted : Flag to mark whether the record is Soft deleted.'; +COMMENT ON COLUMN ida.anonymous_profile.del_dtimes IS 'Deleted DateTimestamp : Date and Timestamp when the record is soft deleted with is_deleted=TRUE'; + +-------------------------------------------------------------------------------------------------------------- + + +ALTER TABLE ida.identity_cache ADD COLUMN identity_expiry timestamp; + + +ALTER TABLE ida.ca_cert_store ADD CONSTRAINT cert_thumbprint_unique UNIQUE (cert_thumbprint,partner_domain); + + +ALTER TABLE ida.key_alias ADD COLUMN uni_ident character varying(50); +ALTER TABLE ida.key_alias ADD CONSTRAINT uni_ident_const UNIQUE (uni_ident); + +ALTER TABLE ida.key_policy_def ADD COLUMN pre_expire_days smallint; +ALTER TABLE ida.key_policy_def ADD COLUMN access_allowed character varying(1024); + +--------------------------------------------------------------------------------------------------------------- + +ALTER TABLE ida.uin_auth_lock ALTER COLUMN is_deleted SET DEFAULT FALSE; + +update ida.key_policy_def set pre_expire_days=90, access_allowed='NA' where app_id='ROOT'; +update ida.key_policy_def set pre_expire_days=30, access_allowed='NA' where app_id='BASE'; +update ida.key_policy_def set pre_expire_days=60, access_allowed='NA' where app_id='IDA'; diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B1_to_1.2.0.1-B2_rollback.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B1_to_1.2.0.1-B2_rollback.sql new file mode 100644 index 00000000000..45325dd4de5 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B1_to_1.2.0.1-B2_rollback.sql @@ -0,0 +1,9 @@ +\c mosip_ida + +ALTER TABLE ida.misp_license_data DROP COLUMN policy_id; + +ALTER TABLE ida.partner_mapping ALTER COLUMN api_key_id TYPE varchar(36); + +DROP TABLE IF EXISTS ida.oidc_client_data CASCADE; + +DROP TABLE IF EXISTS ida.kyc_token_store CASCADE; \ No newline at end of file diff --git a/db_release_scripts/mosip_ida/sql/1.2.0.1_to_1.2.0.1-B2_upgrade.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B1_to_1.2.0.1-B2_upgrade.sql similarity index 60% rename from db_release_scripts/mosip_ida/sql/1.2.0.1_to_1.2.0.1-B2_upgrade.sql rename to db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B1_to_1.2.0.1-B2_upgrade.sql index 8cba60ce711..4d19ecafd48 100644 --- a/db_release_scripts/mosip_ida/sql/1.2.0.1_to_1.2.0.1-B2_upgrade.sql +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B1_to_1.2.0.1-B2_upgrade.sql @@ -1,20 +1,4 @@ --- ------------------------------------------------------------------------------------------------- --- Database Name : mosip_ida --- Release Version : 1.2 --- Purpose : Database Alter scripts for the release for ID Authentication DB. --- Create By : Ram Bhatt --- Created Date : Apr-2021 --- --- Modified Date Modified By Comments / Remarks --- ------------------------------------------------------------------------------------------------- --- Apr-2021 Ram Bhatt create tables to store partner details --- Jul-2021 Ram Bhatt creation of failed message store table --- Jul-2021 Ram Bhatt Adding a new nullable column identity_expiry in IDA table identity_cache --- Sep-2021 Loganathan Sekar Adding Anonymous Profile Table --- Sep-2021 Ram Bhatt Adding indices to multiple tables --- Oct-2021 Loganathan Sekar Removed failed_message_store table ----------------------------------------------------------------------------------------------------- -\c mosip_ida sysadmin +\c mosip_ida ALTER TABLE ida.misp_license_data ADD policy_id character varying(50); @@ -39,6 +23,10 @@ CREATE TABLE ida.oidc_client_data ( ); +GRANT SELECT, INSERT, REFERENCES, UPDATE, DELETE + ON ida.oidc_client_data + TO idauser; + -- DROP TABLE IF EXISTS ida.kyc_token_store CASCADE; CREATE TABLE ida.kyc_token_store( id character varying(36) NOT NULL, @@ -57,4 +45,8 @@ CREATE TABLE ida.kyc_token_store( del_dtimes timestamp, CONSTRAINT pk_key_id PRIMARY KEY (id), CONSTRAINT kyc_token_const UNIQUE (kyc_token) -); \ No newline at end of file +); + +GRANT SELECT, INSERT, REFERENCES, UPDATE, DELETE + ON ida.kyc_token_store + TO idauser; \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1-B3_rollback.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1-B3_rollback.sql new file mode 100644 index 00000000000..23b12cc2acf --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1-B3_rollback.sql @@ -0,0 +1,10 @@ +\c mosip_ida + +ALTER TABLE ida.kyc_token_store DROP COLUMN request_trn_id; + +DROP TABLE IF EXISTS ida.ident_binding_cert_store CASCADE; + +DELETE FROM ida.key_policy_def WHERE app_id='IDA_KYC_EXCHANGE'; + +DELETE FROM ida.key_policy_def WHERE app_id='IDA_KEY_BINDING' + diff --git a/db_release_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql similarity index 94% rename from db_release_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql rename to db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql index bd73af0acd7..6cc241fcd29 100644 --- a/db_release_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql @@ -8,7 +8,7 @@ -- Modified Date Modified By Comments / Remarks -- ------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------- -\c mosip_ida sysadmin +\c mosip_ida ALTER TABLE ida.kyc_token_store ADD request_trn_id character varying(64); @@ -30,6 +30,10 @@ CREATE TABLE ida.ident_binding_cert_store ( del_dtimes timestamp, CONSTRAINT uni_public_key_hash_const UNIQUE (public_key_hash) ); + +GRANT SELECT, INSERT, REFERENCES, UPDATE, DELETE + ON ida.ident_binding_cert_store + TO idauser; -- ddl-end -- INSERT INTO ida.key_policy_def (app_id, key_validity_duration, is_active, cr_by, cr_dtimes, upd_by, upd_dtimes, is_deleted, del_dtimes, pre_expire_days, access_allowed) diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B3_to_1.2.0.1-B4_rollback.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B3_to_1.2.0.1-B4_rollback.sql new file mode 100644 index 00000000000..5548b94e9cb --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B3_to_1.2.0.1-B4_rollback.sql @@ -0,0 +1 @@ +\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B3_to_1.2.0.1-B4_upgrade.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B3_to_1.2.0.1-B4_upgrade.sql new file mode 100644 index 00000000000..e19d945e657 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B3_to_1.2.0.1-B4_upgrade.sql @@ -0,0 +1,3 @@ +\c mosip_ida + +DROP TABLE IF EXISTS ida.key_policy_def_h; diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B4_to_1.2.0.1-B5_rollback.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B4_to_1.2.0.1-B5_rollback.sql new file mode 100644 index 00000000000..cb5727f8853 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B4_to_1.2.0.1-B5_rollback.sql @@ -0,0 +1,7 @@ +\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' + +DROP TABLE IF EXISTS ida.cred_subject_id_store CASCADE; + +DROP INDEX IF EXISTS ida.ind_csid_key_hash; + +DELETE FROM ida.key_policy_def WHERE app_id='IDA_VCI_EXCHANGE'; \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B4_to_1.2.0.1-B5_upgrade.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B4_to_1.2.0.1-B5_upgrade.sql new file mode 100644 index 00000000000..99e1c98db33 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B4_to_1.2.0.1-B5_upgrade.sql @@ -0,0 +1,47 @@ +-- ------------------------------------------------------------------------------------------------- +-- Database Name : mosip_ida +-- Release Version : 1.2.1 +-- Purpose : Database Alter scripts for the release for ID Authentication DB. +-- Create By : Mahammed Taheer +-- Created Date : Aug-2023 +-- +-- Modified Date Modified By Comments / Remarks +-- ------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +\c mosip_ida + +CREATE TABLE ida.cred_subject_id_store( + id character varying(36) NOT NULL, + id_vid_hash character varying(128) NOT NULL, + token_id character varying(128) NOT NULL, + cred_subject_id character varying(2000) NOT NULL, + csid_key_hash character varying(128) NOT NULL, + oidc_client_id character varying(128), + csid_status character varying(36), + cr_by character varying(256) NOT NULL, + cr_dtimes timestamp NOT NULL, + upd_by character varying(256), + upd_dtimes timestamp, + is_deleted boolean DEFAULT FALSE, + del_dtimes timestamp, + CONSTRAINT key_hash_unique UNIQUE (id_vid_hash, csid_key_hash) +); +COMMENT ON TABLE ida.cred_subject_id_store IS 'Credential Subject Id Store: To store and maintain the input credential subject ids to identify the individual.'; +COMMENT ON COLUMN ida.cred_subject_id_store.id IS 'ID: Id is a unique identifier (UUID) used to map uniqueness to the credential subject id.'; +COMMENT ON COLUMN ida.cred_subject_id_store.id_vid_hash IS 'IdVidHash: SHA 256 Hash value of the Id/VID.'; +COMMENT ON COLUMN ida.cred_subject_id_store.token_id IS 'Token ID: Token ID generated in reference to UIN/VID'; +COMMENT ON COLUMN ida.cred_subject_id_store.cred_subject_id IS 'Credential Subject ID : DID format holder id.'; +COMMENT ON COLUMN ida.cred_subject_id_store.csid_key_hash IS 'Credential Subject ID Public Key Hash: Derived hash value of the public key.'; +COMMENT ON COLUMN ida.cred_subject_id_store.oidc_client_id IS 'OIDC Client ID: An Id assigned to specific OIDC Client.'; +COMMENT ON COLUMN ida.cred_subject_id_store.csid_status IS 'Credential Subject Id Status: To identify the current status of the credential subject id.'; +COMMENT ON COLUMN ida.cred_subject_id_store.cr_by IS 'Created By : ID or name of the user who create / insert record'; +COMMENT ON COLUMN ida.cred_subject_id_store.cr_dtimes IS 'Created DateTimestamp : Date and Timestamp when the record is created/inserted'; +COMMENT ON COLUMN ida.cred_subject_id_store.upd_by IS 'Updated By : ID or name of the user who update the record with new values'; +COMMENT ON COLUMN ida.cred_subject_id_store.upd_dtimes IS 'Updated DateTimestamp : Date and Timestamp when any of the fields in the record is updated with new values.'; +COMMENT ON COLUMN ida.cred_subject_id_store.is_deleted IS 'IS_Deleted : Flag to mark whether the record is Soft deleted.'; +COMMENT ON COLUMN ida.cred_subject_id_store.del_dtimes IS 'Deleted DateTimestamp : Date and Timestamp when the record is soft deleted with is_deleted=TRUE'; + +CREATE INDEX ind_csid_key_hash ON ida.cred_subject_id_store (csid_key_hash); + +INSERT INTO ida.key_policy_def (app_id, key_validity_duration, is_active, cr_by, cr_dtimes, upd_by, upd_dtimes, is_deleted, del_dtimes, pre_expire_days, access_allowed) +VALUES('IDA_VCI_EXCHANGE', 1095, true, 'mosipadmin', now(), NULL, NULL, false, NULL, 60, 'NA'); diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B5_to_1.2.0.1-B6_rollback.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B5_to_1.2.0.1-B6_rollback.sql new file mode 100644 index 00000000000..15d4f96627b --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B5_to_1.2.0.1-B6_rollback.sql @@ -0,0 +1,7 @@ + +ALTER TABLE ida.credential_event_store ALTER COLUMN credential_transaction_id type character varying(36); + +CREATE INDEX ind_otphsh ON ida.otp_transaction (otp_hash,status_code); + +DROP INDEX IF EXISTS ida.ind_refid; + diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B5_to_1.2.0.1-B6_upgrade.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B5_to_1.2.0.1-B6_upgrade.sql new file mode 100644 index 00000000000..1400ca91bed --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B5_to_1.2.0.1-B6_upgrade.sql @@ -0,0 +1,7 @@ +\c mosip_ida + +ALTER TABLE ida.credential_event_store ALTER COLUMN credential_transaction_id type character varying(64); + +DROP INDEX IF EXISTS ida.ind_otphsh; + +CREATE INDEX ind_refid ON ida.otp_transaction (ref_id,status_code); diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B6_to_1.2.0.1_rollback.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B6_to_1.2.0.1_rollback.sql new file mode 100644 index 00000000000..1a2e0a41c47 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B6_to_1.2.0.1_rollback.sql @@ -0,0 +1 @@ +\echo 'Rollback Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B6_to_1.2.0.1_upgrade.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B6_to_1.2.0.1_upgrade.sql new file mode 100644 index 00000000000..381e2be11c1 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1-B6_to_1.2.0.1_upgrade.sql @@ -0,0 +1 @@ +\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1_to_1.2.1.0_rollback.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1_to_1.2.1.0_rollback.sql new file mode 100644 index 00000000000..1a2e0a41c47 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1_to_1.2.1.0_rollback.sql @@ -0,0 +1 @@ +\echo 'Rollback Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_ida/sql/1.2.0.1_to_1.2.1.0_upgrade.sql b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1_to_1.2.1.0_upgrade.sql new file mode 100644 index 00000000000..381e2be11c1 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/sql/1.2.0.1_to_1.2.1.0_upgrade.sql @@ -0,0 +1 @@ +\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_ida/upgrade.properties b/db_upgrade_scripts/mosip_ida/upgrade.properties new file mode 100644 index 00000000000..6226f1194f0 --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/upgrade.properties @@ -0,0 +1,12 @@ +MOSIP_DB_NAME= +DB_SERVERIP= +DB_PORT= +SU_USER=postgres +SU_USER_PWD= +SYS_ADMIN_USER= +SYS_ADMIN_PWD= +DEFAULT_DB_NAME=postgres +DBUSER_PWD= +ACTION= +CURRENT_VERSION= +UPGRADE_VERSION= diff --git a/db_upgrade_scripts/mosip_ida/upgrade.sh b/db_upgrade_scripts/mosip_ida/upgrade.sh new file mode 100644 index 00000000000..fe7b2f03d2f --- /dev/null +++ b/db_upgrade_scripts/mosip_ida/upgrade.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +set -e +properties_file="$1" +echo `date "+%m/%d/%Y %H:%M:%S"` ": $properties_file" +if [ -f "$properties_file" ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found." + while IFS='=' read -r key value + do + key=$(echo $key | tr '.' '_') + eval ${key}=\${value} + done < "$properties_file" +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument." +fi + +echo "Current version: $CURRENT_VERSION" +echo "UPGRADE version: $UPGRADE_VERSION" +echo "Action: $ACTION" + +# Terminate existing connections +echo "Terminating active connections" +CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit;) +echo "Terminated connections" + +# Execute upgrade or rollback +if [ "$ACTION" == "upgrade" ]; then + echo "Upgrading database from $CURRENT_VERSION to $UPGRADE_VERSION" + UPGRADE_SCRIPT_FILE="sql/${CURRENT_VERSION}_to_${UPGRADE_VERSION}_upgrade.sql" + if [ -f "$UPGRADE_SCRIPT_FILE" ]; then + echo "Executing upgrade script $UPGRADE_SCRIPT_FILE" + PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $UPGRADE_SCRIPT_FILE + else + echo "Upgrade script not found, exiting." + exit 1 + fi +elif [ "$ACTION" == "rollback" ]; then + echo "Rolling back database for $CURRENT_VERSION to $UPGRADE_VERSION" + REVOKE_SCRIPT_FILE="sql/${CURRENT_VERSION}_to_${UPGRADE_VERSION}_rollback.sql" + if [ -f "$REVOKE_SCRIPT_FILE" ]; then + echo "Executing rollback script $REVOKE_SCRIPT_FILE" + PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $REVOKE_SCRIPT_FILE + else + echo "rollback script not found, exiting." + exit 1 + fi +else + echo "Unknown action: $ACTION, must be 'upgrade' or 'rollback'." + exit 1 +fi diff --git a/docs/Images/Authentication_error_eventing.png b/docs/Images/Authentication_error_eventing.png new file mode 100644 index 00000000000..4fdbde5d354 Binary files /dev/null and b/docs/Images/Authentication_error_eventing.png differ diff --git a/docs/authentication_error_eventing.md b/docs/authentication_error_eventing.md new file mode 100644 index 00000000000..aa3e36dd445 --- /dev/null +++ b/docs/authentication_error_eventing.md @@ -0,0 +1,68 @@ +# Authentication Error Eventing Guide + +## Overview +The resident has registered and obtain a valid UIN/VID and proceed with authentication by entering UIN/VID and get error as UIN is not available in database, then resident couldn’t proceed with authentication further as the provided UIN/VID is not available in IDA DB. +This could happen when a country has large number of registrations completed, processed and issued UINs. +Since resident is eager to authenticate, we want to prioritize the credential processing (along with template extraction) of this resident, we can tell him/her to retry and complete the authentication. +While getting the error UIN/VID is not available in database the kafka event is triggered which publish the data in to the topic and the subscriber will receive a message for futher processing. + +## Configuration files +These properties needed to be modified to configure this feature +id-authentication-default.properties: + +- It enable and disable the bean init of kafka and Authentication error eventing +``` +mosip.ida.authentication.error.eventing.enabled=true +``` + +- If we enable authentication error eventing as true we need all the below property +``` +ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS +``` + +- Partner Id for encryption used in ondemand template extraction +``` +mosip.ida.authentication.error.eventing.encrypt.partner.id=mpartner-default-tempextraction +``` + +- kafka Configuration +``` +mosip.ida.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port} +spring.kafka.admin.properties.allow.auto.create.topics=true + +``` + +## Image source + +![Authentication_error_eventing](Images/Authentication_error_eventing.png) + +## Steps of sequence diagram: +``` +1. Client -> IDA : The client sends Authentication or OTP request to IDA. +2. IDA ->IDA: Query the Record with the Individual Id. +3. IDA ->IDA :If the requested data (UIN/VID) is not available in the database the server throws an exception +4. IDA-> Kafka:IDA triggers a event for topic AUTHENTICATION_ERRORS +5. Kafka->Subscriber : The subscriber to the topic(AUTHENTICATION_ERRORS) will receive a message for futher processing. + +``` +## Event Structure published to kafka: +``` +{ + "publisher": "IDA", + "topic": "AUTHENTICATION_ERRORS", + "publishedOn": "2024-01-03T09:45:13.992Z", (Current date and time) + "event": { + "id": " ", + "data": { + "error_Code" : "IDA-MLC-018" + "error_message" : "UIN not available in database" + "requestdatetime": "yyyy-mm-ddThh:mm:ss", (Current date and time) + "individualId" :" (This should be encrypted with a public key)" + "authPartnerId" :"" + "individualIdType": "UIN", + "entityName": "", + "requestSignature": "" + } + } +} +``` diff --git a/docs/configuration.md b/docs/configuration.md index 233bded7624..8f89577a56b 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -12,6 +12,32 @@ id-authentication-external-default.properties id-authentication-internal-default.properties id-authentication-otp-default.properties identity-mapping.json +``` +## Optional Configuration +Below properties needed to be add in id-authentication-default.properties to configure Authentication Error Eventing feature which is present in 1.2.1.0 + +id-authentication-default.properties: + +- It enable and disable the bean init of kafka and Authentication error eventing +``` +mosip.ida.authentication.error.eventing.enabled=true +``` + +- If we enable authentication error eventing as true we need all the below property +``` +ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS +``` + +- Partner Id for encryption used in ondemand template extraction +``` +mosip.ida.authentication.error.eventing.encrypt.partner.id=mpartner-default-tempextraction +``` + +- kafka Configuration +``` +mosip.ida.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port} +spring.kafka.admin.properties.allow.auto.create.topics=true + ``` See [Module Configuration](https://docs.mosip.io/1.2.0/modules/module-configuration) for location of these files.