jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Save the last batch (#2748)

Browse source 
* feat(backend): fix to save the latest message tracker just after the token has been expired

* feat(http): return 401 even after successfully saved batch for JustExpired case
This commit is contained in:
Alexander 2024-11-15 11:49:37 +01:00 • committed by GitHub
parent fdc281a406
commit b2cb874a2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
backend/internal/http/router/handlers-web.go
View file

@ -302,10 +302,15 @@ func (e *Router) pushMessagesHandlerWeb(w http.ResponseWriter, r *http.Request)
if sessionData != nil {
r = r.WithContext(context.WithValue(r.Context(), "sessionID", fmt.Sprintf("%d", sessionData.ID)))
}
tokenJustExpired := false
if err != nil {
if errors.Is(err, token.JUST_EXPIRED) {
tokenJustExpired = true
} else {
e.ResponseWithError(r.Context(), w, http.StatusUnauthorized, err, startTime, r.URL.Path, bodySize)
return
}
}
// Add sessionID and projectID to context
if info, err := e.services.Sessions.Get(sessionData.ID); err == nil {
@ -314,13 +319,21 @@ func (e *Router) pushMessagesHandlerWeb(w http.ResponseWriter, r *http.Request)
// Check request body
if r.Body == nil {
e.ResponseWithError(r.Context(), w, http.StatusBadRequest, errors.New("request body is empty"), startTime, r.URL.Path, bodySize)
errCode := http.StatusBadRequest
if tokenJustExpired {
errCode = http.StatusUnauthorized
}
e.ResponseWithError(r.Context(), w, errCode, errors.New("request body is empty"), startTime, r.URL.Path, bodySize)
return
}
bodyBytes, err := e.readBody(w, r, e.getBeaconSize(sessionData.ID))
if err != nil {
e.ResponseWithError(r.Context(), w, http.StatusRequestEntityTooLarge, err, startTime, r.URL.Path, bodySize)
errCode := http.StatusRequestEntityTooLarge
if tokenJustExpired {
errCode = http.StatusUnauthorized
}
e.ResponseWithError(r.Context(), w, errCode, err, startTime, r.URL.Path, bodySize)
return
}
bodySize = len(bodyBytes)
@ -329,10 +342,18 @@ func (e *Router) pushMessagesHandlerWeb(w http.ResponseWriter, r *http.Request)
err = e.services.Producer.Produce(e.cfg.TopicRawWeb, sessionData.ID, bodyBytes)
if err != nil {
e.log.Error(r.Context(), "can't send messages batch to queue: %s", err)
e.ResponseWithError(r.Context(), w, http.StatusInternalServerError, errors.New("can't save message, try again"), startTime, r.URL.Path, bodySize)
errCode := http.StatusInternalServerError
if tokenJustExpired {
errCode = http.StatusUnauthorized
}
e.ResponseWithError(r.Context(), w, errCode, errors.New("can't save message, try again"), startTime, r.URL.Path, bodySize)
return
}
if tokenJustExpired {
e.ResponseWithError(r.Context(), w, http.StatusUnauthorized, errors.New("token expired"), startTime, r.URL.Path, bodySize)
return
}
e.ResponseOK(r.Context(), w, startTime, r.URL.Path, bodySize)
}

2
backend/pkg/token/http.go
View file

@ -11,7 +11,7 @@ const BEARER_SCHEMA = "Bearer "
func (tokenizer *Tokenizer) ParseFromHTTPRequest(r *http.Request) (*TokenData, error) {
header := r.Header.Get("Authorization")
if !strings.HasPrefix(header, BEARER_SCHEMA) {
return nil, errors.New("Missing token")
return nil, errors.New("missing token")
}
token := header[len(BEARER_SCHEMA):]
return tokenizer.Parse(token)

14
backend/pkg/token/tokenizer.go
View file

@ -11,7 +11,10 @@ import (
"github.com/btcsuite/btcutil/base58"
)
var EXPIRED = errors.New("token expired")
var (
EXPIRED = errors.New("token expired")
JUST_EXPIRED = errors.New("token just expired")
)
type Tokenizer struct {
secret []byte
@ -64,8 +67,13 @@ func (tokenizer *Tokenizer) Parse(token string) (*TokenData, error) {
if err != nil {
return nil, err
}
res := &TokenData{id, delay, expTime}
if expTime <= time.Now().UnixMilli() {
return &TokenData{id, delay, expTime}, EXPIRED
// If token is expired less than 30 seconds ago, we still consider it semi-valid
if expTime+30000 > time.Now().UnixMilli() {
return res, JUST_EXPIRED
}
return &TokenData{id, delay, expTime}, nil
return res, EXPIRED
}
return res, nil
}