diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml new file mode 100644 index 0000000..a62b9e1 --- /dev/null +++ b/.github/workflows/check.yaml @@ -0,0 +1,42 @@ +name: Run dependency and spotbugs checks + +on: + workflow_run: + workflows: ["Run tests"] + types: + - completed + +permissions: + contents: read + +jobs: + run-checks: + runs-on: ubuntu-latest + strategy: + matrix: + java-version: ['8', '11', '17'] + name: Run dependency and spotbugs checks with java SDK ${{ matrix.java-version }} + + steps: + - uses: actions/checkout@v4 + + - name: Setup java + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java-version }} + distribution: 'temurin' + cache: maven + + - name: Run dependency check + run: | + ./mvnw org.owasp:dependency-check-maven:check + + - name: Archive dependency report + uses: actions/upload-artifact@v4 + with: + name: dependency-report + path: target/dependency-check-report.html + + - name: Run spotbugs check + run: | + ./mvnw spotbugs:check \ No newline at end of file diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml new file mode 100644 index 0000000..824e465 --- /dev/null +++ b/.github/workflows/publish.yaml @@ -0,0 +1,51 @@ +name: Publish to maven repository + +on: + release: + types: + - published + +permissions: + contents: read + +jobs: + package_and_publish: + name: Publish to maven repository + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Setup java SDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + cache: maven + + - name: Import GPG key + uses: crazy-max/ghaction-import-gpg@v6 + with: + gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} + + - name: Create bundle and upload to oss.sonatype.org (staging) + # Fail on first error + run: | + set -e + version=${{ github.event.release.name }} + artifact=mid-rest-java-client-$version + echo "[INFO] Artifact name: $artifact" + ./mvnw versions:set -DnewVersion="$version" + ./mvnw package -DskipTests + gpg -ab pom.xml + cd target + gpg -ab $artifact.jar + gpg -ab $artifact-sources.jar + gpg -ab $artifact-javadoc.jar + jar -cvf bundle.jar ../pom.xml ../pom.xml.asc $artifact.jar $artifact.jar.asc $artifact-javadoc.jar $artifact-javadoc.jar.asc $artifact-sources.jar $artifact-sources.jar.asc + CODE=$(curl -w "%{http_code}" -o curl_response.txt -s -ujorlina2 -u ${{ secrets.SONATYPETOKENUN }}:${{ secrets.SONATYPETOKENPW }} --request POST -F "file=@bundle.jar" "https://oss.sonatype.org/service/local/staging/bundle_upload") + echo "[INFO] ------------------------------------------------------------------------" + echo "[INFO] Upload to oss.sonatype.org ResponseCode: $CODE" + cat curl_response.txt + echo -e "\n[INFO] Login to oss.sonatype.org for releasing $artifact" + echo "[INFO] ------------------------------------------------------------------------" + [[ $CODE == 201 ]] && exit 0 || exit 1 \ No newline at end of file diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml new file mode 100644 index 0000000..a3fd5a4 --- /dev/null +++ b/.github/workflows/tests.yaml @@ -0,0 +1,44 @@ +name: Run tests + +on: + push: + branches: [ "github_workflow" ] + pull_request: + branches: [ "github_workflow" ] + +permissions: + contents: read + +jobs: + run-tests: + runs-on: ubuntu-latest + strategy: + matrix: + java-version: ['8', '11', '17'] + name: Run tests with java SDK ${{ matrix.java-version }} + + steps: + - uses: actions/checkout@v4 + + - name: Setup java + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java-version }} + distribution: 'temurin' + cache: maven + + - name: Install dependencies + run: | + pip install --user codecov + + - name: Check JAVA version (v${{ matrix.java-version }}) + run: java -version + + - name: Run tests + # Fail on first error + run: | + set -e + mvn test + + - name: Upload coverage reports to Codecov + run: codecov \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4a4a81f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -language: java -jdk: - - openjdk8 - - openjdk11 - - openjdk17 -sudo: required - -cache: - directories: - - $HOME/.m2 -env: - global: - - secure: pmR4WAufSwARNTj1qSxrmMNqIvz4UkL99gYCj+pQDtATVvrrbSdJv8/qG9AdJdXg6QuIc3l9b+tCoKPnTKlHtm9rxFsvhYwEtoV7mEIviUUIAPab+h62QRqu0f6QlUL76CG4EJmCmBuv2hNX2a+vRyueYDEaYl4xFvE3O+0cGa3bp04CI0E3rJaH3V5IgiUYK04WxnkKao4EvxZuSRXKebNFxRckV1jgZOdTfY8jvEzpD27nPJWRVHT11f9SWcyRXHiHqreFPNu+4G/ugVtWe1rLr3Vw/HDK2heBjxIJXVmNaojS/kpvxmoz+XbDt2NCmkO11Cxo4nJ59F2PEYe9FkrUJWOhTBQNPaUoNn1NLOs54IJDUQXq1e0ZtqOWYLDLehmC+JWdGzN1/HmBkdZWKlrosIXhOR02KSb+Uy2Dz3d7Qft0EiP1rZp916WCaYppoKEuzA7/WuBMs/vlYGP1i8kgC7abWx7/2fKE7AxB9Z8x4A41EhhL0wkmu/p66W48ZEHS6e6wQCtuRipWZ+ettHPO8DC+hNaMuHydLjMVdwBvuGEzX5tCxlv37jiEbsWbmmP9KmnE5F2oO4pHQJe/pXA5KuD9TT/WERkXKU3Zx8Kg3Hcqpw8ZEc5J/65Pmzlh0OUI0kNZ3941S4+kHJR9Rdq65Z4tD7BKe3uX/NSSIoU= - - secure: fLwzTEJGNvfVsQix9ahNc9nvOW0RkgItAa6o2vVLkZIeCCmNlfqnus3W8PcZ36+GtuueOb90hkNi18w+PhPKgWK7QDp1jiLMOe9o4PnURvEhh7gCxVx69d+1zsuV7SMX3lzOrZ/OdVDe5fytRp/+7cQ6uWxXyO9bcDrmJw3Q8IV8EKn/pS+21KzUK69mRmrqEzu1+ccqnHArK1kDlLpO4ikGQatpxnQ6vypyqVxTbvbZjVeBLbE4pWVHizNAXem1zWZ9wov2NZcnp9V48yb9Zl0sjMC4XSyM1v/pVf1lJzGv8Y7RY7g+pOXW2LYPv6hxQPEAB+DRRPwrNAgm+gvEMkq7vvxC1g1CtNlaV6M8BVO99FvM+it1YTSp4o/CFxc7lv5s+WzdOwv5Szgj4apXiq8iZTzLf5LMbip/Co5hHvHyO1nQk3QV9GZiI5EVyqsRU/YlJ7EQPUGKhn0e2Brh8r80sNX95eegiyp1Zafhfjcq0aNFxCq/kPGPK82pT4j/GKi9kUobfEUyIrR1yGWvc+1hs4IW2ovZA+hOOzCdhSFXduSJ/hGul+3aoPLNiFOYyIKnCjrqSeYAcpS4JlPYKR1YAX6KDJM1PdrSJkvox8fBFUTakPyRv4ZytOkpUYFIjZ8foOTAAgYO9tsr0ACjPjlX9HeEpkswyvMn4vAVMjA= -before_install: - - eval $(openssl aes-256-cbc -K $encrypted_key -iv $encrypted_iv -in private.key.enc -out private.key -d) - - chmod +x travis.sh - - pip install --user codecov -install: true -after_success: - - codecov -script: - - "./travis.sh" diff --git a/README.md b/README.md index c1fc319..755e5ba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://api.travis-ci.com/SK-EID/mid-rest-java-client.svg?branch=master)](https://travis-ci.com/SK-EID/mid-rest-java-client) +[![Tests](https://github.com/SK-EID/mid-rest-java-client/actions/workflows/tests.yaml/badge.svg)](https://github.com/SK-EID/mid-rest-java-client/actions/workflows/tests.yaml) [![Coverage Status](https://img.shields.io/codecov/c/github/SK-EID/mid-rest-java-client.svg)](https://codecov.io/gh/SK-EID/mid-rest-java-client) [![License: MIT](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ee.sk.mid/mid-rest-java-client/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ee.sk.mid/mid-rest-java-client) diff --git a/private.key.enc b/private.key.enc deleted file mode 100644 index 3a45026..0000000 Binary files a/private.key.enc and /dev/null differ diff --git a/publish.sh b/publish.sh deleted file mode 100755 index c61ec8b..0000000 --- a/publish.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -project="mid-rest-java-client" - -version=$TRAVIS_TAG - -staging_url="https://oss.sonatype.org/service/local/staging/deploy/maven2/" -repositoryId="ossrh" - -artifact=$project-$version - -gpg --import ./private.key - -mvn versions:set -DnewVersion=$TRAVIS_TAG - -mvn package - -gpg -ab pom.xml - -cd target - -gpg -ab $artifact.jar -gpg -ab $artifact-sources.jar -gpg -ab $artifact-javadoc.jar - -jar -cvf bundle.jar ../pom.xml ../pom.xml.asc $artifact.jar $artifact.jar.asc $artifact-javadoc.jar $artifact-javadoc.jar.asc $artifact-sources.jar $artifact-sources.jar.asc - -curl -ujorlina2 -u $SONATYPEUN:$SONATYPEPW --request POST -F "file=@bundle.jar" "https://oss.sonatype.org/service/local/staging/bundle_upload" diff --git a/src/test/java/ee/sk/mid/AuthenticationResponseValidatorTest.java b/src/test/java/ee/sk/mid/AuthenticationResponseValidatorTest.java index ba5d95e..8c0d537 100644 --- a/src/test/java/ee/sk/mid/AuthenticationResponseValidatorTest.java +++ b/src/test/java/ee/sk/mid/AuthenticationResponseValidatorTest.java @@ -67,7 +67,7 @@ public void validate_whenRSA_shouldReturnValidAuthenticationResult() throws Exce @Test public void validate_whenECC_shouldReturnValidAuthenticationResult() throws Exception{ - X509Certificate caCertificate = fileToX509Certificate("/trusted_certificates/TEST_of_ESTEID-SK_2011.pem.crt"); + X509Certificate caCertificate = fileToX509Certificate("/trusted_certificates/TEST_of_ESTEID-SK_2015.pem.crt"); MidAuthenticationResponseValidator validator = new MidAuthenticationResponseValidator(Collections.singletonList(caCertificate)); MidAuthentication authentication = createMobileIdAuthenticationWithECC(); diff --git a/src/test/java/ee/sk/mid/mock/TestData.java b/src/test/java/ee/sk/mid/mock/TestData.java index 4f2dff4..6e6fefb 100644 --- a/src/test/java/ee/sk/mid/mock/TestData.java +++ b/src/test/java/ee/sk/mid/mock/TestData.java @@ -33,10 +33,10 @@ public class TestData { public static final String SIGNATURE_SESSION_PATH = "/signature/session/{sessionId}"; public static final String AUTHENTICATION_SESSION_PATH = "/authentication/session/{sessionId}"; - public static final String AUTH_CERTIFICATE_EE = "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"; + public static final String AUTH_CERTIFICATE_EE = "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"; public static final String AUTH_CERTIFICATE_LV = "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"; public static final String AUTH_CERTIFICATE_LT = "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"; - public static final String ECC_CERTIFICATE = "MIIEVzCCAz+gAwIBAgIQMhKpLxxSmoxRrcXdufmvWTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEfMB0GA1UEAwwWVEVTVCBvZiBFU1RFSUQtU0sgMjAxMTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTEzMDYwNDEwNDc1N1oXDTIzMDkwNzEyMDYwOVowgaExCzAJBgNVBAYTAkVFMRswGQYDVQQKDBJFU1RFSUQgKE1PQklJTC1JRCkxFzAVBgNVBAsMDmF1dGhlbnRpY2F0aW9uMSMwIQYDVQQDDBpURVNUTlVNQkVSLEVDQywxNDIxMjEyODAyOTETMBEGA1UEBAwKVEVTVE5VTUJFUjEMMAoGA1UEKgwDRUNDMRQwEgYDVQQFEwsxNDIxMjEyODAyOTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHYleZg39CkgQGU8z8b8ehctBEnaGlducij6eTETeOj2LpEwLedMS1pCfNEZAJjDwAZ2DJMBgB05QHrrvzersUKjggGIMIIBhDAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIEsDCBmQYDVR0gBIGRMIGOMIGLBgorBgEEAc4fAwMBMH0wWAYIKwYBBQUHAgIwTB5KAEEAaQBuAHUAbAB0ACAAdABlAHMAdABpAG0AaQBzAGUAawBzAC4AIABPAG4AbAB5ACAAZgBvAHIAIAB0AGUAcwB0AGkAbgBnAC4wIQYIKwYBBQUHAgEWFWh0dHA6Ly93d3cuc2suZWUvY3BzLzAdBgNVHQ4EFgQUnd6oi9wn+4hQ+LtPvEdaXM5kz+gwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMCIGCCsGAQUFBwEDBBYwFDAIBgYEAI5GAQEwCAYGBACORgEEMB8GA1UdIwQYMBaAFEG2/sWxsbRTE4z6+mLQNG1tIjQKMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL3Rlc3RfZXN0ZWlkMjAxMS5jcmwwDQYJKoZIhvcNAQEFBQADggEBADAmT+luPaCMnO78z5L9QY3K5/5yfC7r1/PQ76rzvzKem/zfsJV2y0siVaWgLLoxu1ZzxnOe7zBGNGKF/w4pLoiDZkaj9HE9JCoirrvbOg6sCJF942RGtIFLSAYfM1N8vPXPIN8a9pgTLxSpWYox//hY4OHbPEbOysQ65hAkIH15yhnHTCQBcMvv7+vdZUw1siVqj3DRAXY0VnqI6WWsVBPgpSu8g5StXEihaHZsq8cDmu4VtZi6VcUzifCxZa0ZjvGeJr5LkVA0pE56u37W99PSNY0VS/xhrdqNW4EiRB6V8zAz7LaAk83kh1BoXa5ayOuWmSCs28NQCz0lDT4Zw2A="; + public static final String ECC_CERTIFICATE = "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"; public static final String LOCALHOST_URL = "http://localhost:18089"; public static final String DEMO_HOST_URL = "https://tsp.demo.sk.ee/mid-api"; diff --git a/travis.sh b/travis.sh deleted file mode 100755 index 8fe4b7c..0000000 --- a/travis.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -echo $TRAVIS_PULL_REQUEST -echo $TRAVIS_TAG - -VERSION_REGEX='^([0-9]+\.){1,3}([0-9]+)$' - -if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ] && ![ "$TRAVIS_TAG" =~ $VERSION_REGEX ]; then - echo "error: invalid version number. Version number must only contain numbers (and some dots in between)." - exit 1 -elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then - echo "Starting to publish" - ./publish.sh - echo "Finished" -else - mvn test - mvn org.owasp:dependency-check-maven:check - mvn spotbugs:check -fi