jostreff/wireguard-ui
1
0
Fork 0
mirror of https://github.com/ngoduykhanh/wireguard-ui.git synced 2025-04-21 20:12:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

hash passwords in json file

Browse source 
Signed-off-by: Mitaka Jin <jin@mitaka.nl>
This commit is contained in:
Mitaka Jin 2020-12-12 11:30:53 +01:00
parent 68058a356e
commit 1ce08cfe40
3 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
handler/routes.go
View file

@ -9,6 +9,8 @@ import (
rice "github.com/GeertJohan/go.rice" rice "github.com/GeertJohan/go.rice"
"golang.org/x/crypto/bcrypt"
"github.com/gorilla/sessions" "github.com/gorilla/sessions"
"github.com/labstack/echo-contrib/session" "github.com/labstack/echo-contrib/session"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
@ -37,7 +39,15 @@ func Login() echo.HandlerFunc {
return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot query user from DB"}) return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot query user from DB"})
} }
if user.Username == dbuser.Username && user.Password == dbuser.Password { // Check if the username matches
if user.Username != dbuser.Username {
return c.JSON(http.StatusUnauthorized, jsonHTTPResponse(false, "Invalid credentials"))
}
if err := bcrypt.CompareHashAndPassword(dbuser.Password, user.Password); err != nil {
return c.JSON(http.StatusUnauthorized, jsonHTTPResponse(false, "Invalid credentials"))
}
// TODO: refresh the token // TODO: refresh the token
sess, _ := session.Get("session", c) sess, _ := session.Get("session", c)
sess.Options = &sessions.Options{ sess.Options = &sessions.Options{
@ -61,9 +71,6 @@ func Login() echo.HandlerFunc {
return c.JSON(http.StatusOK, jsonHTTPResponse{true, "Logged in successfully"}) return c.JSON(http.StatusOK, jsonHTTPResponse{true, "Logged in successfully"})
} }
return c.JSON(http.StatusUnauthorized, jsonHTTPResponse{false, "Invalid credentials"})
}
} }
// Logout to log a user out // Logout to log a user out

6
util/db.go
View file

@ -11,6 +11,7 @@ import (
"github.com/ngoduykhanh/wireguard-ui/model" "github.com/ngoduykhanh/wireguard-ui/model"
"github.com/sdomino/scribble" "github.com/sdomino/scribble"
"github.com/skip2/go-qrcode" "github.com/skip2/go-qrcode"
"golang.org/x/crypto/bcrypt"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
) )
@ -113,7 +114,10 @@ func InitDB() error {
user := new(model.User) user := new(model.User)
user.Username = defaultUsername user.Username = defaultUsername
user.Password = defaultPassword user.Password, err = bcrypt.GenerateFromPassword(defaultPassword, bcrypt.MaxCost)
if err != nil {
return err
}
db.Write("server", "users", user) db.Write("server", "users", user)
} }