Merge pull request #851 from snyk/scm-504-bitbucker-sever-cred-valida…

…tion chore: add bitbucket server permission search for cred validation [SCM-504]
snyk · Sep 27, 2024 · 3ea95a2 · 3ea95a2
2 parents 58ea8b4 + c899f9c
commit 3ea95a2
Show file tree

Hide file tree

Showing 8 changed files with 280 additions and 79 deletions.
diff --git a/client-templates/bitbucket-server-bearer-auth/accept.json.sample b/client-templates/bitbucket-server-bearer-auth/accept.json.sample
@@ -1052,6 +1052,16 @@
         "scheme": "bearer",
         "token": "${BITBUCKET_PAT}"
       }
+    },
+    {
+      "//": "used to validate credentials",
+      "method": "GET",
+      "path": "/rest/api/1.0/projects/:project/repos/:repo/permissions/search",
+      "origin": "https://${BITBUCKET}",
+      "auth": {
+        "scheme": "bearer",
+        "token": "${BITBUCKET_PAT}"
+      }
     }
   ]
 }
diff --git a/client-templates/bitbucket-server/accept.json.sample b/client-templates/bitbucket-server/accept.json.sample
@@ -1156,6 +1156,17 @@
         "username": "${BITBUCKET_USERNAME}",
         "password": "${BITBUCKET_PASSWORD}"
       }
+    },
+    {
+      "//": "used to validate credentials",
+      "method": "GET",
+      "path": "/rest/api/1.0/projects/:project/repos/:repo/permissions/search",
+      "origin": "https://${BITBUCKET}",
+      "auth": {
+        "scheme": "basic",
+        "username": "${BITBUCKET_USERNAME}",
+        "password": "${BITBUCKET_PASSWORD}"
+      }
     }
   ]
 }
diff --git a/defaultFilters/bitbucket-server-bearer-auth.json b/defaultFilters/bitbucket-server-bearer-auth.json
@@ -1052,6 +1052,16 @@
         "scheme": "bearer",
         "token": "${BITBUCKET_PAT}"
       }
+    },
+    {
+      "//": "used to validate credentials",
+      "method": "GET",
+      "path": "/rest/api/1.0/projects/:project/repos/:repo/permissions/search",
+      "origin": "https://${BITBUCKET}",
+      "auth": {
+        "scheme": "bearer",
+        "token": "${BITBUCKET_PAT}"
+      }
     }
   ]
 }
diff --git a/defaultFilters/bitbucket-server.json b/defaultFilters/bitbucket-server.json
@@ -1156,6 +1156,17 @@
           "username": "${BITBUCKET_USERNAME}",
           "password": "${BITBUCKET_PASSWORD}"
         }
+      },
+      {
+        "//": "used to validate credentials",
+        "method": "GET",
+        "path": "/rest/api/1.0/projects/:project/repos/:repo/permissions/search",
+        "origin": "https://${BITBUCKET}",
+        "auth": {
+          "scheme": "basic",
+          "username": "${BITBUCKET_USERNAME}",
+          "password": "${BITBUCKET_PASSWORD}"
+        }
       }
     ]
   }
diff --git a/test/fixtures/accept/bitbucket-server-bearer-auth.json b/test/fixtures/accept/bitbucket-server-bearer-auth.json
diff --git a/test/fixtures/accept/bitbucket-server.json b/test/fixtures/accept/bitbucket-server.json