Change the behavior of GitClientAuthenticatorExtension to reflect what the GitSCM does. That is register credentials for the a given URL indeed to clear all credentials in the GitClient and register credentials as global. This should fix those use cases where multiple UserRemoteConfig are configured.

Move GitSCMExtension under impl package, mark old classes as deprecated to be backward compatible.

Author: nfalco79

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMBuilder.java

@@ -30,6 +30,7 @@
 import com.cloudbees.jenkins.plugins.bitbucket.endpoints.AbstractBitbucketEndpoint;
 import com.cloudbees.jenkins.plugins.bitbucket.endpoints.BitbucketEndpointConfiguration;
 import com.cloudbees.jenkins.plugins.bitbucket.endpoints.BitbucketServerEndpoint;
+import com.cloudbees.jenkins.plugins.bitbucket.impl.extension.FallbackToOtherRepositoryGitSCMExtension;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketApiUtils;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketCredentials;
 import com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey;

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSource.java

@@ -44,6 +44,7 @@
 import com.cloudbees.jenkins.plugins.bitbucket.endpoints.BitbucketServerEndpoint;
 import com.cloudbees.jenkins.plugins.bitbucket.hooks.HasPullRequests;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.extension.BitbucketEnvVarExtension;
+import com.cloudbees.jenkins.plugins.bitbucket.impl.extension.GitClientAuthenticatorExtension;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketApiUtils;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketApiUtils.BitbucketSupplier;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketCredentials;
@@ -1006,15 +1007,17 @@ private BitbucketCommit findPRDestinationCommit(BitbucketPullRequest pr, TaskLis
     public SCM build(@NonNull SCMHead head, @CheckForNull SCMRevision revision) {
         initCloneLinks();
 
-        boolean sshAuth = traits.stream()
-            .anyMatch(SSHCheckoutTrait.class::isInstance);
-
-        BitbucketAuthenticator authenticator = authenticator();
-        return new BitbucketGitSCMBuilder(this, head, revision, credentialsId)
-                .withExtension(new GitClientAuthenticatorExtension(authenticator == null || sshAuth ? null : authenticator.getCredentialsForSCM()))
+        BitbucketGitSCMBuilder scmBuilder = new BitbucketGitSCMBuilder(this, head, revision, credentialsId)
                 .withExtension(new BitbucketEnvVarExtension(getRepoOwner(), getRepository(), getProjectKey(), getServerUrl()))
                 .withCloneLinks(primaryCloneLinks, mirrorCloneLinks)
-                .withTraits(traits)
+                .withTraits(traits);
+
+        boolean sshAuth = traits.stream()
+                .anyMatch(SSHCheckoutTrait.class::isInstance);
+        BitbucketAuthenticator authenticator = authenticator();
+
+        return scmBuilder
+                .withExtension(new GitClientAuthenticatorExtension(scmBuilder.remote(), authenticator == null || sshAuth ? null : authenticator.getCredentialsForSCM()))
                 .build();
     }
 

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/FallbackToOtherRepositoryGitSCMExtension.java

@@ -1,77 +1,46 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package com.cloudbees.jenkins.plugins.bitbucket;
 
-import hudson.model.Run;
-import hudson.model.TaskListener;
-import hudson.plugins.git.GitException;
-import hudson.plugins.git.GitSCM;
-import hudson.plugins.git.Revision;
-import hudson.plugins.git.extensions.GitSCMExtension;
-import java.net.URISyntaxException;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import hudson.RestrictedSince;
 import java.util.List;
-import org.eclipse.jgit.transport.RefSpec;
-import org.eclipse.jgit.transport.URIish;
-import org.jenkinsci.plugins.gitclient.FetchCommand;
-import org.jenkinsci.plugins.gitclient.GitClient;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 
 /**
  * If specified commit hashes are not found in repository then fetch
  * specified branches from remote.
  */
-//TODO be attention serialized in config.xml of the job as extension child of hudson.plugins.git.GitSCM. Provide a xml alias when move to package com.cloudbees.jenkins.plugins.bitbucket.impl.extension
-public class FallbackToOtherRepositoryGitSCMExtension extends GitSCMExtension {
-
-    private final String cloneLink;
-    private final String remoteName;
-    private final List<BranchWithHash> branchWithHashes;
-
-    public FallbackToOtherRepositoryGitSCMExtension(
-        String cloneLink,
-        String remoteName,
-        List<BranchWithHash> branchWithHashes
-    ) {
-        this.cloneLink = cloneLink;
-        this.remoteName = remoteName;
-        this.branchWithHashes = branchWithHashes;
-    }
-
-    @Override
-    public Revision decorateRevisionToBuild(
-        GitSCM scm,
-        Run<?, ?> build,
-        GitClient git,
-        TaskListener listener,
-        Revision marked,
-        Revision rev
-    ) throws InterruptedException {
-        List<RefSpec> refSpecs = branchWithHashes.stream()
-            .filter(branchWithHash -> !commitExists(git, branchWithHash.getHash()))
-            .map(branchWithHash -> {
-                String branch = branchWithHash.getBranch();
-                return new RefSpec("+refs/heads/" + branch + ":refs/remotes/" + remoteName + "/" + branch);
-            })
-            .toList();
+@Restricted(DoNotUse.class)
+@RestrictedSince("933.3.0")
+@Deprecated(since = "933.3.0")
+@SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS")
+public class FallbackToOtherRepositoryGitSCMExtension extends com.cloudbees.jenkins.plugins.bitbucket.impl.extension.FallbackToOtherRepositoryGitSCMExtension {
 
-        if (!refSpecs.isEmpty()) {
-            FetchCommand fetchCommand = git.fetch_();
-            URIish remote;
-            try {
-                remote = new URIish(cloneLink);
-            } catch (URISyntaxException e) {
-                throw new RuntimeException(e);
-            }
-            fetchCommand.from(remote, refSpecs).execute();
-        }
-        return rev;
+    public FallbackToOtherRepositoryGitSCMExtension(String cloneLink, String remoteName, List<BranchWithHash> branchWithHashes) {
+        super(cloneLink, remoteName, branchWithHashes);
     }
 
-    private static boolean commitExists(GitClient git, String sha1) {
-        try {
-            git.revParse(sha1);
-            return true;
-        } catch (GitException ignored) {
-            return false;
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/GitClientAuthenticatorExtension.java

@@ -1,27 +1,42 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package com.cloudbees.jenkins.plugins.bitbucket;
 
 import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
-import hudson.plugins.git.GitException;
-import hudson.plugins.git.GitSCM;
-import hudson.plugins.git.extensions.GitSCMExtension;
-import org.jenkinsci.plugins.gitclient.GitClient;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import hudson.RestrictedSince;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 
-// TODO be attention serialized in config.xml of the job as extension child of hudson.plugins.git.GitSCM. Provide a xml alias when move to package com.cloudbees.jenkins.plugins.bitbucket.impl.extension
-public class GitClientAuthenticatorExtension extends GitSCMExtension {
-
-    // TODO remove this because it is serialized in config.xml with username and secret (password or token could change/expiry specially with OAuth2)
-    private final StandardUsernameCredentials credentials;
+@Restricted(DoNotUse.class)
+@RestrictedSince("933.3.0")
+@Deprecated(since = "933.3.0")
+@SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS")
+public class GitClientAuthenticatorExtension extends com.cloudbees.jenkins.plugins.bitbucket.impl.extension.GitClientAuthenticatorExtension {
 
     public GitClientAuthenticatorExtension(StandardUsernameCredentials credentials) {
-        this.credentials = credentials;
+        super(null, credentials);
     }
 
-    @Override
-    public GitClient decorate(GitSCM scm, GitClient git) throws GitException {
-        if (credentials != null) {
-            git.setCredentials(credentials);
-        }
-
-        return git;
-    }
 }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/extension/BitbucketEnvVarExtension.java

@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package com.cloudbees.jenkins.plugins.bitbucket.impl.extension;
 
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.URLUtils;

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/extension/FallbackToOtherRepositoryGitSCMExtension.java

@@ -0,0 +1,128 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.cloudbees.jenkins.plugins.bitbucket.impl.extension;
+
+import com.cloudbees.jenkins.plugins.bitbucket.BranchWithHash;
+import hudson.Extension;
+import hudson.model.Run;
+import hudson.model.TaskListener;
+import hudson.plugins.git.GitException;
+import hudson.plugins.git.GitSCM;
+import hudson.plugins.git.Revision;
+import hudson.plugins.git.extensions.GitSCMExtension;
+import hudson.plugins.git.extensions.GitSCMExtensionDescriptor;
+import java.net.URISyntaxException;
+import java.util.List;
+import org.eclipse.jgit.transport.RefSpec;
+import org.eclipse.jgit.transport.URIish;
+import org.jenkinsci.plugins.gitclient.FetchCommand;
+import org.jenkinsci.plugins.gitclient.GitClient;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+/**
+ * If specified commit hashes are not found in repository then fetch
+ * specified branches from remote.
+ */
+public class FallbackToOtherRepositoryGitSCMExtension extends GitSCMExtension {
+
+    private final String cloneLink;
+    private final String remoteName;
+    private final List<BranchWithHash> branchWithHashes;
+
+    @DataBoundConstructor
+    public FallbackToOtherRepositoryGitSCMExtension(
+        String cloneLink,
+        String remoteName,
+        List<BranchWithHash> branchWithHashes
+    ) {
+        this.cloneLink = cloneLink;
+        this.remoteName = remoteName;
+        this.branchWithHashes = branchWithHashes;
+    }
+
+    @Override
+    public Revision decorateRevisionToBuild(
+        GitSCM scm,
+        Run<?, ?> build,
+        GitClient git,
+        TaskListener listener,
+        Revision marked,
+        Revision rev
+    ) throws InterruptedException {
+        List<RefSpec> refSpecs = branchWithHashes.stream()
+            .filter(branchWithHash -> !commitExists(git, branchWithHash.getHash()))
+            .map(branchWithHash -> {
+                String branch = branchWithHash.getBranch();
+                return new RefSpec("+refs/heads/" + branch + ":refs/remotes/" + remoteName + "/" + branch);
+            })
+            .toList();
+
+        if (!refSpecs.isEmpty()) {
+            FetchCommand fetchCommand = git.fetch_();
+            URIish remote;
+            try {
+                remote = new URIish(cloneLink);
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
+            fetchCommand.from(remote, refSpecs).execute();
+        }
+        return rev;
+    }
+
+    private static boolean commitExists(GitClient git, String sha1) {
+        try {
+            git.revParse(sha1);
+            return true;
+        } catch (GitException ignored) {
+            return false;
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String getCloneLink() {
+        return cloneLink;
+    }
+
+    public String getRemoteName() {
+        return remoteName;
+    }
+
+    public List<BranchWithHash> getBranchWithHashes() {
+        return branchWithHashes;
+    }
+
+    @Extension
+    // No @Symbol because Pipeline users should not configure this in other ways than this plugin provides
+    public static class DescriptorImpl extends GitSCMExtensionDescriptor {
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public String getDisplayName() {
+            return "Additional refSpecs to fetch in case of clone links.";
+        }
+    }
+}