Skip to content

Commit 699de9a

Browse files
emlunemlun
committed
gradle spotlessApply
1 parent 98e7e8f commit 699de9a

File tree

4 files changed

+107
-33
lines changed

4 files changed

+107
-33
lines changed

‎webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/FidoMetadataDownloader.java

Lines changed: 55 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -677,9 +677,16 @@ public FidoMetadataDownloaderBuilder trustHttpsCerts(@NonNull X509Certificate...
677677
* written to cache in this case.
678678
*/
679679
public MetadataBLOB loadCachedBlob()
680-
throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
681-
CertificateException, IOException, NoSuchAlgorithmException, SignatureException,
682-
InvalidKeyException, UnexpectedLegalHeader, DigestException,
680+
throws CertPathValidatorException,
681+
InvalidAlgorithmParameterException,
682+
Base64UrlException,
683+
CertificateException,
684+
IOException,
685+
NoSuchAlgorithmException,
686+
SignatureException,
687+
InvalidKeyException,
688+
UnexpectedLegalHeader,
689+
DigestException,
683690
FidoMetadataDownloaderException {
684691
final X509Certificate trustRoot = retrieveTrustRootCert();
685692

@@ -773,9 +780,16 @@ public MetadataBLOB loadCachedBlob()
773780
* written to cache in this case.
774781
*/
775782
public MetadataBLOB refreshBlob()
776-
throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
777-
CertificateException, IOException, NoSuchAlgorithmException, SignatureException,
778-
InvalidKeyException, UnexpectedLegalHeader, DigestException,
783+
throws CertPathValidatorException,
784+
InvalidAlgorithmParameterException,
785+
Base64UrlException,
786+
CertificateException,
787+
IOException,
788+
NoSuchAlgorithmException,
789+
SignatureException,
790+
InvalidKeyException,
791+
UnexpectedLegalHeader,
792+
DigestException,
779793
FidoMetadataDownloaderException {
780794
final X509Certificate trustRoot = retrieveTrustRootCert();
781795

@@ -797,9 +811,16 @@ public MetadataBLOB refreshBlob()
797811

798812
private Optional<MetadataBLOB> refreshBlobInternal(
799813
@NonNull X509Certificate trustRoot, @NonNull Optional<MetadataBLOB> cached)
800-
throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
801-
CertificateException, IOException, NoSuchAlgorithmException, SignatureException,
802-
InvalidKeyException, UnexpectedLegalHeader, FidoMetadataDownloaderException {
814+
throws CertPathValidatorException,
815+
InvalidAlgorithmParameterException,
816+
Base64UrlException,
817+
CertificateException,
818+
IOException,
819+
NoSuchAlgorithmException,
820+
SignatureException,
821+
InvalidKeyException,
822+
UnexpectedLegalHeader,
823+
FidoMetadataDownloaderException {
803824

804825
try {
805826
log.debug("Attempting to download new BLOB...");
@@ -928,9 +949,15 @@ private X509Certificate retrieveTrustRootCert()
928949
* signature.
929950
*/
930951
private Optional<MetadataBLOB> loadExplicitBlobOnly(X509Certificate trustRootCertificate)
931-
throws Base64UrlException, CertPathValidatorException, CertificateException, IOException,
932-
InvalidAlgorithmParameterException, InvalidKeyException, NoSuchAlgorithmException,
933-
SignatureException, FidoMetadataDownloaderException {
952+
throws Base64UrlException,
953+
CertPathValidatorException,
954+
CertificateException,
955+
IOException,
956+
InvalidAlgorithmParameterException,
957+
InvalidKeyException,
958+
NoSuchAlgorithmException,
959+
SignatureException,
960+
FidoMetadataDownloaderException {
934961
if (blobJwt != null) {
935962
return Optional.of(
936963
parseAndVerifyBlob(
@@ -1008,9 +1035,15 @@ private ByteArray download(URL url) throws IOException {
10081035
}
10091036

10101037
private MetadataBLOB parseAndVerifyBlob(ByteArray jwt, X509Certificate trustRootCertificate)
1011-
throws CertPathValidatorException, InvalidAlgorithmParameterException, CertificateException,
1012-
IOException, NoSuchAlgorithmException, SignatureException, InvalidKeyException,
1013-
Base64UrlException, FidoMetadataDownloaderException {
1038+
throws CertPathValidatorException,
1039+
InvalidAlgorithmParameterException,
1040+
CertificateException,
1041+
IOException,
1042+
NoSuchAlgorithmException,
1043+
SignatureException,
1044+
InvalidKeyException,
1045+
Base64UrlException,
1046+
FidoMetadataDownloaderException {
10141047
Scanner s = new Scanner(new ByteArrayInputStream(jwt.getBytes())).useDelimiter("\\.");
10151048
final ByteArray header = ByteArray.fromBase64Url(s.next());
10161049
final ByteArray payload = ByteArray.fromBase64Url(s.next());
@@ -1023,8 +1056,13 @@ private MetadataBLOB verifyBlob(
10231056
ByteArray jwtPayload,
10241057
ByteArray jwtSignature,
10251058
X509Certificate trustRootCertificate)
1026-
throws IOException, CertificateException, NoSuchAlgorithmException, InvalidKeyException,
1027-
SignatureException, CertPathValidatorException, InvalidAlgorithmParameterException,
1059+
throws IOException,
1060+
CertificateException,
1061+
NoSuchAlgorithmException,
1062+
InvalidKeyException,
1063+
SignatureException,
1064+
CertPathValidatorException,
1065+
InvalidAlgorithmParameterException,
10281066
FidoMetadataDownloaderException {
10291067
final ObjectMapper headerJsonMapper =
10301068
com.yubico.internal.util.JacksonCodecs.json()

‎webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/FidoMetadataService.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,16 @@ public FidoMetadataServiceBuilder certStore(@NonNull CertStore certStore) {
325325
}
326326

327327
public FidoMetadataService build()
328-
throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
329-
DigestException, FidoMetadataDownloaderException, CertificateException,
330-
UnexpectedLegalHeader, IOException, NoSuchAlgorithmException, SignatureException,
328+
throws CertPathValidatorException,
329+
InvalidAlgorithmParameterException,
330+
Base64UrlException,
331+
DigestException,
332+
FidoMetadataDownloaderException,
333+
CertificateException,
334+
UnexpectedLegalHeader,
335+
IOException,
336+
NoSuchAlgorithmException,
337+
SignatureException,
331338
InvalidKeyException {
332339
return new FidoMetadataService(blob, prefilter, filter, certStore);
333340
}

‎webauthn-server-demo/src/main/java/demo/webauthn/WebAuthnRestResource.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,18 @@ public class WebAuthnRestResource {
8484
private final JsonNodeFactory jsonFactory = JsonNodeFactory.instance;
8585

8686
public WebAuthnRestResource()
87-
throws InvalidAppIdException, CertificateException, CertPathValidatorException,
88-
InvalidAlgorithmParameterException, Base64UrlException, DigestException,
89-
FidoMetadataDownloaderException, UnexpectedLegalHeader, IOException,
90-
NoSuchAlgorithmException, SignatureException, InvalidKeyException {
87+
throws InvalidAppIdException,
88+
CertificateException,
89+
CertPathValidatorException,
90+
InvalidAlgorithmParameterException,
91+
Base64UrlException,
92+
DigestException,
93+
FidoMetadataDownloaderException,
94+
UnexpectedLegalHeader,
95+
IOException,
96+
NoSuchAlgorithmException,
97+
SignatureException,
98+
InvalidKeyException {
9199
this(new WebAuthnServer());
92100
}
93101

‎webauthn-server-demo/src/main/java/demo/webauthn/WebAuthnServer.java

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,16 @@ public class WebAuthnServer {
105105
private final MetadataService metadataService = getMetadataService();
106106

107107
private static MetadataService getMetadataService()
108-
throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
109-
DigestException, FidoMetadataDownloaderException, CertificateException,
110-
UnexpectedLegalHeader, IOException, NoSuchAlgorithmException, SignatureException,
108+
throws CertPathValidatorException,
109+
InvalidAlgorithmParameterException,
110+
Base64UrlException,
111+
DigestException,
112+
FidoMetadataDownloaderException,
113+
CertificateException,
114+
UnexpectedLegalHeader,
115+
IOException,
116+
NoSuchAlgorithmException,
117+
SignatureException,
111118
InvalidKeyException {
112119
if (Config.useFidoMds()) {
113120
logger.info("Using combination of Yubico JSON file and FIDO MDS for attestation metadata.");
@@ -140,9 +147,16 @@ private static MetadataService getMetadataService()
140147
private final RelyingParty rp;
141148

142149
public WebAuthnServer()
143-
throws CertificateException, CertPathValidatorException, InvalidAlgorithmParameterException,
144-
Base64UrlException, DigestException, FidoMetadataDownloaderException,
145-
UnexpectedLegalHeader, IOException, NoSuchAlgorithmException, SignatureException,
150+
throws CertificateException,
151+
CertPathValidatorException,
152+
InvalidAlgorithmParameterException,
153+
Base64UrlException,
154+
DigestException,
155+
FidoMetadataDownloaderException,
156+
UnexpectedLegalHeader,
157+
IOException,
158+
NoSuchAlgorithmException,
159+
SignatureException,
146160
InvalidKeyException {
147161
this(
148162
new InMemoryRegistrationStorage(),
@@ -158,9 +172,16 @@ public WebAuthnServer(
158172
Cache<ByteArray, AssertionRequestWrapper> assertRequestStorage,
159173
RelyingPartyIdentity rpIdentity,
160174
Set<String> origins)
161-
throws CertificateException, CertPathValidatorException, InvalidAlgorithmParameterException,
162-
Base64UrlException, DigestException, FidoMetadataDownloaderException,
163-
UnexpectedLegalHeader, IOException, NoSuchAlgorithmException, SignatureException,
175+
throws CertificateException,
176+
CertPathValidatorException,
177+
InvalidAlgorithmParameterException,
178+
Base64UrlException,
179+
DigestException,
180+
FidoMetadataDownloaderException,
181+
UnexpectedLegalHeader,
182+
IOException,
183+
NoSuchAlgorithmException,
184+
SignatureException,
164185
InvalidKeyException {
165186
this.userStorage = userStorage;
166187
this.registerRequestStorage = registerRequestStorage;

0 commit comments

Comments
 (0)