Merge branch 'master' into fix/universal-bearer-auth-conns

snyk · Sep 27, 2024 · 89167b7 · 89167b7
2 parents 00f39f8 + 3ea95a2
commit 89167b7
Show file tree

Hide file tree

Showing 10 changed files with 376 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/client-templates/gitlab/accept.json.sample b/client-templates/gitlab/accept.json.sample
@@ -1575,6 +1575,12 @@
       "method": "any",
       "path": "/snykgit/*",
       "origin": "${GIT_CLIENT_URL}"
+    },
+    {
+      "//": "get token information to check scope",
+      "method": "GET",
+      "path": "/api/v4/personal_access_tokens/self",
+      "origin": "https://${GITLAB}"
     }
   ]
 }
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/defaultFilters/gitlab.json b/defaultFilters/gitlab.json
@@ -1575,6 +1575,12 @@
         "method": "any",
         "path": "/snykgit/*",
         "origin": "${GIT_CLIENT_URL}"
+      },
+      {
+        "//": "get token information to check scope",
+        "method": "GET",
+        "path": "/api/v4/personal_access_tokens/self",
+        "origin": "https://${GITLAB}"
       }
     ]
   }
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