@burtthecoder/mcp-shodan 1.0.7 → 1.0.8

package/README.md

@@ -7,8 +7,9 @@ A Model Context Protocol (MCP) server for querying the [Shodan API](https://shod
 - **IP Lookup**: Retrieve detailed information about an IP address
 - **Search**: Search for devices on Shodan matching specific queries
 - **Ports**: Get a list of ports that Shodan is scanning
-- **Vulnerabilities**: Fetch detailed information about CVEs using Shodan's CVEDB
+- **CVE Lookup**: Fetch detailed information about specific CVEs using Shodan's CVEDB
 - **CPE Lookup**: Search for Common Platform Enumeration (CPE) entries by product name
+- **CVEs by Product**: Search for all CVEs affecting a specific product or CPE
 - **DNS Lookup**: Resolve hostnames to IP addresses
 
 ## Tools
@@ -26,8 +27,8 @@ A Model Context Protocol (MCP) server for querying the [Shodan API](https://shod
   * `query` (required): Shodan search query
   * `max_results` (optional, default: 10): Number of results to return
 
-### 3. Vulnerabilities Tool
-- Name: `vulnerabilities`
+### 3. CVE Lookup Tool
+- Name: `cve_lookup`
 - Description: Fetch detailed information about CVEs using Shodan's CVEDB
 - Parameters:
   * `cve` (required): CVE identifier in format CVE-YYYY-NNNNN (e.g., CVE-2021-44228)
@@ -53,7 +54,27 @@ A Model Context Protocol (MCP) server for querying the [Shodan API](https://shod
   * When count is true: Total number of matching CPEs
   * When count is false: List of CPEs with pagination details
 
-### 5. DNS Lookup Tool
+### 5. CVEs by Product Tool
+- Name: `cves_by_product`
+- Description: Search for CVEs affecting a specific product or CPE
+- Parameters:
+  * `cpe23` (optional): CPE 2.3 identifier (format: cpe:2.3:part:vendor:product:version)
+  * `product` (optional): Name of the product to search for CVEs
+  * `count` (optional, default: false): If true, returns only the count of matching CVEs
+  * `is_kev` (optional, default: false): If true, returns only CVEs with KEV flag set
+  * `sort_by_epss` (optional, default: false): If true, sorts CVEs by EPSS score
+  * `skip` (optional, default: 0): Number of CVEs to skip (for pagination)
+  * `limit` (optional, default: 1000): Maximum number of CVEs to return
+  * `start_date` (optional): Start date for filtering CVEs (format: YYYY-MM-DDTHH:MM:SS)
+  * `end_date` (optional): End date for filtering CVEs (format: YYYY-MM-DDTHH:MM:SS)
+- Notes:
+  * Must provide either cpe23 or product, but not both
+  * Date filtering uses published time of CVEs
+- Returns:
+  * When count is true: Total number of matching CVEs
+  * When count is false: List of CVEs with pagination details and query parameters
+
+### 6. DNS Lookup Tool
 - Name: `dns_lookup`
 - Description: Resolve hostnames to IP addresses
 - Parameters:
@@ -157,9 +178,12 @@ The server includes comprehensive error handling for:
 - Invalid input parameters
 - Invalid CVE formats
 - Invalid CPE lookup parameters
+- Invalid date formats
+- Mutually exclusive parameter validation
 
 ## Version History
 
+- v1.0.7: Added CVEs by Product search functionality and renamed vulnerabilities tool to cve_lookup
 - v1.0.6: Added CVEDB integration for enhanced CVE lookups and CPE search functionality
 - v1.0.0: Initial release with core functionality
 

package/build/index.js

@@ -41,7 +41,7 @@ const SearchArgsSchema = z.object({
         .default(10)
         .describe("Maximum results to return."),
 });
-const VulnerabilitiesArgsSchema = z.object({
+const CVELookupArgsSchema = z.object({
     cve: z.string()
         .regex(/^CVE-\d{4}-\d{4,}$/i, "Must be a valid CVE ID format (e.g., CVE-2021-44228)")
         .describe("The CVE identifier to query (format: CVE-YYYY-NNNNN)."),
@@ -55,6 +55,17 @@ const CpeLookupArgsSchema = z.object({
     skip: z.number().optional().default(0).describe("Number of CPEs to skip (for pagination)."),
     limit: z.number().optional().default(1000).describe("Maximum number of CPEs to return (max 1000)."),
 });
+const CVEsByProductArgsSchema = z.object({
+    cpe23: z.string().optional().describe("The CPE version 2.3 identifier (format: cpe:2.3:part:vendor:product:version)."),
+    product: z.string().optional().describe("The name of the product to search for CVEs."),
+    count: z.boolean().optional().default(false).describe("If true, returns only the count of matching CVEs."),
+    is_kev: z.boolean().optional().default(false).describe("If true, returns only CVEs with the KEV flag set."),
+    sort_by_epss: z.boolean().optional().default(false).describe("If true, sorts CVEs by EPSS score in descending order."),
+    skip: z.number().optional().default(0).describe("Number of CVEs to skip (for pagination)."),
+    limit: z.number().optional().default(1000).describe("Maximum number of CVEs to return (max 1000)."),
+    start_date: z.string().optional().describe("Start date for filtering CVEs (format: YYYY-MM-DDTHH:MM:SS)."),
+    end_date: z.string().optional().describe("End date for filtering CVEs (format: YYYY-MM-DDTHH:MM:SS).")
+}).refine(data => !(data.cpe23 && data.product), { message: "Cannot specify both cpe23 and product. Use only one." }).refine(data => data.cpe23 || data.product, { message: "Must specify either cpe23 or product." });
 // Helper Function to Query Shodan API
 async function queryShodan(endpoint, params) {
     try {
@@ -101,6 +112,20 @@ async function queryCPEDB(params) {
         throw new Error(`CVEDB API error: ${error.message}`);
     }
 }
+// Helper Function for CVEs by product/CPE lookups using CVEDB
+async function queryCVEsByProduct(params) {
+    try {
+        logToFile(`Querying CVEDB for CVEs with params: ${JSON.stringify(params)}`);
+        const response = await axios.get(`${CVEDB_API_URL}/cves`, { params });
+        return response.data;
+    }
+    catch (error) {
+        if (error.response?.status === 422) {
+            throw new Error(`Invalid parameters: ${error.response.data?.detail || error.message}`);
+        }
+        throw new Error(`CVEDB API error: ${error.message}`);
+    }
+}
 // Server Setup
 const server = new Server({
     name: "shodan-mcp",
@@ -126,7 +151,7 @@ server.setRequestHandler(InitializeRequestSchema, async (request) => {
             name: "shodan-mcp",
             version: "1.0.0",
         },
-        instructions: "This server provides tools for querying Shodan, including IP lookups, searches, vulnerabilities, and CPE lookups.",
+        instructions: "This server provides tools for querying Shodan, including IP lookups, searches, CVE lookups, CPE lookups, and CVE searches by product/CPE.",
     };
 });
 // Register Tools
@@ -143,9 +168,9 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             inputSchema: zodToJsonSchema(SearchArgsSchema),
         },
         {
-            name: "vulnerabilities",
+            name: "cve_lookup",
             description: "Retrieve vulnerability information for a CVE. Use format: CVE-YYYY-NNNNN (e.g., CVE-2021-44228)",
-            inputSchema: zodToJsonSchema(VulnerabilitiesArgsSchema),
+            inputSchema: zodToJsonSchema(CVELookupArgsSchema),
         },
         {
             name: "dns_lookup",
@@ -157,6 +182,11 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             description: "Search for Common Platform Enumeration (CPE) entries by product name.",
             inputSchema: zodToJsonSchema(CpeLookupArgsSchema),
         },
+        {
+            name: "cves_by_product",
+            description: "Search for CVEs affecting a specific product or CPE. Provide either product name or CPE 2.3 identifier.",
+            inputSchema: zodToJsonSchema(CVEsByProductArgsSchema),
+        },
     ];
     logToFile("Registered tools.");
     return { tools };
@@ -200,12 +230,12 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     ],
                 };
             }
-            case "vulnerabilities": {
-                const parsedVulnArgs = VulnerabilitiesArgsSchema.safeParse(args);
-                if (!parsedVulnArgs.success) {
+            case "cve_lookup": {
+                const parsedCveArgs = CVELookupArgsSchema.safeParse(args);
+                if (!parsedCveArgs.success) {
                     throw new Error("Invalid CVE format. Please use format: CVE-YYYY-NNNNN (e.g., CVE-2021-44228)");
                 }
-                const cveId = parsedVulnArgs.data.cve.toUpperCase();
+                const cveId = parsedCveArgs.data.cve.toUpperCase();
                 logToFile(`Looking up CVE: ${cveId}`);
                 try {
                     const result = await queryCVEDB(cveId);
@@ -308,6 +338,61 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     };
                 }
             }
+            case "cves_by_product": {
+                const parsedArgs = CVEsByProductArgsSchema.safeParse(args);
+                if (!parsedArgs.success) {
+                    throw new Error("Invalid arguments. Must provide either cpe23 or product name, but not both.");
+                }
+                try {
+                    const result = await queryCVEsByProduct({
+                        cpe23: parsedArgs.data.cpe23,
+                        product: parsedArgs.data.product,
+                        count: parsedArgs.data.count,
+                        is_kev: parsedArgs.data.is_kev,
+                        sort_by_epss: parsedArgs.data.sort_by_epss,
+                        skip: parsedArgs.data.skip,
+                        limit: parsedArgs.data.limit,
+                        start_date: parsedArgs.data.start_date,
+                        end_date: parsedArgs.data.end_date
+                    });
+                    // Format the response based on whether it's a count request or full CVE list
+                    const formattedResult = parsedArgs.data.count
+                        ? { total_cves: result.total }
+                        : {
+                            cves: result.cves,
+                            skip: parsedArgs.data.skip,
+                            limit: parsedArgs.data.limit,
+                            total_returned: result.cves.length,
+                            query_params: {
+                                cpe23: parsedArgs.data.cpe23,
+                                product: parsedArgs.data.product,
+                                is_kev: parsedArgs.data.is_kev,
+                                sort_by_epss: parsedArgs.data.sort_by_epss,
+                                start_date: parsedArgs.data.start_date,
+                                end_date: parsedArgs.data.end_date
+                            }
+                        };
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: JSON.stringify(formattedResult, null, 2),
+                            },
+                        ],
+                    };
+                }
+                catch (error) {
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: error.message,
+                            },
+                        ],
+                        isError: true,
+                    };
+                }
+            }
             default:
                 throw new Error(`Unknown tool: ${name}`);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@burtthecoder/mcp-shodan",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "A Model Context Protocol server for Shodan API queries.",
   "main": "./build/index.js",
   "bin": {