Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

fix: crash if invalid url is set #2142

Merged
merged 5 commits into from
Mar 19, 2025
Merged

fix: crash if invalid url is set #2142

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2b1880
fix: crash if invalid url is set
sangjanai Mar 18, 2025
56283d3
Merge branch 'dev' into s/fix/pull
vansangpfiev Mar 18, 2025
b3da82c
Merge branch 'dev' of https://github.com/janhq/cortex.cpp into s/fix/…
sangjanai Mar 19, 2025
42fa968
fix: validation for hf
sangjanai Mar 19, 2025
437afb7
Merge branch 's/fix/pull' of https://github.com/janhq/cortex.cpp into…
sangjanai Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions engine/services/model_service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,20 @@ cpp::result<DownloadTask, std::string> ModelService::HandleDownloadUrlAsync(
const std::string& url, std::optional<std::string> temp_model_id,
std::optional<std::string> temp_name) {
auto url_obj = url_parser::FromUrlString(url);
if (url_obj.has_error()) {
return cpp::fail("Invalid url: " + url);
if (url_obj.has_error() || url_obj->pathParams.size() < 5) {
return cpp::fail(
"Invalid url: " + url +
", a valid URL example is: "
"https://huggingface.co/cortexso/tinyllama/blob/1b/model.gguf");
}

if (url_obj->host == kHuggingFaceHost) {
if (url_obj->pathParams[2] == "blob") {
url_obj->pathParams[2] = "resolve";
}
} else {
return cpp::fail("Only support pull model from " +
std::string(kHuggingFaceHost));
}
auto author{url_obj->pathParams[0]};
auto model_id{url_obj->pathParams[1]};
Expand All @@ -243,10 +249,6 @@ cpp::result<DownloadTask, std::string> ModelService::HandleDownloadUrlAsync(
return DownloadModelFromCortexsoAsync(model_id, url_obj->pathParams[3]);
}

if (url_obj->pathParams.size() < 5) {
return cpp::fail("Invalid url: " + url);
}

std::string huggingFaceHost{kHuggingFaceHost};
std::string unique_model_id = "";
if (temp_model_id.has_value()) {
Expand Down Expand Up @@ -798,13 +800,19 @@ cpp::result<ModelPullInfo, std::string> ModelService::GetModelPullInfo(

if (string_utils::StartsWith(input, "https://")) {
auto url_obj = url_parser::FromUrlString(input);
if (url_obj.has_error()) {
return cpp::fail("Invalid url: " + input);
if (url_obj.has_error() || url_obj->pathParams.size() < 5) {
return cpp::fail(
"Invalid url: " + input +
", a valid URL example is: "
"https://huggingface.co/cortexso/tinyllama/blob/1b/model.gguf");
}
if (url_obj->host == kHuggingFaceHost) {
if (url_obj->pathParams[2] == "blob") {
url_obj->pathParams[2] = "resolve";
}
} else {
return cpp::fail("Only support pull model from " +
std::string(kHuggingFaceHost));
}

auto author{url_obj->pathParams[0]};
Expand Down
Loading