backport of commit c261445 (#20405)

Co-authored-by: davidadeleon <56207066+davidadeleon@users.noreply.github.com>
hashicorp · Apr 28, 2023 · 0c249cb · 0c249cb
1 parent 8b002ba
commit 0c249cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog/20375.txt b/changelog/20375.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core: prevent panic on login after namespace is deleted that had mfa enforcement
+```
diff --git a/vault/login_mfa.go b/vault/login_mfa.go
@@ -1693,7 +1693,8 @@ ECONFIG_LOOP:
 		if err != nil {
 			return nil, fmt.Errorf("failed to find the MFAEnforcementConfig namespace")
 		}
-		if eConfig == nil || (eConfigNS.ID != ns.ID && !ns.HasParent(eConfigNS)) {
+
+		if eConfig == nil || eConfigNS == nil || (eConfigNS.ID != ns.ID && !ns.HasParent(eConfigNS)) {
 			continue
 		}