#16 Add ability to configure list of credentials per agent - hide pswd

runAs-agent/src/main/java/jetbrains/buildServer/runAs/agent/BuildFeatureParameters.java

@@ -0,0 +1,10 @@
+package jetbrains.buildServer.runAs.agent;
+
+import java.util.List;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface BuildFeatureParameters {
+  @Nullable
+  String tryGetBuildFeatureParameter(@NotNull final String buildFeatureType, @NotNull final String parameterName);
+}

runAs-agent/src/main/java/jetbrains/buildServer/runAs/agent/ParametersService.java

@@ -8,6 +8,4 @@ public interface ParametersService {
   String tryGetParameter(@NotNull final String paramName);
 
   String tryGetConfigParameter(@NotNull final String configParamName);
-
-  void disableLoggingOfCommandLine();
 }

runAs-agent/src/main/java/jetbrains/buildServer/runAs/agent/ParametersServiceImpl.java

@@ -1,68 +1,36 @@
 package jetbrains.buildServer.runAs.agent;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import jetbrains.buildServer.agent.*;
 import jetbrains.buildServer.dotNet.buildRunner.agent.BuildRunnerContextProvider;
 import jetbrains.buildServer.dotNet.buildRunner.agent.RunnerParametersService;
 import jetbrains.buildServer.runAs.common.Constants;
 import jetbrains.buildServer.util.EventDispatcher;
 import jetbrains.buildServer.util.StringUtil;
