Fix delete SSH key in file

This commit is contained in:
Unknown 2014-03-16 05:24:13 -04:00
parent 8de9517862
commit ab747f2790
6 changed files with 138 additions and 9 deletions

View File

@ -3,8 +3,8 @@ RUN_USER = lunny
[repository] [repository]
ROOT = /Users/%(RUN_USER)s/git/gogs-repositories ROOT = /Users/%(RUN_USER)s/git/gogs-repositories
LANG_IGNS=Google Go|C|Python LANG_IGNS=Google Go|C|Python|Ruby
LICENSES=Apache v2 License|GPL v2|BSD (3-Clause) License LICENSES=Apache v2 License|GPL v2|MIT License|BSD (3-Clause) License
[server] [server]
HTTP_ADDR = HTTP_ADDR =

18
conf/gitignore/Ruby Normal file
View File

@ -0,0 +1,18 @@
*.gem
*.rbc
.bundle
.config
coverage
InstalledFiles
lib/bundler/man
pkg
rdoc
spec/reports
test/tmp
test/version_tmp
tmp
# YARD artifacts
.yardoc
_yardoc
doc/

21
conf/license/MIT License Normal file
View File

@ -0,0 +1,21 @@
The MIT License (MIT)
Copyright (c) 2014
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -1,21 +1,30 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package models package models
import ( import (
"bufio"
"fmt" "fmt"
"io"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strings"
"sync"
"time" "time"
"github.com/Unknwon/com" "github.com/Unknwon/com"
) )
var ( var (
sshOpLocker = sync.Mutex{}
//publicKeyRootPath string //publicKeyRootPath string
sshPath string sshPath string
appPath string appPath string
tmplPublicKey = "### autogenerated by gitgos, DO NOT EDIT\n" + // "### autogenerated by gitgos, DO NOT EDIT\n"
"command=\"%s serv key-%d\",no-port-forwarding," + tmplPublicKey = "command=\"%s serv key-%d\",no-port-forwarding," +
"no-X11-forwarding,no-agent-forwarding,no-pty %s\n" "no-X11-forwarding,no-agent-forwarding,no-pty %s\n"
) )
@ -77,9 +86,69 @@ func AddPublicKey(key *PublicKey) error {
return nil return nil
} }
func DeletePublicKey(key *PublicKey) error { // DeletePublicKey deletes SSH key information both in database and authorized_keys file.
_, err := orm.Delete(key) func DeletePublicKey(key *PublicKey) (err error) {
return err if _, err = orm.Delete(key); err != nil {
return err
}
sshOpLocker.Lock()
defer sshOpLocker.Unlock()
p := filepath.Join(sshPath, "authorized_keys")
tmpP := filepath.Join(sshPath, "authorized_keys.tmp")
fr, err := os.Open(p)
if err != nil {
return err
}
defer fr.Close()
fw, err := os.Create(tmpP)
if err != nil {
return err
}
defer fw.Close()
buf := bufio.NewReader(fr)
for {
line, errRead := buf.ReadString('\n')
line = strings.TrimSpace(line)
if errRead != nil {
if errRead != io.EOF {
return errRead
}
// Reached end of file, if nothing to read then break,
// otherwise handle the last line.
if len(line) == 0 {
break
}
}
// Found the line and copy rest of file.
if strings.Contains(line, key.Content) {
if _, err = io.Copy(fw, fr); err != nil {
return err
}
break
}
// Still finding the line, copy the line that currently read.
if _, err = fw.WriteString(line + "\n"); err != nil {
return err
}
if errRead == io.EOF {
break
}
}
if err = os.Remove(p); err != nil {
return err
}
return os.Rename(tmpP, p)
} }
func ListPublicKey(userId int64) ([]PublicKey, error) { func ListPublicKey(userId int64) ([]PublicKey, error) {
@ -89,11 +158,16 @@ func ListPublicKey(userId int64) ([]PublicKey, error) {
} }
func SaveAuthorizedKeyFile(key *PublicKey) error { func SaveAuthorizedKeyFile(key *PublicKey) error {
sshOpLocker.Lock()
defer sshOpLocker.Unlock()
p := filepath.Join(sshPath, "authorized_keys") p := filepath.Join(sshPath, "authorized_keys")
f, err := os.OpenFile(p, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600) f, err := os.OpenFile(p, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
if err != nil { if err != nil {
return err return err
} }
defer f.Close()
//os.Chmod(p, 0600) //os.Chmod(p, 0600)
_, err = f.WriteString(GenAuthorizedKey(key.Id, key.Content)) _, err = f.WriteString(GenAuthorizedKey(key.Id, key.Content))
return err return err

View File

@ -142,6 +142,7 @@ func UpdateUser(user *User) (err error) {
// DeleteUser completely deletes everything of the user. // DeleteUser completely deletes everything of the user.
func DeleteUser(user *User) error { func DeleteUser(user *User) error {
// Check ownership of repository.
count, err := GetRepositoryCount(user) count, err := GetRepositoryCount(user)
if err != nil { if err != nil {
return errors.New("modesl.GetRepositories: " + err.Error()) return errors.New("modesl.GetRepositories: " + err.Error())
@ -151,6 +152,17 @@ func DeleteUser(user *User) error {
// TODO: check issues, other repos' commits // TODO: check issues, other repos' commits
// Delete SSH keys.
keys := make([]PublicKey, 0, 10)
if err = orm.Find(&keys, &PublicKey{OwnerId: user.Id}); err != nil {
return err
}
for _, key := range keys {
if err = DeletePublicKey(&key); err != nil {
return err
}
}
_, err = orm.Delete(user) _, err = orm.Delete(user)
// TODO: delete and update follower information. // TODO: delete and update follower information.
return err return err

View File

@ -1,3 +1,7 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package repo package repo
import ( import (