x-fidelity 2.11.0 → 2.12.1

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [2.12.1](https://github.com/zotoio/x-fidelity/compare/v2.12.0...v2.12.1) (2024-08-25)
+
+
+### Bug Fixes
+
+* **deps:** reduce noise in dependency checks ([88f3ecb](https://github.com/zotoio/x-fidelity/commit/88f3ecb74a29624ee91594a06900c54a2d9fd7f9))
+
+# [2.12.0](https://github.com/zotoio/x-fidelity/compare/v2.11.0...v2.12.0) (2024-08-25)
+
+
+### Bug Fixes
+
+* **analysis:** ensure long single-line files are catered for and npm namespaces ([509b4db](https://github.com/zotoio/x-fidelity/commit/509b4db1c3bb3f2cb487e043f5d23689bc8ed42d))
+* Handle [@namespace](https://github.com/namespace) packages in dependency analysis ([b5314ac](https://github.com/zotoio/x-fidelity/commit/b5314ac2b67f1bf241cbad3229c0ce3498bd9175))
+* Refactor repoFileAnalysis function to improve performance ([ae725bb](https://github.com/zotoio/x-fidelity/commit/ae725bbab307008424bb7494444e66eaca684aad))
+
+
+### Features
+
+* Implement file content splitting for analysis ([4d5f049](https://github.com/zotoio/x-fidelity/commit/4d5f04938d7fd78425e79ac74143439be1552879))
+
 # [2.11.0](https://github.com/zotoio/x-fidelity/compare/v2.10.0...v2.11.0) (2024-08-24)
 
 

package/dist/archetypes/node-fullstack-exemptions.json

@@ -1,8 +1,8 @@
 [
   {
-    "repoUrl": "https://github.com/example/node-fullstack-project",
+    "repoUrl": "git@github.com:zotoio/x-fidelity.git",
     "rule": "outdatedFramework-global",
-    "expirationDate": "2024-12-31",
+    "expirationDate": "2023-12-31",
     "reason": "Upgrading dependencies is scheduled for Q4 2024"
   },
   {

package/dist/archetypes/node-fullstack.json

@@ -21,6 +21,9 @@
     ],
     "config": {
         "minimumDependencyVersions": {
+            "@types/react": "^17.0.0",
+            "react": "^17.0.0",
+            "@yarnpkg/lockfile": "^1.2.0",
             "commander": "^2.0.0",
             "nodemon": "^3.9.0"
         },

package/dist/facts/repoDependencyFacts.js

@@ -40,6 +40,7 @@ exports.getDependencyVersionFacts = getDependencyVersionFacts;
 exports.findPropertiesInTree = findPropertiesInTree;
 exports.repoDependencyAnalysis = repoDependencyAnalysis;
 exports.semverValid = semverValid;
+exports.normalizePackageName = normalizePackageName;
 const logger_1 = require("../utils/logger");
 const child_process_1 = require("child_process");
 const semver = __importStar(require("semver"));
@@ -105,6 +106,13 @@ function processYarnDependencies(yarnOutput) {
             return newDep;
         };
         const extractNameAndVersion = (nameAndVersion) => {
+            const lastAtIndex = nameAndVersion.lastIndexOf('@');
+            if (nameAndVersion.startsWith('@') && lastAtIndex > 0) {
+                return {
+                    name: nameAndVersion.substring(0, lastAtIndex),
+                    version: nameAndVersion.substring(lastAtIndex + 1)
+                };
+            }
             const parts = nameAndVersion.split('@');
             return { name: parts[0], version: parts[1] };
         };
@@ -160,8 +168,10 @@ function findPropertiesInTree(depGraph, minVersions) {
     logger_1.logger.debug(`depGraph: ${JSON.stringify(depGraph)}`);
     function walk(dep, parentName = '') {
         const fullName = parentName ? `${parentName}/${dep.name}` : dep.name;
-        if (Object.keys(minVersions).includes(dep.name)) {
-            results.push({ dep: fullName, ver: dep.version, min: minVersions[dep.name] });
+        if (Object.keys(minVersions).some(key => key === dep.name || `@${key}` === dep.name)) {
+            const minVersionKey = Object.keys(minVersions).find(key => key === dep.name || `@${key}` === dep.name);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            results.push({ dep: fullName, ver: dep.version, min: minVersions[minVersionKey] });
         }
         if (dep.dependencies) {
             dep.dependencies.forEach(childDep => {
@@ -186,7 +196,7 @@ function repoDependencyAnalysis(params, almanac) {
             logger_1.logger.debug(`outdatedFramework: checking ${versionData.dep}`);
             // Check if the installed version satisfies the required version, supporting both ranges and specific versions
             const isValid = semverValid(versionData.ver, versionData.min);
-            if (!isValid) {
+            if (!isValid && semver.valid(versionData.ver)) {
                 const dependencyFailure = {
                     'dependency': versionData.dep,
                     'currentVersion': versionData.ver,
@@ -201,8 +211,11 @@ function repoDependencyAnalysis(params, almanac) {
         return result;
     });
 }
-function semverValid(required, installed) {
-    if (!required || !installed) {
+function semverValid(installed, required) {
+    // Remove potential @namespace from installed version
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const installedVersion = installed.includes('@') ? installed.split('@').pop() : installed;
+    if (!required || !installedVersion) {
         return true;
     }
     // If 'installed' is a single version and 'required' is a range
@@ -227,3 +240,6 @@ function semverValid(required, installed) {
     }
     return false;
 }
+function normalizePackageName(name) {
+    return name.startsWith('@') ? name : `@${name}`;
+}

package/dist/facts/repoFilesystemFacts.js

@@ -89,17 +89,49 @@ function repoFileAnalysis(params, almanac) {
         const analysis = [];
         const lines = fileContent.split('\n');
         logger_1.logger.debug(`lines: ${lines.length}`);
-        let lineNumber = 0;
+        const processedLines = [];
+        let splitOccurred = false;
         for (const line of lines) {
-            lineNumber++;
+            if (line.length > 200) {
+                let startIndex = 0;
+                while (startIndex < line.length) {
+                    let endIndex = startIndex + 200;
+                    if (endIndex < line.length) {
+                        // Find the nearest space or end of token
+                        while (endIndex > startIndex && !(/\s/.test(line[endIndex]) || /\W/.test(line[endIndex]))) {
+                            endIndex--;
+                        }
+                        // If no suitable break point found, use the full 200 characters
+                        if (endIndex === startIndex) {
+                            endIndex = startIndex + 200;
+                        }
+                    }
+                    else {
+                        endIndex = line.length;
+                    }
+                    processedLines.push(line.substring(startIndex, endIndex));
+                    startIndex = endIndex;
+                }
+                splitOccurred = true;
+            }
+            else {
+                processedLines.push(line);
+            }
+        }
+        if (lines.length === 1 || splitOccurred) {
+            logger_1.logger.debug(`File content was split for analysis`);
+        }
+        for (let i = 0; i < processedLines.length; i++) {
+            const line = processedLines[i];
             for (const pattern of checkPatterns) {
                 const regex = new RegExp(pattern, 'g');
                 if (regex.test(line)) {
-                    logger_1.logger.debug(`match on line ${lineNumber} for pattern ${pattern}`);
+                    logger_1.logger.debug(`match on line ${i + 1} for pattern ${pattern}`);
                     const match = {
                         'match': pattern,
-                        'lineNumber': lineNumber,
-                        'line': line
+                        'lineNumber': i + 1,
+                        'line': line,
+                        'splitOccurred': splitOccurred
                     };
                     analysis.push(match);
                 }

package/dist/index.js

@@ -59,19 +59,18 @@ function main() {
                 if (resultMetadata.XFI_RESULT.totalIssues > 0) {
                     logger_1.logger.warn(`WARNING: lo-fi attributes detected in codebase. ${resultMetadata.XFI_RESULT.warningCount} are warnings, ${resultMetadata.XFI_RESULT.fatalityCount} are fatal.`);
                     logger_1.logger.warn(JSON.stringify(resultMetadata));
-                    logger_1.logger.warn(`\n${prettyjson_1.default.render(resultMetadata)}\n\n`);
                     if (resultMetadata.XFI_RESULT.fatalityCount > 0) {
                         logger_1.logger.error(outcomeMessage(`THERE WERE ${resultMetadata.XFI_RESULT.fatalityCount} FATAL ERRORS DETECTED TO BE IMMEDIATELY ADDRESSED!`));
                         logger_1.logger.on('finish', function () {
                             process.exit(1);
                         });
-                        logger_1.logger.error(`\n${prettyjson_1.default.render(resultMetadata.XFI_RESULT.issueDetails)}\n\n`);
+                        logger_1.logger.error(`\n${prettyjson_1.default.render(resultMetadata.XFI_RESULT)}\n\n`);
                         logger_1.logger.error(outcomeMessage(`THERE WERE ${resultMetadata.XFI_RESULT.fatalityCount} FATAL ERRORS DETECTED TO BE IMMEDIATELY ADDRESSED!`));
                         logger_1.logger.end();
                     }
                     else {
                         logger_1.logger.warn(outcomeMessage('No fatal errors were found, however please review the following warnings.'));
-                        logger_1.logger.warn(`\n${prettyjson_1.default.render(resultMetadata.XFI_RESULT.issueDetails)}\n\n`);
+                        logger_1.logger.warn(`\n${prettyjson_1.default.render(resultMetadata.XFI_RESULT)}\n\n`);
                         logger_1.logger.warn(outcomeMessage('No fatal errors were found, however please review the above warnings.'));
                     }
                 }

package/dist/server/configServer.js

@@ -18,7 +18,8 @@ const archetypeRuleRoute_1 = require("./routes/archetypeRuleRoute");
 const telemetryRoute_1 = require("./routes/telemetryRoute");
 const clearCacheRoute_1 = require("./routes/clearCacheRoute");
 const viewCacheRoute_1 = require("./routes/viewCacheRoute");
-const githubWebhookRoute_1 = require("./routes/githubWebhookRoute");
+const githubWebhookConfigUpdateRoute_1 = require("./routes/githubWebhookConfigUpdateRoute");
+const githubWebhookPullRequestCheckRoute_1 = require("./routes/githubWebhookPullRequestCheckRoute");
 const exemptionsRoute_1 = require("./routes/exemptionsRoute");
 const validateUrlInput_1 = require("./middleware/validateUrlInput");
 const validateTelemetryData_1 = require("./middleware/validateTelemetryData");
@@ -57,7 +58,8 @@ app.post('/telemetry', checkSharedSecret, validateTelemetryData_1.validateTeleme
 app.post('/clearcache', checkSharedSecret, clearCacheRoute_1.clearCacheRoute);
 app.get('/viewcache', checkSharedSecret, viewCacheRoute_1.viewCacheRoute);
 app.get('/archetypes/:archetype/exemptions', checkSharedSecret, exemptionsRoute_1.exemptionsRoute);
-app.post('/github-webhook', validateGithubWebhook_1.validateGithubWebhook, githubWebhookRoute_1.githubWebhookRoute);
+app.post('/github-config-update', validateGithubWebhook_1.validateGithubWebhook, githubWebhookConfigUpdateRoute_1.githubWebhookConfigUpdateRoute);
+app.post('/github-pull-request-check', validateGithubWebhook_1.validateGithubWebhook, githubWebhookPullRequestCheckRoute_1.githubWebhookPullRequestCheckRoute);
 function startServer({ customPort, executionLogPrefix }) {
     const serverPort = customPort ? parseInt(customPort) : port;
     executionLogPrefix && (0, logger_1.setLogPrefix)(executionLogPrefix);

package/dist/server/configServer.test.js

@@ -6,15 +6,16 @@ const archetypeRuleRoute_1 = require("./routes/archetypeRuleRoute");
 const telemetryRoute_1 = require("./routes/telemetryRoute");
 const clearCacheRoute_1 = require("./routes/clearCacheRoute");
 const viewCacheRoute_1 = require("./routes/viewCacheRoute");
-const githubWebhookRoute_1 = require("./routes/githubWebhookRoute");
+const githubWebhookConfigUpdateRoute_1 = require("./routes/githubWebhookConfigUpdateRoute");
 const checkSharedSecret_1 = require("./middleware/checkSharedSecret");
+const validateGithubWebhook_1 = require("./middleware/validateGithubWebhook");
 jest.mock('./routes/archetypeRoute');
 jest.mock('./routes/archetypeRulesRoute');
 jest.mock('./routes/archetypeRuleRoute');
 jest.mock('./routes/telemetryRoute');
 jest.mock('./routes/clearCacheRoute');
 jest.mock('./routes/viewCacheRoute');
-jest.mock('./routes/githubWebhookRoute');
+jest.mock('./routes/githubWebhookConfigUpdateRoute');
 jest.mock('./middleware/checkSharedSecret');
 describe('configServer', () => {
     let app;
@@ -32,7 +33,7 @@ describe('configServer', () => {
         app.post('/telemetry', checkSharedSecret_1.checkSharedSecret, telemetryRoute_1.telemetryRoute);
         app.post('/clearcache', checkSharedSecret_1.checkSharedSecret, clearCacheRoute_1.clearCacheRoute);
         app.get('/viewcache', checkSharedSecret_1.checkSharedSecret, viewCacheRoute_1.viewCacheRoute);
-        app.post('/github-webhook', githubWebhookRoute_1.githubWebhookRoute);
+        app.post('/github-config-update', validateGithubWebhook_1.validateGithubWebhook, githubWebhookConfigUpdateRoute_1.githubWebhookConfigUpdateRoute);
         // Verify routes are set up correctly
         expect(app.get).toHaveBeenCalledWith('/archetypes/:archetype', archetypeRoute_1.archetypeRoute);
         expect(app.get).toHaveBeenCalledWith('/archetypes/:archetype/rules', archetypeRulesRoute_1.archetypeRulesRoute);
@@ -40,7 +41,7 @@ describe('configServer', () => {
         expect(app.post).toHaveBeenCalledWith('/telemetry', checkSharedSecret_1.checkSharedSecret, telemetryRoute_1.telemetryRoute);
         expect(app.post).toHaveBeenCalledWith('/clearcache', checkSharedSecret_1.checkSharedSecret, clearCacheRoute_1.clearCacheRoute);
         expect(app.get).toHaveBeenCalledWith('/viewcache', checkSharedSecret_1.checkSharedSecret, viewCacheRoute_1.viewCacheRoute);
-        expect(app.post).toHaveBeenCalledWith('/github-webhook', githubWebhookRoute_1.githubWebhookRoute);
+        expect(app.post).toHaveBeenCalledWith('/github-config-update', validateGithubWebhook_1.validateGithubWebhook, githubWebhookConfigUpdateRoute_1.githubWebhookConfigUpdateRoute);
     });
     afterEach(() => {
         jest.resetAllMocks();

package/dist/server/routes/{githubWebhookRoute.js → githubWebhookConfigUpdateRoute.js}

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.githubWebhookRoute = githubWebhookRoute;
+exports.githubWebhookConfigUpdateRoute = githubWebhookConfigUpdateRoute;
 const logger_1 = require("../../utils/logger");
 const crypto_1 = __importDefault(require("crypto"));
 const axios_1 = __importDefault(require("axios"));
@@ -22,7 +22,7 @@ const fs_1 = __importDefault(require("fs"));
 const cacheManager_1 = require("../cacheManager");
 const configManager_1 = require("../../utils/configManager");
 const cli_1 = require("../../core/cli");
-function githubWebhookRoute(req, res) {
+function githubWebhookConfigUpdateRoute(req, res) {
     return __awaiter(this, void 0, void 0, function* () {
         const requestLogPrefix = req.headers['x-log-prefix'] || '';
         (0, logger_1.setLogPrefix)(requestLogPrefix);

package/dist/server/routes/githubWebhookPullRequestCheckRoute.js

@@ -0,0 +1,45 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.githubWebhookPullRequestCheckRoute = githubWebhookPullRequestCheckRoute;
+const logger_1 = require("../../utils/logger");
+const crypto_1 = __importDefault(require("crypto"));
+function githubWebhookPullRequestCheckRoute(req, res) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const requestLogPrefix = req.headers['x-log-prefix'] || '';
+        (0, logger_1.setLogPrefix)(requestLogPrefix);
+        const signature = req.headers['x-hub-signature-256'];
+        const githubSecret = process.env.GITHUB_WEBHOOK_SECRET;
+        if (!githubSecret) {
+            logger_1.logger.error('GitHub webhook secret is not set');
+            return res.status(500).send('Server is not configured for webhooks');
+        }
+        if (!signature) {
+            logger_1.logger.error('No X-Hub-Signature-256 found on request');
+            return res.status(400).send('No X-Hub-Signature-256 found on request');
+        }
+        const hmac = crypto_1.default.createHmac('sha256', githubSecret);
+        const digest = 'sha256=' + hmac.update(JSON.stringify(req.body)).digest('hex');
+        if (signature !== digest) {
+            logger_1.logger.error('Request body digest did not match X-Hub-Signature-256');
+            return res.status(400).send('Invalid signature');
+        }
+        const event = req.headers['x-github-event'];
+        if (event === 'push') {
+            // TODO: Implement pull request check
+            return res.status(200).send('Webhook received and processed');
+        }
+        res.status(200).send('Received');
+    });
+}

package/dist/xfidelity

@@ -59,19 +59,18 @@ function main() {
                 if (resultMetadata.XFI_RESULT.totalIssues > 0) {
                     logger_1.logger.warn(`WARNING: lo-fi attributes detected in codebase. ${resultMetadata.XFI_RESULT.warningCount} are warnings, ${resultMetadata.XFI_RESULT.fatalityCount} are fatal.`);
                     logger_1.logger.warn(JSON.stringify(resultMetadata));
-                    logger_1.logger.warn(`\n${prettyjson_1.default.render(resultMetadata)}\n\n`);
                     if (resultMetadata.XFI_RESULT.fatalityCount > 0) {
                         logger_1.logger.error(outcomeMessage(`THERE WERE ${resultMetadata.XFI_RESULT.fatalityCount} FATAL ERRORS DETECTED TO BE IMMEDIATELY ADDRESSED!`));
                         logger_1.logger.on('finish', function () {
                             process.exit(1);
                         });
-                        logger_1.logger.error(`\n${prettyjson_1.default.render(resultMetadata.XFI_RESULT.issueDetails)}\n\n`);
+                        logger_1.logger.error(`\n${prettyjson_1.default.render(resultMetadata.XFI_RESULT)}\n\n`);
                         logger_1.logger.error(outcomeMessage(`THERE WERE ${resultMetadata.XFI_RESULT.fatalityCount} FATAL ERRORS DETECTED TO BE IMMEDIATELY ADDRESSED!`));
                         logger_1.logger.end();
                     }
                     else {
                         logger_1.logger.warn(outcomeMessage('No fatal errors were found, however please review the following warnings.'));
-                        logger_1.logger.warn(`\n${prettyjson_1.default.render(resultMetadata.XFI_RESULT.issueDetails)}\n\n`);
+                        logger_1.logger.warn(`\n${prettyjson_1.default.render(resultMetadata.XFI_RESULT)}\n\n`);
                         logger_1.logger.warn(outcomeMessage('No fatal errors were found, however please review the above warnings.'));
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x-fidelity",
-  "version": "2.11.0",
+  "version": "2.12.1",
   "description": "cli for opinionated framework adherence checks",
   "main": "dist/xfidelity",
   "bin": {
@@ -73,7 +73,7 @@
     "dotenv": "^16.4.5",
     "esprima": "^4.0.1",
     "express": "^4.18.2",
-    "express-rate-limit": "^6.7.0",
+    "express-rate-limit": "^7.4.0",
     "helmet": "^7.1.0",
     "json-rules-engine": "^6.5.0",
     "lodash": "^4.17.21",

package/src/archetypes/node-fullstack-exemptions.json

@@ -1,8 +1,8 @@
 [
   {
-    "repoUrl": "https://github.com/example/node-fullstack-project",
+    "repoUrl": "git@github.com:zotoio/x-fidelity.git",
     "rule": "outdatedFramework-global",
-    "expirationDate": "2024-12-31",
+    "expirationDate": "2023-12-31",
     "reason": "Upgrading dependencies is scheduled for Q4 2024"
   },
   {

package/src/archetypes/node-fullstack.json

@@ -21,6 +21,9 @@
     ],
     "config": {
         "minimumDependencyVersions": {
+            "@types/react": "^17.0.0",
+            "react": "^17.0.0",
+            "@yarnpkg/lockfile": "^1.2.0",
             "commander": "^2.0.0",
             "nodemon": "^3.9.0"
         },

package/src/facts/repoDependencyFacts.ts

@@ -64,9 +64,16 @@ function processYarnDependencies(yarnOutput: any): LocalDependencies[] {
             return newDep;
         };
         const extractNameAndVersion = (nameAndVersion: string) => {
+            const lastAtIndex = nameAndVersion.lastIndexOf('@');
+            if (nameAndVersion.startsWith('@') && lastAtIndex > 0) {
+                return {
+                    name: nameAndVersion.substring(0, lastAtIndex),
+                    version: nameAndVersion.substring(lastAtIndex + 1)
+                };
+            }
             const parts = nameAndVersion.split('@');
             return { name: parts[0], version: parts[1] };
-        }
+        };
         yarnOutput.data.trees.forEach((tree: any) => {
             dependencies.push(processDependency(tree));
         });
@@ -125,8 +132,10 @@ export function findPropertiesInTree(depGraph: LocalDependencies[], minVersions:
 
     function walk(dep: LocalDependencies, parentName = '') {
         const fullName = parentName ? `${parentName}/${dep.name}` : dep.name;
-        if (Object.keys(minVersions).includes(dep.name)) {
-            results.push({ dep: fullName, ver: dep.version, min: minVersions[dep.name] });
+        if (Object.keys(minVersions).some(key => key === dep.name || `@${key}` === dep.name)) {
+            const minVersionKey = Object.keys(minVersions).find(key => key === dep.name || `@${key}` === dep.name);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            results.push({ dep: fullName, ver: dep.version, min: minVersions[minVersionKey!] });
         }
         if (dep.dependencies) {
             dep.dependencies.forEach(childDep => {
@@ -157,7 +166,7 @@ export async function repoDependencyAnalysis(params: any, almanac: Almanac) {
 
         // Check if the installed version satisfies the required version, supporting both ranges and specific versions
         const isValid = semverValid(versionData.ver, versionData.min);
-        if (!isValid) {
+        if (!isValid && semver.valid(versionData.ver)) {
             const dependencyFailure = {
                 'dependency': versionData.dep,
                 'currentVersion': versionData.ver,
@@ -176,9 +185,12 @@ export async function repoDependencyAnalysis(params: any, almanac: Almanac) {
     return result;
 }
 
-export function semverValid(required: string, installed: string): boolean {
-
-    if (!required || !installed) {
+export function semverValid(installed: string, required: string): boolean {
+    // Remove potential @namespace from installed version
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const installedVersion = installed.includes('@') ? installed.split('@').pop()! : installed;
+    
+    if (!required || !installedVersion) {
         return true;
     }
 
@@ -208,3 +220,6 @@ export function semverValid(required: string, installed: string): boolean {
 
     return false;
 }
+export function normalizePackageName(name: string): string {
+    return name.startsWith('@') ? name : `@${name}`;
+}

package/src/facts/repoFilesystemFacts.ts

@@ -83,17 +83,50 @@ async function repoFileAnalysis(params: any, almanac: any) {
     const analysis: any = [];
     const lines = fileContent.split('\n');
     logger.debug(`lines: ${lines.length}`);
-    let lineNumber = 0;
+    const processedLines: string[] = [];
+    let splitOccurred = false;
+
     for (const line of lines) {
-        lineNumber++;
+        if (line.length > 200) {
+            let startIndex = 0;
+            while (startIndex < line.length) {
+                let endIndex = startIndex + 200;
+                if (endIndex < line.length) {
+                    // Find the nearest space or end of token
+                    while (endIndex > startIndex && !(/\s/.test(line[endIndex]) || /\W/.test(line[endIndex]))) {
+                        endIndex--;
+                    }
+                    // If no suitable break point found, use the full 200 characters
+                    if (endIndex === startIndex) {
+                        endIndex = startIndex + 200;
+                    }
+                } else {
+                    endIndex = line.length;
+                }
+                processedLines.push(line.substring(startIndex, endIndex));
+                startIndex = endIndex;
+            }
+            splitOccurred = true;
+        } else {
+            processedLines.push(line);
+        }
+    }
+
+    if (lines.length === 1 || splitOccurred) {
+        logger.debug(`File content was split for analysis`);
+    }
+
+    for (let i = 0; i < processedLines.length; i++) {
+        const line = processedLines[i];
         for (const pattern of checkPatterns) {
             const regex = new RegExp(pattern, 'g');
             if (regex.test(line)) {
-                logger.debug(`match on line ${lineNumber} for pattern ${pattern}`)
+                logger.debug(`match on line ${i + 1} for pattern ${pattern}`);
                 const match = {
                     'match': pattern,
-                    'lineNumber': lineNumber,
-                    'line': line
+                    'lineNumber': i + 1,
+                    'line': line,
+                    'splitOccurred': splitOccurred
                 };
                 analysis.push(match);
             }

package/src/index.ts

@@ -49,19 +49,18 @@ export async function main() {
             if (resultMetadata.XFI_RESULT.totalIssues > 0) {
                 logger.warn(`WARNING: lo-fi attributes detected in codebase. ${resultMetadata.XFI_RESULT.warningCount} are warnings, ${resultMetadata.XFI_RESULT.fatalityCount} are fatal.`);
                 logger.warn(JSON.stringify(resultMetadata));
-                logger.warn(`\n${json.render(resultMetadata)}\n\n`);
 
                 if (resultMetadata.XFI_RESULT.fatalityCount > 0) {
                     logger.error(outcomeMessage(`THERE WERE ${resultMetadata.XFI_RESULT.fatalityCount} FATAL ERRORS DETECTED TO BE IMMEDIATELY ADDRESSED!`));
                     logger.on('finish', function () {
                         process.exit(1);
                     });
-                    logger.error(`\n${json.render(resultMetadata.XFI_RESULT.issueDetails)}\n\n`);
+                    logger.error(`\n${json.render(resultMetadata.XFI_RESULT)}\n\n`);
                     logger.error(outcomeMessage(`THERE WERE ${resultMetadata.XFI_RESULT.fatalityCount} FATAL ERRORS DETECTED TO BE IMMEDIATELY ADDRESSED!`));
                     logger.end();
                 } else {
                     logger.warn(outcomeMessage('No fatal errors were found, however please review the following warnings.'));
-                    logger.warn(`\n${json.render(resultMetadata.XFI_RESULT.issueDetails)}\n\n`);
+                    logger.warn(`\n${json.render(resultMetadata.XFI_RESULT)}\n\n`);
                     logger.warn(outcomeMessage('No fatal errors were found, however please review the above warnings.'));
                     
                 }

package/src/server/configServer.test.ts

@@ -5,8 +5,9 @@ import { archetypeRuleRoute } from './routes/archetypeRuleRoute';
 import { telemetryRoute } from './routes/telemetryRoute';
 import { clearCacheRoute } from './routes/clearCacheRoute';
 import { viewCacheRoute } from './routes/viewCacheRoute';
-import { githubWebhookRoute } from './routes/githubWebhookRoute';
+import { githubWebhookConfigUpdateRoute } from './routes/githubWebhookConfigUpdateRoute';
 import { checkSharedSecret } from './middleware/checkSharedSecret';
+import { validateGithubWebhook } from './middleware/validateGithubWebhook';
 
 jest.mock('./routes/archetypeRoute');
 jest.mock('./routes/archetypeRulesRoute');
@@ -14,7 +15,7 @@ jest.mock('./routes/archetypeRuleRoute');
 jest.mock('./routes/telemetryRoute');
 jest.mock('./routes/clearCacheRoute');
 jest.mock('./routes/viewCacheRoute');
-jest.mock('./routes/githubWebhookRoute');
+jest.mock('./routes/githubWebhookConfigUpdateRoute');
 jest.mock('./middleware/checkSharedSecret');
 
 describe('configServer', () => {
@@ -35,7 +36,7 @@ describe('configServer', () => {
     app.post('/telemetry', checkSharedSecret, telemetryRoute);
     app.post('/clearcache', checkSharedSecret, clearCacheRoute);
     app.get('/viewcache', checkSharedSecret, viewCacheRoute);
-    app.post('/github-webhook', githubWebhookRoute);
+    app.post('/github-config-update', validateGithubWebhook, githubWebhookConfigUpdateRoute);
 
     // Verify routes are set up correctly
     expect(app.get).toHaveBeenCalledWith('/archetypes/:archetype', archetypeRoute);
@@ -44,7 +45,7 @@ describe('configServer', () => {
     expect(app.post).toHaveBeenCalledWith('/telemetry', checkSharedSecret, telemetryRoute);
     expect(app.post).toHaveBeenCalledWith('/clearcache', checkSharedSecret, clearCacheRoute);
     expect(app.get).toHaveBeenCalledWith('/viewcache', checkSharedSecret, viewCacheRoute);
-    expect(app.post).toHaveBeenCalledWith('/github-webhook', githubWebhookRoute);
+    expect(app.post).toHaveBeenCalledWith('/github-config-update', validateGithubWebhook, githubWebhookConfigUpdateRoute);
   });
 
   afterEach(() => {

package/src/server/configServer.ts

@@ -13,7 +13,8 @@ import { archetypeRuleRoute } from './routes/archetypeRuleRoute';
 import { telemetryRoute } from './routes/telemetryRoute';
 import { clearCacheRoute } from './routes/clearCacheRoute';
 import { viewCacheRoute } from './routes/viewCacheRoute';
-import { githubWebhookRoute } from './routes/githubWebhookRoute';
+import { githubWebhookConfigUpdateRoute } from './routes/githubWebhookConfigUpdateRoute';
+import { githubWebhookPullRequestCheckRoute } from './routes/githubWebhookPullRequestCheckRoute';
 import { exemptionsRoute } from './routes/exemptionsRoute';
 import { validateUrlInput } from './middleware/validateUrlInput';
 import { validateTelemetryData } from './middleware/validateTelemetryData';
@@ -62,7 +63,8 @@ app.post('/clearcache', checkSharedSecret, clearCacheRoute);
 app.get('/viewcache', checkSharedSecret, viewCacheRoute);
 app.get('/archetypes/:archetype/exemptions', checkSharedSecret, exemptionsRoute);
 
-app.post('/github-webhook', validateGithubWebhook, githubWebhookRoute);
+app.post('/github-config-update', validateGithubWebhook, githubWebhookConfigUpdateRoute);
+app.post('/github-pull-request-check', validateGithubWebhook, githubWebhookPullRequestCheckRoute);
 
 export function startServer({ customPort, executionLogPrefix }: StartServerParams): any {
     const serverPort = customPort ? parseInt(customPort) : port;

package/src/server/routes/{githubWebhookRoute.ts → githubWebhookConfigUpdateRoute.ts}

@@ -9,7 +9,7 @@ import { clearCache } from '../cacheManager';
 import { ConfigManager } from '../../utils/configManager';
 import { options } from '../../core/cli';
 
-export async function githubWebhookRoute(req: Request, res: Response) {
+export async function githubWebhookConfigUpdateRoute(req: Request, res: Response) {
     const requestLogPrefix = req.headers['x-log-prefix'] as string || '';
     setLogPrefix(requestLogPrefix);
 

package/src/server/routes/githubWebhookPullRequestCheckRoute.ts

@@ -0,0 +1,40 @@
+import { Request, Response } from 'express';
+import { logger, setLogPrefix } from '../../utils/logger';
+import crypto from 'crypto';
+
+export async function githubWebhookPullRequestCheckRoute(req: Request, res: Response) {
+    const requestLogPrefix = req.headers['x-log-prefix'] as string || '';
+    setLogPrefix(requestLogPrefix);
+
+    const signature = req.headers['x-hub-signature-256'] as string;
+    const githubSecret = process.env.GITHUB_WEBHOOK_SECRET;
+
+    if (!githubSecret) {
+        logger.error('GitHub webhook secret is not set');
+        return res.status(500).send('Server is not configured for webhooks');
+    }
+
+    if (!signature) {
+        logger.error('No X-Hub-Signature-256 found on request');
+        return res.status(400).send('No X-Hub-Signature-256 found on request');
+    }
+
+    const hmac = crypto.createHmac('sha256', githubSecret);
+    const digest = 'sha256=' + hmac.update(JSON.stringify(req.body)).digest('hex');
+
+    if (signature !== digest) {
+        logger.error('Request body digest did not match X-Hub-Signature-256');
+        return res.status(400).send('Invalid signature');
+    }
+
+    const event = req.headers['x-github-event'] as string;
+    if (event === 'push') {
+        // TODO: Implement pull request check
+
+        return res.status(200).send('Webhook received and processed');
+    }
+
+    res.status(200).send('Received');
+}
+
+