Merge branch 'main' into reconcile

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
         mongodb-version: [4.4]
 
     steps:
-    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
+    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
       with:
         fetch-depth: 0
 

.github/workflows/cve-scanning-node.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         node-version: [18.x]
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:

.github/workflows/lint.yml

@@ -16,7 +16,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Code Checkout
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
         with:
           fetch-depth: 0
 

.github/workflows/npm.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v4
         with:

config.schema.json

@@ -4,44 +4,40 @@
   "title": "Git Proxy configuration file",
   "description": "Configuration for customizing git-proxy",
   "type": "object",
-  "oneOf": [
-    {
+  "properties": {
+    "authorisedList": {
+      "description": "List of repositories that are authorised to be pushed to through the proxy.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/authorisedRepo"
+      }
+    },
+    "sink": {
+      "description": "List of database sources. The first source in the configuration with enabled=true will be used.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/database"
+      }
+    },
+    "authentication": {
+      "description": "List of authentication sources. The first source in the configuration with enabled=true will be used.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/authentication"
+      }
+    },
+    "tempPassword": {
+      "description": "Toggle the generation of temporary password for git-proxy admin user",
+      "type": "object",
       "properties": {
-        "authorisedList": {
-          "description": "List of repositories that are authorised to be pushed to through the proxy.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/authorisedRepo"
-          }
-        },
-        "sink": {
-          "description": "List of database sources. The first source in the configuration with enabled=true will be used.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/database"
-          }
-        },
-        "authentication": {
-          "description": "List of authentication sources. The first source in the configuration with enabled=true will be used.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/authentication"
-          }
-        },
-        "tempPassword": {
-          "description": "Toggle the generation of temporary password for git-proxy admin user",
-          "type": "object",
-          "properties": {
-            "sendEmail": { "type": "boolean" },
-            "emailConfig": {
-              "description": "Generic object to configure nodemailer. For full type information, please see https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/nodemailer",
-              "type": "object"
-            }
-          }
+        "sendEmail": { "type": "boolean" },
+        "emailConfig": {
+          "description": "Generic object to configure nodemailer. For full type information, please see https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/nodemailer",
+          "type": "object"
         }
       }
     }
-  ],
+  },
   "definitions": {
     "authorisedRepo": {
       "type": "object",

index.js

@@ -18,32 +18,26 @@ const argv = require('yargs/yargs')(process.argv.slice(2))
   })
   .strict().argv;
 
-require('./src/config/file').configFile = argv.c ? argv.c : undefined;
+const config = require('./src/config/file');
+config.configFile = argv.c ? argv.c : undefined;
 
 if (argv.v) {
   const fs = require('fs');
-  const path = require('path');
-  const validate = require('jsonschema').validate;
-  const configFile = require('./src/config/file').configFile;
 
-  if (!fs.existsSync(configFile)) {
+  if (!fs.existsSync(config.configFile)) {
     console.error(
-      `Config file ${configFile} doesn't exist, nothing to validate! Did you forget -c/--config?`,
+      `Config file ${config.configFile} doesn't exist, nothing to validate! Did you forget -c/--config?`,
     );
     process.exit(1);
   }
 
-  const config = JSON.parse(fs.readFileSync(configFile));
-  const schema = JSON.parse(
-    fs.readFileSync(path.join(__dirname, 'config.schema.json')),
-  );
-
-  validate(config, schema, { required: true, throwError: true });
-
-  console.log(`${configFile} is valid`);
+  config.validate();
+  console.log(`${config.configFile} is valid`);
   process.exit(0);
 }
 
+config.validate();
+
 const proxy = require('./src/proxy');
 const service = require('./src/service');
 

package.json

@@ -65,7 +65,7 @@
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-html-parser": "^2.0.2",
-    "react-router-dom": "6.22.3",
+    "react-router-dom": "6.23.0",
     "uuid": "^9.0.0",
     "yargs": "^17.7.2"
   },

