You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by "kdamichie (via GitHub)" <gi...@apache.org> on 2023/04/27 22:03:18 UTC
[GitHub] [trafficcontrol] kdamichie opened a new pull request, #7469: Maformed cookie error when empty
kdamichie opened a new pull request, #7469:
URL: https://github.com/apache/trafficcontrol/pull/7469
<!--
Thank you for contributing! Please be sure to read our contribution guidelines: https://github.com/apache/trafficcontrol/blob/master/CONTRIBUTING.md
If this closes or relates to an existing issue, please reference it using one of the following:
Closes: #ISSUE
Related: #ISSUE
If this PR fixes a security vulnerability, DO NOT submit! Instead, contact
the Apache Traffic Control Security Team at security@trafficcontrol.apache.org and follow the
guidelines at https://apache.org/security regarding vulnerability disclosure.
-->
Updated logic to not report empty or missing cookies as an error into the error.log. Added a unit test for the cookie parse function.
<!-- **^ Add meaningful description above** --><hr/>
## Which Traffic Control components are affected by this PR?
<!-- Please delete all components from this list that are NOT affected by this PR.
Feel free to add the name of a tool or script that is affected but not on the list.
-->
- Traffic Ops
## What is the best way to verify this PR?
<!-- Please include here ALL the steps necessary to test your PR.
If your PR has tests (and most should), provide the steps needed to run the tests.
If not, please provide step-by-step instructions to test the PR manually and explain why your PR does not need tests. -->
Ensure tests pass.
Submit a request without a cookie and another with an empty string for the cookie. Ensure that 401 log is found in access.log and error.log does not report.
## If this is a bugfix, which Traffic Control versions contained the bug?
<!-- Delete this section if the PR is not a bugfix, or if the bug is only in the master branch.
Examples:
- 5.1.2
- 5.1.3 (RC1)
-->
## PR submission checklist
- [x] This PR has tests <!-- If not, please delete this text and explain why this PR does not need tests. -->
- [ ] This PR has documentation <!-- If not, please delete this text and explain why this PR does not need documentation. -->
- [x] This PR has a CHANGELOG.md entry <!-- A fix for a bug from an ATC release, an improvement, or a new feature should have a changelog entry. -->
- [x] This PR **DOES NOT FIX A SERIOUS SECURITY VULNERABILITY** (see [the Apache Software Foundation's security guidelines](https://apache.org/security) for details)
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] zrhoffman commented on pull request #7469: Maformed cookie error when empty
Posted by "zrhoffman (via GitHub)" <gi...@apache.org>.
zrhoffman commented on PR #7469:
URL: https://github.com/apache/trafficcontrol/pull/7469#issuecomment-1535212876
@kdamichie If you rebase this onto the master branch, the CiaB workflow should pass, since #7489 is what makes it fail
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] srijeet0406 merged pull request #7469: Maformed cookie error when empty
Posted by "srijeet0406 (via GitHub)" <gi...@apache.org>.
srijeet0406 merged PR #7469:
URL: https://github.com/apache/trafficcontrol/pull/7469
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] srijeet0406 commented on a diff in pull request #7469: Maformed cookie error when empty
Posted by "srijeet0406 (via GitHub)" <gi...@apache.org>.
srijeet0406 commented on code in PR #7469:
URL: https://github.com/apache/trafficcontrol/pull/7469#discussion_r1186346259
##########
traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go:
##########
@@ -225,10 +225,12 @@ func WrapAccessLog(secret string, h http.Handler) http.HandlerFunc {
user := "-"
cookieToken := getCookieToken(r)
cookie, userErr, sysErr := tocookie.Parse(secret, cookieToken)
- if userErr == nil && sysErr == nil {
- user = cookie.AuthData
- } else {
- log.Errorf("Error retrieving user from cookie: User Error: %v System Error: %v", userErr, sysErr)
+ if cookie != nil {
+ if userErr == nil && sysErr == nil {
Review Comment:
I think you should move line 228 (if cookie != nil) to be inside this `if` statement. That way, we are not throwing away the errors in case we get something that's actually wrong (other than the cookie being `nil`). The cookie being `nil` should be checked just before the line that dereferences the cookie struct pointer.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] codecov[bot] commented on pull request #7469: Maformed cookie error when empty
Posted by "codecov[bot] (via GitHub)" <gi...@apache.org>.
codecov[bot] commented on PR #7469:
URL: https://github.com/apache/trafficcontrol/pull/7469#issuecomment-1526605653
## [Codecov](https://codecov.io/gh/apache/trafficcontrol/pull/7469?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#7469](https://codecov.io/gh/apache/trafficcontrol/pull/7469?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (2d3ad2d) into [master](https://codecov.io/gh/apache/trafficcontrol/commit/c09cbeb7020e2ffb5a0af84458320cf90486b80e?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (c09cbeb) will **decrease** coverage by `0.01%`.
> The diff coverage is `36.36%`.
> :exclamation: Current head 2d3ad2d differs from pull request most recent head 955ea7f. Consider uploading reports for the commit 955ea7f to get more accurate results
```diff
@@ Coverage Diff @@
## master #7469 +/- ##
============================================
- Coverage 29.28% 29.27% -0.01%
Complexity 98 98
============================================
Files 782 782
Lines 81860 81865 +5
Branches 784 784
============================================
- Hits 23970 23969 -1
- Misses 55825 55831 +6
Partials 2065 2065
```
| Flag | Coverage Δ | |
|---|---|---|
| golib_unit | `48.40% <ø> (ø)` | |
| grove_unit | `4.60% <ø> (ø)` | |
| t3c_unit | `5.32% <ø> (ø)` | |
| traffic_monitor_unit | `21.28% <ø> (ø)` | |
| traffic_ops_unit | `22.81% <36.36%> (-0.01%)` | :arrow_down: |
| traffic_portal_v2 | `64.45% <ø> (ø)` | |
| traffic_stats_unit | `10.14% <ø> (ø)` | |
| unit_tests | `26.24% <36.36%> (-0.01%)` | :arrow_down: |
Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more.
| [Impacted Files](https://codecov.io/gh/apache/trafficcontrol/pull/7469?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [traffic\_ops/traffic\_ops\_golang/api/api.go](https://codecov.io/gh/apache/trafficcontrol/pull/7469?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-dHJhZmZpY19vcHMvdHJhZmZpY19vcHNfZ29sYW5nL2FwaS9hcGkuZ28=) | `28.44% <0.00%> (ø)` | |
| [.../traffic\_ops\_golang/routing/middleware/wrappers.go](https://codecov.io/gh/apache/trafficcontrol/pull/7469?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-dHJhZmZpY19vcHMvdHJhZmZpY19vcHNfZ29sYW5nL3JvdXRpbmcvbWlkZGxld2FyZS93cmFwcGVycy5nbw==) | `61.29% <0.00%> (-1.21%)` | :arrow_down: |
| [traffic\_ops/traffic\_ops\_golang/tocookie/cookie.go](https://codecov.io/gh/apache/trafficcontrol/pull/7469?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-dHJhZmZpY19vcHMvdHJhZmZpY19vcHNfZ29sYW5nL3RvY29va2llL2Nvb2tpZS5nbw==) | `59.32% <100.00%> (-2.50%)` | :arrow_down: |
:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] kdamichie commented on a diff in pull request #7469: Maformed cookie error when empty
Posted by "kdamichie (via GitHub)" <gi...@apache.org>.
kdamichie commented on code in PR #7469:
URL: https://github.com/apache/trafficcontrol/pull/7469#discussion_r1186467904
##########
traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go:
##########
@@ -225,10 +225,12 @@ func WrapAccessLog(secret string, h http.Handler) http.HandlerFunc {
user := "-"
cookieToken := getCookieToken(r)
cookie, userErr, sysErr := tocookie.Parse(secret, cookieToken)
- if userErr == nil && sysErr == nil {
- user = cookie.AuthData
- } else {
- log.Errorf("Error retrieving user from cookie: User Error: %v System Error: %v", userErr, sysErr)
+ if cookie != nil {
+ if userErr == nil && sysErr == nil {
Review Comment:
Rearranged
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org