From bd52240975cfff8bd710d88c6e106eac347320e4 Mon Sep 17 00:00:00 2001
From: Maggie Neterval <mneterval@google.com>
Date: Mon, 1 Jul 2019 13:35:10 -0400
Subject: [PATCH] fix(core): add back isEnabled check to hasPermission method
 to prevent NPEs (#433)

---
 .../netflix/spinnaker/fiat/shared/FiatPermissionEvaluator.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluator.java b/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluator.java
index 8bcb572a0..c5d1256b8 100644
--- a/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluator.java
+++ b/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluator.java
@@ -196,6 +196,9 @@ public boolean hasPermission(
       Serializable resourceName,
       String resourceType,
       Object authorization) {
+    if (!fiatStatus.isEnabled()) {
+      return true;
+    }
     return hasPermission(getUsername(authentication), resourceName, resourceType, authorization);
   }