Merge branch 'master' of https://github.com/DMDirc/DMDirc

src/com/dmdirc/ChannelMap.java

@@ -131,14 +131,4 @@ public class ChannelMap {
                 .collect(Collectors.toList());
     }
 
-    /**
-     * Creates a runnable that, when run, will cause each channel in the map at that time to check
-     * its 'who' status.
-     *
-     * @return A new runnable.
-     */
-    public Runnable getWhoRunnable() {
-        return () -> channels.values().forEach(Channel::checkWho);
-    }
-
 }

src/com/dmdirc/DMDircMBassador.java

@@ -35,6 +35,8 @@ import net.engio.mbassy.bus.config.Feature;
  */
 public class DMDircMBassador extends MBassador<DMDircEvent> {
 
+    private final Object errorHandlerLock = new Object();
+
     public DMDircMBassador() {
         super(new BusConfiguration().addFeature(Feature.SyncPubSub.Default())
                 .addFeature(Feature.AsynchronousHandlerInvocation.Default(1, 1)).addFeature(
@@ -49,11 +51,27 @@ public class DMDircMBassador extends MBassador<DMDircEvent> {
         setupErrorHandler();
     }
 
+    @SuppressWarnings({
+            "ThrowableResultOfMethodCallIgnored",
+            "CallToPrintStackTrace",
+            "UseOfSystemOutOrSystemErr"
+    })
     private void setupErrorHandler() {
         addErrorHandler(e -> {
-            @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-            final Throwable error = e.getCause().getCause();
-            publish(new AppErrorEvent(ErrorLevel.HIGH, error.getCause(), error.getMessage(), ""));
+            if (Thread.holdsLock(errorHandlerLock)) {
+                // ABORT ABORT ABORT - we're publishing an error on the same thread we just tried
+                // to publish an error on. Something in the error reporting pipeline must be
+                // breaking, so don't try adding any more errors.
+                System.err.println("ERROR: Error when reporting error");
+                e.getCause().printStackTrace();
+                return;
+            }
+
+            synchronized (errorHandlerLock) {
+                final Throwable error = e.getCause().getCause();
+                publish(new AppErrorEvent(ErrorLevel.HIGH, error.getCause(), error.getMessage(),
+                        ""));
+            }
         });
     }
 }

src/com/dmdirc/FrameContainer.java

@@ -331,8 +331,9 @@ public abstract class FrameContainer implements WindowModel {
     }
 
     @Override
+    @Deprecated
     public void addLine(final String line, final boolean timestamp) {
-        addLine(line, timestamp ? new Date() : null);
+        addLine(line, new Date());
     }
 
     @Override

src/com/dmdirc/GroupChatManagerImpl.java

@@ -39,9 +39,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import net.engio.mbassy.listener.Handler;
@@ -65,19 +62,12 @@ public class GroupChatManagerImpl implements GroupChatManager {
     /** A set of channels we want to join without focusing. */
     private final Collection<String> backgroundChannels = new HashSet<>();
 
-    private final ScheduledExecutorService executorService;
-
-    /** The future used when a who timer is scheduled. */
-    private ScheduledFuture<?> whoTimerFuture;
-
     public GroupChatManagerImpl(final Connection connection,
             final IdentityFactory identityFactory,
-            final ChannelFactory channelFactory,
-            final ScheduledExecutorService executorService) {
+            final ChannelFactory channelFactory) {
         this.connection = connection;
         this.identityFactory = identityFactory;
         this.channelFactory = channelFactory;
-        this.executorService = executorService;
     }
 
     @Override
@@ -188,10 +178,6 @@ public class GroupChatManagerImpl implements GroupChatManager {
     }
 
     public void handleSocketClosed() {
-        if (whoTimerFuture != null) {
-            whoTimerFuture.cancel(false);
-        }
-
         channels.resetAll();
 
         if (connection.getWindowModel().getConfigManager()
@@ -209,11 +195,6 @@ public class GroupChatManagerImpl implements GroupChatManager {
             requests.addAll(channels.asJoinRequests());
         }
         join(requests.toArray(new ChannelJoinRequest[requests.size()]));
-
-        final int whoTime = connection.getWindowModel().getConfigManager()
-                .getOptionInt("general", "whotime");
-        whoTimerFuture = executorService.scheduleAtFixedRate(
-                channels.getWhoRunnable(), whoTime, whoTime, TimeUnit.MILLISECONDS);
     }
 
     @Handler

src/com/dmdirc/GroupChatManagerImplFactory.java

@@ -25,8 +25,6 @@ package com.dmdirc;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.IdentityFactory;
 
-import java.util.concurrent.ScheduledExecutorService;
-
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
@@ -48,11 +46,8 @@ public class GroupChatManagerImplFactory {
         this.channelFactory = channelFactory;
     }
 
-    public GroupChatManagerImpl create(
-            final Connection connection,
-            final ScheduledExecutorService executorService) {
-        return new GroupChatManagerImpl(connection, identityFactory, channelFactory.get(),
-                executorService);
+    public GroupChatManagerImpl create(final Connection connection) {
+        return new GroupChatManagerImpl(connection, identityFactory, channelFactory.get());
     }
 
 }

src/com/dmdirc/Server.java

@@ -213,7 +213,7 @@ public class Server extends FrameContainer implements Connection {
         this.userSettings = userSettings;
         this.messageEncoderFactory = messageEncoderFactory;
         this.userManager = userManager;
-        this.groupChatManager = groupChatManagerFactory.create(this, executorService);
+        this.groupChatManager = groupChatManagerFactory.create(this);
         this.inviteManager = new InviteManagerImpl(this);
 
         awayMessage = Optional.empty();

src/com/dmdirc/interfaces/WindowModel.java

@@ -188,7 +188,9 @@ public interface WindowModel {
      *
      * @param line      The line to be added
      * @param timestamp Whether or not to display the timestamp for this line
+     * @deprecated Timestamps are always displayed.
      */
+    @Deprecated
     void addLine(String line, boolean timestamp);
 
     /**

src/com/dmdirc/tls/CertificateManager.java

@@ -285,24 +285,55 @@ public class CertificateManager implements X509TrustManager {
     @Override
     public void checkServerTrusted(final X509Certificate[] chain, final String authType)
             throws CertificateException {
-        this.chain = chain;
+        this.chain = Arrays.copyOf(chain, chain.length);
         problems.clear();
 
-        boolean verified = false;
-        boolean manual = false;
+        checkHost(chain);
 
-        if (checkHost) {
-            // Check that the cert is issued to the correct host
-            verified = isValidHost(chain[0]);
+        if (checkIssuer(chain)) {
+            problems.clear();
+        }
 
-            if (!verified) {
-                problems.add(new CertificateDoesntMatchHostException(
-                        "Certificate was not issued to " + serverName));
+        if (!problems.isEmpty()) {
+            eventBus.publishAsync(new ServerCertificateProblemEncounteredEvent(connection, this,
+                    Arrays.asList(chain), problems));
+
+            try {
+                actionSem.acquire();
+            } catch (InterruptedException ie) {
+                throw new CertificateException("Thread aborted", ie);
+            } finally {
+                problems.clear();
+                eventBus.publishAsync(new ServerCertificateProblemResolvedEvent(connection, this));
             }
 
-            verified = false;
+            switch (action) {
+                case DISCONNECT:
+                    throw new CertificateException("Not trusted");
+                case IGNORE_PERMANENTLY:
+                    final List<String> list = new ArrayList<>(config
+                            .getOptionList("ssl", "trusted"));
+                    list.add(Base64.getEncoder().encodeToString(chain[0].getSignature()));
+                    userSettings.setOption("ssl", "trusted", list);
+                    break;
+                case IGNORE_TEMPORARILY:
+                    // Do nothing, continue connecting
+                    break;
+            }
         }
+    }
 
+    /**
+     * Checks that some issuer in the certificate chain is trusted, either by the global CA list,
+     * or manually by the user.
+     *
+     * @param chain The chain of certificates to check.
+     * @return True if the certificate is trusted manually, false otherwise (i.e., trusted globally
+     * OR untrusted).
+     */
+    private boolean checkIssuer(final X509Certificate... chain) {
+        boolean manual = false;
+        boolean verified = false;
         for (X509Certificate cert : chain) {
             final TrustResult trustResult = isTrusted(cert);
 
@@ -317,7 +348,6 @@ public class CertificateManager implements X509TrustManager {
 
             if (checkIssuer) {
                 // Check that we trust an issuer
-
                 verified |= trustResult.isTrusted();
             }
 
@@ -329,38 +359,22 @@ public class CertificateManager implements X509TrustManager {
         if (!verified && checkIssuer) {
             problems.add(new CertificateNotTrustedException("Issuer is not trusted"));
         }
+        return manual;
+    }
 
-        if (!problems.isEmpty() && !manual) {
-            eventBus.publishAsync(new ServerCertificateProblemEncounteredEvent(
-                    connection, this, Arrays.asList(chain), problems));
-
-            try {
-                actionSem.acquire();
-            } catch (InterruptedException ie) {
-                throw new CertificateException("Thread aborted", ie);
-            } finally {
-                problems.clear();
-
-                eventBus.publishAsync(new ServerCertificateProblemResolvedEvent(connection, this));
-            }
-
-            switch (action) {
-                case DISCONNECT:
-                    throw new CertificateException("Not trusted");
-                case IGNORE_PERMANENTLY:
-                    final List<String> list = new ArrayList<>(config
-                            .getOptionList("ssl", "trusted"));
-                    list.add(Base64.getEncoder().encodeToString(chain[0].getSignature()));
-                    userSettings.setOption("ssl", "trusted", list);
-                    break;
-                case IGNORE_TEMPORARILY:
-                    // Do nothing, continue connecting
-                    break;
+    /**
+     * Checks that the host of the leaf certificate is the same as the server we are connected to.
+     *
+     * @param chain The chain of certificates to check.
+     */
+    private void checkHost(final X509Certificate... chain) {
+        if (checkHost) {
+            // Check that the cert is issued to the correct host
+            if (!isValidHost(chain[0])) {
+                problems.add(new CertificateDoesntMatchHostException(
+                        "Certificate was not issued to " + serverName));
             }
         }
-        if (manual) {
-            problems.clear();
-        }
     }
 
     /**
@@ -429,4 +443,4 @@ public class CertificateManager implements X509TrustManager {
         return globalTrustedCAs.toArray(new X509Certificate[globalTrustedCAs.size()]);
     }
 
-}
+}