From bee1227b2f64d33ecbb0c5972ffc1b7d9689f95f Mon Sep 17 00:00:00 2001 From: zeripath Date: Fri, 16 Aug 2019 22:56:57 +0100 Subject: [PATCH] Extract the username and password from the mirror url (#7651) * Explode out mirror username and password * Update models/repo_mirror.go * Just roundtrip the password * remove unused declaration * Update templates/repo/settings/options.tmpl --- models/repo_mirror.go | 38 +++++++++++++++++++++++++++- modules/auth/repo_form.go | 16 +++++++----- options/locale/locale_en-US.ini | 2 +- routers/repo/setting.go | 4 +++ templates/repo/settings/options.tmpl | 19 +++++++++++++- 5 files changed, 69 insertions(+), 10 deletions(-) diff --git a/models/repo_mirror.go b/models/repo_mirror.go index 7f703a1c9..02c87daf6 100644 --- a/models/repo_mirror.go +++ b/models/repo_mirror.go @@ -7,6 +7,7 @@ package models import ( "fmt" + "net/url" "strings" "time" @@ -119,7 +120,7 @@ func sanitizeOutput(output, repoPath string) (string, error) { return util.SanitizeMessage(output, remoteAddr), nil } -// Address returns mirror address from Git repository config without credentials. +// Address returns mirror address from Git repository config with credentials censored. func (m *Mirror) Address() string { m.readAddress() return util.SanitizeURLCredentials(m.address, false) @@ -131,6 +132,41 @@ func (m *Mirror) FullAddress() string { return m.address } +// AddressNoCredentials returns mirror address from Git repository config without credentials. +func (m *Mirror) AddressNoCredentials() string { + m.readAddress() + u, err := url.Parse(m.address) + if err != nil { + // this shouldn't happen but just return it unsanitised + return m.address + } + u.User = nil + return u.String() +} + +// Username returns the mirror address username +func (m *Mirror) Username() string { + m.readAddress() + u, err := url.Parse(m.address) + if err != nil { + // this shouldn't happen but if it does return "" + return "" + } + return u.User.Username() +} + +// Password returns the mirror address password +func (m *Mirror) Password() string { + m.readAddress() + u, err := url.Parse(m.address) + if err != nil { + // this shouldn't happen but if it does return "" + return "" + } + password, _ := u.User.Password() + return password +} + // SaveAddress writes new address to Git repository config. func (m *Mirror) SaveAddress(addr string) error { repoPath := m.Repo.RepoPath() diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 0333c3c92..cdac210dd 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -98,13 +98,15 @@ func (f MigrateRepoForm) ParseRemoteAddr(user *models.User) (string, error) { // RepoSettingForm form for changing repository settings type RepoSettingForm struct { - RepoName string `binding:"Required;AlphaDashDot;MaxSize(100)"` - Description string `binding:"MaxSize(255)"` - Website string `binding:"ValidUrl;MaxSize(255)"` - Interval string - MirrorAddress string - Private bool - EnablePrune bool + RepoName string `binding:"Required;AlphaDashDot;MaxSize(100)"` + Description string `binding:"MaxSize(255)"` + Website string `binding:"ValidUrl;MaxSize(255)"` + Interval string + MirrorAddress string + MirrorUsername string + MirrorPassword string + Private bool + EnablePrune bool // Advanced settings EnableWiki bool diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 0df7cdf7e..fb86d5490 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -584,7 +584,7 @@ mirror_prune_desc = Remove obsolete remote-tracking references mirror_interval = Mirror Interval (valid time units are 'h', 'm', 's'). 0 to disable automatic sync. mirror_interval_invalid = The mirror interval is not valid. mirror_address = Clone From URL -mirror_address_desc = Include any required authorization credentials in the URL. These must be url escaped as appropriate +mirror_address_desc = Put any required credentials in the Clone Authorization section. mirror_address_url_invalid = The provided url is invalid. You must escape all components of the url correctly. mirror_address_protocol_invalid = The provided url is invalid. Only http(s):// or git:// locations can be mirrored from. mirror_last_synced = Last Synchronized diff --git a/routers/repo/setting.go b/routers/repo/setting.go index c9ecb6302..38c6ecf56 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -169,6 +169,10 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { return } + if form.MirrorUsername != "" || form.MirrorPassword != "" { + u.User = url.UserPassword(form.MirrorUsername, form.MirrorPassword) + } + // Now use xurls address := validFormAddress.FindString(form.MirrorAddress) if address != form.MirrorAddress && form.MirrorAddress != "" { diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index c6d715acb..87e23b693 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -80,9 +80,26 @@
- +

{{.i18n.Tr "repo.mirror_address_desc"}}

+
+ +
+
+ + +
+ +
+ + +
+
+