Skip to content
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

Jump to bottom

[ssh] fix the config specification in the authorized_keys template #8031

Merged
merged 5 commits into from
Sep 15, 2019
Merged

[ssh] fix the config specification in the authorized_keys template #8031

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbd1f8c
[ssh] fix the config specification in the authorized_keys template
das7pad Jun 18, 2019
68e6ee6
Merge branch 'master' into hotfix-authorized-keys-config
das7pad Sep 7, 2019
46809d5
Merge branch 'master' into hotfix-authorized-keys-config
lunny Sep 15, 2019
11732df
Merge branch 'master' into hotfix-authorized-keys-config
lunny Sep 15, 2019
e2ab867
Merge branch 'master' into hotfix-authorized-keys-config
lunny Sep 15, 2019
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
4 changes: 2 additions & 2 deletions models/ssh_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (

const (
tplCommentPrefix = `# gitea public key`
tplPublicKey = tplCommentPrefix + "\n" + `command="%s serv key-%d --config='%s'",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n"
tplPublicKey = tplCommentPrefix + "\n" + `command="%s --config='%s' serv key-%d",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n"
)

var sshOpLocker sync.Mutex
Expand Down Expand Up @@ -81,7 +81,7 @@ func (key *PublicKey) OmitEmail() string {

// AuthorizedString returns formatted public key string for authorized_keys file.
func (key *PublicKey) AuthorizedString() string {
return fmt.Sprintf(tplPublicKey, setting.AppPath, key.ID, setting.CustomConf, key.Content)
return fmt.Sprintf(tplPublicKey, setting.AppPath, setting.CustomConf, key.ID, key.Content)
}

func extractTypeFromBase64Key(key string) (string, error) {
Expand Down