Merge branch 'finos:main' into Search

darkhorse-420 · web-flow · commit e784109c2846 · 2024-11-06T22:00:17.000+05:30
diff --git a/.env.development b/.env.development
@@ -1,2 +1 @@
 VITE_API_URI=http://localhost:8080
-VITE_SERVER_URI=http://localhost:8000
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
         mongodb-version: [4.4]
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Code Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v4
         with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -37,7 +37,7 @@ jobs:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
@@ -64,7 +64,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: SARIF file
           path: results.sarif
diff --git a/config.schema.json b/config.schema.json
@@ -20,6 +20,10 @@
       "description": "Customisable questions to add to attestation form",
       "type": "object"
     },
+    "domains": {
+      "description": "Provide domains to use alternative to the defaults",
+      "type": "object"
+    },
     "privateOrganizations": {
       "description": "Pattern searches for listed private organizations are disabled",
       "type": "array"
diff --git a/cypress/e2e/repo.cy.js b/cypress/e2e/repo.cy.js
@@ -0,0 +1,55 @@
+describe('Repo', () => {
+  beforeEach(() => {
+    cy.visit('/admin/repo');
+
+    // prevent failures on 404 request and uncaught promises
+    cy.on('uncaught:exception', () => false);
+  });
+
+  describe('Code button for repo row', () => {
+    it('Opens tooltip with correct content and can copy', () => {
+      const cloneURL = 'http://localhost:8000/finos/test-repo.git';
+      const tooltipQuery = 'div[role="tooltip"]';
+
+      cy
+        // tooltip isn't open to start with
+        .get(tooltipQuery)
+        .should('not.exist');
+
+      cy
+        // find the entry for finos/test-repo
+        .get('a[href="/admin/repo/test-repo"]')
+        // take it's parent row
+        .closest('tr')
+        // find the nearby span containing Code we can click to open the tooltip
+        .find('span')
+        .contains('Code')
+        .should('exist')
+        .click();
+
+      cy
+        // find the newly opened tooltip
+        .get(tooltipQuery)
+        .should('exist')
+        .find('span')
+        // check it contains the url we expect
+        .contains(cloneURL)
+        .should('exist')
+        .parent()
+        // find the adjacent span that contains the svg
+        .find('span')
+        .next()
+        // check it has the copy icon first and click it
+        .get('svg.octicon-copy')
+        .should('exist')
+        .click()
+        // check the icon has changed to the check icon
+        .get('svg.octicon-copy')
+        .should('not.exist')
+        .get('svg.octicon-check')
+        .should('exist');
+
+      // failed to successfully check the clipboard
+    });
+  });
+});
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -22,4 +22,16 @@
 //
 //
 // -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+
+// start of a login command with sessions
+// TODO: resolve issues with the CSRF token
+Cypress.Commands.add('login', (username, password) => {
+  cy.session([username, password], () => {
+    cy.visit('/login');
+    cy.get('[data-test=username]').type(username);
+    cy.get('[data-test=password]').type(password);
+    cy.get('[data-test=login]').click();
+    cy.url().should('contain', '/admin/profile');
+  });
+});
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@finos/git-proxy",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Deploy custom push protections and policies on top of Git.",
   "scripts": {
     "cli": "node ./packages/git-proxy-cli/index.js",
diff --git a/proxy.config.json b/proxy.config.json
@@ -92,6 +92,7 @@
       }
     ]
   },
+  "domains": {},
   "privateOrganizations": [],
   "urlShortener": "",
   "contactEmail": "",
diff --git a/scripts/doc-schema.js b/scripts/doc-schema.js
@@ -20,6 +20,7 @@ try {
   console.log(genDocOutput);
 
   const schemaDoc = readFileSync(`${tempdir}${sep}schema.md`, 'utf-8')
+    .replace(/\s\s\n\n<\/summary>/g, '\n</summary>')
     .replace(/# GitProxy configuration file/g, '# Schema Reference'); // https://github.com/finos/git-proxy/pull/327#discussion_r1377343213
   const docString = `---
 title: Schema Reference
diff --git a/src/config/index.js b/src/config/index.js
@@ -24,6 +24,7 @@ let _privateOrganizations = defaultSettings.privateOrganizations;
 let _urlShortener = defaultSettings.urlShortener;
 let _contactEmail = defaultSettings.contactEmail;
 let _csrfProtection = defaultSettings.csrfProtection;
+let _domains = defaultSettings.domains;
 
 // Get configured proxy URL
 const getProxyUrl = () => {
@@ -189,6 +190,13 @@ const getSSLCertPath = () => {
   return _sslCertPath;
 };
 
+const getDomains = () => {
+  if (_userSettings && _userSettings.domains) {
+    _domains = _userSettings.domains;
+  }
+  return _domains;
+};
+
 exports.getAPIs = getAPIs;
 exports.getProxyUrl = getProxyUrl;
 exports.getAuthorisedList = getAuthorisedList;
@@ -207,3 +215,4 @@ exports.getCSRFProtection = getCSRFProtection;
 exports.getPlugins = getPlugins;
 exports.getSSLKeyPath = getSSLKeyPath;
 exports.getSSLCertPath = getSSLCertPath;
+exports.getDomains = getDomains;
diff --git a/src/service/proxyURL.js b/src/service/proxyURL.js
@@ -0,0 +1,13 @@
+const { GIT_PROXY_SERVER_PORT: PROXY_HTTP_PORT, GIT_PROXY_UI_PORT: UI_PORT } =
+  require('../config/env').Vars;
+const config = require('../config');
+
+module.exports = {
+  getProxyURL: (req) => {
+    const defaultURL = `${req.protocol}://${req.headers.host}`.replace(
+      `:${UI_PORT}`,
+      `:${PROXY_HTTP_PORT}`,
+    );
+    return config.getDomains().proxy ?? defaultURL;
+  },
+};
diff --git a/src/service/routes/repo.js b/src/service/routes/repo.js
@@ -1,8 +1,10 @@
 const express = require('express');
 const router = new express.Router();
 const db = require('../../db');
