diff --git a/models/publickey.go b/models/publickey.go index 49863d8c..ea5af881 100644 --- a/models/publickey.go +++ b/models/publickey.go @@ -77,6 +77,12 @@ func AddPublicKey(key *PublicKey) error { return nil } +func ListPublicKey(userId int64) ([]PublicKey, error) { + keys := make([]PublicKey, 0) + err := orm.Find(&keys, &PublicKey{OwnerId: userId}) + return keys, err +} + func SaveAuthorizedKeyFile(key *PublicKey) error { p := filepath.Join(sshPath, "authorized_keys") f, err := os.OpenFile(p, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600) diff --git a/routers/user/ssh.go b/routers/user/ssh.go index 7b5a1d32..9e9cf009 100644 --- a/routers/user/ssh.go +++ b/routers/user/ssh.go @@ -11,26 +11,46 @@ import ( "github.com/martini-contrib/render" "github.com/gogits/gogs/models" + "github.com/martini-contrib/sessions" ) -func AddPublicKey(req *http.Request, r render.Render) { +func AddPublicKey(req *http.Request, r render.Render, session sessions.Session) { if req.Method == "GET" { r.HTML(200, "user/publickey_add", map[string]interface{}{ - "Title": "Add Public Key", + "Title": "Add Public Key", + "IsSigned": IsSignedIn(session), }) return } - k := &models.PublicKey{OwnerId: 1, + k := &models.PublicKey{OwnerId: SignedInId(session), Name: req.FormValue("keyname"), Content: req.FormValue("key_content"), } err := models.AddPublicKey(k) if err != nil { r.HTML(403, "status/403", map[string]interface{}{ - "Title": fmt.Sprintf("%v", err), + "Title": fmt.Sprintf("%v", err), + "IsSigned": IsSignedIn(session), }) } else { r.HTML(200, "user/publickey_added", map[string]interface{}{}) } } + +func ListPublicKey(req *http.Request, r render.Render, session sessions.Session) { + keys, err := models.ListPublicKey(SignedInId(session)) + if err != nil { + r.HTML(200, "base/error", map[string]interface{}{ + "Error": fmt.Sprintf("%v", err), + "IsSigned": IsSignedIn(session), + }) + return + } + + r.HTML(200, "user/publickey_list", map[string]interface{}{ + "Title": "repositories", + "Keys": keys, + "IsSigned": IsSignedIn(session), + }) +} diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl index 323759ba..565fb30c 100644 --- a/templates/base/navbar.tmpl +++ b/templates/base/navbar.tmpl @@ -10,7 +10,7 @@ - + {{else}}Sign in{{end}} diff --git a/templates/user/publickey_add.tmpl b/templates/user/publickey_add.tmpl index 5ab25b72..b6757d1f 100644 --- a/templates/user/publickey_add.tmpl +++ b/templates/user/publickey_add.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}} {{template "base/navbar" .}} -