6 Commits

Author SHA1 Message Date
4ffaabd6e6 added log on failure to attach
Some checks failed
Build and Push Docker Image / Build image (push) Has been cancelled
2025-04-09 16:45:18 +03:00
c647f76894 removed container attach thingy 2025-04-09 16:20:34 +03:00
c1c5d23f92 plz
Some checks failed
Build and Push Docker Image / Build image (push) Has been cancelled
2025-04-09 04:14:08 +03:00
4263647288 plz
Some checks failed
Build and Push Docker Image / Build image (push) Has been cancelled
2025-04-09 04:05:04 +03:00
f1919d0602 fix signup logic
Some checks failed
Build and Push Docker Image / Build image (push) Has been cancelled
2025-04-09 03:59:32 +03:00
440896ec69 fixed invite bug
Some checks failed
Build and Push Docker Image / Build image (push) Has been cancelled
2025-04-09 03:34:05 +03:00
3 changed files with 32 additions and 29 deletions

View File

@@ -84,13 +84,13 @@ func (con *AuthApi) LoggedIn(ctx *gin.Context) {
} }
type SignUpRequest struct { type SignUpRequest struct {
Token string Username string `json:"username"`
Username string Password string `json:"password"`
Password string
} }
func (con AuthApi) signUp(ctx *gin.Context) { func (con AuthApi) signUp(ctx *gin.Context) {
var request SignUpRequest var request SignUpRequest
rawToken := ctx.Query("token")
err := json.NewDecoder(ctx.Request.Body).Decode(&request) err := json.NewDecoder(ctx.Request.Body).Decode(&request)
if err != nil { if err != nil {
@@ -98,7 +98,7 @@ func (con AuthApi) signUp(ctx *gin.Context) {
return return
} }
token, err := con.tokenHandler.GetInviteToken(ctx, request.Token) token, err := con.tokenHandler.GetInviteToken(ctx, rawToken)
if err != nil { if err != nil {
ctx.AbortWithError(500, err) ctx.AbortWithError(500, err)
return return
@@ -119,8 +119,8 @@ func (con AuthApi) signUp(ctx *gin.Context) {
} }
type SignInRequest struct { type SignInRequest struct {
Username string Username string `json:"username"`
Password string Password string `json:"password"`
} }
func (con AuthApi) signIn(ctx *gin.Context) { func (con AuthApi) signIn(ctx *gin.Context) {

View File

@@ -25,8 +25,8 @@ type UserPassAuthenticationDbHandler struct {
collection *mongo.Collection collection *mongo.Collection
} }
func (self *UserPassAuthenticationDbHandler) ListUsers(ctx context.Context) ([]models.User, error) { func (i *UserPassAuthenticationDbHandler) ListUsers(ctx context.Context) ([]models.User, error) {
cursor, err := self.collection.Find(ctx, bson.M{}) cursor, err := i.collection.Find(ctx, bson.M{})
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -49,9 +49,9 @@ func (self *UserPassAuthenticationDbHandler) ListUsers(ctx context.Context) ([]m
return modelUsers, nil return modelUsers, nil
} }
func (self *UserPassAuthenticationDbHandler) AuthenticateUser(ctx context.Context, username string, password string) (*models.User, error) { func (i *UserPassAuthenticationDbHandler) AuthenticateUser(ctx context.Context, username string, password string) (*models.User, error) {
var user AuthUser var user AuthUser
err := self.collection.FindOne(ctx, bson.M{"username": username}).Decode(&user) err := i.collection.FindOne(ctx, bson.M{"username": username}).Decode(&user)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -70,7 +70,7 @@ func (self *UserPassAuthenticationDbHandler) AuthenticateUser(ctx context.Contex
}, nil }, nil
} }
func (self *UserPassAuthenticationDbHandler) CreateUser( func (i *UserPassAuthenticationDbHandler) CreateUser(
ctx context.Context, ctx context.Context,
username string, username string,
password string, password string,
@@ -83,7 +83,7 @@ func (self *UserPassAuthenticationDbHandler) CreateUser(
return err return err
} }
_, err = self.collection.InsertOne(ctx, &AuthUser{ _, err = i.collection.InsertOne(ctx, &AuthUser{
Username: username, Username: username,
HashedPassword: hashedPassword, HashedPassword: hashedPassword,
Permissions: permissions, Permissions: permissions,
@@ -94,16 +94,16 @@ func (self *UserPassAuthenticationDbHandler) CreateUser(
return err return err
} }
func (self *UserPassAuthenticationDbHandler) CountUsers(ctx context.Context) (uint, error) { func (i *UserPassAuthenticationDbHandler) CountUsers(ctx context.Context) (uint, error) {
count, err := self.collection.CountDocuments(ctx, bson.M{}) count, err := i.collection.CountDocuments(ctx, bson.M{})
if err != nil { if err != nil {
return 0, err return 0, err
} }
return uint(count), nil return uint(count), nil
} }
func (self *UserPassAuthenticationDbHandler) RemoveUser(ctx context.Context, username string) error { func (i *UserPassAuthenticationDbHandler) RemoveUser(ctx context.Context, username string) error {
_, err := self.collection.DeleteOne( _, err := i.collection.DeleteOne(
ctx, ctx,
bson.M{ bson.M{
"username": username, "username": username,
@@ -113,12 +113,12 @@ func (self *UserPassAuthenticationDbHandler) RemoveUser(ctx context.Context, use
return err return err
} }
func (self *UserPassAuthenticationDbHandler) SetPermissions( func (i *UserPassAuthenticationDbHandler) SetPermissions(
ctx context.Context, ctx context.Context,
username string, username string,
permissions models.Permission, permissions models.Permission,
) error { ) error {
_, err := self.collection.UpdateOne( _, err := i.collection.UpdateOne(
ctx, ctx,
bson.M{ bson.M{
"username": username, "username": username,
@@ -155,10 +155,10 @@ type InviteTokenDbHandler struct {
collection *mongo.Collection collection *mongo.Collection
} }
func (self *ServersDbHandler) SaveInviteToken(ctx context.Context, email string, permissions models.Permission) (string, error) { func (i *InviteTokenDbHandler) SaveInviteToken(ctx context.Context, email string, permissions models.Permission) (string, error) {
token := uuid.NewString() token := uuid.NewString()
_, err := self.collection.InsertOne(ctx, &InviteToken{ _, err := i.collection.InsertOne(ctx, &InviteToken{
Permissions: permissions, Permissions: permissions,
Email: email, Email: email,
Token: token, Token: token,
@@ -170,9 +170,9 @@ func (self *ServersDbHandler) SaveInviteToken(ctx context.Context, email string,
return token, nil return token, nil
} }
func (self *ServersDbHandler) GetInviteToken(ctx context.Context, token string) (*dbhandler.InviteToken, error) { func (i *InviteTokenDbHandler) GetInviteToken(ctx context.Context, token string) (*dbhandler.InviteToken, error) {
var inviteToken InviteToken var inviteToken InviteToken
err := self.collection.FindOne(ctx, bson.M{"token": token}).Decode(&inviteToken) err := i.collection.FindOne(ctx, bson.M{"token": token}).Decode(&inviteToken)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -3,6 +3,7 @@ package kubernetes
import ( import (
"context" "context"
"io" "io"
"log"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@@ -250,22 +251,24 @@ func (i *InstanceManager) InteractiveTerminal(ctx context.Context, serverId stri
req := i.coreV1Cli.CoreV1().RESTClient(). req := i.coreV1Cli.CoreV1().RESTClient().
Post(). Post().
Resource("pods"). Resource("pods").
Namespace(i.Config.Namespace).
Name(serverId). Name(serverId).
Namespace(i.Config.Namespace).
SubResource("attach"). SubResource("attach").
VersionedParams(&corev1.PodAttachOptions{ VersionedParams(&corev1.PodAttachOptions{
Container: "server", Stdin: true,
Stdin: true, Stdout: true,
Stdout: true, Stderr: true,
Stderr: true, TTY: true,
TTY: true,
}, clientgoscheme.ParameterCodec) }, clientgoscheme.ParameterCodec)
executor, err := remotecommand.NewSPDYExecutor(i.restCfg, "POST", req.URL()) executor, err := remotecommand.NewSPDYExecutor(i.restCfg, "POST", req.URL())
go func() { go func() {
defer stdoutWriter.Close() defer stdoutWriter.Close()
defer stdinReader.Close() defer stdinReader.Close()
_ = executor.StreamWithContext(ctx, remotecommand.StreamOptions{Stdin: stdinReader, Stdout: stdoutWriter, Stderr: stdoutWriter, Tty: true, TerminalSizeQueue: queue}) err := executor.StreamWithContext(ctx, remotecommand.StreamOptions{Stdin: stdinReader, Stdout: stdoutWriter, Stderr: stdoutWriter, Tty: true, TerminalSizeQueue: queue})
if err != nil {
log.Printf("Failed to attach %e", err)
}
}() }()
if err != nil { if err != nil {