+const { getProxyURL } = require('../proxyURL');
 
 router.get('/', async (req, res) => {
+  const proxyURL = getProxyURL(req);
   const query = {
     type: 'push',
   };
@@ -18,12 +20,15 @@ router.get('/', async (req, res) => {
     query[k] = v;
   }
 
-  res.send(await db.getRepos(query));
+  const qd = await db.getRepos(query);
+  res.send(qd.map((d) => ({ ...d, proxyURL })));
 });
 
 router.get('/:name', async (req, res) => {
+  const proxyURL = getProxyURL(req);
   const name = req.params.name;
-  res.send(await db.getRepo(name));
+  const qd = await db.getRepo(name);
+  res.send({ ...qd, proxyURL });
 });
 
 router.patch('/:name/user/push', async (req, res) => {
diff --git a/src/ui/views/RepoDetails/RepoDetails.jsx b/src/ui/views/RepoDetails/RepoDetails.jsx
@@ -59,8 +59,8 @@ export default function RepoDetails() {
   if (isLoading) return <div>Loading...</div>;
   if (isError) return <div>Something went wrong ...</div>;
 
-  const { project: org, name } = data || {};
-  const cloneURL = `${import.meta.env.VITE_SERVER_URI}/${org}/${name}.git`;
+  const { project: org, name, proxyURL } = data || {};
+  const cloneURL = `${proxyURL}/${org}/${name}.git`;
 
   return (
     <GridContainer>
diff --git a/src/ui/views/RepoList/Components/RepoOverview.jsx b/src/ui/views/RepoList/Components/RepoOverview.jsx
@@ -585,8 +585,8 @@ export default function Repositories(props) {
       });
   };
 
-  const { project: org, name } = props?.data || {};
-  const cloneURL = `${window.location.origin.toString()}/${org}/${name}.git`;
+  const { project: org, name, proxyURL } = props?.data || {};
+  const cloneURL = `${proxyURL}/${org}/${name}.git`;
 
   return (
     <TableRow>
diff --git a/test/proxyURL.test.js b/test/proxyURL.test.js
@@ -0,0 +1,51 @@
+const chai = require('chai');
+const sinon = require('sinon');
+const express = require('express');
+const chaiHttp = require('chai-http');
+const { getProxyURL } = require('../src/service/proxyURL');
+const config = require('../src/config');
+
+chai.use(chaiHttp);
+chai.should();
+const expect = chai.expect;
+
+const genSimpleServer = () => {
+  const app = express();
+  app.get('/', (req, res) => {
+    res.contentType('text/html');
+    res.send(getProxyURL(req));
+  });
+  return app;
+};
+
+describe('proxyURL', async () => {
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it('pulls the request path with no override', async () => {
+    const app = genSimpleServer();
+    const res = await chai.request(app).get('/').send();
+    res.should.have.status(200);
+
+    // request url without trailing slash
+    const reqURL = res.request.url.slice(0, -1);
+    expect(res.text).to.equal(reqURL);
+    expect(res.text).to.match(/https?:\/\/127.0.0.1:\d+/);
+  });
+
+  it('can override providing a proxy value', async () => {
+    const proxyURL = 'https://amazing-proxy.path.local';
+    // stub getDomains
+    const configGetDomainsStub = sinon.stub(config, 'getDomains').returns({ proxy: proxyURL });
+
+    const app = genSimpleServer();
+    const res = await chai.request(app).get('/').send();
+    res.should.have.status(200);
+
+    // the stub worked
+    expect(configGetDomainsStub.calledOnce).to.be.true;
+
+    expect(res.text).to.equal(proxyURL);
+  });
+});
diff --git a/website/docs/configuration/reference.mdx b/website/docs/configuration/reference.mdx
diff --git a/website/src/css/custom.css b/website/src/css/custom.css
diff --git a/website/yarn.lock b/website/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`VITE_API_URI=http://localhost:8080`
`2`		`-VITE_SERVER_URI=http://localhost:8000`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@finos/git-proxy",`
`3`		`- "version": "1.4.0",`
	`3`	`+ "version": "1.5.0",`
`4`	`4`	`"description": "Deploy custom push protections and policies on top of Git.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"cli": "node ./packages/git-proxy-cli/index.js",`