Skip to content

fix: validate customGitUrl to prevent command injection via command substitution #4676

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
gsmatheus wants to merge 1 commit into
base: canary
Choose a base branch
from
+28 −1
Open

fix: validate customGitUrl to prevent command injection via command substitution #4676

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
9 changes: 8 additions & 1 deletion packages/server/src/db/schema/application.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { VALID_BRANCH_REGEX } from "@dokploy/server/utils/git-branch-validation";
import { VALID_GIT_URL_REGEX } from "@dokploy/server/utils/git-url-validation";
import { relations } from "drizzle-orm";
import {
bigint,
Expand Down Expand Up @@ -512,7 +513,13 @@ export const apiSaveGitProvider = createSchema
enableSubmodules: true,
})
.required()
.extend({ customGitBranch: branchField })
.extend({
customGitBranch: branchField,
customGitUrl: z
.string()
.min(1)
.refine(VALID_GIT_URL_REGEX, "Invalid Git URL"),
})
.merge(
createSchema.pick({
customGitSSHKeyId: true,
Expand Down
20 changes: 20 additions & 0 deletions packages/server/src/utils/git-url-validation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Valid git URL patterns for HTTPS and SSH clone URLs.
// Rejects shell metacharacters that would enable command injection.
//
// HTTPS examples accepted:
// https://github.com/owner/repo.git
// http://gitlab.example.com/group/subgroup/repo.git
//
// SSH examples accepted:
// git@github.com:owner/repo.git
// ssh://git@gitlab.com:22/owner/repo.git
// git@gitea.example.com:owner/repo.git
//
// Rejected: $(...), `...`, ;, |, &, <, >, newlines, spaces outside of SSH scheme
const HTTPS_GIT_URL_REGEX = /^https?:\/\/[^\s;|&$`(){}[\]<>'"\\]+$/;
const SSH_GIT_URL_REGEX =
/^(?:ssh:\/\/)?[a-zA-Z_][a-zA-Z0-9_-]*@[a-zA-Z0-9.-]+(?::\d{1,5})?:[^\s;|&$`(){}[\]<>'"\\]+$/;

export const VALID_GIT_URL_REGEX = (url: string): boolean => {
return HTTPS_GIT_URL_REGEX.test(url) || SSH_GIT_URL_REGEX.test(url);
};