Security add #18
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package models | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/dgrijalva/jwt-go" | ||
| "github.com/pkg/errors" | ||
|
|
||
| "time" | ||
| ) | ||
|
|
||
| type JwtToken struct { | ||
| Secret []byte | ||
| } | ||
|
|
||
| func NewJwtToken(secret string) (*JwtToken, error) { | ||
| return &JwtToken{Secret: []byte(secret)}, nil | ||
| } | ||
|
|
||
| type JwtCsrfClaims struct { | ||
| SessionID string `json:"sid"` | ||
| jwt.StandardClaims | ||
| } | ||
|
|
||
| func (tk *JwtToken) Create(sID string, tokenExpTime int64) (string, error) { | ||
| data := JwtCsrfClaims{ | ||
| SessionID: sID, | ||
| StandardClaims: jwt.StandardClaims{ | ||
| ExpiresAt: tokenExpTime, | ||
| IssuedAt: time.Now().Unix(), | ||
| }, | ||
| } | ||
| token := jwt.NewWithClaims(jwt.SigningMethodHS256, data) | ||
| return token.SignedString(tk.Secret) | ||
| } | ||
|
|
||
| func (tk *JwtToken) parseSecretGetter(token *jwt.Token) (interface{}, error) { | ||
| method, ok := token.Method.(*jwt.SigningMethodHMAC) | ||
| if !ok || method.Alg() != "HS256" { | ||
| return nil, errors.New("bad sign method") | ||
| } | ||
| return tk.Secret, nil | ||
| } | ||
|
|
||
| func (tk *JwtToken) Check(sID string, inputToken string) (bool, error) { | ||
| payload := &JwtCsrfClaims{} | ||
| _, err := jwt.ParseWithClaims(inputToken, payload, tk.parseSecretGetter) | ||
| if err != nil { | ||
| return false, fmt.Errorf("cant parse jwt token: %w", err) | ||
| } | ||
| if payload.Valid() != nil { | ||
| return false, fmt.Errorf("invalid jwt token: %w", err) | ||
| } | ||
| return payload.SessionID == sID, nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package middleware | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "slices" | ||
| "time" | ||
|
|
||
| csrf "github.com/go-park-mail-ru/2024_1_FullFocus/internal/models" | ||
| "github.com/go-park-mail-ru/2024_1_FullFocus/internal/pkg/logger" | ||
| "github.com/gorilla/mux" | ||
|
|
||
| "net/http" | ||
| ) | ||
|
|
||
| func CSRFMiddleware() mux.MiddlewareFunc { | ||
| return func(next http.Handler) http.Handler { | ||
| return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| ctx := r.Context() | ||
| httpMethods := []string{http.MethodPost, http.MethodPut, http.MethodDelete, http.MethodPatch} | ||
|
There was a problem hiding this comment. проще проверить, что не GET и не HEAD, нет? |
||
| found := slices.Contains(httpMethods, r.Method) | ||
| if found { | ||
| err := CheckSCRFToken(r) | ||
| if err != nil { | ||
| logger.Debug(ctx, fmt.Sprintf("csrf token creation error: %v", err)) | ||
|
There was a problem hiding this comment. Тут тоже, нужно на запрос ответить |
||
| return | ||
| } | ||
| } | ||
| if r.Method == http.MethodGet { | ||
| err := SetSCRFToken(w, r) | ||
| if err != nil { | ||
| logger.Debug(ctx, fmt.Sprintf("csrf token creation error: %v", err)) | ||
|
There was a problem hiding this comment. надо на запрос ответить, не просто завершать функцию |
||
| return | ||
| } | ||
| } | ||
| next.ServeHTTP(w, r) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func SetSCRFToken(w http.ResponseWriter, r *http.Request) error { | ||
| tokens, _ := csrf.NewJwtToken("qsRY2e4hcM5T7X984E9WQ5uZ8Nty7fxB") | ||
| session, err := r.Cookie("session_id") | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sID := session.Value | ||
| token, err := tokens.Create(sID, time.Now().Add(1*time.Hour).Unix()) | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| w.Header().Set("X-Csrf-Token", token) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func CheckSCRFToken(r *http.Request) error { | ||
| tokens, _ := csrf.NewJwtToken("qsRY2e4hcM5T7X984E9WQ5uZ8Nty7fxB") | ||
| session, err := r.Cookie("session_id") | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sID := session.Value | ||
| csrfToken := r.FormValue("X-Csrf-Token") | ||
|
There was a problem hiding this comment. Надо из хедера брать, у вас формы не используются в запросах |
||
| _, err = tokens.Check(sID, csrfToken) | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
нужны тесты