Skip to content

fix: extend validation for git URL in app source info model #71

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

Merged
biersoeckli merged 1 commit into from
Mar 12, 2026
Merged

fix: extend validation for git URL in app source info model #71

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
10 changes: 6 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
**Your Environment**
- Browser [e.g. chrome, safari]:
- QuickStack Version [e.g. 0.0.8]:
- Server OS [e.g. Ubuntu 20.04]:
- Server architecture [e.g. x86_64, arm64]:
- Server Storage Capacity [e.g. 40 GB]:

**Additional context**
Add any other context about the problem here.
13 changes: 11 additions & 2 deletions src/shared/model/app-source-info.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@ import { z } from "zod";
export const appSourceTypeZodModel = z.enum(["GIT", "CONTAINER"]);
export const appTypeZodModel = z.enum(["APP", "POSTGRES", "MYSQL", "MARIADB", "MONGODB", "REDIS"]);

const gitHttpsUrlRegex = /^https:\/\/[^\s/]+(?::\d+)?(\/[^\s]*)+$/;
const gitHubGitLabDotGitRegex = /^https:\/\/(github\.com|gitlab\.com)\//;
const gitUrlValidationMessage = 'Must be a valid HTTPS git URL. For GitHub/GitLab the .git suffix is required (e.g. https://github.com/user/repo.git)';
const gitUrlValidation = (val: string) => {
if (!gitHttpsUrlRegex.test(val)) return false;
if (gitHubGitLabDotGitRegex.test(val) && !val.endsWith('.git')) return false;
return true;
};

export const appSourceInfoGitZodModel = z.object({
gitUrl: z.string().trim(),
gitUrl: z.string().trim().refine(gitUrlValidation, gitUrlValidationMessage),
gitBranch: z.string().trim(),
gitUsername: z.string().trim().nullish(),
gitToken: z.string().trim().nullish(),
Expand All @@ -25,7 +34,7 @@ export const appSourceInfoInputZodModel = z.object({
containerRegistryUsername: z.string().nullish(),
containerRegistryPassword: z.string().nullish(),

gitUrl: z.string().trim().nullish(),
gitUrl: z.string().trim().refine((val) => !val || gitUrlValidation(val), gitUrlValidationMessage).nullish(),
gitBranch: z.string().trim().nullish(),
gitUsername: z.string().trim().nullish(),
gitToken: z.string().trim().nullish(),
Expand Down