diff --git a/.github/workflows/build-and-scan-PR-container.yml b/.github/workflows/build-and-scan-PR-container.yml index 591e7e7..4b5bcab 100644 --- a/.github/workflows/build-and-scan-PR-container.yml +++ b/.github/workflows/build-and-scan-PR-container.yml @@ -12,8 +12,24 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Add Maven Github authentication - run: echo " github-clearinghouse ${{ github.actor }} ${{ secrets.GITHUB_TOKEN }} github-tsd-file-api-client ${{ github.actor }} ${{ secrets.GITHUB_TOKEN }} " > settings.xml + - name: create maven settings.xml + uses: s4u/maven-settings-action@v2.8.0 + with: + servers: | + [{ + "id":"github-clearinghouse", + "username": "${{github.actor}}", + "password": "${{ secrets.GITHUB_TOKEN }}" + }, + { + "id":"github-crypt4gh", + "username": "${{github.actor}}", + "password": "${{ secrets.GITHUB_TOKEN }}" + }] + + - name: Copy settings.xml to project root + shell: bash + run: cp /home/runner/.m2/settings.xml ./settings.xml - name: Log in to the Github Container registry uses: docker/login-action@v2 diff --git a/pom.xml b/pom.xml index c3aff92..5690cab 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,23 @@ spring-boot-starter-test test + + com.konghq + unirest-java + 3.6.01 + + + com.google.code.gson + gson + + + + + junit + junit + 4.12 + test + no.uio.ifi crypt4gh @@ -106,7 +123,7 @@ no.uio.ifi clearinghouse - 1.1.0 + 1.2.1 org.slf4j diff --git a/test/mock_auth.py b/test/mock_auth.py index fb6bfe6..dfd80d7 100644 --- a/test/mock_auth.py +++ b/test/mock_auth.py @@ -9,7 +9,7 @@ def generate_token(): """Generate RSA Key pair to be used to sign token and the JWT Token itself.""" - private_key = rsa.generate_private_key(public_exponent=65537, key_size=1024, backend=default_backend()) + private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048, backend=default_backend()) public_key = private_key.public_key().public_bytes(encoding=serialization.Encoding.PEM, format=serialization.PublicFormat.SubjectPublicKeyInfo) pem = private_key.private_bytes(encoding=serialization.Encoding.PEM,