khairul169/vaulterm
1
0
Fork 0
mirror of https://github.com/khairul169/vaulterm.git synced 2026-09-15 17:03:30 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add gitlab oauth, cleanup code

Browse Source
This commit is contained in:
khairul169
2024-11-17 19:49:42 +07:00
parent a6cc450ea7
commit 83d0ed380d
29 changed files with 297 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/auth/oauth_github.go
+8 -7
View File
@@ -16,21 +16,22 @@ import (
"rul.sh/vaulterm/server/utils"
)
var config *oauth2.Config
var githubCfg *oauth2.Config
func getGithubConfig() *oauth2.Config {
if config != nil {
return config
if githubCfg != nil {
return githubCfg
}
config = &oauth2.Config{
githubCfg = &oauth2.Config{
ClientID: os.Getenv("GITHUB_CLIENT_ID"),
ClientSecret: os.Getenv("GITHUB_CLIENT_SECRET"),
Endpoint: github.Endpoint,
RedirectURL: "http://localhost:3000/auth/oauth/github/callback",
Scopes: []string{"read:user"},
// RedirectURL: "http://localhost:3000/auth/oauth/github/callback",
RedirectURL: "http://localhost:8081",
Scopes: []string{"read:user"},
}
return config
return githubCfg
}
func githubRedir(c *fiber.Ctx) error {
server/app/auth/oauth_gitlab.go
+147
View File
@@ -0,0 +1,147 @@
package auth
import (
"encoding/json"
"errors"
"fmt"
"io"
"log"
"os"
"strconv"
"github.com/gofiber/fiber/v2"
"golang.org/x/oauth2"
"golang.org/x/oauth2/gitlab"
"gorm.io/gorm"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
type GitlabCfg struct {
oauth2.Config
verifier string
challenge string
}
var gitlabCfg *GitlabCfg
func getGitlabConfig() *GitlabCfg {
if gitlabCfg != nil {
return gitlabCfg
}
oauthCfg := oauth2.Config{
ClientID: os.Getenv("GITLAB_CLIENT_ID"),
ClientSecret: os.Getenv("GITLAB_CLIENT_SECRET"),
Endpoint: gitlab.Endpoint,
// RedirectURL: "http://localhost:3000/auth/oauth/gitlab/callback",
RedirectURL: "http://localhost:8081",
Scopes: []string{"read_user"},
}
verifier := oauth2.GenerateVerifier()
challenge := oauth2.S256ChallengeFromVerifier(verifier)
gitlabCfg = &GitlabCfg{
Config: oauthCfg,
verifier: verifier,
challenge: challenge,
}
return gitlabCfg
}
func gitlabRedir(c *fiber.Ctx) error {
// Redirect to Gitlab login page
url := getGitlabConfig().
AuthCodeURL("login", oauth2.S256ChallengeOption(getGitlabConfig().verifier))
return c.Redirect(url)
}
func gitlabCallback(c *fiber.Ctx) error {
cfg := getGitlabConfig()
code := c.Query("code")
verifier := c.Query("verifier")
if code == "" {
return c.Status(fiber.StatusBadRequest).SendString("Missing code")
}
if verifier == "" {
verifier = cfg.verifier
}
// Exchange code for a token
token, err := cfg.Exchange(c.Context(), code, oauth2.VerifierOption(verifier))
if err != nil {
log.Println(token, err)
return c.Status(fiber.StatusInternalServerError).SendString("Failed to exchange token")
}
// Retrieve user info
client := cfg.Client(c.Context(), token)
resp, err := client.Get("https://gitlab.com/api/v4/user")
if err != nil {
return c.Status(fiber.StatusInternalServerError).SendString("Failed to get user info")
}
defer resp.Body.Close()
body, _ := io.ReadAll(resp.Body)
if resp.StatusCode != 200 {
return c.Status(fiber.StatusInternalServerError).
SendString(fmt.Sprintf("Gitlab API error: %s", string(body)))
}
// Parse user info
var user struct {
Username string `json:"username"`
ID int `json:"id"`
Name string `json:"name"`
AvatarURL string `json:"avatar_url"`
Email string `json:"email"`
}
if err := json.Unmarshal(body, &user); err != nil {
return c.Status(fiber.StatusInternalServerError).SendString("Failed to parse user info")
}
repo := NewRepository()
accountId := strconv.Itoa(user.ID)
userAccount, err := repo.FindUserAccount("gitlab", accountId)
// Register the user if the account not yet registered
if errors.Is(err, gorm.ErrRecordNotFound) {
acc := models.UserAccount{
Type: "gitlab",
AccountID: accountId,
Username: user.Username,
Email: user.Email,
}
user := models.User{
Name: user.Name,
Role: models.UserRoleUser,
Image: user.AvatarURL,
Accounts: []*models.UserAccount{&acc},
}
sessionId, err := repo.CreateUser(&user)
if err != nil {
return utils.ResponseError(c, err, 500)
}
return c.JSON(fiber.Map{
"user": user,
"sessionId": sessionId,
})
}
if err != nil {
return utils.ResponseError(c, err, 500)
}
sessionId, err := repo.CreateUserSession(&userAccount.User)
if err != nil {
return utils.ResponseError(c, err, 500)
}
return c.JSON(fiber.Map{
"user": userAccount.User,
"sessionId": sessionId,
})
}
server/app/auth/repository.go
+2 -2
View File
@@ -3,8 +3,8 @@ package auth
import (
"gorm.io/gorm"
"rul.sh/vaulterm/server/db"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
type Auth struct{ db *gorm.DB }
@@ -30,7 +30,7 @@ func (r *Auth) FindUserAccount(accountType string, accountId string) (*models.Us
}
func (r *Auth) CreateUserSession(user *models.User) (string, error) {
sessionId, err := lib.GenerateSessionID(20)
sessionId, err := utils.GenerateSessionID(20)
if err != nil {
return "", err
}
server/app/auth/router.go
+7 -5
View File
@@ -19,6 +19,8 @@ func Router(app *fiber.App) {
oauth := router.Group("/oauth")
oauth.Get("/github", githubRedir)
oauth.Get("/github/callback", githubCallback)
oauth.Get("/gitlab", gitlabRedir)
oauth.Get("/gitlab/callback", gitlabCallback)
}
func login(c *fiber.Ctx) error {
@@ -40,7 +42,7 @@ func login(c *fiber.Ctx) error {
}
}
if valid := lib.VerifyPassword(body.Password, user.Password); !valid {
if valid := utils.VerifyPassword(body.Password, user.Password); !valid {
return &fiber.Error{
Code: fiber.StatusUnauthorized,
Message: "Username or password is invalid",
@@ -59,7 +61,7 @@ func login(c *fiber.Ctx) error {
}
func getUser(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
teams := []TeamWithRole{}
for _, item := range user.Teams {
@@ -96,15 +98,15 @@ func register(c *fiber.Ctx) error {
}
}
password, err := lib.HashPassword(body.Password)
password, err := utils.HashPassword(body.Password)
if err != nil {
return utils.ResponseError(c, err, 500)
}
user := &models.User{
Name: body.Name,
Username: body.Username,
Email: body.Email,
Username: &body.Username,
Email: &body.Email,
Password: password,
Role: models.UserRoleUser,
}
server/app/hosts/repository.go
+2 -2
View File
@@ -3,13 +3,13 @@ package hosts
import (
"gorm.io/gorm"
"rul.sh/vaulterm/server/db"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
type Hosts struct {
db *gorm.DB
User *utils.UserContext
User *lib.UserContext
}
func NewRepository(r *Hosts) *Hosts {
server/app/hosts/router.go
+6 -5
View File
@@ -7,6 +7,7 @@ import (
"strings"
"github.com/gofiber/fiber/v2"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
@@ -25,7 +26,7 @@ func getAll(c *fiber.Ctx) error {
teamId := c.Query("teamId")
parentId := c.Query("parentId")
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
if teamId != "" && !user.IsInTeam(&teamId) {
@@ -48,7 +49,7 @@ func create(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
if body.TeamID != nil && !user.TeamCanWrite(body.TeamID) {
@@ -87,7 +88,7 @@ func update(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
id := c.Params("id")
@@ -126,7 +127,7 @@ func update(c *fiber.Ctx) error {
}
func delete(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
id := c.Params("id")
@@ -149,7 +150,7 @@ func delete(c *fiber.Ctx) error {
}
func move(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
// validate request
server/app/hosts/utils.go
+1 -2
View File
@@ -7,11 +7,10 @@ import (
"rul.sh/vaulterm/server/app/keychains"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
func tryConnect(c *fiber.Ctx, host *models.Host) (string, error) {
user := utils.GetUser(c)
user := lib.GetUser(c)
keyRepo := keychains.NewRepository(&keychains.Keychains{User: user})
var key map[string]interface{}
server/app/keychains/repository.go
+2 -2
View File
@@ -3,13 +3,13 @@ package keychains
import (
"gorm.io/gorm"
"rul.sh/vaulterm/server/db"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
type Keychains struct {
db *gorm.DB
User *utils.UserContext
User *lib.UserContext
}
func NewRepository(r *Keychains) *Keychains {
server/app/keychains/router.go
+4 -3
View File
@@ -5,6 +5,7 @@ import (
"net/http"
"github.com/gofiber/fiber/v2"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
@@ -26,7 +27,7 @@ func getAll(c *fiber.Ctx) error {
teamId := c.Query("teamId")
withData := c.Query("withData")
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Keychains{User: user})
if teamId != "" && !user.IsInTeam(&teamId) {
@@ -69,7 +70,7 @@ func create(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Keychains{User: user})
if body.TeamID != nil && !user.TeamCanWrite(body.TeamID) {
@@ -100,7 +101,7 @@ func update(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Keychains{User: user})
id := c.Params("id")
server/app/server/router.go
+2 -1
View File
@@ -22,8 +22,9 @@ func getServerInfo(c *fiber.Ctx) error {
func getConfig(c *fiber.Ctx) error {
config := fiber.Map{
"oauth": "github",
"oauth": os.Getenv("OAUTH_ENABLED"),
"github_client_id": os.Getenv("GITHUB_CLIENT_ID"),
"gitlab_client_id": os.Getenv("GITLAB_CLIENT_ID"),
}
return c.JSON(config)
}
server/app/teams/members/repository.go
+2 -2
View File
@@ -4,13 +4,13 @@ import (
"gorm.io/gorm"
"gorm.io/gorm/clause"
"rul.sh/vaulterm/server/db"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
type TeamMembers struct {
db *gorm.DB
User *utils.UserContext
User *lib.UserContext
}
func NewRepository(r *TeamMembers) *TeamMembers {
server/app/teams/members/router.go
+5 -4
View File
@@ -6,6 +6,7 @@ import (
"github.com/gofiber/fiber/v2"
"rul.sh/vaulterm/server/app/teams"
"rul.sh/vaulterm/server/app/users"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
@@ -20,7 +21,7 @@ func Router(app fiber.Router) {
}
// func getAll(c *fiber.Ctx) error {
// user := utils.GetUser(c)
// user := lib.GetUser(c)
// repo := NewRepository(&TeamMembers{User: user})
// rows, err := repo.GetAll()
@@ -37,7 +38,7 @@ func invite(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
teamRepo := teams.NewRepository(&teams.Teams{User: user})
repo := NewRepository(&TeamMembers{User: user})
@@ -70,7 +71,7 @@ func setRole(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
teamRepo := teams.NewRepository(&teams.Teams{User: user})
repo := NewRepository(&TeamMembers{User: user})
@@ -103,7 +104,7 @@ func setRole(c *fiber.Ctx) error {
}
func remove(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
teamRepo := teams.NewRepository(&teams.Teams{User: user})
repo := NewRepository(&TeamMembers{User: user})
server/app/teams/repository.go
+2 -2
View File
@@ -3,13 +3,13 @@ package teams
import (
"gorm.io/gorm"
"rul.sh/vaulterm/server/db"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
type Teams struct {
db *gorm.DB
User *utils.UserContext
User *lib.UserContext
}
func NewRepository(r *Teams) *Teams {
server/app/teams/router.go
+6 -5
View File
@@ -5,6 +5,7 @@ import (
"net/http"
"github.com/gofiber/fiber/v2"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
@@ -22,7 +23,7 @@ func Router(app fiber.Router) fiber.Router {
}
func getAll(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
rows, err := repo.GetAll()
@@ -34,7 +35,7 @@ func getAll(c *fiber.Ctx) error {
}
func getById(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
id := c.Params("id")
@@ -52,7 +53,7 @@ func create(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
item := &models.Team{
@@ -73,7 +74,7 @@ func update(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
id := c.Params("id")
@@ -98,7 +99,7 @@ func update(c *fiber.Ctx) error {
}
func delete(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
id := c.Params("id")
server/app/users/repository.go
+2 -2
View File
@@ -3,13 +3,13 @@ package users
import (
"gorm.io/gorm"
"rul.sh/vaulterm/server/db"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
type Users struct {
db *gorm.DB
User *utils.UserContext
User *lib.UserContext
}
func NewRepository(r *Users) *Users {
server/app/ws/stats/stats.go
+1 -2
View File
@@ -5,13 +5,12 @@ import (
"rul.sh/vaulterm/server/app/hosts"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
func HandleStats(c *websocket.Conn) {
hostId := c.Query("hostId")
user := utils.GetUserWs(c)
user := lib.GetUserWs(c)
hostRepo := hosts.NewRepository(&hosts.Hosts{User: user})
data, _ := hostRepo.GetWithKeys(hostId)
server/app/ws/term/term.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
func HandleTerm(c *websocket.Conn) {
hostId := c.Query("hostId")
user := utils.GetUserWs(c)
user := lib.GetUserWs(c)
hostRepo := hosts.NewRepository(&hosts.Hosts{User: user})
data, err := hostRepo.GetWithKeys(hostId)