medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: codestyle

This commit is contained in:
jamesread 2026-02-26 20:56:51 +00:00
parent f3549b035e
commit e9a3863b1b
2 changed files with 69 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
service/internal/api/api.go
View File

@ -158,14 +158,32 @@ func (api *oliveTinAPI) PasswordHash(ctx ctx.Context, req *connect.Request[apiv1
return connect.NewResponse(ret), nil return connect.NewResponse(ret), nil
} }
func (api *oliveTinAPI) LocalUserLogin(ctx ctx.Context, req *connect.Request[apiv1.LocalUserLoginRequest]) (*connect.Response[apiv1.LocalUserLoginResponse], error) { func (api *oliveTinAPI) applyLocalLoginResult(req *apiv1.LocalUserLoginRequest, response *connect.Response[apiv1.LocalUserLoginResponse], match bool) {
// Check if local user authentication is enabled if match {
if !api.cfg.AuthLocalUsers.Enabled { user := api.cfg.FindUserByUsername(req.Username)
return connect.NewResponse(&apiv1.LocalUserLoginResponse{ if user != nil {
Success: false, sid := uuid.NewString()
}), nil auth.RegisterUserSession(api.cfg, "local", sid, user.Username)
log.WithFields(log.Fields{"username": user.Username}).Info("LocalUserLogin: Session created and registered")
cookie := &http.Cookie{
Name: "olivetin-sid-local",
Value: sid,
MaxAge: 31556952,
HttpOnly: true,
Path: "/",
}
response.Header().Set("Set-Cookie", cookie.String())
}
log.WithFields(log.Fields{"username": req.Username}).Info("LocalUserLogin: User logged in successfully.")
} else {
log.WithFields(log.Fields{"username": req.Username}).Warn("LocalUserLogin: User login failed.")
} }
}
func (api *oliveTinAPI) LocalUserLogin(ctx ctx.Context, req *connect.Request[apiv1.LocalUserLoginRequest]) (*connect.Response[apiv1.LocalUserLoginResponse], error) {
if !api.cfg.AuthLocalUsers.Enabled {
return connect.NewResponse(&apiv1.LocalUserLoginResponse{Success: false}), nil
}
match, err := checkUserPassword(api.cfg, req.Msg.Username, req.Msg.Password) match, err := checkUserPassword(api.cfg, req.Msg.Username, req.Msg.Password)
if err != nil { if err != nil {
if errors.Is(err, ErrArgon2Busy) { if errors.Is(err, ErrArgon2Busy) {
@ -173,43 +191,8 @@ func (api *oliveTinAPI) LocalUserLogin(ctx ctx.Context, req *connect.Request[api
} }
return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("checking password: %w", err)) return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("checking password: %w", err))
} }
response := connect.NewResponse(&apiv1.LocalUserLoginResponse{Success: match})
response := connect.NewResponse(&apiv1.LocalUserLoginResponse{ api.applyLocalLoginResult(req.Msg, response, match)
Success: match,
})
if match {
// Set authentication cookie for successful login
user := api.cfg.FindUserByUsername(req.Msg.Username)
if user != nil {
sid := uuid.NewString()
// Register the session in the session storage
auth.RegisterUserSession(api.cfg, "local", sid, user.Username)
log.WithFields(log.Fields{
"username": user.Username,
}).Info("LocalUserLogin: Session created and registered")
// Set the authentication cookie in the response headers
cookie := &http.Cookie{
Name: "olivetin-sid-local",
Value: sid,
MaxAge: 31556952, // 1 year
HttpOnly: true,
Path: "/",
}
response.Header().Set("Set-Cookie", cookie.String())
}
log.WithFields(log.Fields{
"username": req.Msg.Username,
}).Info("LocalUserLogin: User logged in successfully.")
} else {
log.WithFields(log.Fields{
"username": req.Msg.Username,
}).Warn("LocalUserLogin: User login failed.")
}
return response, nil return response, nil
} }
@ -364,31 +347,36 @@ func getMostRecentExecutionStatusByActionId(api *oliveTinAPI, actionId string) *
return ile return ile
} }
func (api *oliveTinAPI) ExecutionStatus(ctx ctx.Context, req *connect.Request[apiv1.ExecutionStatusRequest]) (*connect.Response[apiv1.ExecutionStatusResponse], error) { func (api *oliveTinAPI) resolveExecutionStatusForView(msg *apiv1.ExecutionStatusRequest, user *authpublic.AuthenticatedUser) (*executor.InternalLogEntry, error) {
res := &apiv1.ExecutionStatusResponse{} ile := api.getExecutionStatusByRequest(msg)
user := auth.UserFromApiCall(ctx, req, api.cfg)
if err := api.checkDashboardAccess(user); err != nil {
return nil, err
}
var ile *executor.InternalLogEntry
if req.Msg.ExecutionTrackingId != "" {
ile = getExecutionStatusByTrackingID(api, req.Msg.ExecutionTrackingId)
} else {
ile = getMostRecentExecutionStatusByActionId(api, req.Msg.ActionId)
}
if ile == nil { if ile == nil {
return nil, connect.NewError(connect.CodeNotFound, fmt.Errorf("execution not found for tracking ID %s or action ID %s", req.Msg.ExecutionTrackingId, req.Msg.ActionId)) return nil, connect.NewError(connect.CodeNotFound, fmt.Errorf("execution not found for tracking ID %s or action ID %s", msg.ExecutionTrackingId, msg.ActionId))
} }
if !isValidLogEntry(ile) || !api.isLogEntryAllowed(ile, user) { if !isValidLogEntry(ile) || !api.isLogEntryAllowed(ile, user) {
return nil, connect.NewError(connect.CodePermissionDenied, fmt.Errorf("permission denied to view this execution")) return nil, connect.NewError(connect.CodePermissionDenied, fmt.Errorf("permission denied to view this execution"))
} }
res.LogEntry = api.internalLogEntryToPb(ile, user) return ile, nil
}
func (api *oliveTinAPI) getExecutionStatusByRequest(msg *apiv1.ExecutionStatusRequest) *executor.InternalLogEntry {
if msg.ExecutionTrackingId != "" {
return getExecutionStatusByTrackingID(api, msg.ExecutionTrackingId)
}
return getMostRecentExecutionStatusByActionId(api, msg.ActionId)
}
func (api *oliveTinAPI) ExecutionStatus(ctx ctx.Context, req *connect.Request[apiv1.ExecutionStatusRequest]) (*connect.Response[apiv1.ExecutionStatusResponse], error) {
user := auth.UserFromApiCall(ctx, req, api.cfg)
if err := api.checkDashboardAccess(user); err != nil {
return nil, err
}
ile, err := api.resolveExecutionStatusForView(req.Msg, user)
if err != nil {
return nil, err
}
res := &apiv1.ExecutionStatusResponse{
LogEntry: api.internalLogEntryToPb(ile, user),
}
return connect.NewResponse(res), nil return connect.NewResponse(res), nil
} }

