Merge branch 'main' into drop-jwk-to-pem

Author: kriswest

.github/workflows/dependency-review.yml

@@ -21,6 +21,6 @@ jobs:
         with:
           comment-summary-in-pr: always
           fail-on-severity: high
-          allow-licenses: MIT, MIT-0, Apache-2.0, BSD-3-Clause, BSD-3-Clause-Clear, ISC, BSD-2-Clause, Unlicense, CC0-1.0, 0BSD, X11, MPL-2.0, MPL-1.0, MPL-1.1, MPL-2.0, OFL-1.1, Zlib
+          allow-licenses: MIT, MIT-0, Apache-2.0, BSD-3-Clause, BSD-3-Clause-Clear, ISC, BSD-2-Clause, Unlicense, CC0-1.0, 0BSD, X11, MPL-2.0, MPL-1.0, MPL-1.1, MPL-2.0, OFL-1.1, Zlib, BlueOak-1.0.0
           fail-on-scopes: development, runtime
           allow-dependencies-licenses: 'pkg:npm/caniuse-lite'

package-lock.json

@@ -51,7 +51,7 @@ export default class Proxy {
     const allowedList: Repo[] = await getRepos();
 
     defaultAuthorisedRepoList.forEach(async (x) => {
-      const found = allowedList.find((y) => y.project === x.project && x.name === y.name);
+      const found = allowedList.find((y) => y.url === x.url);
       if (!found) {
         const repo = await createRepo(x);
         await addUserCanPush(repo._id!, 'admin');

src/proxy/index.ts

@@ -18,23 +18,23 @@ import Proxy from '../src/proxy';
 const TEST_DEFAULT_REPO = {
   url: 'https://github.com/finos/git-proxy.git',
   name: 'git-proxy',
-  project: 'finos/git-proxy',
+  project: 'finos',
   host: 'github.com',
   proxyUrlPrefix: '/github.com/finos/git-proxy.git',
 };
 
 const TEST_GITLAB_REPO = {
   url: 'https://gitlab.com/gitlab-community/meta.git',
   name: 'gitlab',
-  project: 'gitlab-community/meta',
+  project: 'gitlab-community',
   host: 'gitlab.com',
   proxyUrlPrefix: '/gitlab.com/gitlab-community/meta.git',
 };
 
 const TEST_UNKNOWN_REPO = {
   url: 'https://github.com/finos/fdc3.git',
   name: 'fdc3',
-  project: 'finos/fdc3',
+  project: 'finos',
   host: 'github.com',
   proxyUrlPrefix: '/github.com/finos/fdc3.git',
   fallbackUrlPrefix: '/finos/fdc3.git',
@@ -559,4 +559,29 @@ describe('proxy express application', async () => {
     res2.should.have.status(200);
     expect(res2.text).to.contain('Rejecting repo');
   }).timeout(5000);
+
+  it('should create the default repo if it does not exist', async function () {
+    // Remove the default repo from the db and check it no longer exists
+    await cleanupRepo(TEST_DEFAULT_REPO.url);
+
+    const repo = await db.getRepoByUrl(TEST_DEFAULT_REPO.url);
+    expect(repo).to.be.null;
+
+    // Restart the proxy
+    await proxy.stop();
+    await proxy.start();
+
+    // Check that the default repo was created in the db
+    const repo2 = await db.getRepoByUrl(TEST_DEFAULT_REPO.url);
+    expect(repo2).to.not.be.null;
+
+    // Check that the default repo isn't duplicated on subsequent restarts
+    await proxy.stop();
+    await proxy.start();
+
+    const allRepos = await db.getRepos();
+    const matchingRepos = allRepos.filter((r) => r.url === TEST_DEFAULT_REPO.url);
+
+    expect(matchingRepos).to.have.length(1);
+  });
 });