Handle case where access is denied searching for buildTypeId.

tcplugins · Aug 29, 2019 · a0cc7f3 · a0cc7f3
1 parent 12e0bdc
commit a0cc7f3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/tcwebhooks-core/src/main/java/webhook/teamcity/settings/WebHookSearchResult.java b/tcwebhooks-core/src/main/java/webhook/teamcity/settings/WebHookSearchResult.java
@@ -11,6 +11,8 @@ public class WebHookSearchResult {
 	private List<Match> matches = new ArrayList<>();
 	@Setter
 	private WebHookConfigEnhanced webHookConfigEnhanced;
+	@Setter
+	private boolean filteredResult = false;
 
 	public void addMatch(Match match) {
 		this.matches.add(match);

diff --git a/tcwebhooks-core/src/main/java/webhook/teamcity/settings/WebHookSettingsManagerImpl.java b/tcwebhooks-core/src/main/java/webhook/teamcity/settings/WebHookSettingsManagerImpl.java
@@ -14,6 +14,7 @@
 import jetbrains.buildServer.serverSide.ProjectManager;
 import jetbrains.buildServer.serverSide.SBuildType;
 import jetbrains.buildServer.serverSide.SProject;
+import jetbrains.buildServer.serverSide.auth.AccessDeniedException;
 import jetbrains.buildServer.serverSide.settings.ProjectSettingsManager;
 import webhook.teamcity.BuildState;
 import webhook.teamcity.WebHookListener;
@@ -210,21 +211,25 @@ private void addMatchingWebHook(WebHookSearchFilter filter, List<WebHookSearchRe
 	 */
 	private void doBuildTypeIdSearch(WebHookSearchFilter filter, WebHookConfigEnhanced e, WebHookSearchResult result) {
 		if (filter.getBuildTypeExternalId() != null && !filter.getBuildTypeExternalId().isEmpty()) {
-			SBuildType myBuildType = myProjectManager.findBuildTypeByExternalId(filter.getBuildTypeExternalId());
-			if (myBuildType != null &&
-				(	
-					(
-						myBuildType.getProjectExternalId().equalsIgnoreCase(e.getProjectExternalId())
-					  && e.getWebHookConfig().isEnabledForBuildType(myBuildType)
-					)
-				|| 	(
-						e.getWebHookConfig().isEnabledForSubProjects() 
-					  && myProjectManager.findProjectByExternalId(e.getProjectExternalId()).getProjects().contains(myBuildType.getProject())
+			try {
+				SBuildType myBuildType = myProjectManager.findBuildTypeByExternalId(filter.getBuildTypeExternalId());
+				if (myBuildType != null &&
+					(	
+						(
+							myBuildType.getProjectExternalId().equalsIgnoreCase(e.getProjectExternalId())
+						  && e.getWebHookConfig().isEnabledForBuildType(myBuildType)
+						)
+					|| 	(
+							e.getWebHookConfig().isEnabledForSubProjects() 
+						  && myProjectManager.findProjectByExternalId(e.getProjectExternalId()).getProjects().contains(myBuildType.getProject())
+						)
 					)
 				)
-			)
-			{
-				result.addMatch(Match.BUILD_TYPE);
+				{
+					result.addMatch(Match.BUILD_TYPE);
+				}
+			} catch (AccessDeniedException ex) {
+				result.setFilteredResult(true);
 			}
 		}
 	}