[JENKINS-74980] Pull requests are no longer fetchable (#989)

Restore the comparison of the owner name in Bitbucket Server to be case insensitive.

Author: nfalco79

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

@@ -214,7 +214,7 @@ private void withPullRequestRemote(PullRequestSCMHead head, String headName) {
         String scmSourceRepository = scmSource.getRepository();
         String pullRequestRepoOwner = head.getRepoOwner();
         String pullRequestRepository = head.getRepository();
-        boolean prFromTargetRepository = pullRequestRepoOwner.equalsIgnoreCase(scmSourceRepoOwner)
+        boolean prFromTargetRepository = StringUtils.equalsIgnoreCase(pullRequestRepoOwner, scmSourceRepoOwner)
             && pullRequestRepository.equalsIgnoreCase(scmSourceRepository);
         SCMRevision revision = revision();
         ChangeRequestCheckoutStrategy checkoutStrategy = head.getCheckoutStrategy();

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

@@ -513,7 +513,8 @@ public void visitSources(SCMSourceObserver observer) throws IOException, Interru
             listener.getLogger()
                     .format("Connecting to %s using %s%n", serverUrl, CredentialsNameProvider.name(credentials));
         }
-        try (final BitbucketSCMNavigatorRequest request = new BitbucketSCMNavigatorContext().withTraits(traits)
+        try (final BitbucketSCMNavigatorRequest request = new BitbucketSCMNavigatorContext()
+                .withTraits(traits)
                 .newRequest(this, observer)) {
             SourceFactory sourceFactory = new SourceFactory(request);
             WitnessImpl witness = new WitnessImpl(request, listener);

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

@@ -373,7 +373,7 @@ public void setServerUrl(@CheckForNull String serverUrl) {
     }
 
     @NonNull
-    public String getEndpointJenkinsRootUrl() {
+    public String getEndpointJenkinsRootURL() {
         return AbstractBitbucketEndpoint.getEndpointJenkinsRootUrl(serverUrl);
     }
 
@@ -692,10 +692,10 @@ class Skip extends IOException {
                     pull.getSource().getRepository().getFullName(),
                     originalBranchName
             );
-            boolean fork = !fullName.equalsIgnoreCase(pull.getSource().getRepository().getFullName());
+            boolean fork = !StringUtils.equalsIgnoreCase(fullName, pull.getSource().getRepository().getFullName());
             String pullRepoOwner = pull.getSource().getRepository().getOwnerName();
             String pullRepository = pull.getSource().getRepository().getRepositoryName();
-            final BitbucketApi pullBitbucket = fork && BitbucketApiUtils.isCloud(originBitbucket)
+            final BitbucketApi client = fork && BitbucketApiUtils.isCloud(originBitbucket)
                     ? BitbucketApiFactory.newInstance(
                     getServerUrl(),
                     authenticator(),
@@ -731,8 +731,8 @@ class Skip extends IOException {
                             // use branch instead of commit to postpone closure initialisation
                             return new BranchHeadCommit(pull.getSource().getBranch());
                         },  //
-                            new BitbucketProbeFactory<>(pullBitbucket, request), //
-                            new BitbucketRevisionFactory<BitbucketCommit>(pullBitbucket) {
+                            new BitbucketProbeFactory<>(client, request), //
+                            new BitbucketRevisionFactory<BitbucketCommit>(client) {
                                 @NonNull
                                 @Override
                                 public SCMRevision create(@NonNull SCMHead head, @Nullable BitbucketCommit sourceCommit)
@@ -1172,7 +1172,7 @@ protected List<Action> retrieveActions(@NonNull SCMHead head,
         SCMSourceOwner owner = getOwner();
         if (owner instanceof Actionable actionable) {
             for (BitbucketDefaultBranch p : actionable.getActions(BitbucketDefaultBranch.class)) {
-                if (StringUtils.equals(getRepoOwner(), p.getRepoOwner())
+                if (StringUtils.equalsIgnoreCase(getRepoOwner(), p.getRepoOwner())
                         && StringUtils.equals(repository, p.getRepository())
                         && StringUtils.equals(p.getDefaultBranch(), head.getName())) {
                     result.add(new PrimaryInstanceMetadataAction());
@@ -1202,7 +1202,7 @@ private synchronized Map<String, ContributorMetadataAction> getPullRequestContri
     @NonNull
     public SCMHeadOrigin originOf(@NonNull String repoOwner, @NonNull String repository) {
         if (this.repository.equalsIgnoreCase(repository)) {
-            if (this.repoOwner.equalsIgnoreCase(repoOwner)) {
+            if (StringUtils.equalsIgnoreCase(this.repoOwner, repoOwner)) {
                 return SCMHeadOrigin.DEFAULT;
             }
             return new SCMHeadOrigin.Fork(repoOwner);

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

@@ -41,6 +41,7 @@
 import jenkins.scm.api.trait.SCMSourceTrait;
 import jenkins.scm.api.trait.SCMSourceTraitDescriptor;
 import jenkins.scm.impl.trait.Discovery;
+import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -243,7 +244,7 @@ public boolean isExcluded(@NonNull SCMSourceRequest request, @NonNull SCMHead he
                 String fullName = req.getRepoOwner() + "/" + req.getRepository();
                 for (BitbucketPullRequest pullRequest : req.getPullRequests()) {
                     BitbucketRepository source = pullRequest.getSource().getRepository();
-                    if (fullName.equalsIgnoreCase(source.getFullName())
+                    if (StringUtils.equalsIgnoreCase(fullName, source.getFullName())
                             && pullRequest.getSource().getBranch().getName().equals(head.getName())) {
                         request.listener().getLogger().println("Discard branch " + head.getName()
                                 + " because current strategy excludes branches that are also filed as a pull request");

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

@@ -43,6 +43,7 @@
 import jenkins.scm.api.trait.SCMSourceTraitDescriptor;
 import jenkins.scm.impl.ChangeRequestSCMHeadCategory;
 import jenkins.scm.impl.trait.Discovery;
+import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -301,7 +302,7 @@ public TrustTeamForks() {
         protected boolean checkTrusted(@NonNull BitbucketSCMSourceRequest request, @NonNull PullRequestSCMHead head)
                 throws IOException, InterruptedException {
             if (!head.getOrigin().equals(SCMHeadOrigin.DEFAULT)) {
-                return head.getRepoOwner().equalsIgnoreCase(request.getRepoOwner());
+                return StringUtils.equalsIgnoreCase(head.getRepoOwner(), request.getRepoOwner());
             }
             return false;
         }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java

@@ -75,6 +75,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.HttpHead;
 import org.apache.http.config.SocketConfig;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -344,7 +345,7 @@ public boolean checkPathExists(@NonNull String branchOrHash, @NonNull String pat
                 .set("branchOrHash", branchOrHash)
                 .set("path", path.split(Operator.PATH.getSeparator()))
                 .expand();
-        int status = headRequestStatus(url);
+        int status = headRequestStatus(new HttpHead(url));
         if (HttpStatus.SC_OK == status) {
             return true;
         } else if (HttpStatus.SC_NOT_FOUND == status) {

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/events/BitbucketCloudPullRequestEvent.java

@@ -76,7 +76,7 @@ private void reconstructMissingData() {
                         sourceRepository.setScm(repository.getScm());
                     }
                     if (sourceRepository.getOwner() == null) {
-                        if (!sourceRepository.getOwnerName().equals(repository.getOwnerName())) { // i.e., a fork
+                        if (!StringUtils.equalsIgnoreCase(sourceRepository.getOwnerName(), repository.getOwnerName())) { // i.e., a fork
                             BitbucketCloudRepositoryOwner owner = new BitbucketCloudRepositoryOwner();
                             owner.setUsername(sourceRepository.getOwnerName());
                             owner.setDisplayName(this.pullRequest.getAuthorLogin());
@@ -111,8 +111,7 @@ private void reconstructMissingData() {
                     destination.getRepository().setScm(repository.getScm());
                 }
                 if (destination.getRepository().getOwner() == null
-                    && destination.getRepository().getOwnerName()
-                    .equals(repository.getOwnerName())) {
+                        && StringUtils.equalsIgnoreCase(destination.getRepository().getOwnerName(), repository.getOwnerName())) {
                     destination.getRepository().setOwner(repository.getOwner());
                     destination.getRepository().setPrivate(repository.isPrivate());
                 }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/filesystem/BitbucketSCMFileSystem.java

@@ -56,6 +56,7 @@
 import jenkins.scm.api.SCMSource;
 import jenkins.scm.api.SCMSourceDescriptor;
 import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;
+import org.apache.commons.lang.StringUtils;
 
 public class BitbucketSCMFileSystem extends SCMFileSystem {
 
@@ -163,7 +164,7 @@ public SCMFileSystem build(@NonNull SCMSource source, @NonNull SCMHead head, @Ch
                 if (BitbucketApiUtils.isCloud(apiClient)) {
                     // support lightweight checkout for branches with same owner and repository
                     if (prHead.getCheckoutStrategy() == ChangeRequestCheckoutStrategy.HEAD &&
-                        prHead.getRepoOwner().equals(src.getRepoOwner()) &&
+                        StringUtils.equalsIgnoreCase(prHead.getRepoOwner(), src.getRepoOwner()) &&
                         prHead.getRepository().equals(src.getRepository())) {
                         ref = prHead.getOriginName();
                     } else {

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/AbstractSCMHeadEvent.java

@@ -58,7 +58,7 @@ public boolean isMatch(@NonNull SCMNavigator navigator) {
         if (!isServerURLMatch(bbNav.getServerUrl())) {
             return false;
         }
-        return bbNav.getRepoOwner().equalsIgnoreCase(getRepository().getOwnerName());
+        return StringUtils.equalsIgnoreCase(bbNav.getRepoOwner(), getRepository().getOwnerName());
     }
 
     protected abstract BitbucketRepository getRepository();

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/BitbucketSCMSourcePushHookReceiver.java

@@ -53,8 +53,7 @@ public class BitbucketSCMSourcePushHookReceiver extends CrumbExclusion implement
     public static final String FULL_PATH = PATH + "/notify";
 
     @Override
-    public boolean process(HttpServletRequest req, HttpServletResponse resp, FilterChain chain)
-    throws IOException, ServletException {
+    public boolean process(HttpServletRequest req, HttpServletResponse resp, FilterChain chain) throws IOException, ServletException {
         String pathInfo = req.getPathInfo();
         if (pathInfo != null && pathInfo.startsWith("/"+FULL_PATH)) {
             chain.doFilter(req, resp);