Changeset 10235 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-05-17T02:02:30+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S00112 - Generic exceptions should never be thrown

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• CertificateAmendment.java (modified) (4 diffs)
• OsmReader.java (modified) (3 diffs)
• XmlStreamParsingException.java (added)

trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java

@@ -11 +11 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.security.GeneralSecurityException;
 import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.PKIXParameters;
@@ -59 +57 @@
      * Add missing root certificates to the list of trusted certificates for TLS connections.
      * @throws IOException if an I/O error occurs
+     * @throws GeneralSecurityException if a security error occurs
      */
-    public static void addMissingCertificates() throws IOException {
+    public static void addMissingCertificates() throws IOException, GeneralSecurityException {
         if (!Main.pref.getBoolean("tls.add-missing-certificates", true))
             return;
-        KeyStore keyStore;
-        try {
-            keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-        } catch (KeyStoreException ex) {
-            throw new IOException(ex);
-        }
+        KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         Path cacertsPath = Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts");
         try (InputStream is = Files.newInputStream(cacertsPath)) {
             keyStore.load(is, "changeit".toCharArray());
-        } catch (NoSuchAlgorithmException ex) {
-            throw new RuntimeException(ex);
-        } catch (CertificateException ex) {
-            throw new IOException(ex);
         }
 
-        CertificateFactory cf;
-        try {
-            cf = CertificateFactory.getInstance("X.509");
-        } catch (CertificateException ex) {
-            throw new RuntimeException(ex);
-        }
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
         boolean certificateAdded = false;
         for (int i = 0; i < CERT_AMEND.length; i++) {
-            CachedFile certCF = new CachedFile(CERT_AMEND[i]);
-            byte[] certBytes = certCF.getByteContent();
-            ByteArrayInputStream certIS = new ByteArrayInputStream(certBytes);
-            X509Certificate cert;
-
-            try {
-                cert = (X509Certificate) cf.generateCertificate(certIS);
+            try (CachedFile certCF = new CachedFile(CERT_AMEND[i])) {
+                byte[] certBytes = certCF.getByteContent();
+                ByteArrayInputStream certIS = new ByteArrayInputStream(certBytes);
+                X509Certificate cert = (X509Certificate) cf.generateCertificate(certIS);
                 MessageDigest md = MessageDigest.getInstance("SHA-256");
                 String sha1 = Utils.toHexString(md.digest(cert.getEncoded()));
                 if (!SHA_HASHES[i].equals(sha1)) {
-                    throw new RuntimeException(tr("Error adding certificate {0} - certificate fingerprint mismatch. Expected {1}, was {2}",
+                    throw new IllegalStateException(
+                            tr("Error adding certificate {0} - certificate fingerprint mismatch. Expected {1}, was {2}",
                             CERT_AMEND[i],
                             SHA_HASHES[i],
@@ -102 +85 @@
                             ));
                 }
-            } catch (CertificateException ex) {
-                throw new IOException(ex);
-            } catch (NoSuchAlgorithmException ex) {
-                throw new RuntimeException(ex);
-            }
-            if (certificateIsMissing(keyStore, cert)) {
-                if (Main.isDebugEnabled()) {
-                    Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName()));
+                if (certificateIsMissing(keyStore, cert)) {
+                    if (Main.isDebugEnabled()) {
+                        Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName()));
+                    }
+                    String alias = "josm:" + new File(CERT_AMEND[i]).getName();
+                    keyStore.setCertificateEntry(alias, cert);
+                    certificateAdded = true;
                 }
-                String alias = "josm:" + new File(CERT_AMEND[i]).getName();
-                try {
-                    keyStore.setCertificateEntry(alias, cert);
-                } catch (KeyStoreException ex) {
-                    throw new AssertionError(ex);
-                }
-                certificateAdded = true;
             }
         }
 
         if (certificateAdded) {
-            try {
-                TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                tmf.init(keyStore);
-                SSLContext sslContext = SSLContext.getInstance("TLS");
-                sslContext.init(null, tmf.getTrustManagers(), null);
-                SSLContext.setDefault(sslContext);
-            } catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException ex) {
-                throw new RuntimeException(ex);
-            }
+            TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init(keyStore);
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(null, tmf.getTrustManagers(), null);
+            SSLContext.setDefault(sslContext);
         }
     }
@@ -139 +110 @@
      * @param crt the certificate
      * @return true, if the certificate is not contained in the keystore
+     * @throws InvalidAlgorithmParameterException if the keystore does not contain at least one trusted certificate entry
+     * @throws KeyStoreException if the keystore has not been initialized
      */
-    private static boolean certificateIsMissing(KeyStore keyStore, X509Certificate crt) {
-        PKIXParameters params;
-        try {
-            params = new PKIXParameters(keyStore);
-        } catch (KeyStoreException ex) {
-            throw new AssertionError(ex);
-        } catch (InvalidAlgorithmParameterException ex) {
-            throw new RuntimeException(ex);
-        }
+    private static boolean certificateIsMissing(KeyStore keyStore, X509Certificate crt)
+            throws KeyStoreException, InvalidAlgorithmParameterException {
+        PKIXParameters params = new PKIXParameters(keyStore);
         String id = crt.getSubjectX500Principal().getName();
         for (TrustAnchor ta : params.getTrustAnchors()) {

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -95 +95 @@
 
     protected void throwException(String msg, Throwable th) throws XMLStreamException {
-        throw new OsmParsingException(msg, parser.getLocation(), th);
+        throw new XmlStreamParsingException(msg, parser.getLocation(), th);
     }
 
     protected void throwException(String msg) throws XMLStreamException {
-        throw new OsmParsingException(msg, parser.getLocation());
+        throw new XmlStreamParsingException(msg, parser.getLocation());
     }
 
@@ -560 +560 @@
     }
 
-    private static class OsmParsingException extends XMLStreamException {
-
-        OsmParsingException(String msg, Location location) {
-            super(msg); /* cannot use super(msg, location) because it messes with the message preventing localization */
-            this.location = location;
-        }
-
-        OsmParsingException(String msg, Location location, Throwable th) {
-            super(msg, th);
-            this.location = location;
-        }
-
-        @Override
-        public String getMessage() {
-            String msg = super.getMessage();
-            if (msg == null) {
-                msg = getClass().getName();
-            }
-            if (getLocation() == null)
-                return msg;
-            msg += ' ' + tr("(at line {0}, column {1})", getLocation().getLineNumber(), getLocation().getColumnNumber());
-            int offset = getLocation().getCharacterOffset();
-            if (offset > -1) {
-                msg += ". "+ tr("{0} bytes have been read", offset);
-            }
-            return msg;
-        }
-    }
-
     /**
      * Exception thrown after user cancelation.
      */
-    private static final class OsmParsingCanceledException extends OsmParsingException implements ImportCancelException {
+    private static final class OsmParsingCanceledException extends XmlStreamParsingException implements ImportCancelException {
         /**
          * Constructs a new {@code OsmParsingCanceledException}.
@@ -639 +610 @@
         } catch (IllegalDataException e) {
             throw e;
-        } catch (OsmParsingException e) {
+        } catch (XmlStreamParsingException e) {
             throw new IllegalDataException(e.getMessage(), e);
         } catch (XMLStreamException e) {