mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-12 15:44:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(editor): Update git repo url validation regex (#7151)

Browse source
This commit is contained in:
Csaba Tuncsik 2023-09-11 20:54:03 +02:00 committed by GitHub
parent fd800b674b
commit e51f173608
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/editor-ui/src/views/SettingsSourceControl.vue
View file

@ -122,7 +122,8 @@ const repoUrlValidationRules: Array<Rule | RuleGroup> = [
{ {
name: 'MATCH_REGEX', name: 'MATCH_REGEX',
config: { config: {
regex: /^(?!https?:\/\/)(?:git|ssh|git@[-\w.]+):(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$/, regex:
/^git@(?:\[[0-9a-fA-F:]+\]|(?:[a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+)(?::[0-9]+)*:(?:v[0-9]+\/)?[a-zA-Z0-9_.\-\/]+(\.git)?(?:\/[a-zA-Z0-9_.\-\/]+)*$/,
message: locale.baseText('settings.sourceControl.repoUrlInvalid'), message: locale.baseText('settings.sourceControl.repoUrlInvalid'),
}, },
}, },

45
packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
View file

@ -128,4 +128,49 @@ describe('SettingsSourceControl', () => {
expect(queryByTestId('source-control-connected-content')).not.toBeInTheDocument(), expect(queryByTestId('source-control-connected-content')).not.toBeInTheDocument(),
); );
}, 10000); }, 10000);
describe('should test repo URLs', () => {
beforeEach(() => {
settingsStore.settings.enterprise[EnterpriseEditionFeature.SourceControl] = true;
});
test.each([
['git@github.com:user/repository.git', true],
['git@github.enterprise.com:org-name/repo-name.git', true],
['git@192.168.1.101:2222:user/repo.git', true],
['git@github.com:user/repo.git/path/to/subdir', true],
// The opening bracket in curly braces makes sure it is not treated as a special character by the 'user-event' library
['git@{[}2001:db8:100:f101:210:a4ff:fee3:9566]:user/repo.git', true],
['git@github.com:org/suborg/repo.git', true],
['git@github.com:user-name/repo-name.git', true],
['git@github.com:user_name/repo_name.git', true],
['git@github.com:user/repository', true],
['git@github.enterprise.com:org-name/repo-name', true],
['git@192.168.1.101:2222:user/repo', true],
['git@ssh.dev.azure.com:v3/User/repo/directory', true],
['http://github.com/user/repository', false],
['https://github.com/user/repository', false],
])('%s', async (url: string, isValid: boolean) => {
await nextTick();
const { container, queryByText } = renderComponent({
pinia,
});
await waitFor(() => expect(sourceControlStore.preferences.publicKey).not.toEqual(''));
const repoUrlInput = container.querySelector('input[name="repoUrl"]')!;
await userEvent.click(repoUrlInput);
await userEvent.type(repoUrlInput, url);
await userEvent.tab();
const inputError = expect(queryByText('The Git repository URL is not valid'));
if (isValid) {
inputError.not.toBeInTheDocument();
} else {
inputError.toBeInTheDocument();
}
});
});
}); });