Skip to content

Commit 80b6c15

Browse files
authored
Add instanceof check for disableGraphIntegration (#157)
1 parent a369cc3 commit 80b6c15

File tree

4 files changed

+25
-6
lines changed

4 files changed

+25
-6
lines changed

src/main/java/com/microsoft/jenkins/azuread/AzureAdAuthorizationMatrixFolderProperty.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import hudson.model.Item;
1010
import hudson.security.Permission;
1111
import hudson.security.PermissionScope;
12+
import hudson.security.SecurityRealm;
1213
import hudson.util.FormValidation;
1314
import jenkins.model.Jenkins;
1415
import net.sf.json.JSONObject;
@@ -102,8 +103,13 @@ public FormValidation doCheckName(@AncestorInPath AbstractFolder<?> folder, @Que
102103

103104
@SuppressWarnings("unused") // called by jelly
104105
public boolean isDisableGraphIntegration() {
105-
AzureSecurityRealm securityRealm = (AzureSecurityRealm) Jenkins.get().getSecurityRealm();
106-
return securityRealm.isDisableGraphIntegration();
106+
SecurityRealm securityRealm = Jenkins.get().getSecurityRealm();
107+
if (securityRealm instanceof AzureSecurityRealm) {
108+
AzureSecurityRealm azureSecurityRealm = (AzureSecurityRealm) securityRealm;
109+
return azureSecurityRealm.isDisableGraphIntegration();
110+
}
111+
112+
return true;
107113
}
108114

109115
@Override

src/main/java/com/microsoft/jenkins/azuread/AzureAdAuthorizationMatrixNodeProperty.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import hudson.security.AuthorizationStrategy;
99
import hudson.security.Permission;
1010
import hudson.security.PermissionScope;
11+
import hudson.security.SecurityRealm;
1112
import hudson.slaves.NodePropertyDescriptor;
1213
import hudson.util.FormValidation;
1314
import jenkins.model.Jenkins;
@@ -129,8 +130,13 @@ public String getDisplayName() {
129130

130131
@SuppressWarnings("unused") // called by jelly
131132
public boolean isDisableGraphIntegration() {
132-
AzureSecurityRealm securityRealm = (AzureSecurityRealm) Jenkins.get().getSecurityRealm();
133-
return securityRealm.isDisableGraphIntegration();
133+
SecurityRealm securityRealm = Jenkins.get().getSecurityRealm();
134+
if (securityRealm instanceof AzureSecurityRealm) {
135+
AzureSecurityRealm azureSecurityRealm = (AzureSecurityRealm) securityRealm;
136+
return azureSecurityRealm.isDisableGraphIntegration();
137+
}
138+
139+
return true;
134140
}
135141

136142
@Restricted(DoNotUse.class)

src/main/java/com/microsoft/jenkins/azuread/AzureAdAuthorizationMatrixProperty.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import hudson.security.AuthorizationMatrixProperty;
1010
import hudson.security.Permission;
1111
import hudson.security.PermissionScope;
12+
import hudson.security.SecurityRealm;
1213
import hudson.util.FormValidation;
1314
import jenkins.model.Jenkins;
1415
import net.sf.json.JSONObject;
@@ -132,8 +133,13 @@ public String getDisplayName() {
132133

133134
@SuppressWarnings("unused") // called by jelly
134135
public boolean isDisableGraphIntegration() {
135-
AzureSecurityRealm securityRealm = (AzureSecurityRealm) Jenkins.get().getSecurityRealm();
136-
return securityRealm.isDisableGraphIntegration();
136+
SecurityRealm securityRealm = Jenkins.get().getSecurityRealm();
137+
if (securityRealm instanceof AzureSecurityRealm) {
138+
AzureSecurityRealm azureSecurityRealm = (AzureSecurityRealm) securityRealm;
139+
return azureSecurityRealm.isDisableGraphIntegration();
140+
}
141+
142+
return true;
137143
}
138144
}
139145

src/main/java/com/microsoft/jenkins/azuread/AzureAdMatrixAuthorizationStrategy.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ public boolean isDisableGraphIntegration() {
264264
AzureSecurityRealm azureSecurityRealm = (AzureSecurityRealm) securityRealm;
265265
return azureSecurityRealm.isDisableGraphIntegration();
266266
}
267+
267268
return true;
268269
}
269270
}

0 commit comments

Comments
 (0)