somehow Scala didn't warn about this; fix regex matching

2 files changed, 8 insertions, 12 deletions

diff --git a/src/main/scala/com/getbootstrap/savage/server/PullRequestEventHandler.scala b/src/main/scala/com/getbootstrap/savage/server/PullRequestEventHandler.scala
index e3f1f7b..4f348f2 100644
--- a/src/main/scala/com/getbootstrap/savage/server/PullRequestEventHandler.scala
+++ b/src/main/scala/com/getbootstrap/savage/server/PullRequestEventHandler.scala
@@ -22,21 +22,17 @@ class PullRequestEventHandler(protected val pusher: ActorRef) extends GitHubActo
 
   private val NormalPathRegex = "^[a-zA-Z0-9_./-]+$".r
   private def isNormal(path: Path): Boolean = {
-    path match {
-      case NormalPathRegex(_) => true
-      case _ => false
+    path.toString match {
+      case NormalPathRegex(_*) => true
+      case _ => {
+        log.info(s"Abnormal path: ${path}")
+        false
+      }
     }
   }
   private def areSafe(paths: Set[Path]): Boolean = {
     implicit val logger = log
-    val unsafeOption = paths.find{ path => !isNormal(path) || !settings.Whitelist.isAllowed(path) }
-    unsafeOption match {
-      case None => true
-      case Some(unsafePath) => {
-        log.info(s"Unsafe path: ${unsafePath}")
-        false
-      }
-    }
+    paths.forall{ path => isNormal(path) && settings.Whitelist.isAllowed(path) }
   }
   private def areInteresting(paths: Set[Path]): Boolean = {
     implicit val logger = log
diff --git a/src/main/scala/com/getbootstrap/savage/travis/TravisPayload.scala b/src/main/scala/com/getbootstrap/savage/travis/TravisPayload.scala
index 5b07d6b..dae0e30 100644
--- a/src/main/scala/com/getbootstrap/savage/travis/TravisPayload.scala
+++ b/src/main/scala/com/getbootstrap/savage/travis/TravisPayload.scala
@@ -22,7 +22,7 @@ object FairlySafeUrl {
   def apply(url: Uri): Try[String] = {
     val cleanUrl = url.withScheme("https").withQuery(Uri.Query.Empty).withoutFragment.toString
     cleanUrl match {
-      case SafeishUrlRegex(_) => Success(cleanUrl)
+      case SafeishUrlRegex(_*) => Success(cleanUrl)
       case _ => Failure(new IllegalStateException(s"Travis URL failed safety check; URL: ${cleanUrl}"))
     }