Support git hosts other than GitHub + multiple forks

config.schema.json

@@ -5,7 +5,11 @@
   "description": "Configuration for customizing git-proxy",
   "type": "object",
   "properties": {
-    "proxyUrl": { "type": "string" },
+    "proxyUrl": {
+      "type": "string",
+      "description": "Used in early versions of git proxy to configure the remote host that traffic is proxied to. In later versions, the repository URL is used to determine the domain proxied, allowing multiple hosts to be proxied by one instance.",
+      "deprecated": true
+    },
     "cookieSecret": { "type": "string" },
     "sessionMaxAgeHours": { "type": "number" },
     "api": {

cypress/e2e/repo.cy.js

@@ -10,7 +10,7 @@ describe('Repo', () => {
 
   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 cloneURL = 'http://localhost:8000/github.com/finos/test-repo.git';
       const tooltipQuery = 'div[role="tooltip"]';
 
       cy

package.json

@@ -19,7 +19,7 @@
     "prepare": "node ./scripts/prepare.js",
     "lint": "eslint \"src/**/*.{js,jsx,ts,tsx,json}\" \"test/**/*.{js,jsx,ts,tsx,json}\"",
     "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx,json}\" \"test/**/*.{js,jsx,ts,tsx,json}\"",
-    "format": "prettier --write src/**/*.{js,jsx,ts,tsx,css,md,json,scss} test/**/*.{js,jsx,ts,tsx,json} --config ./.prettierrc",
+    "format": "prettier --write src/**/*.{js,jsx,ts,tsx,css,md,json,scss} test/**/*.{js,jsx,ts,tsx,json} packages/git-proxy-cli/test/**/*.{js,jsx,ts,tsx,json}  packages/git-proxy-cli/index.js --config ./.prettierrc",
     "gen-schema-doc": "node ./scripts/doc-schema.js",
     "cypress:run": "cypress run"
   },

packages/git-proxy-cli/test/testCli.proxy.config.json

@@ -1,8 +1,7 @@
 {
   "tempPassword": {
     "sendEmail": false,
-    "emailConfig": {
-    }
+    "emailConfig": {}
   },
   "authorisedList": [
     {
@@ -22,9 +21,9 @@
     {
       "type": "mongo",
       "connectionString": "mongodb://localhost:27017/gitproxy",
-      "options": {        
+      "options": {
         "useUnifiedTopology": true
-      },      
+      },
       "enabled": false
     }
   ],

packages/git-proxy-cli/test/testCli.test.js

@@ -219,12 +219,12 @@ describe('test git-proxy-cli', function () {
 
     before(async function () {
       await helper.addRepoToDb(TEST_REPO_CONFIG);
-      await helper.addGitPushToDb(pushId, TEST_REPO);
+      await helper.addGitPushToDb(pushId, TEST_REPO_CONFIG.url);
     });
 
     after(async function () {
       await helper.removeGitPushFromDb(pushId);
-      await helper.removeRepoFromDb(TEST_REPO_CONFIG.name);
+      await helper.removeRepoFromDb(TEST_REPO_CONFIG.url);
     });
 
     it('attempt to authorise should fail when server is down', async function () {
@@ -299,7 +299,7 @@ describe('test git-proxy-cli', function () {
 
     after(async function () {
       await helper.removeGitPushFromDb(pushId);
-      await helper.removeRepoFromDb(TEST_REPO_CONFIG.name);
+      await helper.removeRepoFromDb(TEST_REPO_CONFIG.url);
     });
 
     it('attempt to cancel should fail when server is down', async function () {
@@ -415,12 +415,12 @@ describe('test git-proxy-cli', function () {
 
     before(async function () {
       await helper.addRepoToDb(TEST_REPO_CONFIG);
-      await helper.addGitPushToDb(pushId, TEST_REPO);
+      await helper.addGitPushToDb(pushId, TEST_REPO_CONFIG.url);
     });
 
     after(async function () {
       await helper.removeGitPushFromDb(pushId);
-      await helper.removeRepoFromDb(TEST_REPO_CONFIG.name);
+      await helper.removeRepoFromDb(TEST_REPO_CONFIG.url);
     });
 
     it('attempt to reject should fail when server is down', async function () {
@@ -492,13 +492,13 @@ describe('test git-proxy-cli', function () {
     before(async function () {
       await helper.addRepoToDb(TEST_REPO_CONFIG);
       await helper.addUserToDb('testuser1', 'testpassword', 'test@email.com', gitAccount);
-      await helper.addGitPushToDb(pushId, TEST_REPO, gitAccount);
+      await helper.addGitPushToDb(pushId, TEST_REPO_CONFIG.url, gitAccount);
     });
 
     after(async function () {
       await helper.removeUserFromDb('testuser1');
       await helper.removeGitPushFromDb(pushId);
-      await helper.removeRepoFromDb(TEST_REPO_CONFIG.name);
+      await helper.removeRepoFromDb(TEST_REPO_CONFIG.url);
     });
 
     it('attempt to ls should list existing push', async function () {

packages/git-proxy-cli/test/testCliUtils.js

@@ -30,7 +30,7 @@ async function runCli(
   expectedExitCode = 0,
   expectedMessages = null,
   expectedErrorMessages = null,
-  debug = false,
+  debug = true,
 ) {
   try {
     console.log(`cli: '${cli}'`);
@@ -152,8 +152,9 @@ async function addRepoToDb(newRepo, debug = false) {
   const found = repos.find((y) => y.project === newRepo.project && newRepo.name === y.name);
   if (!found) {
     await db.createRepo(newRepo);
-    await db.addUserCanPush(newRepo.name, 'admin');
-    await db.addUserCanAuthorise(newRepo.name, 'admin');
+    const repo = await db.getRepoByUrl(newRepo.url);
+    await db.addUserCanPush(repo._id, 'admin');
+    await db.addUserCanAuthorise(repo._id, 'admin');
     if (debug) {
       console.log(`New repo added to database: ${newRepo}`);
     }
@@ -166,26 +167,27 @@ async function addRepoToDb(newRepo, debug = false) {
 
 /**
  * Removes a repo from the DB.
- * @param {string} repoName  The name of the repo to remove.
+ * @param {string} repoUrl  The url of the repo to remove.
  */
-async function removeRepoFromDb(repoName) {
-  await db.deleteRepo(repoName);
+async function removeRepoFromDb(repoUrl) {
+  const repo = await db.getRepoByUrl(repoUrl);
+  await db.deleteRepo(repo._id);
 }
 
 /**
  * Add a new git push record to the database.
  * @param {string} id The ID of the git push.
- * @param {string} repo The repository of the git push.
+ * @param {string} repoUrl The repository URL of the git push.
  * @param {string} user The user who pushed the git push.
  * @param {boolean} debug Flag to enable logging for debugging.
  */
-async function addGitPushToDb(id, repo, user = null, debug = false) {
+async function addGitPushToDb(id, repoUrl, user = null, debug = false) {
   const action = new actions.Action(
     id,
     'push', // type
     'get', // method
     Date.now(), // timestamp
-    repo,
+    repoUrl,
   );
   action.user = user;
   const step = new steps.Step(

proxy.config.json

@@ -1,5 +1,4 @@
 {
-  "proxyUrl": "https://github.com",
   "cookieSecret": "cookie secret",
   "sessionMaxAgeHours": 12,
   "rateLimit": {

src/config/env.ts

@@ -9,12 +9,12 @@ const {
   GIT_PROXY_SERVER_PORT = 8000,
   GIT_PROXY_HTTPS_SERVER_PORT = 8443,
   GIT_PROXY_UI_HOST = 'http://localhost',
-  GIT_PROXY_UI_PORT = 8080
+  GIT_PROXY_UI_PORT = 8080,
 } = process.env;
 
 export const serverConfig: ServerConfig = {
   GIT_PROXY_SERVER_PORT,
   GIT_PROXY_HTTPS_SERVER_PORT,
   GIT_PROXY_UI_HOST,
-  GIT_PROXY_UI_PORT
+  GIT_PROXY_UI_PORT,
 };

src/config/index.ts

@@ -21,7 +21,6 @@
 let _authentication: Authentication[] = defaultSettings.authentication;
 let _apiAuthentication: Authentication[] = defaultSettings.apiAuthentication;
 let _tempPassword: TempPasswordConfig = defaultSettings.tempPassword;
-let _proxyUrl = defaultSettings.proxyUrl;
 let _api: Record<string, unknown> = defaultSettings.api;
 let _cookieSecret: string = defaultSettings.cookieSecret;
 let _sessionMaxAgeHours: number = defaultSettings.sessionMaxAgeHours;
@@ -47,15 +46,6 @@
 // Create config loader instance
 const configLoader = new ConfigLoader(_config);
 
-// Get configured proxy URL
-export const getProxyUrl = () => {
-  if (_userSettings !== null && _userSettings.proxyUrl) {
-    _proxyUrl = _userSettings.proxyUrl;
-  }
-
-  return _proxyUrl;
-};
-
 // Gets a list of authorised repositories
 export const getAuthorisedList = () => {
   if (_userSettings !== null && _userSettings.authorisedList) {
@@ -87,12 +77,12 @@
     }
   }
 
-  throw Error('No database cofigured!');
+  throw Error('No database configured!');
 };
 
 /**
  * Get the list of enabled authentication methods
- * 
+ *
  * At least one authentication method must be enabled.
  * @return {Array} List of enabled authentication methods
  */
@@ -104,15 +94,15 @@
   const enabledAuthMethods = _authentication.filter((auth) => auth.enabled);
 
   if (enabledAuthMethods.length === 0) {
-    throw new Error("No authentication method enabled");
+    throw new Error('No authentication method enabled');
   }
 
   return enabledAuthMethods;
 };
 
 /**
  * Get the list of enabled authentication methods for API endpoints
- * 
+ *
  * If no API authentication methods are enabled, all endpoints are public.
  * @return {Array} List of enabled authentication methods
  */
@@ -121,7 +111,7 @@
     _apiAuthentication = _userSettings.apiAuthentication;
   }
 
-  const enabledAuthMethods = _apiAuthentication.filter(auth => auth.enabled);
+  const enabledAuthMethods = _apiAuthentication.filter((auth) => auth.enabled);
 
   return enabledAuthMethods;
 };

src/db/file/index.ts

@@ -2,29 +2,19 @@ import * as users from './users';
 import * as repo from './repo';
 import * as pushes from './pushes';
 
-export const {
-  getPushes,
-  writeAudit,
-  getPush,
-  deletePush,
-  authorise,
-  cancel,
-  reject,
-  canUserCancelPush,
-  canUserApproveRejectPush,
-} = pushes;
+export const { getPushes, writeAudit, getPush, deletePush, authorise, cancel, reject } = pushes;
 
 export const {
   getRepos,
   getRepo,
+  getRepoByUrl,
+  getRepoById,
   createRepo,
   addUserCanPush,
   addUserCanAuthorise,
   removeUserCanPush,
   removeUserCanAuthorise,
   deleteRepo,
-  isUserPushAllowed,
-  canUserApproveRejectPushRepo,
 } = repo;
 
 export const { findUser, findUserByOIDC, getUsers, createUser, deleteUser, updateUser } = users;