Skip to content

feat(gitclone): support Codeberg URLs and ssh:// protocol format #2

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
drewr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(gitclone): support Codeberg URLs and ssh:// protocol format #2

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
107 changes: 79 additions & 28 deletions src/gitclone.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ fn reportParseError(err: UrlParseError) void {
std.debug.print("\n", .{});
std.debug.print("Valid URL formats:\n", .{});
std.debug.print(" SSH: git@github.com:org/repo.git\n", .{});
std.debug.print(" SSH: ssh://git@github.com/org/repo.git\n", .{});
std.debug.print(" HTTPS: https://github.com/org/repo.git\n", .{});
std.debug.print(" HTTP: http://github.com/org/repo.git\n", .{});
std.debug.print("\n", .{});
Expand All @@ -153,43 +154,33 @@ pub fn parseGitUrl(allocator: mem.Allocator, url: []const u8) !GitUrl {
return error.InvalidUrl;
}

// Handle SSH URLs: git@github.com:org/repo.git
if (mem.indexOf(u8, url, "@")) |at_pos| {
// Validate user part is not empty (@ cannot be at the beginning)
if (at_pos == 0) {
reportParseError(.{
.reason = "SSH format missing user",
.url = url,
.detected_format = "SSH",
.expected = "git@host:org/repo",
});
return error.InvalidUrl;
}

const colon_pos = mem.lastIndexOf(u8, url, ":");
// Handle SSH protocol URLs: ssh://git@github.com/org/repo.git
// Must come before SCP-style SSH check since ssh:// URLs also contain '@'
if (mem.startsWith(u8, url, "ssh://")) {
const after_protocol = url["ssh://".len..];
const slash_pos = mem.indexOf(u8, after_protocol, "/");

if (colon_pos == null) {
const host_part = url[at_pos + 1 ..];
if (slash_pos == null) {
reportParseError(.{
.reason = "SSH format missing colon separator",
.reason = "Missing path after hostname",
.url = url,
.detected_format = "SSH (git@...)",
.found_at = host_part,
.expected = "git@host:org/repo",
.detected_format = "SSH (ssh://)",
.found_at = after_protocol,
.expected = "ssh://host/org/repo",
});
return error.InvalidUrl;
}

const host = url[at_pos + 1 .. colon_pos.?];
const path = url[colon_pos.? + 1 ..];
const host = after_protocol[0..slash_pos.?];
const path = after_protocol[slash_pos.? + 1 ..];

// Validate host is not empty
if (host.len == 0) {
reportParseError(.{
.reason = "SSH format missing hostname",
.reason = "Missing hostname",
.url = url,
.detected_format = "SSH",
.expected = "git@host:org/repo",
.detected_format = "SSH (ssh://)",
.expected = "ssh://host/org/repo",
});
return error.InvalidUrl;
}
Expand All @@ -198,7 +189,7 @@ pub fn parseGitUrl(allocator: mem.Allocator, url: []const u8) !GitUrl {
reportParseError(.{
.reason = "Path missing org/repo separator",
.url = url,
.detected_format = "SSH (git@host:...)",
.detected_format = "SSH (ssh://)",
.found_at = path,
.expected = "org/repo or org/repo.git",
});
Expand All @@ -209,7 +200,7 @@ pub fn parseGitUrl(allocator: mem.Allocator, url: []const u8) !GitUrl {
reportParseError(.{
.reason = "Failed to parse org/repo from path",
.url = url,
.detected_format = "SSH",
.detected_format = "SSH (ssh://)",
.found_at = path,
.expected = "org/repo or org/repo.git",
});
Expand Down Expand Up @@ -284,10 +275,70 @@ pub fn parseGitUrl(allocator: mem.Allocator, url: []const u8) !GitUrl {
};
}

// Handle SCP-style SSH URLs: git@github.com:org/repo.git
if (mem.indexOf(u8, url, "@")) |at_pos| {
// Validate user part is not empty (@ cannot be at the beginning)
if (at_pos == 0) {
reportParseError(.{
.reason = "SSH format missing user",
.url = url,
.detected_format = "SSH",
.expected = "git@host:org/repo",
});
return error.InvalidUrl;
}

const colon_pos = mem.lastIndexOf(u8, url, ":") orelse {
reportParseError(.{
.reason = "SSH format missing colon separator",
.url = url,
.detected_format = "SSH (git@...)",
.expected = "git@host:org/repo",
});
return error.InvalidUrl;
};

const host = url[at_pos + 1 .. colon_pos];
const path = url[colon_pos + 1 ..];

// Validate host is not empty
if (host.len == 0) {
reportParseError(.{
.reason = "SSH format missing hostname",
.url = url,
.detected_format = "SSH",
.expected = "git@host:org/repo",
});
return error.InvalidUrl;
}

if (mem.indexOf(u8, path, "/") == null) {
reportParseError(.{
.reason = "Path missing org/repo separator",
.url = url,
.detected_format = "SSH (git@host:...)",
.found_at = path,
.expected = "org/repo or org/repo.git",
});
return error.InvalidUrl;
}

return parsePathComponent(allocator, path) catch |err| {
reportParseError(.{
.reason = "Failed to parse org/repo from path",
.url = url,
.detected_format = "SSH",
.found_at = path,
.expected = "org/repo or org/repo.git",
});
return err;
};
}

reportParseError(.{
.reason = "URL doesn't start with recognized protocol",
.url = url,
.expected = "git@... OR http://... OR https://...",
.expected = "git@... OR http://... OR https://... OR ssh://...",
});
return error.InvalidUrl;
}
Expand Down
56 changes: 56 additions & 0 deletions src/gitclone_test.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,42 @@ test "parse HTTPS URL with different domain" {
try testing.expectEqualStrings("project", result.repo);
}

test "parse SSH protocol URL (ssh://) with Codeberg" {
var arena = std.heap.ArenaAllocator.init(testing.allocator);
defer arena.deinit();
const allocator = arena.allocator();

const url = "ssh://git@codeberg.org/ziglang/zig.git";
const result = try parseGitUrl(allocator, url);

try testing.expectEqualStrings("ziglang", result.org);
try testing.expectEqualStrings("zig", result.repo);
}

test "parse HTTPS URL with Codeberg" {
var arena = std.heap.ArenaAllocator.init(testing.allocator);
defer arena.deinit();
const allocator = arena.allocator();

const url = "https://codeberg.org/ziglang/zig.git";
const result = try parseGitUrl(allocator, url);

try testing.expectEqualStrings("ziglang", result.org);
try testing.expectEqualStrings("zig", result.repo);
}

test "parse SSH protocol URL (ssh://) without .git suffix" {
var arena = std.heap.ArenaAllocator.init(testing.allocator);
defer arena.deinit();
const allocator = arena.allocator();

const url = "ssh://git@github.com/microsoft/vscode";
const result = try parseGitUrl(allocator, url);

try testing.expectEqualStrings("microsoft", result.org);
try testing.expectEqualStrings("vscode", result.repo);
}

// ============================================================================
// URL PARSING TESTS - Invalid Cases (Generative)
// ============================================================================
Expand Down Expand Up @@ -205,6 +241,7 @@ test "reject malformed protocol URLs" {
"git://github.com/org/repo",
"github.com://org/repo",
"http/github.com/org/repo",
"ssh://git@github.com:org/repo.git", // ssh:// with SCP-style colon path
};

for (invalid_urls) |url| {
Expand Down Expand Up @@ -663,6 +700,25 @@ test "reject HTTP URLs with protocol variations" {
}
}

test "reject SSH protocol URLs (ssh://) with missing components" {
var arena = std.heap.ArenaAllocator.init(testing.allocator);
defer arena.deinit();
const allocator = arena.allocator();

const bad_ssh_proto_urls = [_][]const u8{
"ssh://", // Only protocol
"ssh://github.com", // Missing path
"ssh://github.com/", // Missing org/repo
"ssh:///org/repo.git", // Missing host
"ssh://github.com/onlyrepo", // Missing org/repo separator
};

for (bad_ssh_proto_urls) |url| {
const result = parseGitUrl(allocator, url);
try testing.expectError(error.InvalidUrl, result);
}
}

test "reject URLs with special characters in org/repo names" {
var arena = std.heap.ArenaAllocator.init(testing.allocator);
defer arena.deinit();
Expand Down