PGPainless/cert-d-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/cert-d-java.git synced 2025-12-05 04:41:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

BadDataException: Pass in throwable cause/message

Browse source
This commit is contained in:
Paul Schaub 2025-09-29 13:39:58 +02:00
parent b4683292f8
commit 9d85141f32
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pgp-cert-d-java/src/main/java/pgp/cert_d/backend/FileBasedCertificateDirectoryBackend.java
View file

@ -181,7 +181,9 @@ public class FileBasedCertificateDirectoryBackend implements PGPCertificateDirec
Certificate certificate = reader.read(bufferedIn, tag).asCertificate(); Certificate certificate = reader.read(bufferedIn, tag).asCertificate();
if (!certificate.getFingerprint().equals(fingerprint)) { if (!certificate.getFingerprint().equals(fingerprint)) {
// TODO: Figure out more suitable exception // TODO: Figure out more suitable exception
throw new BadDataException(); throw new BadDataException("Identified certificate fingerprint does not match queried fingerprint:\n" +
"found: " + certificate.getFingerprint() + "\n" +
"query: " + fingerprint);
} }
return certificate; return certificate;
@ -242,7 +244,9 @@ public class FileBasedCertificateDirectoryBackend implements PGPCertificateDirec
long tag = getTag(certFile); long tag = getTag(certFile);
Certificate certificate = reader.read(new FileInputStream(certFile), tag).asCertificate(); Certificate certificate = reader.read(new FileInputStream(certFile), tag).asCertificate();
if (!(subdirectory.getName() + certFile.getName()).equals(certificate.getFingerprint())) { if (!(subdirectory.getName() + certFile.getName()).equals(certificate.getFingerprint())) {
throw new BadDataException(); throw new BadDataException("Certificate fingerprint does not match file location+name.\n" +
"Fingerprint: " + certificate.getFingerprint() + "\n" +
"Location+name: " + subdirectory.getName() + certFile.getName());
} }
return certificate; return certificate;
} catch (IOException e) { } catch (IOException e) {
@ -279,7 +283,7 @@ public class FileBasedCertificateDirectoryBackend implements PGPCertificateDirec
existingCertificate = readBySpecialName(SpecialNames.TRUST_ROOT); existingCertificate = readBySpecialName(SpecialNames.TRUST_ROOT);
certFile = resolver.getCertFileBySpecialName(SpecialNames.TRUST_ROOT); certFile = resolver.getCertFileBySpecialName(SpecialNames.TRUST_ROOT);
} catch (BadNameException e) { } catch (BadNameException e) {
throw new BadDataException(); throw new BadDataException("Unknown special name '" + SpecialNames.TRUST_ROOT + "'");
} }
if (existingCertificate != null) { if (existingCertificate != null) {
@ -304,7 +308,7 @@ public class FileBasedCertificateDirectoryBackend implements PGPCertificateDirec
existingCertificate = readByFingerprint(newCertificate.getFingerprint()); existingCertificate = readByFingerprint(newCertificate.getFingerprint());
certFile = resolver.getCertFileByFingerprint(newCertificate.getFingerprint()); certFile = resolver.getCertFileByFingerprint(newCertificate.getFingerprint());
} catch (BadNameException e) { } catch (BadNameException e) {
throw new BadDataException(); throw new BadDataException("Malformed key fingerprint: " + newCertificate.getFingerprint());
} }
if (existingCertificate != null) { if (existingCertificate != null) {
@ -324,7 +328,7 @@ public class FileBasedCertificateDirectoryBackend implements PGPCertificateDirec
existingCertificate = readBySpecialName(specialName); existingCertificate = readBySpecialName(specialName);
certFile = resolver.getCertFileBySpecialName(specialName); certFile = resolver.getCertFileBySpecialName(specialName);
} catch (BadNameException e) { } catch (BadNameException e) {
throw new BadDataException(); throw new BadDataException("Unknown special name '" + specialName + "'");
} }
if (existingCertificate != null) { if (existingCertificate != null) {
@ -349,7 +353,7 @@ public class FileBasedCertificateDirectoryBackend implements PGPCertificateDirec
private Long getTag(File file) throws IOException { private Long getTag(File file) throws IOException {
if (!file.exists()) { if (!file.exists()) {
throw new NoSuchElementException(); throw new NoSuchElementException("File '" + file.getAbsolutePath() + "' does not exist.");
} }
Path path = file.toPath(); Path path = file.toPath();
BasicFileAttributes attrs = Files.readAttributes(path, BasicFileAttributes.class); BasicFileAttributes attrs = Files.readAttributes(path, BasicFileAttributes.class);
@ -409,7 +413,7 @@ public class FileBasedCertificateDirectoryBackend implements PGPCertificateDirec
*/ */
public File getCertFileByFingerprint(String fingerprint) throws BadNameException { public File getCertFileByFingerprint(String fingerprint) throws BadNameException {
if (!isFingerprint(fingerprint)) { if (!isFingerprint(fingerprint)) {
throw new BadNameException(); throw new BadNameException("Malformed query fingerprint '" + fingerprint + "'");
} }
// is fingerprint // is fingerprint

2
pgp-cert-d-java/src/test/java/pgp/cert_d/dummy/TestKeyMaterialReaderBackend.java
View file

@ -43,7 +43,7 @@ public class TestKeyMaterialReaderBackend implements KeyMaterialReaderBackend {
try { try {
return readCertificate(new ByteArrayInputStream(out.toByteArray()), tag); return readCertificate(new ByteArrayInputStream(out.toByteArray()), tag);
} catch (IOException e1) { } catch (IOException e1) {
throw new BadDataException(); throw new BadDataException("Cannot read certificate", e1);
} }
} }
} }

5
pgp-certificate-store/src/main/java/pgp/certificate_store/exception/BadDataException.java
View file

@ -9,6 +9,11 @@ package pgp.certificate_store.exception;
*/ */
public class BadDataException extends Exception { public class BadDataException extends Exception {
@Deprecated // pass cause and/or message
public BadDataException() {
super();
}
public BadDataException(Throwable cause) { public BadDataException(Throwable cause) {
super(cause); super(cause);
} }