From 61c3ff8e01e9adacca94079f21e2c5347b4e0b43 Mon Sep 17 00:00:00 2001 From: Patrick Favre-Bulle Date: Sat, 11 Feb 2023 09:17:27 +0100 Subject: [PATCH 1/2] Migrate to Github Actions, CodeCov and Maven Central --- .github/workflows/build_deploy.yml | 64 +++++++++++++++++++++++++++++ .travis.yml | 54 ------------------------ README.md | 8 ++-- modules/bcrypt-cli/pom.xml | 4 +- modules/bcrypt/pom.xml | 2 +- modules/benchmark-jmh/pom.xml | 4 +- pom.xml | 29 ++++++++----- secrets.tar.enc | Bin 6672 -> 0 bytes 8 files changed, 91 insertions(+), 74 deletions(-) create mode 100644 .github/workflows/build_deploy.yml delete mode 100644 .travis.yml delete mode 100644 secrets.tar.enc diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml new file mode 100644 index 0000000..c1a10af --- /dev/null +++ b/.github/workflows/build_deploy.yml @@ -0,0 +1,64 @@ +name: Build and Deploy with Maven + +on: + push: + branches: + - main + tags: + - '*' # Trigger on all tags + pull_request: {} + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout Code + uses: actions/checkout@v3 + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'adopt' + cache: 'maven' + - name: Build with Maven + run: ./mvnw -B clean package checkstyle:checkstyle jacoco:report -DcommonConfig.jarSign.skip=true + - name: Upload coverage reports to CodeCov + uses: codecov/codecov-action@v3 + + deploy: + needs: build + if: startsWith(github.ref, 'refs/tags/') + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Retrieve Keystore from secrets + env: + KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }} + run: | + echo $KEYSTORE_BASE64 | base64 --decode > keystore.jks + - name: Set up Maven Central Repository + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'adopt' + cache: 'maven' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish package + run: mvn -B deploy -DskipTests + env: + OPENSOURCE_PROJECTS_KS_PW: ${{ secrets.KEYSTORE_PASSWORD }} + OPENSOURCE_PROJECTS_KEY_PW: ${{ secrets.KEYSTORE_KEY_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + - name: Create and upload Github Release + uses: xresloader/upload-to-github-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + file: "modules/bcrypt/target/bcrypt-*.jar;modules/bcrypt/target/*.sha256;modules/bcrypt/target/checksum-sha256.txt;modules/bcrypt-cli/target/bcrypt-*-full.jar;modules/bcrypt-cli/target/*.sha256" + tags: true + draft: false diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dc1d30f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,54 +0,0 @@ -# To let the CI execute the maven wrapper, use this command and push the change: -# git update-index --chmod=+x mvnw - -language: java -install: true -jdk: - - openjdk8 - -env: - global: - - secure: "N8EZ+1uW2P0sQHdVQ5dm9Ha/Lr36iBuWRg0lXOrdzzp/5RxvKQ2nnGGF9m1FacLa++SJ4+xJtQCMPDkELK6vhvG+bS86MuzlBVdys+awiuBlxiO6KcUDnu/VQ5PGXxGexJ5NQbkuwYQWwE2yeRZR9tq0FoAOBllXOmi3Tqk7LN0Yt5DpoEaBW4YNZee8Qz7fNV5wd7ekGn4On42/Ngvcg2yOAdJbxn9XAvDJlBABCsDx8zlNPZUhAnWZERnLATcN7KGYQAiZy3TVyBs/8wsGVfrWoPLbvoVZ6ZJI19Q083JEk2wQSNw/AD7fqd32BoMlVQ0cuUcvTTP8Swj4hIyhreXhdG6r+x6KqVtK81HiNa8rFTkAGmzZNF5UZoNN2I5XIJwIty2h4JtR1LmuzJgS4o4oarlm4kjnz/mXER8qRRJg6y3I50zt9Nba14Fger4zBQwyrjdr8DVCGfxnupYoSfjBAQfT9n5Mja6lsowL5BS7hSs1REr9VQwZlvUwNEbc/NrFu+PMP7y0Z4YEYoCpeMZ6P01/qRZUehugrhSHks5Ff1L895dAh7lqXKXmzClVAcq9gfiVitD4PKok9LFUHKCmkdSAQ2c+zPWHvPYRqh4FxKPjBRzSbtgwq+0ctnnDa4ji9PIWOP1VzOn7UNJVzQbiD460Ix/hlCsse4YmBnU=" - - secure: "rO0GEdDFN4QlA6+SLJXOvOPmKWt6RGM5YdVgI+RupmAcwlYB+VW+gmVPC+G1jQIbN6rtRLtyO2J2j0rLtBpCTKsWSwmLUQytlpIc5qQBSaYHoij+JR4j3Cngfb0ifjH9Doj6kb40/k+4Qy9t3ypbhRcZ32eXkOI3dlrnK2AubaUA1XlmxDG/ViA9FCpukcNLBVOqFdmzw3ity3YsXm5xRCXVkoTX/9zBl2x7XEHYWRR1ZgyOUCVSkQgT/OP5sqlfT7vRb0gg00ShgP5wepLDfQ1zc4QERo4/+CkD3ES/69fvQJWlAwTJ3b57pGZM8dkfhEQCInCHIL9HhQyXhwZ3gzsfflnu4+hSRnlmJIaNogFtdgOYF/NpadNBPBTytDHkLy7LKEJadz3snPFQM47ZBtleqygNMEq02QdD1tUkBQeDE0xNjUowPZcNQDEucihgHHBVQfCR/eR+3zxSlFnH1cKNn0k4Y5Hwx55eTqrnVtNQFXmD3E3ZfdTK9ne4c3Uk9gYHpuvj6vflUhDAlzGJfplsb9xMBtGDAt2qKDLgObnae9780RTxPDIM3FVP+WS1ATB6UCKNsrK/7KcCT6zrGwX3a5biCGCx9x/em5NHG4ZuF/Nq6m7qnHuVhrghjQgVL8wx6t3J9fLEidTcXiYo26A+kxzmlY7widyBb/l7g9U=" - -before_install: - - openssl aes-256-cbc -K $encrypted_55afeb8ba94e_key -iv $encrypted_55afeb8ba94e_iv -in secrets.tar.enc -out secrets.tar -d - - tar xvf secrets.tar - -script: - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./mvnw clean install -Djarsigner.skip=true; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./mvnw clean install -Djarsigner.skip=false; fi' - -after_success: - - ./mvnw test jacoco:report coveralls:report - -deploy: - - provider: script - script: ./mvnw -s ci-settings.xml deploy -X checkstyle:checkstyle - skip_cleanup: true - on: - branch: master - tags: true - - provider: releases - api_key: - secure: "jTRC8q1o58sepRHphhUJEVnWPatWESdQuO8IYcqxQOSWsObD8Xr5KNrsLSgBAAGKCTEFdSb88/HrXQShZp1w4pdqTrmB4+eXgWxjtYNPzcaMkWMxsiJabLss91ahvvUVpNVp3AE2iHjUEOOqeXyx7ynhBVtvDn0Bf80O8ufqvq0PqQunQa5xlYp0UgTIEZ1BAoOtMTyWQrywvTRZj2ZLi0Aa5Lnqbrr2U2ZLqC3FLFOKveWJ8XxG10a2x2DmyRyW9h9EamXgoWVS3DqWOYdNDwEjgeih+0yNtJ1CWcDDC6PC77Nkit9/L5roCCnaTJbdhNdsVFBKP+1AUH81xMdSMl9SRKi16eVbjyEcu4laEzJlYz46eO8spbYJrmIDs59ij4C4dPQeb3LQPeioheEkFmUD/krZHH2klDnlN4T4nU2VPm0iYSkqezRHOkess+SDKxXvS8ZjmBcJLaI20QYLk+MFpWGw69JcgI90WHHFXBDLC+juz+16kmIEs6X96iaK0buysE0aSIy1/3l03mfnAl2fdMydrRhOkvWOpvOc67QCpkehEbhhC29TrbZAp954fu9akaKoHrdFU/I0Y4esM7CgzWUOc3oxfzInJ4Uva+Dun17gZxyuAXhvXqe7x9fPjpMnJGZUSe1E1GCja8BKpx4VFlz1SmBqC+FhDqTlmk8=" - file_glob: true - file: - - "modules/bcrypt/target/bcrypt-*.jar" - - "modules/bcrypt/target/*.sha256" - - "modules/bcrypt/target/checksum-sha256.txt" - - "modules/bcrypt-cli/target/bcrypt-*-full.jar" - - "modules/bcrypt-cli/target/*.sha256" - skip_cleanup: true - on: - branch: master - tags: true - -cache: - directories: - - $HOME/.m2 - -notifications: - slack: - secure: "M94V15GAKJqqX+zY1DwqQeEPMZoO2TLihxdnjvxrdH6LE37BTZcPH8KF5kEQ1ZrwN7F6kHWg9DlDNjKhwz2t7aeFuM7vn6HjhVGFPe6N1UT9vxeFf892LeTalM2ayScBXpPUpQ2RKak4rpQzhNILZabafFuJA7VB5gVSRBfj1I3PCQYWxlIiUbfjx7fS4OeQ8YCWjqHkrAyhksXhs344cyTzlWGXb7pVNHim9J52ZF33YUt9T5aRKdpdyFBAxL73/U+jdKqPZhg0JHrQVWO31q6nsQCaL2DYwj2ykB4ZRYnd3VYpqt1XnwEMyMHC7Vrc0G1Pnm2pqJU809Pps5nrstsjfxd6wz/51hk6kX+p+hFZN6cwR0XtzQcakGG9Pm4RNvNdyo03Y5+uHemmWl6rThgf9Q22RaDHuxkJ5STyWwHTrpmDtV3g/LJNjMEPT6sZGCzH0MgUFd8PP9L2ANq7N8t5a/te3p86gtjMLl0BHTiksNwv5y9QszoiOhCP+G0BIcixYus9XfKmxsA/LcAD1249OQumebcKcnUGwYA3wrhqJ9L1JllJCo/FxEM7gehWqdKws+3PrZ7k2AFT4vdvZKoy1Uj6utjX0udF5AdRK0p1gLrioSqXiFElD3hs/VPy72Gygk4obOkFXzzKpcwVDOCHAh2EInm1we+dCwzyW7o=" - email: false diff --git a/README.md b/README.md index 993512f..e79fc20 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ This is an implementation of the OpenBSD Blowfish password hashing algorithm, as described in "[A Future-Adaptable Password Scheme](http://www.openbsd.org/papers/bcrypt-paper.ps)" by Niels Provos and David Mazieres. It's core is based on [jBcrypt](https://github.com/djmdjm/jBCrypt), but heavily refactored, modernized and with a lot of updates and enhancements. It supports all common [versions](https://en.wikipedia.org/wiki/Bcrypt#Versioning_history), has a security sensitive API and is fully tested against a range of test vectors and reference implementations. -[![Download](https://api.bintray.com/packages/patrickfav/maven/bcrypt/images/download.svg)](https://bintray.com/patrickfav/maven/bcrypt/_latestVersion) -[![Build Status](https://travis-ci.com/patrickfav/bcrypt.svg?branch=master)](https://travis-ci.com/patrickfav/bcrypt) +![Maven Central](https://img.shields.io/maven-central/v/at.favre.lib/bcrypt) +[![Github Actions](https://github.com/patrickfav/bcrypt/actions/workflows/build_deploy.yml/badge.svg)](https://github.com/patrickfav/bcrypt/actions) [![Javadocs](https://www.javadoc.io/badge/at.favre.lib/bcrypt.svg)](https://www.javadoc.io/doc/at.favre.lib/bcrypt) -[![Coverage Status](https://coveralls.io/repos/github/patrickfav/bcrypt/badge.svg?branch=master)](https://coveralls.io/github/patrickfav/bcrypt?branch=master) +[![codecov](https://codecov.io/gh/patrickfav/bcrypt/branch/master/graph/badge.svg?token=HP8FL3ZJG7)](https://codecov.io/gh/patrickfav/bcrypt) [![Maintainability](https://api.codeclimate.com/v1/badges/bbc7ebd960a9f0bb7baa/maintainability)](https://codeclimate.com/github/patrickfav/bcrypt/maintainability) The code is compiled with target [Java 7](https://en.wikipedia.org/wiki/Java_version_history#Java_SE_7) to be compatible with most [_Android_](https://www.android.com/) versions as well as normal Java applications. @@ -180,7 +180,7 @@ The full API can be read in the doc by passing `-h` ## Download -The artifacts are deployed to [jcenter](https://bintray.com/bintray/jcenter) and [Maven Central](https://search.maven.org/). +The artifacts are deployed to [Maven Central](https://search.maven.org/). ### Maven diff --git a/modules/bcrypt-cli/pom.xml b/modules/bcrypt-cli/pom.xml index 824ca0c..9f54392 100644 --- a/modules/bcrypt-cli/pom.xml +++ b/modules/bcrypt-cli/pom.xml @@ -7,7 +7,7 @@ bcrypt-parent at.favre.lib - 0.10.0 + 0.10.0-RC ../../ @@ -57,7 +57,7 @@ at.favre.lib bcrypt - 0.10.0 + 0.10.0-RC optimized diff --git a/modules/bcrypt/pom.xml b/modules/bcrypt/pom.xml index 13a0e57..9e2a1ee 100644 --- a/modules/bcrypt/pom.xml +++ b/modules/bcrypt/pom.xml @@ -7,7 +7,7 @@ bcrypt-parent at.favre.lib - 0.10.0 + 0.10.0-RC ../../ diff --git a/modules/benchmark-jmh/pom.xml b/modules/benchmark-jmh/pom.xml index 57ec7f9..515ba4e 100644 --- a/modules/benchmark-jmh/pom.xml +++ b/modules/benchmark-jmh/pom.xml @@ -7,7 +7,7 @@ bcrypt-parent at.favre.lib - 0.10.0 + 0.10.0-RC ../../ @@ -74,7 +74,7 @@ at.favre.lib bcrypt - 0.10.0 + 0.10.0-RC optimized diff --git a/pom.xml b/pom.xml index d434cad..d49aaaa 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ bcrypt-parent pom - 0.10.0 + 0.10.0-RC https://github.com/patrickfav/bcrypt 2018 @@ -35,15 +35,26 @@ - jcenter - jcenter - https://jcenter.bintray.com + central + Maven Central + https://repo1.maven.org/maven2 false + + + central + Maven Central + https://repo1.maven.org/maven2 + + false + + + + @@ -58,18 +69,14 @@ org.jacoco jacoco-maven-plugin - - org.eluder.coveralls - coveralls-maven-plugin - - bintray-patrickfav - patrickfav-bcrypt - https://api.bintray.com/maven/patrickfav/maven/bcrypt/;publish=1 + ossrh + Central Repository OSSRH + https://oss.sonatype.org/service/local/staging/deploy/maven2/ diff --git a/secrets.tar.enc b/secrets.tar.enc deleted file mode 100644 index bff4944a53d173ce7cf5c78b807b293e59c4300a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6672 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 aL*BdmUQ%C;@)?<+SR>7o;tF0yC4`OytPUvv From f3fe79f7a6bf591652f161fadffcaa365a2b475b Mon Sep 17 00:00:00 2001 From: Patrick Favre-Bulle Date: Sat, 11 Feb 2023 16:17:28 +0100 Subject: [PATCH 2/2] Bumpt version to 0.10.0 and add CHANGELOG --- CHANGELOG | 7 +++++++ modules/bcrypt-cli/pom.xml | 4 ++-- modules/bcrypt/pom.xml | 2 +- modules/benchmark-jmh/pom.xml | 4 ++-- pom.xml | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 88d9d77..43442da 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,12 @@ # Releases +## v0.10.0 + +* [BREAKING CHANGE] the null terminator will not be counted to the 72 byte max length anymore. This changes the behaviour IF you used passwords with EXACTLY 72 bytes. #43, #44 (thx @quinot) +* migrate to Maven Central, Github Actions and Codecov #46 +* update many dependencies and remove warnings for CVE-2020-15522 (bc) CVE-2020-15250 (junit) -> were never part of production code #41 + + ## v0.9.0 * fix license headers and correct credits to jBcrypt * add long-password strategy to verifier #21 diff --git a/modules/bcrypt-cli/pom.xml b/modules/bcrypt-cli/pom.xml index 9f54392..824ca0c 100644 --- a/modules/bcrypt-cli/pom.xml +++ b/modules/bcrypt-cli/pom.xml @@ -7,7 +7,7 @@ bcrypt-parent at.favre.lib - 0.10.0-RC + 0.10.0 ../../ @@ -57,7 +57,7 @@ at.favre.lib bcrypt - 0.10.0-RC + 0.10.0 optimized diff --git a/modules/bcrypt/pom.xml b/modules/bcrypt/pom.xml index 9e2a1ee..13a0e57 100644 --- a/modules/bcrypt/pom.xml +++ b/modules/bcrypt/pom.xml @@ -7,7 +7,7 @@ bcrypt-parent at.favre.lib - 0.10.0-RC + 0.10.0 ../../ diff --git a/modules/benchmark-jmh/pom.xml b/modules/benchmark-jmh/pom.xml index 515ba4e..57ec7f9 100644 --- a/modules/benchmark-jmh/pom.xml +++ b/modules/benchmark-jmh/pom.xml @@ -7,7 +7,7 @@ bcrypt-parent at.favre.lib - 0.10.0-RC + 0.10.0 ../../ @@ -74,7 +74,7 @@ at.favre.lib bcrypt - 0.10.0-RC + 0.10.0 optimized diff --git a/pom.xml b/pom.xml index d49aaaa..05c7af6 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ bcrypt-parent pom - 0.10.0-RC + 0.10.0 https://github.com/patrickfav/bcrypt 2018