src/config/file.js

@@ -2,11 +2,31 @@ const path = require('path');
 // eslint-disable-next-line prefer-const
 let configFile = undefined;
 
+/**
+ * Validate config file.
+ * @param {string} configFilePath - The path to the config file.
+ * @return {boolean} - Returns true if validation is successful.
+ * @throws Will throw an error if the validation fails.
+ */
+function validate(configFilePath = configFile) {
+  const fs = require('fs');
+  const path = require('path');
+  const validate = require('jsonschema').validate;
+
+  const config = JSON.parse(fs.readFileSync(configFilePath));
+  const schema = JSON.parse(
+    fs.readFileSync(path.join(__dirname, '..', '..', 'config.schema.json')),
+  );
+  validate(config, schema, { required: true, throwError: true });
+  return true;
+}
+
 module.exports = {
   get configFile() {
     return configFile ? configFile : path.join(process.cwd(), 'proxy.config.json');
   },
   set configFile(file) {
     configFile = file;
   },
+  validate,
 };

test/fixtures/proxy.config.invalid-1.json

@@ -0,0 +1,9 @@
+{
+  "invalidProperty": [
+    {
+      "project": "finos",
+      "name": "git-proxy",
+      "url": "https://www.github.com/finos/git-proxy.git"
+    }
+  ]
+}

test/fixtures/proxy.config.invalid-2.json

@@ -0,0 +1,9 @@
+{
+  "authorisedList": [
+    {
+      "project": "finos",
+      "name": "git-proxy",
+      "link": "https://www.github.com/finos/git-proxy"
+    }
+  ]
+}

test/fixtures/proxy.config.valid-1.json

@@ -0,0 +1 @@
+{}

test/fixtures/proxy.config.valid-2.json

@@ -0,0 +1,14 @@
+{
+  "authorisedList": [
+    {
+      "project": "finos",
+      "name": "git-proxy",
+      "url": "https://github.com/finos/git-proxy.git"
+    },
+    {
+      "project": "finos",
+      "name": "git-proxy-test",
+      "url": "[email protected]:finos/git-proxy-test.git"
+    }
+  ]
+}

test/testConfig.test.js

@@ -2,13 +2,15 @@ const chai = require('chai');
 const fs = require('fs');
 const path = require('path');
 const defaultSettings = require('../proxy.config.json');
+const fixtures = 'fixtures';
 
 chai.should();
 const expect = chai.expect;
 
 describe('default configuration', function () {
   it('should use default values if no user-settings.json file exists', function () {
     const config = require('../src/config');
+    config.logConfiguration();
 
     expect(config.getAuthentication()).to.be.eql(defaultSettings.authentication[0]);
     expect(config.getDatabase()).to.be.eql(defaultSettings.sink[0]);
@@ -94,3 +96,35 @@ describe('user configuration', function () {
     delete require.cache[require.resolve('../src/config')];
   });
 });
+
+describe('validate config files', function () {
+  const config = require('../src/config/file');
+
+  it('all valid config files should pass validation', function () {
+    const validConfigFiles = [
+      'proxy.config.valid-1.json',
+      'proxy.config.valid-2.json',
+    ];
+    for (const testConfigFile of validConfigFiles) {
+      expect(config.validate(path.join(__dirname, fixtures, testConfigFile))).to
+        .be.true;
+    }
+  });
+
+  it('all invalid config files should fail validation', function () {
+    const invalidConfigFiles = [
+      'proxy.config.invalid-1.json',
+      'proxy.config.invalid-2.json',
+    ];
+    for (const testConfigFile of invalidConfigFiles) {
+      const test = function () {
+        config.validate(path.join(__dirname, fixtures, testConfigFile));
+      };
+      expect(test).to.throw();
+    }
+  });
+
+  after(function () {
+    delete require.cache[require.resolve('../src/config')];
+  });
+});