Directory support first draft

ntrp · ntrp · commit 5f8447b0d334 · 2021-06-27T20:37:56.000+02:00
diff --git a/src/main/scala/io/conduktor/ksm/AclSynchronizer.scala b/src/main/scala/io/conduktor/ksm/AclSynchronizer.scala
@@ -6,6 +6,7 @@ import io.conduktor.ksm.source.{ParsingContext, SourceAcl}
 import kafka.security.auth.{Acl, Authorizer, Resource}
 import org.slf4j.{Logger, LoggerFactory}
 
+import scala.collection.mutable
 import scala.util.{Failure, Success, Try}
 
 object AclSynchronizer {
@@ -66,7 +67,8 @@ class AclSynchronizer(
 
   import AclSynchronizer._
 
-  private var sourceAclsCache: Set[(Resource, Acl)] = _
+  private val sourceAclsCache: mutable.Map[String, Set[(Resource, Acl)]] =
+    mutable.Map()
   private var failedRefreshes: Int = 0
 
   if (readOnly) {
@@ -84,50 +86,49 @@ class AclSynchronizer(
     Try(sourceAcl.refresh()) match {
       case Success(result) =>
         failedRefreshes = 0
-        result match {
-          // the source has not changed
-          case None =>
-            if (sourceAclsCache != null) {
-              // the Kafka Acls may have changed so we check against the last known correct SourceAcl that we cached
+        result.foreach { context: ParsingContext =>
+          context match {
+            case ParsingContext(resourceKey, aclParser, reader, true) =>
+              val sourceAclResult = aclParser.aclsFromReader(reader)
+              reader.close()
+              sourceAclResult.result match {
+                // the source has changed
+                case Right(ksmAcls) =>
+                  // we have a new result, so we cache it
+                  sourceAclsCache + (resourceKey -> ksmAcls)
+                  applySourceAcls(
+                    sourceAclsCache(resourceKey),
+                    getKafkaAcls,
+                    notification,
+                    authorizer
+                  )
+                case Left(parsingExceptions: List[Exception]) =>
+                  // parsing exceptions we want to notify
+                  log.error(
+                    "Exceptions while refreshing ACL source:",
+                    parsingExceptions.map(e => e.toString).mkString("\n")
+                  )
+                  // ugly but for now this will do
+                  notification.notifyErrors(
+                    parsingExceptions.map(e => Try(throw e))
+                  )
+              }
+            case ParsingContext(resourceKey, _, _, false) =>
+              // the source does not need updating, reapply the permission
               applySourceAcls(
-                sourceAclsCache,
+                sourceAclsCache.getOrElse(resourceKey, Set()),
                 getKafkaAcls,
                 notification,
                 authorizer
               )
-            }
-          case Some(ParsingContext(parser, reader)) =>
-            val sourceAclResult = parser.aclsFromReader(reader)
-            reader.close()
-            sourceAclResult.result match {
-              // the source has changed
-              case Right(ksmAcls) =>
-                // we have a new result, so we cache it
-                sourceAclsCache = ksmAcls
-                applySourceAcls(
-                  sourceAclsCache,
-                  getKafkaAcls,
-                  notification,
-                  authorizer
-                )
-              case Left(parsingExceptions: List[Exception]) =>
-                // parsing exceptions we want to notify
-                log.error(
-                  "Exceptions while refreshing ACL source:",
-                  parsingExceptions.map(e => e.toString).mkString("\n")
-                )
-                // ugly but for now this will do
-                notification.notifyErrors(
-                  parsingExceptions.map(e => Try(throw e))
-                )
-            }
+          }
         }
       case Failure(e) =>
         // errors such as HTTP exceptions when refreshing
         failedRefreshes += 1
         try {
           log.error("Exceptions while refreshing ACL source:", e)
-          if(failedRefreshes >= numFailedRefreshesBeforeNotification){
+          if (failedRefreshes >= numFailedRefreshesBeforeNotification) {
             notification.notifyErrors(List(Try(e)))
             failedRefreshes = 0
           }
diff --git a/src/main/scala/io/conduktor/ksm/source/BitbucketCloudSourceAcl.scala b/src/main/scala/io/conduktor/ksm/source/BitbucketCloudSourceAcl.scala
@@ -45,7 +45,7 @@ class BitbucketCloudSourceAcl(parserRegistry: AclParserRegistry)
     password = config.getString(AUTH_PASSWORD_CONFIG)
   }
 
-  override def refresh(): Option[ParsingContext] = {
+  override def refresh(): List[ParsingContext] = {
     // get the latest file
     val url = s"$apiurl/repositories/$organization/$repo/src/master/$filePath"
     val request: Request = new Request(url)
@@ -63,7 +63,13 @@ class BitbucketCloudSourceAcl(parserRegistry: AclParserRegistry)
       case 200 =>
         // we receive a valid response
         val reader = new BufferedReader(new StringReader(response.textBody))
-        Some(source.ParsingContext(parserRegistry.getParserByFilename(filePath), reader))
+        List(
+          ParsingContext(
+            filePath,
+            parserRegistry.getParserByFilename(filePath),
+            reader
+          )
+        )
       case _ =>
         // uncaught error
         log.warn(response.asString)
diff --git a/src/main/scala/io/conduktor/ksm/source/BitbucketServerSourceAcl.scala b/src/main/scala/io/conduktor/ksm/source/BitbucketServerSourceAcl.scala
@@ -63,7 +63,7 @@ class BitbucketServerSourceAcl(parserRegistry: AclParserRegistry)
       })
   }
 
-  override def refresh(): Option[ParsingContext] = {
+  override def refresh(): List[ParsingContext] = {
     // get changes since last commit
     val url =
       s"$protocol://$hostname:$port/rest/api/1.0/projects/$project/repos/$repo/commits"
@@ -103,8 +103,9 @@ class BitbucketServerSourceAcl(parserRegistry: AclParserRegistry)
               // update the last commit id
               lastCommit = Some(values.get(0).get("id").asText())
               val data = fileResponse.textBody
-              Some(
-                source.ParsingContext(
+              List(
+                ParsingContext(
+                  filePath,
                   parserRegistry.getParserByFilename(filePath),
                   new StringReader(data)
                 )
@@ -115,7 +116,7 @@ class BitbucketServerSourceAcl(parserRegistry: AclParserRegistry)
               throw HTTPException(Some(response.asString), response)
           }
         } else {
-          None
+          List()
         }
       case _ =>
         // uncaught error
diff --git a/src/main/scala/io/conduktor/ksm/source/FileSourceAcl.scala b/src/main/scala/io/conduktor/ksm/source/FileSourceAcl.scala
@@ -2,9 +2,9 @@ package io.conduktor.ksm.source
 
 import com.typesafe.config.Config
 import io.conduktor.ksm.parser.AclParserRegistry
-import io.conduktor.ksm.source
 
 import java.io.{File, FileReader}
+import scala.util.Try
 
 class FileSourceAcl(parserRegistry: AclParserRegistry)
     extends SourceAcl(parserRegistry) {
@@ -14,6 +14,7 @@ class FileSourceAcl(parserRegistry: AclParserRegistry)
 
   var lastModified: Long = -1
   var filename: String = _
+  val modifiedMap: Map[String, Long] = Map[String, Long]()
 
   /**
     * internal config definition for the module
@@ -29,14 +30,31 @@ class FileSourceAcl(parserRegistry: AclParserRegistry)
     * Uses a CSV parser on the file afterwards
     * @return
     */
-  override def refresh(): Option[ParsingContext] = {
-    val file = new File(filename)
-    if (file.lastModified() > lastModified) {
-      val reader = new FileReader(file)
-      lastModified = file.lastModified()
-      Some(source.ParsingContext(parserRegistry.getParserByFilename(filename), reader))
+  override def refresh(): List[ParsingContext] = {
+
+    val path = new File(filename)
+    if (path.exists()) {
+      val files =
+        if (path.isFile)
+          List(path)
+        else
+          path.listFiles.filter(_.isFile).toList
+
+      files.map(file =>
+        ParsingContext(
+          file.getName,
+          parserRegistry.getParserByFilename(file.getName),
+          new FileReader(file),
+          file.lastModified >= (modifiedMap.get(file.getName) match {
+            case None =>
+              modifiedMap + (file.getName -> file.lastModified)
+              0L
+            case Some(value) => value
+          })
+        )
+      )
     } else {
-      None
+      List()
     }
   }
 
diff --git a/src/main/scala/io/conduktor/ksm/source/GitHubSourceAcl.scala b/src/main/scala/io/conduktor/ksm/source/GitHubSourceAcl.scala
@@ -3,7 +3,6 @@ package io.conduktor.ksm.source
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.typesafe.config.Config
 import io.conduktor.ksm.parser.AclParserRegistry
-import io.conduktor.ksm.source
 import org.slf4j.LoggerFactory
 import skinny.http.{HTTP, HTTPException, Request, Response}
 
@@ -49,7 +48,7 @@ class GitHubSourceAcl(parserRegistry: AclParserRegistry)
     tokenOpt = Try(config.getString(AUTH_TOKEN_CONFIG)).toOption
   }
 
-  override def refresh(): Option[ParsingContext] = {
+  override def refresh(): List[ParsingContext] = {
     val url =
       s"https://$hostname/repos/$user/$repo/contents/$filepath?ref=$branch"
     val request: Request = new Request(url)
@@ -80,11 +79,15 @@ class GitHubSourceAcl(parserRegistry: AclParserRegistry)
           Charset.forName("UTF-8")
         )
         // use the CSV Parser
-        Some(
-          source.ParsingContext(parserRegistry.getParserByFilename(filepath), new StringReader(data))
+        List(
+          ParsingContext(
+            filepath,
+            parserRegistry.getParserByFilename(filepath),
+            new StringReader(data)
+          )
         )
       case 304 =>
-        None
+        List()
       case _ =>
         // we got an http error so we propagate it
         log.warn(response.asString)
diff --git a/src/main/scala/io/conduktor/ksm/source/GitLabSourceAcl.scala b/src/main/scala/io/conduktor/ksm/source/GitLabSourceAcl.scala
@@ -3,7 +3,6 @@ package io.conduktor.ksm.source
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.typesafe.config.Config
 import io.conduktor.ksm.parser.AclParserRegistry
-import io.conduktor.ksm.source
 import org.slf4j.LoggerFactory
 import skinny.http.{HTTP, HTTPException, Request, Response}
 
@@ -42,7 +41,7 @@ class GitLabSourceAcl(parserRegistry: AclParserRegistry)
     accessToken = config.getString(ACCESSTOKEN_CONFIG)
   }
 
-  override def refresh(): Option[ParsingContext] = {
+  override def refresh(): List[ParsingContext] = {
     val url =
       s"https://$hostname/api/v4/projects/$repoid/repository/files/$filepath?ref=$branch"
     val request: Request = new Request(url)
@@ -62,7 +61,7 @@ class GitLabSourceAcl(parserRegistry: AclParserRegistry)
         log.info(
           s"No changes were detected in the ACL file ${filepath}. Skipping .... "
         )
-        None
+        List()
       case _ =>
         val response: Response = HTTP.get(request)
         response.status match {
@@ -76,8 +75,9 @@ class GitLabSourceAcl(parserRegistry: AclParserRegistry)
               Charset.forName("UTF-8")
             )
             // use the CSV Parser
-            Some(
-              source.ParsingContext(
+            List(
+              ParsingContext(
+                filepath,
                 parserRegistry.getParserByFilename(filepath),
                 new StringReader(data)
               )
diff --git a/src/main/scala/io/conduktor/ksm/source/NoSourceAcl.scala b/src/main/scala/io/conduktor/ksm/source/NoSourceAcl.scala
@@ -26,7 +26,7 @@ class NoSourceAcl(parserRegistry: AclParserRegistry) extends SourceAcl(parserReg
     *
     * @return
     */
-  override def refresh(): Option[ParsingContext] = None
+  override def refresh(): List[ParsingContext] = List()
 
   /**
     * Close all the necessary underlying objects or connections belonging to this instance
diff --git a/src/main/scala/io/conduktor/ksm/source/S3SourceAcl.scala b/src/main/scala/io/conduktor/ksm/source/S3SourceAcl.scala
@@ -1,16 +1,15 @@
 package io.conduktor.ksm.source
 
-import java.io._
-import java.util.Date
 import com.amazonaws.regions.Regions
 import com.amazonaws.services.s3._
 import com.amazonaws.services.s3.model._
-import io.conduktor.ksm.parser.AclParserRegistry
 import com.typesafe.config.Config
 import io.conduktor.ksm.parser.AclParserRegistry
-import io.conduktor.ksm.source
 import org.slf4j.LoggerFactory
 
+import java.io._
+import java.util.Date
+
 class S3SourceAcl(parserRegistry: AclParserRegistry)
     extends SourceAcl(parserRegistry) {
 
@@ -59,7 +58,7 @@ class S3SourceAcl(parserRegistry: AclParserRegistry)
     *
     * @return
     */
-  override def refresh(): Option[ParsingContext] = {
+  override def refresh(): List[ParsingContext] = {
     val s3 = s3Client()
     val s3object = Option(
       s3.getObject(
@@ -84,13 +83,14 @@ class S3SourceAcl(parserRegistry: AclParserRegistry)
 
         reader.close()
         bucket.close()
-        Some(
-          source.ParsingContext(
+        List(
+          ParsingContext(
+            key,
             parserRegistry.getParserByFilename(key),
             new BufferedReader(new StringReader(content))
           )
         )
-      case None => None
+      case None => List()
     }
   }
 
diff --git a/src/main/scala/io/conduktor/ksm/source/SourceAcl.scala b/src/main/scala/io/conduktor/ksm/source/SourceAcl.scala
@@ -1,12 +1,10 @@
 package io.conduktor.ksm.source
 
-import io.conduktor.ksm.parser.AclParserRegistry
-
 import java.io.Reader
 import com.typesafe.config.Config
 import io.conduktor.ksm.parser.{AclParser, AclParserRegistry}
 
-case class ParsingContext(aclParser: AclParser, reader: Reader)
+case class ParsingContext(resourceKey: String, aclParser: AclParser, reader: Reader, shouldUpdate: Boolean = true)
 
 abstract class SourceAcl(val parserRegistry: AclParserRegistry) {
 
@@ -30,7 +28,7 @@ abstract class SourceAcl(val parserRegistry: AclParserRegistry) {
     * Kafka Security Manager will not update Acls in Kafka until there are no errors in the result
     * @return
     */
-  def refresh(): Option[ParsingContext]
+  def refresh(): List[ParsingContext]
 
   /**
     * Close all the necessary underlying objects or connections belonging to this instance

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class NoSourceAcl(parserRegistry: AclParserRegistry) extends SourceAcl(parserReg`
`26`	`26`	`*`
`27`	`27`	`* @return`
`28`	`28`	`*/`
`29`		`- override def refresh(): Option[ParsingContext] = None`
	`29`	`+ override def refresh(): List[ParsingContext] = List()`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* Close all the necessary underlying objects or connections belonging to this instance`