41
service/internal/api/local_user_login.go
View File

@ -33,7 +33,7 @@ func CreateHash(password string) (string, error) {
hash, err := argon2id.CreateHash(password, &defaultParams) hash, err := argon2id.CreateHash(password, &defaultParams)
if err != nil { if err != nil {
log.Fatal("Error creating hash: ", err) log.Warnf("Error creating hash: %v", err)
return "", err return "", err
} }
@ -62,27 +62,22 @@ func comparePasswordAndHash(password, hash string) (bool, error) {
} }
func checkUserPassword(cfg *config.Config, username, password string) (bool, error) { func checkUserPassword(cfg *config.Config, username, password string) (bool, error) {
for _, user := range cfg.AuthLocalUsers.Users { user := cfg.FindUserByUsername(username)
if user.Username == username { if user == nil {
match, err := comparePasswordAndHash(password, user.Password) log.WithFields(log.Fields{"username": username}).Warn("Failed to check password for user, as username was not found")
if err != nil { return false, nil
return false, err
}
if match {
return true, nil
} else {
log.WithFields(log.Fields{
"username": username,
}).Warn("Password does not match for user")
return false, nil
}
}
} }
return comparePasswordAndLogResult(password, user.Password, username)
log.WithFields(log.Fields{ }
"username": username,
}).Warn("Failed to check password for user, as username was not found") func comparePasswordAndLogResult(password, hash, username string) (bool, error) {
match, err := comparePasswordAndHash(password, hash)
return false, nil if err != nil {
return false, err
}
if !match {
log.WithFields(log.Fields{"username": username}).Warn("Password does not match for user")
return false, nil
}
return true, nil
} }