Recover to None if an authenticator builder fails

Author: jaliss

ChangeLog

@@ -1,4 +1,5 @@
 master	-
+		- Recover to None if an authenticator builder fails
 		- Fixed #601: Security: password reset email host injection
 3.0-M6  - 2017-02-17
 		- Upgraded to Play 2.5.12

module-code/app/securesocial/core/services/AuthenticatorService.scala

@@ -23,7 +23,8 @@ import scala.reflect.ClassTag
 import org.apache.commons.lang3.reflect.TypeUtils
 
 class AuthenticatorService[U](builders: AuthenticatorBuilder[U]*)(implicit val executionContext: ExecutionContext) {
-  val asMap = builders.map { builder => builder.id -> builder }.toMap
+  private val logger = play.api.Logger(getClass.getName)
+  private val asMap = builders.map { builder => builder.id -> builder }.toMap
 
   def find(id: String): Option[AuthenticatorBuilder[U]] = {
     asMap.get(id)
@@ -46,6 +47,10 @@ class AuthenticatorService[U](builders: AuthenticatorBuilder[U]*)(implicit val e
         }
       }
     }
-    iterateIt(builders)
+    iterateIt(builders) recover {
+      case t: Throwable =>
+        logger.error(s"An error occurred while trying to build an authenticator from a request", t)
+        None
+    }
   }
 }