From: Renato "Lond" Cerqueira <renato@lond.com.br>
Date: Thu, 24 Jan 2019 14:38:18 +0000 (+0100)
Subject: Rescue SSL error in verify link service (#9914)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e1ec3a9f09add8a34b1a77ce217be8e51ebd4936;p=mastodon.git

Rescue SSL error in verify link service (#9914)

If the first link to be verified contains a rel=me link with a SSL
error, the VerifyAccountLinksWorker will fail and not try the following
links. This rescues the SSL error when fetching the link, avoiding this
issue.
---

diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index c65578761..878a2188d 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -10,7 +10,7 @@ class VerifyLinkService < BaseService
     return unless link_back_present?
 
     field.mark_verified!
-  rescue HTTP::Error, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e
+  rescue OpenSSL::SSL::SSLError, HTTP::Error, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e
     Rails.logger.debug "Error fetching link #{@url}: #{e}"
     nil
   end