Add check if public key name has been used

diff --git a/models/publickey.go b/models/publickey.go
index bd0b7ee937a1a930836fb87231ba0ed199860c73..ee6bd5310184b263ad8d01d0fb5d2fcd8e65e747 100644 (file)
--- a/models/publickey.go
+++ b/models/publickey.go
@@ -67,11 +67,23 @@ type PublicKey struct {
        Updated     time.Time `xorm:"updated"`
 }
 
+var (
+       ErrKeyAlreadyExist = errors.New("Public key already exist")
+)
+
 func GenAuthorizedKey(keyId int64, key string) string {
        return fmt.Sprintf(tmplPublicKey, appPath, keyId, key)
 }
 
 func AddPublicKey(key *PublicKey) (err error) {
+       // Check if public key name has been used.
+       has, err := orm.Get(key)
+       if err != nil {
+               return err
+       } else if has {
+               return ErrKeyAlreadyExist
+       }
+
        // Calculate fingerprint.
        tmpPath := filepath.Join(os.TempDir(), fmt.Sprintf("%d", time.Now().Nanosecond()),
                "id_rsa.pub")

diff --git a/routers/user/setting.go b/routers/user/setting.go
index cd12bb6296d887d2f833daf76ddcae3425c5ea06..91e992b18efaac4e805a4189da0563c3b838ffb6 100644 (file)
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -128,6 +128,10 @@ func SettingSSHKeys(ctx *middleware.Context, form auth.AddSSHKeyForm) {
                }
 
                if err := models.AddPublicKey(k); err != nil {
+                       if err.Error() == models.ErrKeyAlreadyExist.Error() {
+                               ctx.RenderWithErr("Public key name has been used", "user/publickey", &form)
+                               return
+                       }
                        ctx.Handle(200, "ssh.AddPublicKey", err)
                        return
                } else {