Auth & CSRF #16
Open
Auth & CSRF #16
Conversation
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
pniedzwiedzinski
requested changes
Aug 17, 2022
| } else { | ||
| $items = array(); | ||
| while ($row = $result->fetch_assoc()) { | ||
| $items[$row['id']]['name'] = $row['name']; |
There was a problem hiding this comment.
Ja bym zrobił po prostu Array a id byłoby atrybutem obiektu w arrayu
Bo trochę łatwiej na froncie po tym iterować
Ale to taki szczegół i w sumie może być jak jest
Comment on lines
+14
to
+20
| $item = array(); | ||
| $row = $result->fetch_assoc(); | ||
| $item['name'] = $row['name']; | ||
| $item['description'] = $row['description']; | ||
| $item['image_url'] = $row['image_url']; | ||
| $item['order_type'] = $row['order_type']; | ||
| $item['contact_info'] = $row['contact_info']; |
There was a problem hiding this comment.
$item = $result->fetch_assoc();Tak to nie zadziała? :P
Comment on lines
+80
to
+89
| case 0: | ||
| $perms = "Użytkownik"; | ||
| break; | ||
| case 1: | ||
| $perms = "Redaktor serwisu"; | ||
| break; | ||
| case 2: | ||
| $perms = "Administrator"; | ||
| break; |
There was a problem hiding this comment.
Suggested change
| switch ($code){ | |
| case 0: | |
| $perms = "Użytkownik"; | |
| break; | |
| case 1: | |
| $perms = "Redaktor serwisu"; | |
| break; | |
| case 2: | |
| $perms = "Administrator"; | |
| break; | |
| $p = ["Użytkownik", "Redaktor serwisu", "Administrator"]; | |
| $perms = $p[$code] |
Comment on lines
+58
to
+73
| if ($token_age <= $config['site']['csrf_time']){ | ||
| if ($token == $_SESSION['csrf']) { | ||
| unset($_SESSION['csrf']); | ||
| unset($_SESSION['csrf_time']); | ||
| return true; | ||
| } else { | ||
| unset($_SESSION['csrf']); | ||
| unset($_SESSION['csrf_time']); | ||
| return false; | ||
| } | ||
| } else { | ||
| unset($_SESSION['csrf']); | ||
| unset($_SESSION['csrf_time']); | ||
| return false; | ||
| } |
There was a problem hiding this comment.
To jest bardzo pogmatwane i można uprościć, na przykład tak:
Suggested change
| $token_age = $timestamp - $_SESSION['csrf_time']; | |
| if ($token_age <= $config['site']['csrf_time']){ | |
| if ($token == $_SESSION['csrf']) { | |
| unset($_SESSION['csrf']); | |
| unset($_SESSION['csrf_time']); | |
| return true; | |
| } else { | |
| unset($_SESSION['csrf']); | |
| unset($_SESSION['csrf_time']); | |
| return false; | |
| } | |
| } else { | |
| unset($_SESSION['csrf']); | |
| unset($_SESSION['csrf_time']); | |
| return false; | |
| } | |
| $token_age = $timestamp - $_SESSION['csrf_time']; | |
| $r = ($token_age <= $config['site']['csrf_time'] && $token == $_SESSION['csrf']); | |
| unset($_SESSION['csrf']); | |
| unset($_SESSION['csrf_time']); | |
| return $r; |
Można nawet bardziej uprościć. Generalnie im mniej kodu tym lepiej, bo:
- Mam mniej do czytania na review
- Jak się wraca do tego to jest mniej do czytania
- Mniej kodu = mniej miejsc gdzie może się coś zepsuć
Comment on lines
+39
to
+52
| $token_age = $timestamp - $_SESSION['csrf_time']; | ||
| if ($token_age <= $config['site']['csrf_time']){ | ||
| return $_SESSION['csrf']; | ||
| } else { | ||
| $_SESSION['csrf'] = sha1(randomStr().$user_agent); | ||
| $_SESSION['csrf_time'] = $timestamp; | ||
| return $_SESSION['csrf']; | ||
| } | ||
| } else { | ||
| $_SESSION['csrf'] = sha1(randomStr().$user_agent); | ||
| $_SESSION['csrf_time'] = $timestamp; | ||
| return $_SESSION['csrf']; | ||
| } |
There was a problem hiding this comment.
Tak jak w verifyCsrf można tu pozbyć się zbędnej logiki
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Zacząłem tworzyć logikę uwierzytelniania, dodałem funkcje walidacji tokenów anty-CSRF, zrobiłem porządek w plikach i wypisałem wszystkie endpointy w readme