-import jetbrains.buildServer.util.positioning.PositionAware;
-import jetbrains.buildServer.util.positioning.PositionConstraint;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class ParametersServiceImpl extends AgentLifeCycleAdapter implements ParametersService, PositionAware {
-  static final String TEAMCITY_BUILD_LOG_LOG_COMMAND_LINE = "teamcity.buildLog.logCommandLine";
-  private static final String[] OurProtectedParams = new String[] { Constants.PASSWORD, Constants.CREDENTIALS, Constants.CREDENTIALS_DIRECTORY };
-  private final BuildRunnerContextProvider myBuildRunnerContextProvider;
-  private final RunnerParametersService myRunnerParametersService;
-  private final BuildFeatureParametersService myBuildFeatureParametersService;
-  private final BuildRunnerContextProvider myContextProvider;
-  private final Parameters agentProtectedParameters = new Parameters();
-  private final Parameters buildProtectedParameters = new Parameters();
+public class ParametersServiceImpl implements ParametersService {
+  private final SecuredParametersService mySecuredParametersService;
 
   public ParametersServiceImpl(
-    @Nullable final EventDispatcher<AgentLifeCycleListener> agentDispatcher,
-    @NotNull final BuildRunnerContextProvider buildRunnerContextProvider,
-    @NotNull final RunnerParametersService runnerParametersService,
-    @NotNull final BuildFeatureParametersService buildFeatureParametersService,
-    @NotNull final BuildRunnerContextProvider contextProvider) {
-    myBuildRunnerContextProvider = buildRunnerContextProvider;
-    myRunnerParametersService = runnerParametersService;
-    myBuildFeatureParametersService = buildFeatureParametersService;
-    myContextProvider = contextProvider;
-    if(agentDispatcher != null) {
-      agentDispatcher.addListener(this);
-    }
+    @NotNull final SecuredParametersService securedParametersService) {
+    mySecuredParametersService = securedParametersService;
   }
 
   @Nullable
   @Override
   public String tryGetParameter(@NotNull final String paramName) {
-    final String isRunAsEnabled = myRunnerParametersService.tryGetConfigParameter(Constants.RUN_AS_UI_ENABLED);
+    final String isRunAsEnabled = mySecuredParametersService.tryGetConfigParameter(Constants.RUN_AS_UI_ENABLED);
     if(StringUtil.isEmpty(isRunAsEnabled) || Boolean.toString(true).equalsIgnoreCase(isRunAsEnabled)) {
-      if(buildProtectedParameters.getRunnerParameters().containsKey(paramName)) {
-        return buildProtectedParameters.getRunnerParameters().get(paramName);
-      }
-
-      String paramValue = myRunnerParametersService.tryGetRunnerParameter(paramName);
+      String paramValue = mySecuredParametersService.tryGetRunnerParameter(paramName);
       if (!StringUtil.isEmptyOrSpaces(paramValue)) {
         return paramValue;
       }
 
-      if(buildProtectedParameters.getBuildFeatureParameters().containsKey(paramName)) {
-        return buildProtectedParameters.getBuildFeatureParameters().get(paramName);
-      }
-
-      final List<String> paramValues = myBuildFeatureParametersService.getBuildFeatureParameters(Constants.BUILD_FEATURE_TYPE, paramName);
-      if (paramValues.size() != 0) {
-        paramValue = paramValues.get(0);
-        if (paramValue != null) {
-          return paramValue;
-        }
+      paramValue = mySecuredParametersService.tryGetBuildFeatureParameter(Constants.BUILD_FEATURE_TYPE, paramName);
+      if (!StringUtil.isEmptyOrSpaces(paramValue)) {
+        return paramValue;
       }
     }
 
@@ -71,114 +39,6 @@ public String tryGetParameter(@NotNull final String paramName) {
 
   @Override
   public String tryGetConfigParameter(@NotNull final String configParamName) {
-    if(agentProtectedParameters.getConfigParameters().containsKey(configParamName)) {
-      return agentProtectedParameters.getConfigParameters().get(configParamName);
-    }
-
-    if(buildProtectedParameters.getConfigParameters().containsKey(configParamName)) {
-      return buildProtectedParameters.getConfigParameters().get(configParamName);
-    }
-
-    return myRunnerParametersService.tryGetConfigParameter(configParamName);
-  }
-
-  public void disableLoggingOfCommandLine()
-  {
-    myContextProvider.getContext().addConfigParameter(TEAMCITY_BUILD_LOG_LOG_COMMAND_LINE, Boolean.toString(false));
-  }
-
-  @Override
-  public void agentStarted(@NotNull final BuildAgent agent) {
-    final Map<String, String> configParameters = agent.getConfiguration().getConfigurationParameters();
-    for (final String protectedParamName: OurProtectedParams) {
-      final String configParameterValue = configParameters.get(protectedParamName);
-      if (!StringUtil.isEmptyOrSpaces(configParameterValue)) {
-        agent.getConfiguration().addConfigurationParameter(protectedParamName, Constants.PASSWORD_REPLACEMENT_VAL);
-        agentProtectedParameters.getConfigParameters().put(protectedParamName, configParameterValue);
-      }
-    }
-
-    super.agentStarted(agent);
-  }
-
-  @Override
-  public void buildStarted(@NotNull final AgentRunningBuild runningBuild) {
-    if(runningBuild instanceof AgentRunningBuildEx)
-    {
-      AgentRunningBuildEx agentRunningBuildEx = (AgentRunningBuildEx)runningBuild;
-      myBuildRunnerContextProvider.initialize(((AgentRunningBuildEx)runningBuild).getCurrentRunnerContext());
-      final Map<String, String> configParameters = this.myContextProvider.getContext().getConfigParameters();
-      final Map<String, String> runnerParameters = this.myContextProvider.getContext().getRunnerParameters();
-
-      for (final String protectedParamName: OurProtectedParams) {
-        // Config parameters
-        final String configParameterValue = configParameters.get(protectedParamName);
-        if(!StringUtil.isEmptyOrSpaces(configParameterValue)) {
-          myContextProvider.getContext().addConfigParameter(protectedParamName, Constants.PASSWORD_REPLACEMENT_VAL);
-          buildProtectedParameters.getConfigParameters().put(protectedParamName, configParameterValue);
-        }
-
-        // Runner parameters
-        final String runnerParameterValue = runnerParameters.get(protectedParamName);
-        if(!StringUtil.isEmptyOrSpaces(runnerParameterValue)) {
-          myContextProvider.getContext().addRunnerParameter(protectedParamName, Constants.PASSWORD_REPLACEMENT_VAL);
-          buildProtectedParameters.getRunnerParameters().put(protectedParamName, runnerParameterValue);
-        }
-
-        // Build Feature parameters
-        final List<String> buildFeatureParameterValues = myBuildFeatureParametersService.getBuildFeatureParameters(Constants.BUILD_FEATURE_TYPE, protectedParamName);
-        myBuildFeatureParametersService.setBuildFeatureParameters(Constants.BUILD_FEATURE_TYPE, protectedParamName, Constants.PASSWORD_REPLACEMENT_VAL);
-        if (buildFeatureParameterValues.size() != 0) {
-          final String buildFeatureParameterValue = buildFeatureParameterValues.get(0);
-          if(!StringUtil.isEmptyOrSpaces(buildFeatureParameterValue)) {
-            buildProtectedParameters.getBuildFeatureParameters().put(protectedParamName, buildFeatureParameterValue);
-          }
-        }
-      }
-    }
-
-    super.buildStarted(runningBuild);
-  }
-
-  @Override
-  public void buildFinished(@NotNull final AgentRunningBuild build, @NotNull final BuildFinishedStatus buildStatus) {
-    super.buildFinished(build, buildStatus);
-  }
-
-  @NotNull
-  @Override
-  public String getOrderId() {
-    return "";
-  }
-
-  @NotNull
-  @Override
-  public PositionConstraint getConstraint() {
-    return PositionConstraint.first();
-  }
-
-  private static class Parameters {
-    private final HashMap<String, String> myConfigParameters = new HashMap<String, String>();
-    private final HashMap<String, String> myRunnerParameters = new HashMap<String, String>();
-    private final HashMap<String, String> myBuildFeatureParameters = new HashMap<String, String>();
-
-    HashMap<String, String> getConfigParameters() {
-      return myConfigParameters;
-    }
-
-    HashMap<String, String> getRunnerParameters() {
-      return myRunnerParameters;
-    }
-
-    HashMap<String, String> getBuildFeatureParameters() {
-      return myBuildFeatureParameters;
-    }
-
-    public void clear()
-    {
-      myConfigParameters.clear();
-      myRunnerParameters.clear();
-      myBuildFeatureParameters.clear();
-    }
+    return mySecuredParametersService.tryGetConfigParameter(configParamName);
   }
 }

runAs-agent/src/main/java/jetbrains/buildServer/runAs/agent/RunAsLoggerImpl.java

@@ -13,20 +13,20 @@
 public class RunAsLoggerImpl implements RunAsLogger {
   private final LoggerService myLoggerService;
   private final FileService myFileService;
-  private final ParametersService myParametersService;
+  private final SecuredLoggingService mySecuredLoggingService;
 
   public RunAsLoggerImpl(
     @NotNull final LoggerService loggerService,
     @NotNull final FileService fileService,
-    @NotNull final ParametersService parametersService) {
+    @NotNull final SecuredLoggingService securedLoggingService) {
     myLoggerService = loggerService;
     myFileService = fileService;
-    myParametersService = parametersService;
+    mySecuredLoggingService = securedLoggingService;
   }
 
   @Override
   public void LogRunAs(@NotNull final CommandLineSetup runAsCommandLineSetup) {
-    myParametersService.disableLoggingOfCommandLine();
+    mySecuredLoggingService.disableLoggingOfCommandLine();
 
     final GeneralCommandLine cmd = new GeneralCommandLine();
     cmd.setExePath(runAsCommandLineSetup.getToolPath());

runAs-agent/src/main/java/jetbrains/buildServer/runAs/agent/SecuredLoggingService.java

@@ -0,0 +1,5 @@
+package jetbrains.buildServer.runAs.agent;
+
+public interface SecuredLoggingService {
+  void disableLoggingOfCommandLine();
+}

runAs-agent/src/main/java/jetbrains/buildServer/runAs/agent/SecuredLoggingServiceImpl.java

@@ -0,0 +1,20 @@
+package jetbrains.buildServer.runAs.agent;
+
+import jetbrains.buildServer.dotNet.buildRunner.agent.BuildRunnerContextProvider;
+import org.jetbrains.annotations.NotNull;
+
+public class SecuredLoggingServiceImpl implements SecuredLoggingService {
+  static final String TEAMCITY_BUILD_LOG_LOG_COMMAND_LINE = "teamcity.buildLog.logCommandLine";
+  private final BuildRunnerContextProvider myContextProvider;
+
+  public SecuredLoggingServiceImpl(
+    @NotNull final BuildRunnerContextProvider contextProvider) {
+    myContextProvider = contextProvider;
+  }
+
+  @Override
+  public void disableLoggingOfCommandLine()
+  {
+    myContextProvider.getContext().addConfigParameter(TEAMCITY_BUILD_LOG_LOG_COMMAND_LINE, Boolean.toString(false));
+  }
+}

runAs-agent/src/main/java/jetbrains/buildServer/runAs/agent/SecuredParametersService.java

@@ -0,0 +1,12 @@
+package jetbrains.buildServer.runAs.agent;
+
+import java.util.List;
+import jetbrains.buildServer.agent.AgentLifeCycleAdapter;
+import jetbrains.buildServer.agent.AgentLifeCycleListener;
+import jetbrains.buildServer.dotNet.buildRunner.agent.RunnerParametersService;
+import jetbrains.buildServer.util.positioning.PositionAware;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface SecuredParametersService extends RunnerParametersService, BuildFeatureParameters, AgentLifeCycleListener, PositionAware {
+}