From 2bbb07b805346fd085d101c493d63eb90cf9f30e Mon Sep 17 00:00:00 2001 From: Legion2 Date: Thu, 31 Oct 2019 14:46:09 +0100 Subject: [PATCH 01/14] added Dockerfile --- .dockerignore | 25 +++++++++++++++++++++++++ .gitattributes | 2 ++ Dockerfile | 15 +++++++++++++++ README.md | 17 ++++++++++------- json-web-key-generator.sh | 5 +++++ pom.xml | 2 ++ 6 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 .dockerignore create mode 100644 .gitattributes create mode 100644 Dockerfile create mode 100755 json-web-key-generator.sh diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..3729ff0 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a97a586 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +* text=auto +*.sh text eol=ln diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d758642 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM maven:3-jdk-14 AS builder + +WORKDIR /build + +COPY ./ . + +RUN mvn package + +FROM openjdk:14-jdk-alpine + +COPY --from=builder /build/target/json-web-key-generator.jar /target/json-web-key-generator.jar + +COPY json-web-key-generator.sh /json-web-key-generator.sh + +ENTRYPOINT ["/json-web-key-generator.sh"] diff --git a/README.md b/README.md index 029ba0a..2c4bd60 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -json-web-key-generator -====================== +# json-web-key-generator +A command-line Java-based generator for JSON Web Keys (JWK) and JSON Private/Shared Keys (JPSKs). -A commandline Java-based generator for JSON Web Keys (JWK) and JSON Private/Shared Keys (JPSKs). +## Getting Started -===================== +To compile, run `mvn package`. +This will generate a `json-web-key-generator.jar` in the `target` directory. -To compile, run `mvn package`. This will generate a `json-web-key-generator-0.9-SNAPSHOT-jar-with-dependencies.jar` in the `/target` directory. - -To generate a key, run `java -jar target/json-web-key-generator-0.9-SNAPSHOT-jar-with-dependencies.jar -t `. Several other arguments are defined which may be required depending on your key type: +To generate a key, run `java -jar json-web-key-generator.jar -t `. +Several other arguments are defined which may be required depending on your key type: ``` usage: java -jar json-web-key-generator.jar -t [options] @@ -39,3 +39,6 @@ usage: java -jar json-web-key-generator.jar -t [options] must be declared as well. -x,--x509 Display keys in X509 PEM format ``` + +## Use Docker +When using the docker image and write to a file you must mount that file in the docker container. diff --git a/json-web-key-generator.sh b/json-web-key-generator.sh new file mode 100755 index 0000000..c73ef15 --- /dev/null +++ b/json-web-key-generator.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BASEDIR=$(dirname $(readlink -f "$0")) + +java -jar "${BASEDIR}/target/json-web-key-generator.jar" "$@" diff --git a/pom.xml b/pom.xml index 6edb1ab..6f31d65 100644 --- a/pom.xml +++ b/pom.xml @@ -53,9 +53,11 @@ org.apache.maven.plugins maven-assembly-plugin + ${project.artifactId} jar-with-dependencies + false org.mitre.jose.jwk.Launcher From 8d6a0f5ac30a688ada928bebb8382f86abe4a7a6 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Tue, 21 Jul 2020 22:58:14 +0200 Subject: [PATCH 02/14] added maven workflow --- .github/workflows/maven.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..c2af380 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,17 @@ +name: Java CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 14 + uses: actions/setup-java@v1 + with: + java-version: 14 + - name: Build with Maven + run: mvn -B package From 261ffd6b6d287ba95bf57336f3fc8f4313226d02 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Thu, 31 Oct 2019 18:14:18 +0100 Subject: [PATCH 03/14] Create LICENSE correctly added license header to files --- LICENSE | 201 ++++++++++++++++++ LICENSE.txt | 14 -- .../java/org/mitre/jose/jwk/ECKeyMaker.java | 15 +- .../org/mitre/jose/jwk/KeyIdGenerator.java | 16 ++ .../java/org/mitre/jose/jwk/Launcher.java | 16 ++ .../java/org/mitre/jose/jwk/OKPKeyMaker.java | 16 ++ .../mitre/jose/jwk/OctetSequenceKeyMaker.java | 15 +- .../java/org/mitre/jose/jwk/RSAKeyMaker.java | 15 +- 8 files changed, 291 insertions(+), 17 deletions(-) create mode 100644 LICENSE delete mode 100644 LICENSE.txt diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index f90e111..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,14 +0,0 @@ -Copyright 2014 The MITRE Corporation and - the MIT Kerberos and Internet Trust Consortium - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/src/main/java/org/mitre/jose/jwk/ECKeyMaker.java b/src/main/java/org/mitre/jose/jwk/ECKeyMaker.java index 60d76de..78c62e7 100644 --- a/src/main/java/org/mitre/jose/jwk/ECKeyMaker.java +++ b/src/main/java/org/mitre/jose/jwk/ECKeyMaker.java @@ -1,5 +1,18 @@ -/** +/* + * Copyright 2019 The MITRE Corporation and + * the MIT Kerberos and Internet Trust Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.mitre.jose.jwk; diff --git a/src/main/java/org/mitre/jose/jwk/KeyIdGenerator.java b/src/main/java/org/mitre/jose/jwk/KeyIdGenerator.java index e350e1b..14a2fcf 100644 --- a/src/main/java/org/mitre/jose/jwk/KeyIdGenerator.java +++ b/src/main/java/org/mitre/jose/jwk/KeyIdGenerator.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019 The MITRE Corporation and + * the MIT Kerberos and Internet Trust Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.mitre.jose.jwk; import java.time.Instant; diff --git a/src/main/java/org/mitre/jose/jwk/Launcher.java b/src/main/java/org/mitre/jose/jwk/Launcher.java index f494b85..5575f8e 100644 --- a/src/main/java/org/mitre/jose/jwk/Launcher.java +++ b/src/main/java/org/mitre/jose/jwk/Launcher.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019 The MITRE Corporation and + * the MIT Kerberos and Internet Trust Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.mitre.jose.jwk; diff --git a/src/main/java/org/mitre/jose/jwk/OKPKeyMaker.java b/src/main/java/org/mitre/jose/jwk/OKPKeyMaker.java index 6da0a1e..088b7a6 100644 --- a/src/main/java/org/mitre/jose/jwk/OKPKeyMaker.java +++ b/src/main/java/org/mitre/jose/jwk/OKPKeyMaker.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019 The MITRE Corporation and + * the MIT Kerberos and Internet Trust Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.mitre.jose.jwk; import java.io.IOException; diff --git a/src/main/java/org/mitre/jose/jwk/OctetSequenceKeyMaker.java b/src/main/java/org/mitre/jose/jwk/OctetSequenceKeyMaker.java index 21ae42b..d781270 100644 --- a/src/main/java/org/mitre/jose/jwk/OctetSequenceKeyMaker.java +++ b/src/main/java/org/mitre/jose/jwk/OctetSequenceKeyMaker.java @@ -1,5 +1,18 @@ -/** +/* + * Copyright 2019 The MITRE Corporation and + * the MIT Kerberos and Internet Trust Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.mitre.jose.jwk; diff --git a/src/main/java/org/mitre/jose/jwk/RSAKeyMaker.java b/src/main/java/org/mitre/jose/jwk/RSAKeyMaker.java index ec24e62..81024e5 100644 --- a/src/main/java/org/mitre/jose/jwk/RSAKeyMaker.java +++ b/src/main/java/org/mitre/jose/jwk/RSAKeyMaker.java @@ -1,5 +1,18 @@ -/** +/* + * Copyright 2019 The MITRE Corporation and + * the MIT Kerberos and Internet Trust Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.mitre.jose.jwk; From b4dc0ee0d000596c7f99d3fa00ee2f56fafab354 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Thu, 12 Mar 2020 15:21:17 +0100 Subject: [PATCH 04/14] added docker hub bagde --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c4bd60..165d18c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# json-web-key-generator +# json-web-key-generator [![Docker Pulls](https://img.shields.io/docker/pulls/legion2/json-web-key-generator)](https://hub.docker.com/r/legion2/json-web-key-generator) A command-line Java-based generator for JSON Web Keys (JWK) and JSON Private/Shared Keys (JPSKs). ## Getting Started From 90e2cfd20ac7afb7f97eb4af83268e257f172491 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Thu, 12 Mar 2020 15:23:55 +0100 Subject: [PATCH 05/14] added target to docker ignore file --- .dockerignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 3729ff0..e466c4a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -21,5 +21,6 @@ **/obj **/secrets.dev.yaml **/values.dev.yaml +target LICENSE -README.md \ No newline at end of file +README.md From 8ab2ab8087e80448181f6fc84f7e529606f67ba7 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Tue, 26 May 2020 22:07:34 +0200 Subject: [PATCH 06/14] added example docker commands --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 165d18c..087d27f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,18 @@ # json-web-key-generator [![Docker Pulls](https://img.shields.io/docker/pulls/legion2/json-web-key-generator)](https://hub.docker.com/r/legion2/json-web-key-generator) A command-line Java-based generator for JSON Web Keys (JWK) and JSON Private/Shared Keys (JPSKs). +Examples: +``` +# Create a new RSA Private and public key and print it to the console as JWK Set +$ docker run --rm legion2/json-web-key-generator -t RSA -s 2048 -S -p + +# Create a new RSA key with the id 'mykeyid' and print it to the console +$ docker run --rm legion2/json-web-key-generator -t RSA -s 2048 -p -i mykeyid + +# Add a new RSA key to an existing JWK Set file +$ docker run --rm -v "${PWD}:/keys" legion2/json-web-key-generator -t RSA -s 2048 -o /keys/jwks.json -S +``` + ## Getting Started To compile, run `mvn package`. From e4b8a0e8124f48285753f47524f6ec85d6fe3866 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Tue, 21 Jul 2020 23:21:40 +0200 Subject: [PATCH 07/14] increased RSA key size --- Dockerfile | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d758642..814ccb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM maven:3-jdk-14 AS builder WORKDIR /build -COPY ./ . +COPY . . RUN mvn package diff --git a/README.md b/README.md index 087d27f..96d92ea 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ A command-line Java-based generator for JSON Web Keys (JWK) and JSON Private/Sha Examples: ``` # Create a new RSA Private and public key and print it to the console as JWK Set -$ docker run --rm legion2/json-web-key-generator -t RSA -s 2048 -S -p +$ docker run --rm legion2/json-web-key-generator -t RSA -s 4096 -S -p # Create a new RSA key with the id 'mykeyid' and print it to the console -$ docker run --rm legion2/json-web-key-generator -t RSA -s 2048 -p -i mykeyid +$ docker run --rm legion2/json-web-key-generator -t RSA -s 4096 -p -i mykeyid # Add a new RSA key to an existing JWK Set file -$ docker run --rm -v "${PWD}:/keys" legion2/json-web-key-generator -t RSA -s 2048 -o /keys/jwks.json -S +$ docker run --rm -v "${PWD}:/keys" legion2/json-web-key-generator -t RSA -s 4096 -o /keys/jwks.json -S ``` ## Getting Started From e11a0c0ae82d022785a399f0a0f40374d5d99425 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 23:47:34 +0000 Subject: [PATCH 08/14] Bump junit from 3.8.1 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 3.8.1 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/commits/r4.13.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f31d65..9af656c 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ junit junit - 3.8.1 + 4.13.1 test From 0c6b61f3a92e22861c34d0dc5dd5155685e46d1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 20:22:42 +0000 Subject: [PATCH 09/14] Bump bcprov-jdk15on from 1.66 to 1.67 Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.66 to 1.67. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f31d65..78f9fed 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ org.bouncycastle bcprov-jdk15on - 1.66 + 1.67 org.bouncycastle From 2f6b96e933a8e7b21773c168add3af6478ce81ca Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Fri, 30 Apr 2021 23:34:27 +0200 Subject: [PATCH 10/14] Create docker-image.yml --- .github/workflows/docker-image.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..310668a --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,29 @@ +name: Docker Image CI + +on: + push: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: ghcr.io/${{ github.repository_owner }}/json-web-key-generator:latest From 9acbf5fd450598c30cdb368f008e0377af17ce1c Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Fri, 30 Apr 2021 23:44:27 +0200 Subject: [PATCH 11/14] Update docker-image.yml --- .github/workflows/docker-image.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 310668a..85fba6f 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -20,10 +20,13 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Prepare image name + run: | + echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - name: Build and push uses: docker/build-push-action@v2 with: context: . platforms: linux/amd64,linux/arm64 push: true - tags: ghcr.io/${{ github.repository_owner }}/json-web-key-generator:latest + tags: ghcr.io/${IMAGE_REPOSITORY}:latest From 141daadf8eb1c6fa5fdb0cd6edec5fba9cc2f0a8 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Fri, 30 Apr 2021 23:46:10 +0200 Subject: [PATCH 12/14] Update docker-image.yml --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 85fba6f..b74d28f 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -5,7 +5,7 @@ on: branches: [ master ] jobs: - build: + docker: runs-on: ubuntu-latest steps: - name: Checkout @@ -29,4 +29,4 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: true - tags: ghcr.io/${IMAGE_REPOSITORY}:latest + tags: ghcr.io/${{ env.IMAGE_REPOSITORY }}:latest From 49dac4368c001b56b7602beeba7cf3981a51db02 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Fri, 30 Apr 2021 23:48:45 +0200 Subject: [PATCH 13/14] only build docker image for linux/amd64 --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b74d28f..b4b08e1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -27,6 +27,6 @@ jobs: uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: true tags: ghcr.io/${{ env.IMAGE_REPOSITORY }}:latest From 9eabaac105ea100615ce3edd2886bc4c247feb06 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Fri, 30 Apr 2021 23:54:58 +0200 Subject: [PATCH 14/14] Use github container registry --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 96d92ea..5f8b1a6 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -# json-web-key-generator [![Docker Pulls](https://img.shields.io/docker/pulls/legion2/json-web-key-generator)](https://hub.docker.com/r/legion2/json-web-key-generator) +# json-web-key-generator A command-line Java-based generator for JSON Web Keys (JWK) and JSON Private/Shared Keys (JPSKs). Examples: ``` # Create a new RSA Private and public key and print it to the console as JWK Set -$ docker run --rm legion2/json-web-key-generator -t RSA -s 4096 -S -p +$ docker run --rm ghcr.io/legion2/json-web-key-generator -t RSA -s 4096 -S -p # Create a new RSA key with the id 'mykeyid' and print it to the console -$ docker run --rm legion2/json-web-key-generator -t RSA -s 4096 -p -i mykeyid +$ docker run --rm ghcr.io/legion2/json-web-key-generator -t RSA -s 4096 -p -i mykeyid # Add a new RSA key to an existing JWK Set file -$ docker run --rm -v "${PWD}:/keys" legion2/json-web-key-generator -t RSA -s 4096 -o /keys/jwks.json -S +$ docker run --rm -v "${PWD}:/keys" ghcr.io/legion2/json-web-key-generator -t RSA -s 4096 -o /keys/jwks.json -S ``` ## Getting Started