NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 20:17:03 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

Mirror fix on public key

Browse source
This commit is contained in:
Unknown 2014-04-27 17:01:39 -04:00
parent 62240b6bc1
commit 41b0a7b97c
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
models/publickey.go
View file

@ -77,12 +77,12 @@ func init() {
// PublicKey represents a SSH key of user. // PublicKey represents a SSH key of user.
type PublicKey struct { type PublicKey struct {
Id int64 Id int64
OwnerId int64 `xorm:"unique(s) index not null"` OwnerId int64 `xorm:"UNIQUE(s) INDEX NOT NULL"`
Name string `xorm:"unique(s) not null"` Name string `xorm:"UNIQUE(s) NOT NULL"`
Fingerprint string Fingerprint string
Content string `xorm:"TEXT not null"` Content string `xorm:"TEXT NOT NULL"`
Created time.Time `xorm:"created"` Created time.Time `xorm:"CREATED"`
Updated time.Time `xorm:"updated"` Updated time.Time `xorm:"UPDATED"`
} }
// GenAuthorizedKey returns formatted public key string. // GenAuthorizedKey returns formatted public key string.
@ -107,9 +107,9 @@ func AddPublicKey(key *PublicKey) (err error) {
if err = ioutil.WriteFile(tmpPath, []byte(key.Content), os.ModePerm); err != nil { if err = ioutil.WriteFile(tmpPath, []byte(key.Content), os.ModePerm); err != nil {
return err return err
} }
stdout, _, err := com.ExecCmd("ssh-keygen", "-l", "-f", tmpPath) stdout, stderr, err := com.ExecCmd("ssh-keygen", "-l", "-f", tmpPath)
if err != nil { if err != nil {
return err return errors.New("ssh-keygen -l -f: " + stderr)
} else if len(stdout) < 2 { } else if len(stdout) < 2 {
return errors.New("Not enough output for calculating fingerprint") return errors.New("Not enough output for calculating fingerprint")
} }

3
routers/user/setting.go
View file

@ -166,7 +166,8 @@ func SettingSSHKeys(ctx *middleware.Context, form auth.AddSSHKeyForm) {
return return
} }
k := &models.PublicKey{OwnerId: ctx.User.Id, k := &models.PublicKey{
OwnerId: ctx.User.Id,
Name: form.KeyName, Name: form.KeyName,
Content: form.KeyContent, Content: form.KeyContent,
} }