use raw repo URIs for resources

SamMorrowDrums · SamMorrowDrums · commit afcb99c1f8f7 · 2025-04-02T17:40:53.000+02:00
diff --git a/pkg/github/repository_resource.go b/pkg/github/repository_resource.go
@@ -4,7 +4,10 @@ import (
 	"context"
 	"encoding/base64"
 	"errors"
+	"fmt"
+	"io"
 	"mime"
+	"net/http"
 	"path/filepath"
 	"strings"
 
@@ -113,6 +116,7 @@ func repositoryResourceContentsHandler(client *github.Client) func(ctx context.C
 			for _, entry := range directoryContent {
 				mimeType := "text/directory"
 				if entry.GetType() == "file" {
+					// this is system dependent, and a best guess
 					mimeType = mime.TypeByExtension(filepath.Ext(entry.GetName()))
 				}
 				resources = append(resources, mcp.TextResourceContents{
@@ -127,28 +131,59 @@ func repositoryResourceContentsHandler(client *github.Client) func(ctx context.C
 		}
 		if fileContent != nil {
 			if fileContent.Content != nil {
-				decodedContent, err := fileContent.GetContent()
+				// download the file content from fileContent.GetDownloadURL() and use the content-type header to determine the MIME type
+				// and return the content as a blob unless it is a text file, where you can return the content as text
+				req, err := http.NewRequest("GET", fileContent.GetDownloadURL(), nil)
 				if err != nil {
-					return nil, err
+					return nil, fmt.Errorf("failed to create request: %w", err)
 				}
 
-				mimeType := mime.TypeByExtension(filepath.Ext(fileContent.GetName()))
+				resp, err := client.Client().Do(req)
+				if err != nil {
+					return nil, fmt.Errorf("failed to send request: %w", err)
+				}
+				defer func() { _ = resp.Body.Close() }()
+
+				if resp.StatusCode != http.StatusOK {
+					body, err := io.ReadAll(resp.Body)
+					if err != nil {
+						return nil, fmt.Errorf("failed to read response body: %w", err)
+					}
+					return nil, fmt.Errorf("failed to get security analysis settings: %s", string(body))
+				}
+
+				mimeType := resp.Header.Get("Content-Type")
+				if mimeType == "" {
+					// backstop to the file extension if the content type is not set
+					mime.TypeByExtension(filepath.Ext(fileContent.GetName()))
+				}
 
+				// if the content is a string, return it as text
 				if strings.HasPrefix(mimeType, "text") {
+					content, err := io.ReadAll(resp.Body)
+					if err != nil {
+						return nil, fmt.Errorf("failed to parse the response body: %w", err)
+					}
+
 					return []mcp.ResourceContents{
 						mcp.TextResourceContents{
 							URI:      request.Params.URI,
 							MIMEType: mimeType,
-							Text:     decodedContent,
+							Text:     string(content),
 						},
 					}, nil
 				}
+				// otherwise, read the content and encode it as base64
+				decodedContent, err := io.ReadAll(resp.Body)
+				if err != nil {
+					return nil, fmt.Errorf("failed to parse the response body: %w", err)
+				}
 
 				return []mcp.ResourceContents{
 					mcp.BlobResourceContents{
 						URI:      request.Params.URI,
 						MIMEType: mimeType,
-						Blob:     base64.StdEncoding.EncodeToString([]byte(decodedContent)), // Encode content as Base64
+						Blob:     base64.StdEncoding.EncodeToString(decodedContent), // Encode content as Base64
 					},
 				}, nil
 			}
