Potential fix for #388 #389
Merged
+195
−769
Conversation
This file contains 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
Refactor ollama to be lazy loaded, and moved stuff around
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| process = subprocess.Popen(cmd, shell=True) | ||
| return f"Started Ollama server for model {model_name} on port {port}. Process ID: {process.pid}" | ||
| cmd = ['ollama', 'serve', model_name, '--port', str(port)] | ||
| process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
Check failure
Code scanning / CodeQL
Uncontrolled command line Critical
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix AI about 3 hours ago
To fix the problem, we need to ensure that the model_name and port parameters are validated against a predefined allowlist of acceptable values. This will prevent arbitrary command execution by ensuring only known, safe commands are executed.
- Define an allowlist: Create a list of valid model names that the application supports.
- Validate user input: Before constructing the command, check if the
model_nameis in the allowlist. If not, return an error message. - Sanitize the port: Ensure the port is a valid integer within an acceptable range.
Suggested changeset
1
App_Function_Libraries/Local_LLM/Local_LLM_ollama.py
| @@ -77,2 +77,4 @@ | ||
|
|
||
| VALID_MODELS = ["model1", "model2", "model3"] # Replace with actual model names | ||
|
|
||
| def serve_ollama_model(model_name, port): | ||
| @@ -85,2 +87,6 @@ | ||
|
|
||
| if model_name not in VALID_MODELS: | ||
| logging.error(f"Invalid model name: {model_name}") | ||
| return f"Error: Invalid model name '{model_name}'." | ||
|
|
||
| try: | ||
| @@ -103,3 +109,2 @@ | ||
| return f"Error starting Ollama server: {e}" | ||
|
|
||
| def stop_ollama_server(pid): |
Copilot is powered by AI and may make mistakes. Always verify output.
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.
Refactor ollama to be lazy loaded, and moved stuff around