Update mock management to support external file server #1243
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
chore
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Adding validation to the user defined file path for external file server to stop possible traversal attacks. Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
craigell
approved these changes
Sep 8, 2025
dhurley
reviewed
Sep 9, 2025
| defaultExternalFileServer, externalFileServerErr := generateDefaultExternalFileSevrevDirectory() | ||
| externalFileServer = &defaultExternalFileServer | ||
| if externalFileServerErr != nil { | ||
| slog.ErrorContext(ctx, "Failed to create default config directory", "error", err) |
There was a problem hiding this comment.
Suggested change
| slog.ErrorContext(ctx, "Failed to create default config directory", "error", err) | |
| slog.ErrorContext(ctx, "Failed to create external file server directory", "error", err) |
|
|
||
| err := os.MkdirAll(externalFileServer, directoryPermissions) | ||
| if err != nil { | ||
| slog.Error("Failed to create external file server directory", "error", err) |
There was a problem hiding this comment.
No need to log error message here his error returned is already being logged above
| @@ -469,3 +536,33 @@ func createFile(fullPath, filePath string) (*mpi.File, error) { | |||
| func isValidFile(info os.FileInfo, fileFullPath string) bool { | |||
| return !info.IsDir() && !strings.HasSuffix(fileFullPath, ".DS_Store") | |||
| } | |||
|
|
|||
| func processConfigApplyRequestBody(c *gin.Context, initialFiles []*mpi.File) ([]*mpi.File, bool, error) { | |||
There was a problem hiding this comment.
The initialFiles won't have any external files in the list so I think you need to append to the list instead of updating an entry in the list
aphralG
reviewed
Sep 9, 2025
| @@ -359,7 +378,17 @@ func (cs *CommandService) addConfigApplyEndpoint() { | |||
| return | |||
| } | |||
|
|
|||
| cs.instanceFiles[instanceID] = configFiles | |||
| updatedConfigFiles, externalFilesWereUpdated, err := processConfigApplyRequestBody(c, configFiles) | |||
There was a problem hiding this comment.
Suggested change
| updatedConfigFiles, externalFilesWereUpdated, err := processConfigApplyRequestBody(c, configFiles) | |
| updatedConfigFiles, externalFilesUpdated, err := processConfigApplyRequestBody(c, configFiles) |
| cs.instanceFiles[instanceID] = configFiles | ||
| updatedConfigFiles, externalFilesWereUpdated, err := processConfigApplyRequestBody(c, configFiles) | ||
| if err != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) |
There was a problem hiding this comment.
Just out of curiosity why gin.H{"error": err.Error()} instead of just err ?
| c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid file name"}) | ||
| return | ||
| } | ||
| if !strings.HasPrefix(absFile, absBase) { |
There was a problem hiding this comment.
Could the checking if the file is valid be put in a separate function ?
| return | ||
| } | ||
| filePath := filepath.Join(cs.externalFileServer, filename) | ||
| absBase, err := filepath.Abs(cs.externalFileServer) |
There was a problem hiding this comment.
Could this check be done in NewCommandService
| c.File(absFile) | ||
| }) | ||
|
|
||
| slog.Info("Serving individual external files from", "directory", cs.externalFileServer) |
There was a problem hiding this comment.
Suggested change
| slog.Info("Serving individual external files from", "directory", cs.externalFileServer) | |
| slog.Info("Serving individual external files from", "external_file_server", cs.externalFileServer) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
Updated Mock Management Plane to support testing for a feature where the Agent should be able to fetch a file from a URL.
Have added a new endpoint that can be used as an external file server.
Updated the config apply endpoint, which can now handle a POST API request containing JSON to specify external file locations.
Checklist
Before creating a PR, run through this checklist and mark each as complete.
CONTRIBUTINGdocumentmake install-toolsand have attached any dependency changes to this pull requestREADME.md)