@dollhousemcp/mcp-server 1.5.2 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +56 -0
- package/README.md +494 -111
- package/data/agents/code-reviewer.md +8 -1
- package/data/agents/research-assistant.md +8 -1
- package/data/agents/task-manager.md +8 -1
- package/data/ensembles/business-advisor.md +8 -1
- package/data/ensembles/creative-studio.md +8 -1
- package/data/ensembles/development-team.md +8 -1
- package/data/ensembles/security-analysis-team.md +8 -1
- package/data/memories/conversation-history.md +8 -1
- package/data/memories/learning-progress.md +8 -1
- package/data/memories/project-context.md +8 -1
- package/data/personas/business-consultant.md +8 -1
- package/data/personas/creative-writer.md +8 -1
- package/data/personas/debug-detective.md +8 -1
- package/data/personas/eli5-explainer.md +8 -1
- package/data/personas/security-analyst.md +8 -1
- package/data/personas/technical-analyst.md +8 -1
- package/data/skills/code-review.md +8 -1
- package/data/skills/creative-writing.md +8 -1
- package/data/skills/data-analysis.md +8 -1
- package/data/skills/penetration-testing.md +8 -1
- package/data/skills/research.md +8 -1
- package/data/skills/threat-modeling.md +8 -1
- package/data/skills/translation.md +8 -1
- package/data/templates/code-documentation.md +8 -1
- package/data/templates/email-professional.md +8 -1
- package/data/templates/meeting-notes.md +8 -1
- package/data/templates/penetration-test-report.md +8 -1
- package/data/templates/project-brief.md +8 -1
- package/data/templates/report-executive.md +8 -1
- package/data/templates/security-vulnerability-report.md +8 -1
- package/data/templates/threat-assessment-report.md +8 -1
- package/dist/auth/GitHubAuthManager.d.ts +6 -1
- package/dist/auth/GitHubAuthManager.d.ts.map +1 -1
- package/dist/auth/GitHubAuthManager.js +45 -18
- package/dist/benchmarks/IndexPerformanceBenchmark.d.ts +98 -0
- package/dist/benchmarks/IndexPerformanceBenchmark.d.ts.map +1 -0
- package/dist/benchmarks/IndexPerformanceBenchmark.js +531 -0
- package/dist/cache/CollectionCache.d.ts.map +1 -1
- package/dist/cache/CollectionCache.js +13 -3
- package/dist/cache/CollectionIndexCache.d.ts +77 -0
- package/dist/cache/CollectionIndexCache.d.ts.map +1 -0
- package/dist/cache/CollectionIndexCache.js +349 -0
- package/dist/cache/LRUCache.d.ts +93 -0
- package/dist/cache/LRUCache.d.ts.map +1 -0
- package/dist/cache/LRUCache.js +299 -0
- package/dist/cache/index.d.ts +1 -0
- package/dist/cache/index.d.ts.map +1 -1
- package/dist/cache/index.js +2 -1
- package/dist/collection/CollectionBrowser.d.ts +21 -1
- package/dist/collection/CollectionBrowser.d.ts.map +1 -1
- package/dist/collection/CollectionBrowser.js +130 -10
- package/dist/collection/CollectionIndexManager.d.ts +151 -0
- package/dist/collection/CollectionIndexManager.d.ts.map +1 -0
- package/dist/collection/CollectionIndexManager.js +499 -0
- package/dist/collection/CollectionSearch.d.ts +55 -0
- package/dist/collection/CollectionSearch.d.ts.map +1 -1
- package/dist/collection/CollectionSearch.js +338 -13
- package/dist/collection/CollectionSeeder.d.ts.map +1 -1
- package/dist/collection/CollectionSeeder.js +38 -1
- package/dist/collection/ElementInstaller.d.ts +31 -0
- package/dist/collection/ElementInstaller.d.ts.map +1 -1
- package/dist/collection/ElementInstaller.js +77 -15
- package/dist/collection/PersonaSubmitter.d.ts +1 -1
- package/dist/collection/PersonaSubmitter.d.ts.map +1 -1
- package/dist/collection/PersonaSubmitter.js +2 -2
- package/dist/collection/index.d.ts +1 -0
- package/dist/collection/index.d.ts.map +1 -1
- package/dist/collection/index.js +2 -1
- package/dist/config/ConfigManager.d.ts +78 -0
- package/dist/config/ConfigManager.d.ts.map +1 -0
- package/dist/config/ConfigManager.js +216 -0
- package/dist/config/element-types.d.ts +135 -0
- package/dist/config/element-types.d.ts.map +1 -0
- package/dist/config/element-types.js +108 -0
- package/dist/config/index.d.ts +2 -0
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +3 -1
- package/dist/config/portfolio-constants.d.ts +83 -0
- package/dist/config/portfolio-constants.d.ts.map +1 -0
- package/dist/config/portfolio-constants.js +99 -0
- package/dist/elements/BaseElement.d.ts +14 -2
- package/dist/elements/BaseElement.d.ts.map +1 -1
- package/dist/elements/BaseElement.js +88 -6
- package/dist/elements/agents/Agent.d.ts +10 -1
- package/dist/elements/agents/Agent.d.ts.map +1 -1
- package/dist/elements/agents/Agent.js +66 -19
- package/dist/elements/agents/AgentManager.d.ts +2 -0
- package/dist/elements/agents/AgentManager.d.ts.map +1 -1
- package/dist/elements/agents/AgentManager.js +12 -10
- package/dist/elements/skills/Skill.d.ts +10 -1
- package/dist/elements/skills/Skill.d.ts.map +1 -1
- package/dist/elements/skills/Skill.js +40 -3
- package/dist/elements/skills/SkillManager.d.ts +1 -0
- package/dist/elements/skills/SkillManager.d.ts.map +1 -1
- package/dist/elements/skills/SkillManager.js +10 -4
- package/dist/elements/templates/Template.d.ts +10 -1
- package/dist/elements/templates/Template.d.ts.map +1 -1
- package/dist/elements/templates/Template.js +35 -18
- package/dist/elements/templates/TemplateManager.d.ts +1 -1
- package/dist/elements/templates/TemplateManager.d.ts.map +1 -1
- package/dist/elements/templates/TemplateManager.js +6 -5
- package/dist/generated/version.d.ts +2 -2
- package/dist/generated/version.js +3 -3
- package/dist/index.barrel.d.ts +1 -2
- package/dist/index.barrel.d.ts.map +1 -1
- package/dist/index.barrel.js +2 -4
- package/dist/index.d.ts +143 -25
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1883 -310
- package/dist/persona/PersonaElement.d.ts +10 -0
- package/dist/persona/PersonaElement.d.ts.map +1 -1
- package/dist/persona/PersonaElement.js +55 -32
- package/dist/persona/PersonaElementManager.d.ts.map +1 -1
- package/dist/persona/PersonaElementManager.js +13 -11
- package/dist/persona/PersonaLoader.d.ts.map +1 -1
- package/dist/persona/PersonaLoader.js +8 -2
- package/dist/persona/export-import/PersonaImporter.d.ts.map +1 -1
- package/dist/persona/export-import/PersonaImporter.js +24 -5
- package/dist/persona/export-import/PersonaSharer.d.ts +21 -0
- package/dist/persona/export-import/PersonaSharer.d.ts.map +1 -1
- package/dist/persona/export-import/PersonaSharer.js +198 -22
- package/dist/portfolio/DefaultElementProvider.d.ts +90 -0
- package/dist/portfolio/DefaultElementProvider.d.ts.map +1 -1
- package/dist/portfolio/DefaultElementProvider.js +499 -7
- package/dist/portfolio/GitHubPortfolioIndexer.d.ts +129 -0
- package/dist/portfolio/GitHubPortfolioIndexer.d.ts.map +1 -0
- package/dist/portfolio/GitHubPortfolioIndexer.js +475 -0
- package/dist/portfolio/MigrationManager.d.ts.map +1 -1
- package/dist/portfolio/MigrationManager.js +136 -3
- package/dist/portfolio/PortfolioIndexManager.d.ts +130 -0
- package/dist/portfolio/PortfolioIndexManager.d.ts.map +1 -0
- package/dist/portfolio/PortfolioIndexManager.js +478 -0
- package/dist/portfolio/PortfolioManager.d.ts +5 -0
- package/dist/portfolio/PortfolioManager.d.ts.map +1 -1
- package/dist/portfolio/PortfolioManager.js +61 -20
- package/dist/portfolio/PortfolioRepoManager.d.ts +75 -0
- package/dist/portfolio/PortfolioRepoManager.d.ts.map +1 -0
- package/dist/portfolio/PortfolioRepoManager.js +337 -0
- package/dist/portfolio/UnifiedIndexManager.d.ts +388 -0
- package/dist/portfolio/UnifiedIndexManager.d.ts.map +1 -0
- package/dist/portfolio/UnifiedIndexManager.js +1434 -0
- package/dist/portfolio/index.d.ts +15 -0
- package/dist/portfolio/index.d.ts.map +1 -0
- package/dist/portfolio/index.js +15 -0
- package/dist/portfolio/types.d.ts +7 -0
- package/dist/portfolio/types.d.ts.map +1 -1
- package/dist/portfolio/types.js +6 -1
- package/dist/security/InputValidator.d.ts.map +1 -1
- package/dist/security/InputValidator.js +50 -48
- package/dist/security/audit/SecurityAuditor.d.ts.map +1 -1
- package/dist/security/audit/SecurityAuditor.js +17 -9
- package/dist/security/audit/config/suppressions.d.ts.map +1 -1
- package/dist/security/audit/config/suppressions.js +19 -3
- package/dist/security/contentValidator.d.ts +2 -0
- package/dist/security/contentValidator.d.ts.map +1 -1
- package/dist/security/contentValidator.js +115 -4
- package/dist/security/secureYamlParser.d.ts +1 -0
- package/dist/security/secureYamlParser.d.ts.map +1 -1
- package/dist/security/secureYamlParser.js +29 -7
- package/dist/security/securityMonitor.d.ts +1 -1
- package/dist/security/securityMonitor.d.ts.map +1 -1
- package/dist/security/securityMonitor.js +1 -1
- package/dist/security/tokenManager.d.ts +1 -1
- package/dist/security/tokenManager.d.ts.map +1 -1
- package/dist/security/tokenManager.js +30 -10
- package/dist/server/ServerSetup.d.ts +22 -2
- package/dist/server/ServerSetup.d.ts.map +1 -1
- package/dist/server/ServerSetup.js +77 -12
- package/dist/server/tools/AuthTools.d.ts.map +1 -1
- package/dist/server/tools/AuthTools.js +33 -1
- package/dist/server/tools/BuildInfoTools.d.ts +25 -0
- package/dist/server/tools/BuildInfoTools.d.ts.map +1 -0
- package/dist/server/tools/BuildInfoTools.js +36 -0
- package/dist/server/tools/CollectionTools.d.ts.map +1 -1
- package/dist/server/tools/CollectionTools.js +55 -46
- package/dist/server/tools/ConfigTools.d.ts.map +1 -1
- package/dist/server/tools/ConfigTools.js +29 -1
- package/dist/server/tools/PersonaTools.d.ts +4 -2
- package/dist/server/tools/PersonaTools.d.ts.map +1 -1
- package/dist/server/tools/PersonaTools.js +5 -152
- package/dist/server/tools/PortfolioTools.d.ts +12 -0
- package/dist/server/tools/PortfolioTools.d.ts.map +1 -0
- package/dist/server/tools/PortfolioTools.js +221 -0
- package/dist/server/tools/index.d.ts +3 -1
- package/dist/server/tools/index.d.ts.map +1 -1
- package/dist/server/tools/index.js +4 -2
- package/dist/server/types.d.ts +40 -5
- package/dist/server/types.d.ts.map +1 -1
- package/dist/server/types.js +1 -1
- package/dist/services/BuildInfoService.d.ts +84 -0
- package/dist/services/BuildInfoService.d.ts.map +1 -0
- package/dist/services/BuildInfoService.js +271 -0
- package/dist/tools/portfolio/PortfolioElementAdapter.d.ts +54 -0
- package/dist/tools/portfolio/PortfolioElementAdapter.d.ts.map +1 -0
- package/dist/tools/portfolio/PortfolioElementAdapter.js +229 -0
- package/dist/tools/portfolio/submitToPortfolioTool.d.ts +164 -0
- package/dist/tools/portfolio/submitToPortfolioTool.d.ts.map +1 -0
- package/dist/tools/portfolio/submitToPortfolioTool.js +1523 -0
- package/dist/tools/portfolio/types.d.ts +41 -0
- package/dist/tools/portfolio/types.d.ts.map +1 -0
- package/dist/tools/portfolio/types.js +15 -0
- package/dist/types/collection.d.ts +51 -0
- package/dist/types/collection.d.ts.map +1 -1
- package/dist/types/collection.js +1 -1
- package/dist/utils/EarlyTerminationSearch.d.ts +41 -0
- package/dist/utils/EarlyTerminationSearch.d.ts.map +1 -0
- package/dist/utils/EarlyTerminationSearch.js +164 -0
- package/dist/utils/ErrorHandler.d.ts +86 -0
- package/dist/utils/ErrorHandler.d.ts.map +1 -0
- package/dist/utils/ErrorHandler.js +201 -0
- package/dist/utils/FileDiscoveryUtil.d.ts +53 -0
- package/dist/utils/FileDiscoveryUtil.d.ts.map +1 -0
- package/dist/utils/FileDiscoveryUtil.js +169 -0
- package/dist/utils/GitHubRateLimiter.d.ts +88 -0
- package/dist/utils/GitHubRateLimiter.d.ts.map +1 -0
- package/dist/utils/GitHubRateLimiter.js +315 -0
- package/dist/utils/PerformanceMonitor.d.ts +134 -0
- package/dist/utils/PerformanceMonitor.d.ts.map +1 -0
- package/dist/utils/PerformanceMonitor.js +347 -0
- package/dist/utils/RateLimiter.d.ts.map +1 -0
- package/dist/utils/RateLimiter.js +172 -0
- package/dist/utils/SecureDownloader.d.ts +241 -0
- package/dist/utils/SecureDownloader.d.ts.map +1 -0
- package/dist/utils/SecureDownloader.js +759 -0
- package/dist/utils/ToolCache.d.ts +82 -0
- package/dist/utils/ToolCache.d.ts.map +1 -0
- package/dist/utils/ToolCache.js +196 -0
- package/dist/utils/errorCodes.d.ts +136 -0
- package/dist/utils/errorCodes.d.ts.map +1 -0
- package/dist/utils/errorCodes.js +87 -0
- package/dist/utils/index.d.ts +3 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +4 -1
- package/dist/utils/installation.d.ts +1 -1
- package/dist/utils/installation.d.ts.map +1 -1
- package/dist/utils/installation.js +9 -8
- package/dist/utils/searchUtils.d.ts +31 -0
- package/dist/utils/searchUtils.d.ts.map +1 -1
- package/dist/utils/searchUtils.js +62 -1
- package/package.json +17 -7
- package/dist/config/updateConfig.d.ts +0 -84
- package/dist/config/updateConfig.d.ts.map +0 -1
- package/dist/config/updateConfig.js +0 -148
- package/dist/server/tools/UpdateTools.d.ts +0 -10
- package/dist/server/tools/UpdateTools.d.ts.map +0 -1
- package/dist/server/tools/UpdateTools.js +0 -85
- package/dist/update/BackupManager.d.ts +0 -63
- package/dist/update/BackupManager.d.ts.map +0 -1
- package/dist/update/BackupManager.js +0 -370
- package/dist/update/DependencyChecker.d.ts +0 -41
- package/dist/update/DependencyChecker.d.ts.map +0 -1
- package/dist/update/DependencyChecker.js +0 -132
- package/dist/update/RateLimiter.d.ts.map +0 -1
- package/dist/update/RateLimiter.js +0 -172
- package/dist/update/SignatureVerifier.d.ts +0 -71
- package/dist/update/SignatureVerifier.d.ts.map +0 -1
- package/dist/update/SignatureVerifier.js +0 -214
- package/dist/update/UpdateChecker.d.ts +0 -132
- package/dist/update/UpdateChecker.d.ts.map +0 -1
- package/dist/update/UpdateChecker.js +0 -506
- package/dist/update/UpdateManager.d.ts +0 -60
- package/dist/update/UpdateManager.d.ts.map +0 -1
- package/dist/update/UpdateManager.js +0 -730
- package/dist/update/VersionManager.d.ts +0 -31
- package/dist/update/VersionManager.d.ts.map +0 -1
- package/dist/update/VersionManager.js +0 -181
- package/dist/update/index.d.ts +0 -9
- package/dist/update/index.d.ts.map +0 -1
- package/dist/update/index.js +0 -9
- /package/dist/{update → utils}/RateLimiter.d.ts +0 -0
|
@@ -0,0 +1,271 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* BuildInfoService - Provides build and runtime information
|
|
3
|
+
* Separated from main index.ts to avoid making that file larger
|
|
4
|
+
*
|
|
5
|
+
* SECURITY FIX (PR #614):
|
|
6
|
+
* 1. DMCP-SEC-004: FALSE POSITIVE SUPPRESSION - No user input Unicode normalization needed
|
|
7
|
+
* This service only processes system information (git, package.json, environment variables)
|
|
8
|
+
* The MCP tool 'get_build_info' takes NO parameters (empty inputSchema)
|
|
9
|
+
* No user-provided data flows through this service that requires Unicode normalization
|
|
10
|
+
*/
|
|
11
|
+
import * as fs from 'fs/promises';
|
|
12
|
+
import * as path from 'path';
|
|
13
|
+
import { fileURLToPath } from 'url';
|
|
14
|
+
import { execSync } from 'child_process';
|
|
15
|
+
import { logger } from '../utils/logger.js';
|
|
16
|
+
export class BuildInfoService {
|
|
17
|
+
static instance;
|
|
18
|
+
startTime;
|
|
19
|
+
packageInfo;
|
|
20
|
+
constructor() {
|
|
21
|
+
this.startTime = new Date();
|
|
22
|
+
}
|
|
23
|
+
static getInstance() {
|
|
24
|
+
if (!BuildInfoService.instance) {
|
|
25
|
+
BuildInfoService.instance = new BuildInfoService();
|
|
26
|
+
}
|
|
27
|
+
return BuildInfoService.instance;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Get comprehensive build information
|
|
31
|
+
* SECURITY NOTE: This method processes only system-generated data
|
|
32
|
+
* No user input is involved - all data comes from filesystem, git, and Node.js process
|
|
33
|
+
*/
|
|
34
|
+
async getBuildInfo() {
|
|
35
|
+
const [packageInfo, gitInfo, dockerInfo] = await Promise.all([
|
|
36
|
+
this.getPackageInfo(),
|
|
37
|
+
this.getGitInfo(),
|
|
38
|
+
this.getDockerInfo()
|
|
39
|
+
]);
|
|
40
|
+
const buildTimestamp = await this.getBuildTimestamp();
|
|
41
|
+
return {
|
|
42
|
+
package: packageInfo,
|
|
43
|
+
build: {
|
|
44
|
+
timestamp: buildTimestamp,
|
|
45
|
+
type: gitInfo.commit ? 'git' : buildTimestamp ? 'npm' : 'unknown',
|
|
46
|
+
gitCommit: gitInfo.commit,
|
|
47
|
+
gitBranch: gitInfo.branch
|
|
48
|
+
},
|
|
49
|
+
runtime: {
|
|
50
|
+
nodeVersion: process.version,
|
|
51
|
+
platform: process.platform,
|
|
52
|
+
arch: process.arch,
|
|
53
|
+
uptime: process.uptime(),
|
|
54
|
+
memoryUsage: process.memoryUsage()
|
|
55
|
+
},
|
|
56
|
+
environment: {
|
|
57
|
+
nodeEnv: process.env.NODE_ENV,
|
|
58
|
+
isProduction: process.env.NODE_ENV === 'production',
|
|
59
|
+
isDevelopment: process.env.NODE_ENV === 'development',
|
|
60
|
+
isDebug: process.env.DEBUG === 'true' || process.env.DEBUG === '1',
|
|
61
|
+
isDocker: dockerInfo.isDocker,
|
|
62
|
+
dockerInfo: dockerInfo.info
|
|
63
|
+
},
|
|
64
|
+
server: {
|
|
65
|
+
startTime: this.startTime,
|
|
66
|
+
uptime: Date.now() - this.startTime.getTime(),
|
|
67
|
+
mcpConnection: true // We're connected if this method is being called via MCP
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Format build info as user-friendly markdown
|
|
73
|
+
* SECURITY NOTE: Only formats system-generated data - no user input processing
|
|
74
|
+
* All input data comes from getBuildInfo() which only reads system information
|
|
75
|
+
*/
|
|
76
|
+
formatBuildInfo(info) {
|
|
77
|
+
const lines = [];
|
|
78
|
+
lines.push('# 🔧 Build Information\n');
|
|
79
|
+
// Package info
|
|
80
|
+
lines.push('## 📦 Package');
|
|
81
|
+
lines.push(`- **Name**: ${info.package.name}`);
|
|
82
|
+
lines.push(`- **Version**: ${info.package.version}`);
|
|
83
|
+
lines.push('');
|
|
84
|
+
// Build info
|
|
85
|
+
lines.push('## 🏗️ Build');
|
|
86
|
+
lines.push(`- **Type**: ${info.build.type}`);
|
|
87
|
+
if (info.build.timestamp) {
|
|
88
|
+
lines.push(`- **Timestamp**: ${info.build.timestamp}`);
|
|
89
|
+
}
|
|
90
|
+
if (info.build.gitCommit) {
|
|
91
|
+
lines.push(`- **Git Commit**: \`${info.build.gitCommit}\``);
|
|
92
|
+
}
|
|
93
|
+
if (info.build.gitBranch) {
|
|
94
|
+
lines.push(`- **Git Branch**: ${info.build.gitBranch}`);
|
|
95
|
+
}
|
|
96
|
+
lines.push('');
|
|
97
|
+
// Runtime info
|
|
98
|
+
lines.push('## 💻 Runtime');
|
|
99
|
+
lines.push(`- **Node.js**: ${info.runtime.nodeVersion}`);
|
|
100
|
+
lines.push(`- **Platform**: ${info.runtime.platform}`);
|
|
101
|
+
lines.push(`- **Architecture**: ${info.runtime.arch}`);
|
|
102
|
+
lines.push(`- **Process Uptime**: ${this.formatUptime(info.runtime.uptime)}`);
|
|
103
|
+
lines.push(`- **Memory Usage**: ${this.formatMemory(info.runtime.memoryUsage.heapUsed)} / ${this.formatMemory(info.runtime.memoryUsage.heapTotal)}`);
|
|
104
|
+
lines.push('');
|
|
105
|
+
// Environment info
|
|
106
|
+
lines.push('## ⚙️ Environment');
|
|
107
|
+
lines.push(`- **NODE_ENV**: ${info.environment.nodeEnv || 'not set'}`);
|
|
108
|
+
lines.push(`- **Mode**: ${info.environment.isProduction ? 'Production' : info.environment.isDevelopment ? 'Development' : 'Unknown'}`);
|
|
109
|
+
lines.push(`- **Debug**: ${info.environment.isDebug ? 'Enabled' : 'Disabled'}`);
|
|
110
|
+
lines.push(`- **Docker**: ${info.environment.isDocker ? 'Yes' : 'No'}`);
|
|
111
|
+
if (info.environment.dockerInfo) {
|
|
112
|
+
lines.push(`- **Container**: ${info.environment.dockerInfo}`);
|
|
113
|
+
}
|
|
114
|
+
lines.push('');
|
|
115
|
+
// Server info
|
|
116
|
+
lines.push('## 🚀 Server');
|
|
117
|
+
lines.push(`- **Started**: ${info.server.startTime.toISOString()}`);
|
|
118
|
+
lines.push(`- **Uptime**: ${this.formatUptime(info.server.uptime / 1000)}`);
|
|
119
|
+
lines.push(`- **MCP Connection**: ${info.server.mcpConnection ? '✅ Connected' : '❌ Disconnected'}`);
|
|
120
|
+
return lines.join('\n');
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* SECURITY NOTE: No Unicode normalization needed - reads application's own package.json
|
|
124
|
+
* Data source: Controlled file system path, no user input
|
|
125
|
+
*/
|
|
126
|
+
async getPackageInfo() {
|
|
127
|
+
if (this.packageInfo) {
|
|
128
|
+
return this.packageInfo;
|
|
129
|
+
}
|
|
130
|
+
try {
|
|
131
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
132
|
+
const __dirname = path.dirname(__filename);
|
|
133
|
+
// Try multiple paths to find package.json
|
|
134
|
+
// This handles both normal execution and compiled test scenarios
|
|
135
|
+
const possiblePaths = [
|
|
136
|
+
path.join(__dirname, '..', '..', 'package.json'), // Normal: dist/services -> root
|
|
137
|
+
path.join(__dirname, '..', '..', '..', 'package.json'), // Test: dist/test/services -> root
|
|
138
|
+
path.join(__dirname, '..', '..', '..', '..', 'package.json'), // Deep test: dist/test/deep/services -> root
|
|
139
|
+
path.join(process.cwd(), 'package.json') // Fallback to current working directory
|
|
140
|
+
];
|
|
141
|
+
let pkg = null;
|
|
142
|
+
for (const packagePath of possiblePaths) {
|
|
143
|
+
try {
|
|
144
|
+
// SECURITY NOTE: Reading our own package.json file - not user input
|
|
145
|
+
// This file is controlled by the application, no Unicode normalization needed
|
|
146
|
+
const content = await fs.readFile(packagePath, 'utf-8');
|
|
147
|
+
pkg = JSON.parse(content);
|
|
148
|
+
break;
|
|
149
|
+
}
|
|
150
|
+
catch {
|
|
151
|
+
// Try next path
|
|
152
|
+
continue;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
if (!pkg) {
|
|
156
|
+
throw new Error('Could not find package.json in any expected location');
|
|
157
|
+
}
|
|
158
|
+
this.packageInfo = {
|
|
159
|
+
name: pkg.name || 'unknown',
|
|
160
|
+
version: pkg.version || 'unknown'
|
|
161
|
+
};
|
|
162
|
+
return this.packageInfo;
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
logger.debug('Failed to read package.json:', error);
|
|
166
|
+
return { name: 'unknown', version: 'unknown' };
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
/**
|
|
170
|
+
* SECURITY NOTE: No Unicode normalization needed - reads build-generated version file
|
|
171
|
+
* Data source: Build system output file, no user input
|
|
172
|
+
*/
|
|
173
|
+
async getBuildTimestamp() {
|
|
174
|
+
try {
|
|
175
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
176
|
+
const __dirname = path.dirname(__filename);
|
|
177
|
+
// Try multiple paths to find version.json
|
|
178
|
+
// This handles both normal execution and compiled test scenarios
|
|
179
|
+
const possiblePaths = [
|
|
180
|
+
path.join(__dirname, '..', '..', 'dist', 'version.json'), // Normal location
|
|
181
|
+
path.join(__dirname, '..', '..', '..', 'dist', 'version.json'), // Test scenario
|
|
182
|
+
path.join(process.cwd(), 'dist', 'version.json') // Fallback to cwd
|
|
183
|
+
];
|
|
184
|
+
for (const versionPath of possiblePaths) {
|
|
185
|
+
try {
|
|
186
|
+
const content = await fs.readFile(versionPath, 'utf-8');
|
|
187
|
+
const version = JSON.parse(content);
|
|
188
|
+
return version.buildTime || version.timestamp;
|
|
189
|
+
}
|
|
190
|
+
catch {
|
|
191
|
+
// Try next path
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
// Version file might not exist, that's okay
|
|
196
|
+
return undefined;
|
|
197
|
+
}
|
|
198
|
+
catch {
|
|
199
|
+
// Version file might not exist, that's okay
|
|
200
|
+
return undefined;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
/**
|
|
204
|
+
* SECURITY NOTE: No Unicode normalization needed - executes system git commands
|
|
205
|
+
* Data source: Git CLI output (system-controlled), no user input
|
|
206
|
+
*/
|
|
207
|
+
async getGitInfo() {
|
|
208
|
+
try {
|
|
209
|
+
// SECURITY NOTE: Git commands return system-controlled data - not user input
|
|
210
|
+
// Git commit hashes and branch names are controlled by git, no Unicode normalization needed
|
|
211
|
+
const commit = execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim();
|
|
212
|
+
const branch = execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf-8' }).trim();
|
|
213
|
+
return { commit, branch };
|
|
214
|
+
}
|
|
215
|
+
catch {
|
|
216
|
+
// Not in a git repository or git not available
|
|
217
|
+
return {};
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
/**
|
|
221
|
+
* SECURITY NOTE: No Unicode normalization needed - reads container runtime files
|
|
222
|
+
* Data source: System cgroup files (container-controlled), no user input
|
|
223
|
+
*/
|
|
224
|
+
async getDockerInfo() {
|
|
225
|
+
try {
|
|
226
|
+
// SECURITY NOTE: Reading system cgroup file - controlled by container runtime, not user input
|
|
227
|
+
// Container runtime generates this file content, no Unicode normalization needed
|
|
228
|
+
const cgroupContent = await fs.readFile('/proc/1/cgroup', 'utf-8');
|
|
229
|
+
const isDocker = cgroupContent.includes('docker') || cgroupContent.includes('containerd');
|
|
230
|
+
if (isDocker) {
|
|
231
|
+
// Try to get container ID
|
|
232
|
+
const containerId = cgroupContent
|
|
233
|
+
.split('\n')
|
|
234
|
+
.find(line => line.includes('docker'))
|
|
235
|
+
?.split('/')
|
|
236
|
+
.pop()
|
|
237
|
+
?.substring(0, 12);
|
|
238
|
+
return {
|
|
239
|
+
isDocker: true,
|
|
240
|
+
info: containerId ? `Container ID: ${containerId}` : 'Running in Docker'
|
|
241
|
+
};
|
|
242
|
+
}
|
|
243
|
+
return { isDocker: false };
|
|
244
|
+
}
|
|
245
|
+
catch {
|
|
246
|
+
// Not in Docker or /proc not available
|
|
247
|
+
return { isDocker: false };
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
formatUptime(seconds) {
|
|
251
|
+
const days = Math.floor(seconds / 86400);
|
|
252
|
+
const hours = Math.floor((seconds % 86400) / 3600);
|
|
253
|
+
const minutes = Math.floor((seconds % 3600) / 60);
|
|
254
|
+
const secs = Math.floor(seconds % 60);
|
|
255
|
+
const parts = [];
|
|
256
|
+
if (days > 0)
|
|
257
|
+
parts.push(`${days}d`);
|
|
258
|
+
if (hours > 0)
|
|
259
|
+
parts.push(`${hours}h`);
|
|
260
|
+
if (minutes > 0)
|
|
261
|
+
parts.push(`${minutes}m`);
|
|
262
|
+
if (secs > 0 || parts.length === 0)
|
|
263
|
+
parts.push(`${secs}s`);
|
|
264
|
+
return parts.join(' ');
|
|
265
|
+
}
|
|
266
|
+
formatMemory(bytes) {
|
|
267
|
+
const mb = bytes / 1024 / 1024;
|
|
268
|
+
return `${mb.toFixed(1)} MB`;
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BuildInfoService.js","sourceRoot":"","sources":["../../src/services/BuildInfoService.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * BuildInfoService - Provides build and runtime information\n * Separated from main index.ts to avoid making that file larger\n * \n * SECURITY FIX (PR #614):\n * 1. DMCP-SEC-004: FALSE POSITIVE SUPPRESSION - No user input Unicode normalization needed\n *    This service only processes system information (git, package.json, environment variables)\n *    The MCP tool 'get_build_info' takes NO parameters (empty inputSchema)\n *    No user-provided data flows through this service that requires Unicode normalization\n */\n\nimport * as fs from 'fs/promises';\nimport * as path from 'path';\nimport { fileURLToPath } from 'url';\nimport { execSync } from 'child_process';\nimport { logger } from '../utils/logger.js';\n\nexport interface BuildInfo {\n  package: {\n    name: string;\n    version: string;\n  };\n  build: {\n    timestamp?: string;\n    type: 'git' | 'npm' | 'unknown';\n    gitCommit?: string;\n    gitBranch?: string;\n  };\n  runtime: {\n    nodeVersion: string;\n    platform: string;\n    arch: string;\n    uptime: number;\n    memoryUsage: NodeJS.MemoryUsage;\n  };\n  environment: {\n    nodeEnv?: string;\n    isProduction: boolean;\n    isDevelopment: boolean;\n    isDebug: boolean;\n    isDocker: boolean;\n    dockerInfo?: string;\n  };\n  server: {\n    startTime: Date;\n    uptime: number;\n    mcpConnection: boolean;\n  };\n}\n\nexport class BuildInfoService {\n  private static instance: BuildInfoService;\n  private readonly startTime: Date;\n  private packageInfo?: { name: string; version: string };\n\n  private constructor() {\n    this.startTime = new Date();\n  }\n\n  public static getInstance(): BuildInfoService {\n    if (!BuildInfoService.instance) {\n      BuildInfoService.instance = new BuildInfoService();\n    }\n    return BuildInfoService.instance;\n  }\n\n  /**\n   * Get comprehensive build information\n   * SECURITY NOTE: This method processes only system-generated data\n   * No user input is involved - all data comes from filesystem, git, and Node.js process\n   */\n  public async getBuildInfo(): Promise<BuildInfo> {\n    const [packageInfo, gitInfo, dockerInfo] = await Promise.all([\n      this.getPackageInfo(),\n      this.getGitInfo(),\n      this.getDockerInfo()\n    ]);\n\n    const buildTimestamp = await this.getBuildTimestamp();\n\n    return {\n      package: packageInfo,\n      build: {\n        timestamp: buildTimestamp,\n        type: gitInfo.commit ? 'git' : buildTimestamp ? 'npm' : 'unknown',\n        gitCommit: gitInfo.commit,\n        gitBranch: gitInfo.branch\n      },\n      runtime: {\n        nodeVersion: process.version,\n        platform: process.platform,\n        arch: process.arch,\n        uptime: process.uptime(),\n        memoryUsage: process.memoryUsage()\n      },\n      environment: {\n        nodeEnv: process.env.NODE_ENV,\n        isProduction: process.env.NODE_ENV === 'production',\n        isDevelopment: process.env.NODE_ENV === 'development',\n        isDebug: process.env.DEBUG === 'true' || process.env.DEBUG === '1',\n        isDocker: dockerInfo.isDocker,\n        dockerInfo: dockerInfo.info\n      },\n      server: {\n        startTime: this.startTime,\n        uptime: Date.now() - this.startTime.getTime(),\n        mcpConnection: true // We're connected if this method is being called via MCP\n      }\n    };\n  }\n\n  /**\n   * Format build info as user-friendly markdown\n   * SECURITY NOTE: Only formats system-generated data - no user input processing\n   * All input data comes from getBuildInfo() which only reads system information\n   */\n  public formatBuildInfo(info: BuildInfo): string {\n    const lines: string[] = [];\n    \n    lines.push('# 🔧 Build Information\\n');\n    \n    // Package info\n    lines.push('## 📦 Package');\n    lines.push(`- **Name**: ${info.package.name}`);\n    lines.push(`- **Version**: ${info.package.version}`);\n    lines.push('');\n    \n    // Build info\n    lines.push('## 🏗️ Build');\n    lines.push(`- **Type**: ${info.build.type}`);\n    if (info.build.timestamp) {\n      lines.push(`- **Timestamp**: ${info.build.timestamp}`);\n    }\n    if (info.build.gitCommit) {\n      lines.push(`- **Git Commit**: \\`${info.build.gitCommit}\\``);\n    }\n    if (info.build.gitBranch) {\n      lines.push(`- **Git Branch**: ${info.build.gitBranch}`);\n    }\n    lines.push('');\n    \n    // Runtime info\n    lines.push('## 💻 Runtime');\n    lines.push(`- **Node.js**: ${info.runtime.nodeVersion}`);\n    lines.push(`- **Platform**: ${info.runtime.platform}`);\n    lines.push(`- **Architecture**: ${info.runtime.arch}`);\n    lines.push(`- **Process Uptime**: ${this.formatUptime(info.runtime.uptime)}`);\n    lines.push(`- **Memory Usage**: ${this.formatMemory(info.runtime.memoryUsage.heapUsed)} / ${this.formatMemory(info.runtime.memoryUsage.heapTotal)}`);\n    lines.push('');\n    \n    // Environment info\n    lines.push('## ⚙️ Environment');\n    lines.push(`- **NODE_ENV**: ${info.environment.nodeEnv || 'not set'}`);\n    lines.push(`- **Mode**: ${info.environment.isProduction ? 'Production' : info.environment.isDevelopment ? 'Development' : 'Unknown'}`);\n    lines.push(`- **Debug**: ${info.environment.isDebug ? 'Enabled' : 'Disabled'}`);\n    lines.push(`- **Docker**: ${info.environment.isDocker ? 'Yes' : 'No'}`);\n    if (info.environment.dockerInfo) {\n      lines.push(`- **Container**: ${info.environment.dockerInfo}`);\n    }\n    lines.push('');\n    \n    // Server info\n    lines.push('## 🚀 Server');\n    lines.push(`- **Started**: ${info.server.startTime.toISOString()}`);\n    lines.push(`- **Uptime**: ${this.formatUptime(info.server.uptime / 1000)}`);\n    lines.push(`- **MCP Connection**: ${info.server.mcpConnection ? '✅ Connected' : '❌ Disconnected'}`);\n    \n    return lines.join('\\n');\n  }\n\n  /**\n   * SECURITY NOTE: No Unicode normalization needed - reads application's own package.json\n   * Data source: Controlled file system path, no user input\n   */\n  private async getPackageInfo(): Promise<{ name: string; version: string }> {\n    if (this.packageInfo) {\n      return this.packageInfo;\n    }\n\n    try {\n      const __filename = fileURLToPath(import.meta.url);\n      const __dirname = path.dirname(__filename);\n      \n      // Try multiple paths to find package.json\n      // This handles both normal execution and compiled test scenarios\n      const possiblePaths = [\n        path.join(__dirname, '..', '..', 'package.json'), // Normal: dist/services -> root\n        path.join(__dirname, '..', '..', '..', 'package.json'), // Test: dist/test/services -> root\n        path.join(__dirname, '..', '..', '..', '..', 'package.json'), // Deep test: dist/test/deep/services -> root\n        path.join(process.cwd(), 'package.json') // Fallback to current working directory\n      ];\n      \n      let pkg: any = null;\n      \n      for (const packagePath of possiblePaths) {\n        try {\n          // SECURITY NOTE: Reading our own package.json file - not user input\n          // This file is controlled by the application, no Unicode normalization needed\n          const content = await fs.readFile(packagePath, 'utf-8');\n          pkg = JSON.parse(content);\n          break;\n        } catch {\n          // Try next path\n          continue;\n        }\n      }\n      \n      if (!pkg) {\n        throw new Error('Could not find package.json in any expected location');\n      }\n      \n      this.packageInfo = {\n        name: pkg.name || 'unknown',\n        version: pkg.version || 'unknown'\n      };\n      \n      return this.packageInfo;\n    } catch (error) {\n      logger.debug('Failed to read package.json:', error);\n      return { name: 'unknown', version: 'unknown' };\n    }\n  }\n\n  /**\n   * SECURITY NOTE: No Unicode normalization needed - reads build-generated version file\n   * Data source: Build system output file, no user input\n   */\n  private async getBuildTimestamp(): Promise<string | undefined> {\n    try {\n      const __filename = fileURLToPath(import.meta.url);\n      const __dirname = path.dirname(__filename);\n      \n      // Try multiple paths to find version.json\n      // This handles both normal execution and compiled test scenarios\n      const possiblePaths = [\n        path.join(__dirname, '..', '..', 'dist', 'version.json'), // Normal location\n        path.join(__dirname, '..', '..', '..', 'dist', 'version.json'), // Test scenario\n        path.join(process.cwd(), 'dist', 'version.json') // Fallback to cwd\n      ];\n      \n      for (const versionPath of possiblePaths) {\n        try {\n          const content = await fs.readFile(versionPath, 'utf-8');\n          const version = JSON.parse(content);\n          return version.buildTime || version.timestamp;\n        } catch {\n          // Try next path\n          continue;\n        }\n      }\n      \n      // Version file might not exist, that's okay\n      return undefined;\n    } catch {\n      // Version file might not exist, that's okay\n      return undefined;\n    }\n  }\n\n  /**\n   * SECURITY NOTE: No Unicode normalization needed - executes system git commands\n   * Data source: Git CLI output (system-controlled), no user input\n   */\n  private async getGitInfo(): Promise<{ commit?: string; branch?: string }> {\n    try {\n      // SECURITY NOTE: Git commands return system-controlled data - not user input\n      // Git commit hashes and branch names are controlled by git, no Unicode normalization needed\n      const commit = execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim();\n      const branch = execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf-8' }).trim();\n      \n      return { commit, branch };\n    } catch {\n      // Not in a git repository or git not available\n      return {};\n    }\n  }\n\n  /**\n   * SECURITY NOTE: No Unicode normalization needed - reads container runtime files\n   * Data source: System cgroup files (container-controlled), no user input\n   */\n  private async getDockerInfo(): Promise<{ isDocker: boolean; info?: string }> {\n    try {\n      // SECURITY NOTE: Reading system cgroup file - controlled by container runtime, not user input\n      // Container runtime generates this file content, no Unicode normalization needed\n      const cgroupContent = await fs.readFile('/proc/1/cgroup', 'utf-8');\n      const isDocker = cgroupContent.includes('docker') || cgroupContent.includes('containerd');\n      \n      if (isDocker) {\n        // Try to get container ID\n        const containerId = cgroupContent\n          .split('\\n')\n          .find(line => line.includes('docker'))\n          ?.split('/')\n          .pop()\n          ?.substring(0, 12);\n        \n        return {\n          isDocker: true,\n          info: containerId ? `Container ID: ${containerId}` : 'Running in Docker'\n        };\n      }\n      \n      return { isDocker: false };\n    } catch {\n      // Not in Docker or /proc not available\n      return { isDocker: false };\n    }\n  }\n\n  private formatUptime(seconds: number): string {\n    const days = Math.floor(seconds / 86400);\n    const hours = Math.floor((seconds % 86400) / 3600);\n    const minutes = Math.floor((seconds % 3600) / 60);\n    const secs = Math.floor(seconds % 60);\n    \n    const parts: string[] = [];\n    if (days > 0) parts.push(`${days}d`);\n    if (hours > 0) parts.push(`${hours}h`);\n    if (minutes > 0) parts.push(`${minutes}m`);\n    if (secs > 0 || parts.length === 0) parts.push(`${secs}s`);\n    \n    return parts.join(' ');\n  }\n\n  private formatMemory(bytes: number): string {\n    const mb = bytes / 1024 / 1024;\n    return `${mb.toFixed(1)} MB`;\n  }\n}"]}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Adapter to convert simple portfolio elements to full IElement interface
|
|
3
|
+
* This resolves type safety issues without complex type casting
|
|
4
|
+
*
|
|
5
|
+
* FIXES IMPLEMENTED (PR #503):
|
|
6
|
+
* 1. TYPE SAFETY (Issue #497): Eliminates complex type casting with adapter pattern
|
|
7
|
+
* 2. SECURITY FIX DMCP-SEC-004 (MEDIUM): Added Unicode normalization for all user input
|
|
8
|
+
* 3. SECURITY FIX DMCP-SEC-006 (LOW): Added audit logging for element creation
|
|
9
|
+
* 4. PERFORMANCE: Helper methods for efficient string normalization
|
|
10
|
+
*/
|
|
11
|
+
import { IElement, IElementMetadata, ElementValidationResult, ElementStatus } from '../../types/elements/IElement.js';
|
|
12
|
+
import { ElementType } from '../../portfolio/types.js';
|
|
13
|
+
import { PortfolioElement } from './submitToPortfolioTool.js';
|
|
14
|
+
/**
|
|
15
|
+
* Adapter class that wraps a simple PortfolioElement and implements IElement
|
|
16
|
+
* This allows us to pass portfolio elements to methods expecting IElement
|
|
17
|
+
* without complex type casting
|
|
18
|
+
*/
|
|
19
|
+
export declare class PortfolioElementAdapter implements IElement {
|
|
20
|
+
readonly id: string;
|
|
21
|
+
readonly type: ElementType;
|
|
22
|
+
readonly version: string;
|
|
23
|
+
readonly metadata: IElementMetadata;
|
|
24
|
+
private readonly portfolioElement;
|
|
25
|
+
constructor(element: PortfolioElement);
|
|
26
|
+
/**
|
|
27
|
+
* Helper to normalize string values safely
|
|
28
|
+
*/
|
|
29
|
+
private normalizeString;
|
|
30
|
+
/**
|
|
31
|
+
* Validate the element
|
|
32
|
+
*/
|
|
33
|
+
validate(): ElementValidationResult;
|
|
34
|
+
/**
|
|
35
|
+
* Serialize the element to markdown with YAML frontmatter
|
|
36
|
+
* FIX: Changed from JSON to markdown format for GitHub portfolio compatibility
|
|
37
|
+
* SECURITY FIX #544: Parse and validate existing frontmatter instead of returning as-is
|
|
38
|
+
* SECURITY FIX #543: Use gray-matter for robust frontmatter detection
|
|
39
|
+
*/
|
|
40
|
+
serialize(): string;
|
|
41
|
+
/**
|
|
42
|
+
* Deserialize from string (not implemented for adapter)
|
|
43
|
+
*/
|
|
44
|
+
deserialize(data: string): void;
|
|
45
|
+
/**
|
|
46
|
+
* Get element status
|
|
47
|
+
*/
|
|
48
|
+
getStatus(): ElementStatus;
|
|
49
|
+
/**
|
|
50
|
+
* Get the original portfolio element content
|
|
51
|
+
*/
|
|
52
|
+
getContent(): string;
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=PortfolioElementAdapter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PortfolioElementAdapter.d.ts","sourceRoot":"","sources":["../../../src/tools/portfolio/PortfolioElementAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,uBAAuB,EACvB,aAAa,EAGd,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAQ9D;;;;GAIG;AACH,qBAAa,uBAAwB,YAAW,QAAQ;IACtD,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,SAAgB,IAAI,EAAE,WAAW,CAAC;IAClC,SAAgB,OAAO,EAAE,MAAM,CAAC;IAChC,SAAgB,QAAQ,EAAE,gBAAgB,CAAC;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;gBAExC,OAAO,EAAE,gBAAgB;IAsDrC;;OAEG;IACH,OAAO,CAAC,eAAe;IAMvB;;OAEG;IACH,QAAQ,IAAI,uBAAuB;IAyBnC;;;;;OAKG;IACH,SAAS,IAAI,MAAM;IA2GnB;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI/B;;OAEG;IACH,SAAS,IAAI,aAAa;IAI1B;;OAEG;IACH,UAAU,IAAI,MAAM;CAGrB"}
|
|
@@ -0,0 +1,229 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Adapter to convert simple portfolio elements to full IElement interface
|
|
3
|
+
* This resolves type safety issues without complex type casting
|
|
4
|
+
*
|
|
5
|
+
* FIXES IMPLEMENTED (PR #503):
|
|
6
|
+
* 1. TYPE SAFETY (Issue #497): Eliminates complex type casting with adapter pattern
|
|
7
|
+
* 2. SECURITY FIX DMCP-SEC-004 (MEDIUM): Added Unicode normalization for all user input
|
|
8
|
+
* 3. SECURITY FIX DMCP-SEC-006 (LOW): Added audit logging for element creation
|
|
9
|
+
* 4. PERFORMANCE: Helper methods for efficient string normalization
|
|
10
|
+
*/
|
|
11
|
+
import { ElementStatus } from '../../types/elements/IElement.js';
|
|
12
|
+
import { UnicodeValidator } from '../../security/validators/unicodeValidator.js';
|
|
13
|
+
import { SecurityMonitor } from '../../security/securityMonitor.js';
|
|
14
|
+
import { logger } from '../../utils/logger.js';
|
|
15
|
+
import * as yaml from 'js-yaml';
|
|
16
|
+
import matter from 'gray-matter';
|
|
17
|
+
import { ContentValidator } from '../../security/contentValidator.js';
|
|
18
|
+
/**
|
|
19
|
+
* Adapter class that wraps a simple PortfolioElement and implements IElement
|
|
20
|
+
* This allows us to pass portfolio elements to methods expecting IElement
|
|
21
|
+
* without complex type casting
|
|
22
|
+
*/
|
|
23
|
+
export class PortfolioElementAdapter {
|
|
24
|
+
id;
|
|
25
|
+
type;
|
|
26
|
+
version;
|
|
27
|
+
metadata;
|
|
28
|
+
portfolioElement;
|
|
29
|
+
constructor(element) {
|
|
30
|
+
// SECURITY FIX #2 (DMCP-SEC-004): Normalize and validate all user input
|
|
31
|
+
// Previously: User input was used directly without validation
|
|
32
|
+
// Now: All string inputs go through UnicodeValidator to prevent homograph attacks
|
|
33
|
+
const normalizedName = UnicodeValidator.normalize(element.metadata.name);
|
|
34
|
+
if (!normalizedName.isValid) {
|
|
35
|
+
// Log security event for invalid Unicode
|
|
36
|
+
SecurityMonitor.logSecurityEvent({
|
|
37
|
+
type: 'UNICODE_VALIDATION_ERROR',
|
|
38
|
+
severity: 'MEDIUM',
|
|
39
|
+
source: 'PortfolioElementAdapter.constructor',
|
|
40
|
+
details: `Invalid Unicode in element name: ${normalizedName.detectedIssues?.[0] || 'unknown'}`
|
|
41
|
+
});
|
|
42
|
+
logger.warn('Invalid Unicode detected in element name', {
|
|
43
|
+
issues: normalizedName.detectedIssues
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
this.portfolioElement = element;
|
|
47
|
+
this.type = element.type;
|
|
48
|
+
this.version = element.metadata.version || '1.0.0';
|
|
49
|
+
// Generate ID from type and normalized name
|
|
50
|
+
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
|
51
|
+
const safeName = normalizedName.normalizedContent || element.metadata.name;
|
|
52
|
+
const nameSlug = safeName.toLowerCase().replace(/\s+/g, '-');
|
|
53
|
+
this.id = `${element.type}_${nameSlug}_${timestamp}`;
|
|
54
|
+
// Convert metadata to IElementMetadata format with normalized values
|
|
55
|
+
this.metadata = {
|
|
56
|
+
name: safeName,
|
|
57
|
+
description: this.normalizeString(element.metadata.description || ''),
|
|
58
|
+
author: this.normalizeString(element.metadata.author || ''),
|
|
59
|
+
version: element.metadata.version,
|
|
60
|
+
created: element.metadata.created,
|
|
61
|
+
modified: element.metadata.updated,
|
|
62
|
+
tags: []
|
|
63
|
+
};
|
|
64
|
+
// SECURITY FIX #3 (DMCP-SEC-006): Log element creation for audit trail
|
|
65
|
+
// Previously: No audit logging for portfolio operations
|
|
66
|
+
// Now: Complete audit trail using SecurityMonitor.logSecurityEvent()
|
|
67
|
+
SecurityMonitor.logSecurityEvent({
|
|
68
|
+
type: 'ELEMENT_CREATED',
|
|
69
|
+
severity: 'LOW',
|
|
70
|
+
source: 'PortfolioElementAdapter.constructor',
|
|
71
|
+
details: `Created portfolio element adapter: ${this.id}`,
|
|
72
|
+
metadata: {
|
|
73
|
+
elementType: this.type,
|
|
74
|
+
elementId: this.id
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* Helper to normalize string values safely
|
|
80
|
+
*/
|
|
81
|
+
normalizeString(value) {
|
|
82
|
+
if (!value)
|
|
83
|
+
return value;
|
|
84
|
+
const normalized = UnicodeValidator.normalize(value);
|
|
85
|
+
return normalized.normalizedContent || value;
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Validate the element
|
|
89
|
+
*/
|
|
90
|
+
validate() {
|
|
91
|
+
const errors = [];
|
|
92
|
+
const warnings = [];
|
|
93
|
+
if (!this.metadata.name) {
|
|
94
|
+
errors.push({
|
|
95
|
+
field: 'name',
|
|
96
|
+
message: 'Element name is required'
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
if (!this.portfolioElement.content) {
|
|
100
|
+
errors.push({
|
|
101
|
+
field: 'content',
|
|
102
|
+
message: 'Element content is required'
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
return {
|
|
106
|
+
valid: errors.length === 0,
|
|
107
|
+
errors: errors.length > 0 ? errors : undefined,
|
|
108
|
+
warnings: warnings.length > 0 ? warnings : undefined
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Serialize the element to markdown with YAML frontmatter
|
|
113
|
+
* FIX: Changed from JSON to markdown format for GitHub portfolio compatibility
|
|
114
|
+
* SECURITY FIX #544: Parse and validate existing frontmatter instead of returning as-is
|
|
115
|
+
* SECURITY FIX #543: Use gray-matter for robust frontmatter detection
|
|
116
|
+
*/
|
|
117
|
+
serialize() {
|
|
118
|
+
// SECURITY FIX #543: Use gray-matter for robust frontmatter detection
|
|
119
|
+
// This handles different line endings, whitespace variations, and malformed YAML
|
|
120
|
+
let contentToProcess = this.portfolioElement.content;
|
|
121
|
+
let existingMetadata = {};
|
|
122
|
+
let bodyContent = contentToProcess;
|
|
123
|
+
// Try to parse existing frontmatter if present
|
|
124
|
+
try {
|
|
125
|
+
// gray-matter handles all edge cases:
|
|
126
|
+
// - Different line endings (\n, \r\n)
|
|
127
|
+
// - Whitespace variations
|
|
128
|
+
// - Malformed YAML (returns empty data object)
|
|
129
|
+
// - Missing closing delimiter
|
|
130
|
+
const parsed = matter(contentToProcess);
|
|
131
|
+
if (parsed.data && Object.keys(parsed.data).length > 0) {
|
|
132
|
+
// SECURITY FIX #544: Validate existing frontmatter instead of bypassing
|
|
133
|
+
logger.debug('Found existing frontmatter, validating before merge');
|
|
134
|
+
// Validate the parsed frontmatter
|
|
135
|
+
const validationResult = ContentValidator.validateAndSanitize(yaml.dump(parsed.data));
|
|
136
|
+
if (!validationResult.isValid && validationResult.severity === 'critical') {
|
|
137
|
+
// Log security event for malicious frontmatter
|
|
138
|
+
SecurityMonitor.logSecurityEvent({
|
|
139
|
+
type: 'CONTENT_INJECTION_ATTEMPT',
|
|
140
|
+
severity: 'HIGH',
|
|
141
|
+
source: 'PortfolioElementAdapter.serialize',
|
|
142
|
+
details: `Critical security issues in frontmatter: ${validationResult.detectedPatterns?.join(', ')}`,
|
|
143
|
+
metadata: {
|
|
144
|
+
elementId: this.id,
|
|
145
|
+
elementType: this.type
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
// Don't use the malicious frontmatter, create new
|
|
149
|
+
existingMetadata = {};
|
|
150
|
+
bodyContent = contentToProcess; // Use original content
|
|
151
|
+
}
|
|
152
|
+
else {
|
|
153
|
+
// Frontmatter is safe, merge with our metadata
|
|
154
|
+
existingMetadata = parsed.data;
|
|
155
|
+
bodyContent = parsed.content;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
catch (error) {
|
|
160
|
+
// If gray-matter fails to parse, treat as content without frontmatter
|
|
161
|
+
logger.warn('Failed to parse potential frontmatter, treating as plain content', {
|
|
162
|
+
error: error instanceof Error ? error.message : String(error)
|
|
163
|
+
});
|
|
164
|
+
// Continue with empty metadata and full content
|
|
165
|
+
}
|
|
166
|
+
// Merge metadata, with our metadata taking precedence for security
|
|
167
|
+
// This ensures critical fields like ID and type are always from our validated source
|
|
168
|
+
const mergedMetadata = {
|
|
169
|
+
...existingMetadata, // Existing metadata first
|
|
170
|
+
...this.metadata, // Our validated metadata overwrites
|
|
171
|
+
id: this.id, // Always use our ID
|
|
172
|
+
type: this.type, // Always use our type
|
|
173
|
+
version: this.version // Always use our version
|
|
174
|
+
};
|
|
175
|
+
// Validate the final merged metadata
|
|
176
|
+
const metadataYaml = yaml.dump(mergedMetadata, {
|
|
177
|
+
noRefs: true,
|
|
178
|
+
sortKeys: false,
|
|
179
|
+
lineWidth: -1
|
|
180
|
+
});
|
|
181
|
+
// Final security check on the complete metadata
|
|
182
|
+
const finalValidation = ContentValidator.validateAndSanitize(metadataYaml);
|
|
183
|
+
if (!finalValidation.isValid && finalValidation.severity === 'critical') {
|
|
184
|
+
// This shouldn't happen with our sanitized data, but log if it does
|
|
185
|
+
SecurityMonitor.logSecurityEvent({
|
|
186
|
+
type: 'UNICODE_VALIDATION_ERROR',
|
|
187
|
+
severity: 'MEDIUM',
|
|
188
|
+
source: 'PortfolioElementAdapter.serialize',
|
|
189
|
+
details: 'Final metadata validation failed after merge',
|
|
190
|
+
metadata: { elementId: this.id }
|
|
191
|
+
});
|
|
192
|
+
// Fall back to minimal safe metadata
|
|
193
|
+
const safeMetadata = {
|
|
194
|
+
id: this.id,
|
|
195
|
+
type: this.type,
|
|
196
|
+
version: this.version,
|
|
197
|
+
name: this.normalizeString(this.metadata.name || 'Untitled'),
|
|
198
|
+
description: this.normalizeString(this.metadata.description || '')
|
|
199
|
+
};
|
|
200
|
+
const safeFrontmatter = yaml.dump(safeMetadata, {
|
|
201
|
+
noRefs: true,
|
|
202
|
+
sortKeys: false,
|
|
203
|
+
lineWidth: -1
|
|
204
|
+
});
|
|
205
|
+
return `---\n${safeFrontmatter}---\n\n${bodyContent}`;
|
|
206
|
+
}
|
|
207
|
+
// Return validated and sanitized markdown with frontmatter
|
|
208
|
+
return `---\n${metadataYaml}---\n\n${bodyContent}`;
|
|
209
|
+
}
|
|
210
|
+
/**
|
|
211
|
+
* Deserialize from string (not implemented for adapter)
|
|
212
|
+
*/
|
|
213
|
+
deserialize(data) {
|
|
214
|
+
throw new Error('Deserialization not supported for PortfolioElementAdapter');
|
|
215
|
+
}
|
|
216
|
+
/**
|
|
217
|
+
* Get element status
|
|
218
|
+
*/
|
|
219
|
+
getStatus() {
|
|
220
|
+
return ElementStatus.INACTIVE;
|
|
221
|
+
}
|
|
222
|
+
/**
|
|
223
|
+
* Get the original portfolio element content
|
|
224
|
+
*/
|
|
225
|
+
getContent() {
|
|
226
|
+
return this.portfolioElement.content;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PortfolioElementAdapter.js","sourceRoot":"","sources":["../../../src/tools/portfolio/PortfolioElementAdapter.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Adapter to convert simple portfolio elements to full IElement interface\n * This resolves type safety issues without complex type casting\n * \n * FIXES IMPLEMENTED (PR #503):\n * 1. TYPE SAFETY (Issue #497): Eliminates complex type casting with adapter pattern\n * 2. SECURITY FIX DMCP-SEC-004 (MEDIUM): Added Unicode normalization for all user input\n * 3. SECURITY FIX DMCP-SEC-006 (LOW): Added audit logging for element creation\n * 4. PERFORMANCE: Helper methods for efficient string normalization\n */\n\nimport { \n  IElement, \n  IElementMetadata, \n  ElementValidationResult, \n  ElementStatus,\n  ValidationError,\n  ValidationWarning\n} from '../../types/elements/IElement.js';\nimport { ElementType } from '../../portfolio/types.js';\nimport { PortfolioElement } from './submitToPortfolioTool.js';\nimport { UnicodeValidator } from '../../security/validators/unicodeValidator.js';\nimport { SecurityMonitor } from '../../security/securityMonitor.js';\nimport { logger } from '../../utils/logger.js';\nimport * as yaml from 'js-yaml';\nimport matter from 'gray-matter';\nimport { ContentValidator } from '../../security/contentValidator.js';\n\n/**\n * Adapter class that wraps a simple PortfolioElement and implements IElement\n * This allows us to pass portfolio elements to methods expecting IElement\n * without complex type casting\n */\nexport class PortfolioElementAdapter implements IElement {\n  public readonly id: string;\n  public readonly type: ElementType;\n  public readonly version: string;\n  public readonly metadata: IElementMetadata;\n  private readonly portfolioElement: PortfolioElement;\n\n  constructor(element: PortfolioElement) {\n    // SECURITY FIX #2 (DMCP-SEC-004): Normalize and validate all user input\n    // Previously: User input was used directly without validation\n    // Now: All string inputs go through UnicodeValidator to prevent homograph attacks\n    const normalizedName = UnicodeValidator.normalize(element.metadata.name);\n    if (!normalizedName.isValid) {\n      // Log security event for invalid Unicode\n      SecurityMonitor.logSecurityEvent({\n        type: 'UNICODE_VALIDATION_ERROR',\n        severity: 'MEDIUM',\n        source: 'PortfolioElementAdapter.constructor',\n        details: `Invalid Unicode in element name: ${normalizedName.detectedIssues?.[0] || 'unknown'}`\n      });\n      logger.warn('Invalid Unicode detected in element name', {\n        issues: normalizedName.detectedIssues\n      });\n    }\n    \n    this.portfolioElement = element;\n    this.type = element.type;\n    this.version = element.metadata.version || '1.0.0';\n    \n    // Generate ID from type and normalized name\n    const timestamp = new Date().toISOString().replace(/[:.]/g, '-');\n    const safeName = normalizedName.normalizedContent || element.metadata.name;\n    const nameSlug = safeName.toLowerCase().replace(/\\s+/g, '-');\n    this.id = `${element.type}_${nameSlug}_${timestamp}`;\n    \n    // Convert metadata to IElementMetadata format with normalized values\n    this.metadata = {\n      name: safeName,\n      description: this.normalizeString(element.metadata.description || ''),\n      author: this.normalizeString(element.metadata.author || ''),\n      version: element.metadata.version,\n      created: element.metadata.created,\n      modified: element.metadata.updated,\n      tags: []\n    };\n    \n    // SECURITY FIX #3 (DMCP-SEC-006): Log element creation for audit trail\n    // Previously: No audit logging for portfolio operations\n    // Now: Complete audit trail using SecurityMonitor.logSecurityEvent()\n    SecurityMonitor.logSecurityEvent({\n      type: 'ELEMENT_CREATED',\n      severity: 'LOW',\n      source: 'PortfolioElementAdapter.constructor',\n      details: `Created portfolio element adapter: ${this.id}`,\n      metadata: {\n        elementType: this.type,\n        elementId: this.id\n      }\n    });\n  }\n  \n  /**\n   * Helper to normalize string values safely\n   */\n  private normalizeString(value: string): string {\n    if (!value) return value;\n    const normalized = UnicodeValidator.normalize(value);\n    return normalized.normalizedContent || value;\n  }\n\n  /**\n   * Validate the element\n   */\n  validate(): ElementValidationResult {\n    const errors: ValidationError[] = [];\n    const warnings: ValidationWarning[] = [];\n\n    if (!this.metadata.name) {\n      errors.push({\n        field: 'name',\n        message: 'Element name is required'\n      });\n    }\n    \n    if (!this.portfolioElement.content) {\n      errors.push({\n        field: 'content',\n        message: 'Element content is required'\n      });\n    }\n\n    return {\n      valid: errors.length === 0,\n      errors: errors.length > 0 ? errors : undefined,\n      warnings: warnings.length > 0 ? warnings : undefined\n    };\n  }\n\n  /**\n   * Serialize the element to markdown with YAML frontmatter\n   * FIX: Changed from JSON to markdown format for GitHub portfolio compatibility\n   * SECURITY FIX #544: Parse and validate existing frontmatter instead of returning as-is\n   * SECURITY FIX #543: Use gray-matter for robust frontmatter detection\n   */\n  serialize(): string {\n    // SECURITY FIX #543: Use gray-matter for robust frontmatter detection\n    // This handles different line endings, whitespace variations, and malformed YAML\n    let contentToProcess = this.portfolioElement.content;\n    let existingMetadata: Record<string, any> = {};\n    let bodyContent = contentToProcess;\n    \n    // Try to parse existing frontmatter if present\n    try {\n      // gray-matter handles all edge cases:\n      // - Different line endings (\\n, \\r\\n)\n      // - Whitespace variations\n      // - Malformed YAML (returns empty data object)\n      // - Missing closing delimiter\n      const parsed = matter(contentToProcess);\n      \n      if (parsed.data && Object.keys(parsed.data).length > 0) {\n        // SECURITY FIX #544: Validate existing frontmatter instead of bypassing\n        logger.debug('Found existing frontmatter, validating before merge');\n        \n        // Validate the parsed frontmatter\n        const validationResult = ContentValidator.validateAndSanitize(\n          yaml.dump(parsed.data)\n        );\n        \n        if (!validationResult.isValid && validationResult.severity === 'critical') {\n          // Log security event for malicious frontmatter\n          SecurityMonitor.logSecurityEvent({\n            type: 'CONTENT_INJECTION_ATTEMPT',\n            severity: 'HIGH',\n            source: 'PortfolioElementAdapter.serialize',\n            details: `Critical security issues in frontmatter: ${validationResult.detectedPatterns?.join(', ')}`,\n            metadata: {\n              elementId: this.id,\n              elementType: this.type\n            }\n          });\n          \n          // Don't use the malicious frontmatter, create new\n          existingMetadata = {};\n          bodyContent = contentToProcess; // Use original content\n        } else {\n          // Frontmatter is safe, merge with our metadata\n          existingMetadata = parsed.data;\n          bodyContent = parsed.content;\n        }\n      }\n    } catch (error) {\n      // If gray-matter fails to parse, treat as content without frontmatter\n      logger.warn('Failed to parse potential frontmatter, treating as plain content', {\n        error: error instanceof Error ? error.message : String(error)\n      });\n      // Continue with empty metadata and full content\n    }\n    \n    // Merge metadata, with our metadata taking precedence for security\n    // This ensures critical fields like ID and type are always from our validated source\n    const mergedMetadata = {\n      ...existingMetadata, // Existing metadata first\n      ...this.metadata,    // Our validated metadata overwrites\n      id: this.id,         // Always use our ID\n      type: this.type,     // Always use our type\n      version: this.version // Always use our version\n    };\n    \n    // Validate the final merged metadata\n    const metadataYaml = yaml.dump(mergedMetadata, {\n      noRefs: true,\n      sortKeys: false,\n      lineWidth: -1\n    });\n    \n    // Final security check on the complete metadata\n    const finalValidation = ContentValidator.validateAndSanitize(metadataYaml);\n    \n    if (!finalValidation.isValid && finalValidation.severity === 'critical') {\n      // This shouldn't happen with our sanitized data, but log if it does\n      SecurityMonitor.logSecurityEvent({\n        type: 'UNICODE_VALIDATION_ERROR',\n        severity: 'MEDIUM',\n        source: 'PortfolioElementAdapter.serialize',\n        details: 'Final metadata validation failed after merge',\n        metadata: { elementId: this.id }\n      });\n      \n      // Fall back to minimal safe metadata\n      const safeMetadata = {\n        id: this.id,\n        type: this.type,\n        version: this.version,\n        name: this.normalizeString(this.metadata.name || 'Untitled'),\n        description: this.normalizeString(this.metadata.description || '')\n      };\n      \n      const safeFrontmatter = yaml.dump(safeMetadata, {\n        noRefs: true,\n        sortKeys: false,\n        lineWidth: -1\n      });\n      \n      return `---\\n${safeFrontmatter}---\\n\\n${bodyContent}`;\n    }\n    \n    // Return validated and sanitized markdown with frontmatter\n    return `---\\n${metadataYaml}---\\n\\n${bodyContent}`;\n  }\n\n  /**\n   * Deserialize from string (not implemented for adapter)\n   */\n  deserialize(data: string): void {\n    throw new Error('Deserialization not supported for PortfolioElementAdapter');\n  }\n\n  /**\n   * Get element status\n   */\n  getStatus(): ElementStatus {\n    return ElementStatus.INACTIVE;\n  }\n\n  /**\n   * Get the original portfolio element content\n   */\n  getContent(): string {\n    return this.portfolioElement.content;\n  }\n}"]}
|