Merge pull request #28 from 09577/master

[FIX] fix remove users and [ADD] The jumpers support public key login

config/config.go

@@ -36,6 +36,7 @@ type User struct {
 	Username   string `yaml:"username"`
 	HashPasswd string `yaml:"hashPasswd"`
 	Admin      bool   `yaml:"admin"`
+	PublicKey  string `yaml:"publickey"`
 }
 
 // Server server
@@ -100,12 +101,13 @@ func (c *Config) SaveTo(path string) error {
 }
 
 // AddUser add user to config
-func (c *Config) AddUser(username string, password string, IsAdmin bool) (string, *User) {
+func (c *Config) AddUser(username string, password string, IsAdmin bool, pubKey string) (string, *User) {
 	// Todo Add sha256 password
 	user := &User{
 		Username:   username,
 		HashPasswd: password,
 		Admin:      IsAdmin,
+		PublicKey:  pubKey,
 	}
 	userAmount := len(*c.Users) + 1
 	log.Printf("Add user, user amount: %d", userAmount)

core/pui/menu.go

@@ -82,7 +82,7 @@ func init() {
 				Label: "Delete user",
 				GetSubMenu: GetUsersMenu(
 					func(index int, menuItem *MenuItem, sess *ssh.Session, selectedChain []*MenuItem) error {
-						userKey := fmt.Sprintf("user%d", index+1)
+						userKey := fmt.Sprintf("users%d", index+1)
 						user := (*config.Conf.Users)[userKey]
 						if user == nil {
 							return fmt.Errorf("Key '%s' of user not existed. ", userKey)

core/pui/user.go

@@ -4,6 +4,8 @@ import (
 	"errors"
 	"fmt"
 	"sort"
+	"io/ioutil"
+	"encoding/base64"
 
 	"github.com/TNK-Studio/gortal/config"
 	"github.com/TNK-Studio/gortal/utils"
@@ -78,6 +80,31 @@ func CreateUser(showAdminSelect bool, isAdmin bool, sess *ssh.Session) (*string,
 		return nil, nil, err
 	}
 
+	publicKeyPui := promptui.Prompt{
+		Label: "Your publicKey's position: ",
+		Validate: MultiValidate([]func(string) error{
+			func(input string) error {
+				if !utils.FileExited(input) {
+					return errors.New("File not found")
+				}
+				return nil
+			},
+		}),
+		Stdin:  stdio,
+		Stdout: stdio,
+	}
+
+	publicKeyPos, err := publicKeyPui.Run()
+	if err != nil {
+		return nil, nil, err
+	}
+	publicKeyFile, err := ioutil.ReadFile(utils.FilePath(publicKeyPos))
+	if err != nil {
+		logger.Logger.Warningf("Error reading publicKey file: %s\n", err)
+		return nil, nil, err
+	}
+	publicKeyBase64:= base64.StdEncoding.EncodeToString(publicKeyFile)
+
 	IsAdminString := ""
 	if showAdminSelect && !isAdmin {
 		adminPui := promptui.Prompt{
@@ -97,7 +124,7 @@ func CreateUser(showAdminSelect bool, isAdmin bool, sess *ssh.Session) (*string,
 	if isAdmin {
 		logger.Logger.Info("Create a admin user")
 	}
-	key, user := config.Conf.AddUser(username, passwd, isAdmin)
+	key, user := config.Conf.AddUser(username, passwd, isAdmin, publicKeyBase64)
 	return &key, user, nil
 }
 

main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"time"
+	"encoding/base64"
 
 	"github.com/TNK-Studio/gortal/config"
 	"github.com/TNK-Studio/gortal/core/jump"
@@ -40,6 +41,22 @@ func passwordAuth(ctx ssh.Context, pass string) bool {
 	return success
 }
 
+func publickKeyAuth(ctx ssh.Context, key ssh.PublicKey) bool {
+	var pub string
+
+	config.Conf.ReadFrom(*config.ConfPath)
+	username := ctx.User()
+	for _, user := range *config.Conf.Users {
+		if user.Username == username  {
+			pub = user.PublicKey
+		}
+	}
+	decodeBytes, _ := base64.StdEncoding.DecodeString(pub)
+	allowed, _, _, _, _ := ssh.ParseAuthorizedKey(decodeBytes)
+
+	return ssh.KeysEqual(key, allowed)
+}
+
 func sessionHandler(sess *ssh.Session) {
 	defer func() {
 		(*sess).Close()
@@ -90,6 +107,7 @@ func main() {
 		fmt.Sprintf(":%d", *Port),
 		nil,
 		ssh.PasswordAuth(passwordAuth),
+		ssh.PublicKeyAuth(publickKeyAuth),
 		ssh.HostKeyFile(utils.FilePath(*hostKeyFile)),
 	),
 	)