Fix #33622: check duplicate fqdn and sub-paths

Author: LEDfan

src/main/kotlin/eu/openanalytics/shinyproxyoperator/impl/kubernetes/KubernetesSource.kt

@@ -44,20 +44,28 @@ class KubernetesSource(private val shinyProxyClient: ShinyProxyClient,
     private val logger = KotlinLogging.logger {}
 
     override suspend fun init() {
-        informer = shinyProxyClient.inform(object : ResourceEventHandler<ShinyProxyCustomResource> {
+        informer = shinyProxyClient.inform(null, 10 * 60 * 1000.toLong())
+        lister = Lister(informer.indexer)
+        informer.addEventHandler(object : ResourceEventHandler<ShinyProxyCustomResource> {
             override fun onAdd(shinyProxy: ShinyProxyCustomResource) {
                 if (!isInManagedNamespace(shinyProxy)) return
                 if (shinyProxy.status?.instances?.isNotEmpty() == true) {
                     // ShinyProxy already has an instance -> not a new resource
                     return
                 }
                 logger.debug { "${logPrefix(shinyProxy.realmId)} [Event/Add]" }
+                if (!checkDuplicateUrl(shinyProxy)) {
+                    return
+                }
                 runBlocking { channel.send(ShinyProxyEvent(ShinyProxyEventType.ADD, shinyProxy.realmId, shinyProxy.metadata.name, shinyProxy.metadata.namespace, null)) }
             }
 
             override fun onUpdate(shinyProxy: ShinyProxyCustomResource, newShinyProxy: ShinyProxyCustomResource) {
                 if (!isInManagedNamespace(shinyProxy)) return
 
+                if (!checkDuplicateUrl(newShinyProxy)) {
+                    return
+                }
                 if (shinyProxy.hashOfCurrentSpec == newShinyProxy.hashOfCurrentSpec) {
                     logger.debug { "${logPrefix(shinyProxy.realmId)} [Event/Update]" }
                     runBlocking {
@@ -90,8 +98,7 @@ class KubernetesSource(private val shinyProxyClient: ShinyProxyClient,
 
             override fun onDelete(shinyProxy: ShinyProxyCustomResource, b: Boolean) {
             }
-        }, 10 * 60 * 1000.toLong())
-        lister = Lister(informer.indexer)
+        })
     }
 
     override suspend fun run() {
@@ -112,6 +119,31 @@ class KubernetesSource(private val shinyProxyClient: ShinyProxyClient,
         }
     }
 
+    private fun checkDuplicateUrl(shinyProxyCustomResource: ShinyProxyCustomResource): Boolean {
+        val shinyProxy = ShinyProxy(shinyProxyCustomResource.spec, shinyProxyCustomResource.metadata.name, shinyProxyCustomResource.metadata.namespace)
+        for (resource in lister.list()) {
+            val otherShinyproxy = ShinyProxy(resource.spec, resource.metadata.name, resource.metadata.namespace)
+            if (shinyProxy.realmId == otherShinyproxy.realmId || shinyProxy.subPath != otherShinyproxy.subPath) {
+                continue
+            }
+            if (shinyProxy.fqdn == otherShinyproxy.fqdn) {
+                logger.warn { "Found multiple ShinyProxy resources with the same URL, fqdn: '${shinyProxy.fqdn}', path: '${shinyProxy.subPath}', realm: '${shinyProxy.realmId}' already defined in realm '${otherShinyproxy.realmId}'" }
+                return false
+            }
+            for (additionalFqdn in shinyProxy.additionalFqdns) {
+                for (otherAdditionalFqdn in otherShinyproxy.additionalFqdns) {
+                    if (additionalFqdn == otherAdditionalFqdn) {
+                        logger.warn { "Found multiple ShinyProxy resources with the same (additional) URL, additional fqdn: '${additionalFqdn}', path: '${shinyProxy.subPath}', realm: '${shinyProxy.realmId}' already defined in realm '${otherShinyproxy.realmId}'" }
+                        return false
+                    }
+                }
+            }
+        }
+        // TODO additionalfqdns
+
+        return true
+    }
+
     private fun isInManagedNamespace(shinyProxy: ShinyProxyCustomResource): Boolean {
         when (mode) {
             Mode.CLUSTERED -> return true

src/main/kotlin/eu/openanalytics/shinyproxyoperator/impl/source/FileSource.kt

@@ -87,6 +87,7 @@ class FileSource(
 
         var hasInputError = false
         val nameToFile = hashMapOf<String, String>()
+        val urlToFile = hashMapOf<Pair<String, String>, String>()
         for (file in files) {
             try {
                 val spec = objectMapper.readValue<JsonNode>(file)
@@ -99,12 +100,17 @@ class FileSource(
 
                 // check for duplicate realms in files
                 if (nameToFile.containsKey(realmId)) {
-                    logger.warn { "Found duplicate realmId: '${shinyProxy.realmId}' in file: '${nameToFile[realmId]}', already defined in '${file.name}'" }
+                    logger.warn { "Found duplicate realmId: '${shinyProxy.realmId}' in file: '${file.name}', already defined in '${nameToFile[realmId]}'" }
                     hasInputError = true
                     continue
                 }
                 nameToFile[realmId] = file.name
 
+                if (!checkDuplicateUrl(urlToFile, shinyProxy, file.name)) {
+                    hasInputError = true
+                    continue
+                }
+
                 val existingShinyProxy = shinyProxies[shinyProxy.realmId]
                 if (existingShinyProxy == null) {
                     logger.info { "${logPrefix(shinyProxy.realmId)} [Add]" }
@@ -135,6 +141,24 @@ class FileSource(
         }
     }
 
+    private fun checkDuplicateUrl(urlToFile: HashMap<Pair<String, String>, String>, shinyProxy: ShinyProxy, fileName: String): Boolean {
+        val baseUrl = Pair(shinyProxy.fqdn, shinyProxy.subPath)
+        if (urlToFile.containsKey(baseUrl)) {
+            logger.warn { "Found multiple ShinyProxy resources with the same URL, fqdn: '${shinyProxy.fqdn}', path: '${shinyProxy.subPath}', realm: '${shinyProxy.realmId}' in file: '${fileName}', already defined in '${urlToFile[baseUrl]}'" }
+            return false
+        }
+        urlToFile[baseUrl] = fileName
+        for (additionalFqdn in shinyProxy.additionalFqdns) {
+            val url = Pair(additionalFqdn, shinyProxy.subPath)
+            if (urlToFile.containsKey(url)) {
+                logger.warn { "Found multiple ShinyProxy resources with the same (additional) URL, additional fqdn: '${additionalFqdn}', path: '${shinyProxy.subPath}', realm: '${shinyProxy.realmId}' in file: '${fileName}', already defined in '${urlToFile[url]}'" }
+                return false
+            }
+            urlToFile[url] =fileName
+        }
+        return true
+    }
+
     private suspend fun checkForDeleted(discoveredShinyProxies: Collection<String>) {
         // list of all ShinyProxies currently being managed
         val allShinyProxies = (orchestrator.getShinyProxyStatuses().map { it.realmId } + shinyProxies.keys).toSet()