michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

optimize<GitURL>: use regex to validate git repository urls

Browse source
This commit is contained in:
leo 2023-06-02 10:29:43 +08:00
parent a39b44ea2e
commit 611d3c7db0
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Views/Clone.xaml.cs
View file

@ -2,6 +2,7 @@
using SourceGit.Views.Validations; using SourceGit.Views.Validations;
using System; using System;
using System.IO; using System.IO;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
@ -12,6 +13,10 @@ namespace SourceGit.Views {
/// 克隆 /// 克隆
/// </summary> /// </summary>
public partial class Clone : Controls.Window { public partial class Clone : Controls.Window {
private static readonly Regex[] SSH_PROTOCOAL = new Regex[] {
new Regex(@"[\w\-]+@[\w\.\-]+(\:[0-9]+)?/[\w\-]+/[\w\-]+\.git$"),
new Regex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-]+/[\w\-]+\.git$"),
};
public string Uri { get; set; } public string Uri { get; set; }
public string Folder { get; set; } public string Folder { get; set; }
@ -112,13 +117,16 @@ namespace SourceGit.Views {
} }
private void OnUrlChanged(object sender, TextChangedEventArgs e) { private void OnUrlChanged(object sender, TextChangedEventArgs e) {
if (!string.IsNullOrEmpty(txtUrl.Text)) { foreach (var check in SSH_PROTOCOAL) {
rowSSHKey.Height = new GridLength(txtUrl.Text.StartsWith("git@") ? 32 : 0, GridUnitType.Pixel); if (check.IsMatch(txtUrl.Text)) {
} else { rowSSHKey.Height = new GridLength(32, GridUnitType.Pixel);
rowSSHKey.Height = new GridLength(0, GridUnitType.Pixel); return;
} }
} }
rowSSHKey.Height = new GridLength(0, GridUnitType.Pixel);
}
private void OnCloseException(object s, RoutedEventArgs e) { private void OnCloseException(object s, RoutedEventArgs e) {
exception.Visibility = Visibility.Collapsed; exception.Visibility = Visibility.Collapsed;
e.Handled = true; e.Handled = true;

22
src/Views/Validations/GitURL.cs
View file

@ -1,19 +1,25 @@
using System;
using System.Globalization; using System.Globalization;
using System.Text.RegularExpressions;
using System.Windows.Controls; using System.Windows.Controls;
namespace SourceGit.Views.Validations { namespace SourceGit.Views.Validations {
public class GitURL : ValidationRule { public class GitURL : ValidationRule {
private static readonly Regex[] VALID_FORMATS = new Regex[] {
new Regex(@"^http[s]?://[\w\.\-]+(\:[0-9]+)?/[\w\-]+/[\w\-]+\.git$"),
new Regex(@"[\w\-]+@[\w\.\-]+(\:[0-9]+)?/[\w\-]+/[\w\-]+\.git$"),
new Regex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-]+/[\w\-]+\.git$"),
};
public override ValidationResult Validate(object value, CultureInfo cultureInfo) { public override ValidationResult Validate(object value, CultureInfo cultureInfo) {
string url = value as string; string url = value as string;
bool valid = !string.IsNullOrEmpty(url) if (!string.IsNullOrEmpty(url)) {
&& (url.StartsWith("http://", StringComparison.Ordinal) foreach (var format in VALID_FORMATS) {
|| url.StartsWith("https://", StringComparison.Ordinal) if (format.IsMatch(url)) return ValidationResult.ValidResult;
|| url.StartsWith("git@", StringComparison.Ordinal) }
|| url.StartsWith("file://", StringComparison.Ordinal) }
|| url.StartsWith("ssh://", StringComparison.Ordinal));
return valid ? ValidationResult.ValidResult : new ValidationResult(false, App.Text("BadRemoteUri")); return new ValidationResult(false, App.Text("BadRemoteUri")); ;
} }
} }
} }