Thanks to visit codestin.com
Credit goes to Github.com

Skip to content

bundle-uri: validate that bundle entries have a uri #2134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sambostock wants to merge 1 commit into
base: master
Choose a base branch
from
+49 −1
Open

bundle-uri: validate that bundle entries have a uri #2134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 23 additions & 1 deletion bundle-uri.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ static int summarize_bundle(struct remote_bundle_info *info, void *data)
{
FILE *fp = data;
fprintf(fp, "[bundle \"%s\"]\n", info->id);
fprintf(fp, "\turi = %s\n", info->uri);
if (info->uri)
fprintf(fp, "\turi = %s\n", info->uri);
else
fprintf(fp, "\t# uri = (missing)\n");

if (info->creationToken)
fprintf(fp, "\tcreationToken = %"PRIu64"\n", info->creationToken);
Expand Down Expand Up @@ -267,6 +270,19 @@ int bundle_uri_parse_config_format(const char *uri,
result = 1;
}

if (!result) {
struct hashmap_iter iter;
struct remote_bundle_info *bundle;

hashmap_for_each_entry(&list->bundles, &iter, bundle, ent) {
if (!bundle->uri) {
error(_("bundle list at '%s': bundle '%s' has no uri"),
uri, bundle->id ? bundle->id : "<unknown>");
result = 1;
}
}
}

return result;
}

Expand Down Expand Up @@ -751,6 +767,12 @@ static int fetch_bundle_uri_internal(struct repository *r,
return -1;
}

if (!bundle->uri) {
error(_("bundle '%s' has no uri"),
bundle->id ? bundle->id : "<unknown>");
return -1;
}

if (!bundle->file &&
!(bundle->file = find_temp_filename())) {
result = -1;
Expand Down
26 changes: 26 additions & 0 deletions t/t5750-bundle-uri-parse.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,4 +286,30 @@ test_expect_success 'parse config format edge cases: creationToken heuristic' '
grep "could not parse bundle list key creationToken with value '\''bogus'\''" err
'

test_expect_success 'parse config format: bundle with missing uri' '
cat >input <<-\EOF &&
[bundle]
version = 1
mode = all
[bundle "missing-uri"]
creationToken = 1
EOF

test_must_fail test-tool bundle-uri parse-config input 2>err &&
grep "bundle '\''missing-uri'\'' has no uri" err
'

test_expect_success 'parse config format: bundle with url instead of uri' '
cat >input <<-\EOF &&
[bundle]
version = 1
mode = all
[bundle "typo"]
url = https://example.com/bundle.bdl
EOF

test_must_fail test-tool bundle-uri parse-config input 2>err &&
grep "bundle '\''typo'\'' has no uri" err
'

test_done
Loading