Fix bug where id not existing in multiplexing map causes panic (#16094)

* multiplexing: guard against connection panic * changelog * Update vault/plugin_catalog.go Co-authored-by: Calvin Leung Huang <[email protected]> Co-authored-by: Calvin Leung Huang <[email protected]>
hashicorp · Jun 22, 2022 · fdfdef9 · fdfdef9
1 parent 8466a64
commit fdfdef9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog/16094.txt b/changelog/16094.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+plugin/multiplexing: Fix panic when id doesn't exist in connection map
+```
diff --git a/vault/plugin_catalog.go b/vault/plugin_catalog.go
@@ -157,7 +157,10 @@ func (c *PluginCatalog) cleanupExternalPlugin(name, id string) error {
 		return fmt.Errorf("plugin client not found")
 	}
 
-	pc := extPlugin.connections[id]
+	pc, ok := extPlugin.connections[id]
+	if !ok {
+		return fmt.Errorf("plugin connection not found")
+	}
 
 	delete(extPlugin.connections, id)
 	if !extPlugin.multiplexingSupport {