[JENKINS-38827] Track credentials use in some relevant cases

These were easy cases because CredentialsProvider.track() arguments were available in the method where credentials were added. It is expected that there are still cases where credentials are not tracked correctly by the plugin. Credential checks from the job definition page are probably not currently tracked. Other contexts (like pipeline) may also not be tracked by these changes.
jenkinsci · Apr 18, 2017 · 79e610c · 79e610c
1 parent 44da1a4
commit 79e610c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -764,6 +764,7 @@ public GitClient createClient(TaskListener listener, EnvVars environment, Run<?,
                 StandardUsernameCredentials credentials = CredentialsMatchers.firstOrNull(urlCredentials, idMatcher);
                 if (credentials != null) {
                     c.addCredentials(url, credentials);
+                    CredentialsProvider.track(project, credentials);
                 }
             }
         }

diff --git a/src/main/java/hudson/plugins/git/UserRemoteConfig.java b/src/main/java/hudson/plugins/git/UserRemoteConfig.java
@@ -185,7 +185,9 @@ public FormValidation doCheckUrl(@AncestorInPath Item item,
             GitClient git = Git.with(TaskListener.NULL, environment)
                     .using(GitTool.getDefaultInstallation().getGitExe())
                     .getClient();
-            git.addDefaultCredentials(lookupCredentials(item, credentialsId, url));
+            StandardCredentials credential = lookupCredentials(item, credentialsId, url);
+            git.addDefaultCredentials(credential);
+            CredentialsProvider.track(item, credential);
 
             // attempt to connect the provided URL
             try {

diff --git a/src/main/java/jenkins/plugins/git/GitSCMFileSystem.java b/src/main/java/jenkins/plugins/git/GitSCMFileSystem.java
@@ -27,6 +27,7 @@
 
 import com.cloudbees.plugins.credentials.CredentialsMatchers;
 import com.cloudbees.plugins.credentials.CredentialsProvider;
+import com.cloudbees.plugins.credentials.common.StandardCredentials;
 import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
 import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
@@ -257,7 +258,7 @@ public SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, @CheckForNull
                 GitClient client = git.getClient();
                 String credentialsId = config.getCredentialsId();
                 if (credentialsId != null) {
-                    client.addDefaultCredentials(CredentialsMatchers.firstOrNull(
+                    StandardCredentials credential = CredentialsMatchers.firstOrNull(
                             CredentialsProvider.lookupCredentials(
                                 StandardUsernameCredentials.class,
                                 owner,
@@ -268,8 +269,9 @@ public SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, @CheckForNull
                                 CredentialsMatchers.withId(credentialsId),
                                 GitClient.CREDENTIALS_MATCHER
                             )
-                        )
-                    );
+                        );
+                    client.addDefaultCredentials(credential);
+                    CredentialsProvider.track(owner, credential);
                 }
 
                 if (!client.hasGitRepo()) {