You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2022/06/02 18:48:57 UTC
[GitHub] [trafficcontrol] srijeet0406 opened a new pull request, #6881: Default routeID to 0, if it is not present in the request context
srijeet0406 opened a new pull request, #6881:
URL: https://github.com/apache/trafficcontrol/pull/6881
<!--
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.
-->
This PR is not related to any issue. It sets the routeID to 0 if it is absent in the request context.
<!-- **^ 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. -->
Make a request to a route that doesn't have a route ID
Tail the access logs and make sure that a route ID of `0` is logged
## 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)
-->
- master
## PR submission checklist
- [ ] 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] srijeet0406 commented on a diff in pull request #6881: Default routeID to 0, if it is not present in the request context
Posted by GitBox <gi...@apache.org>.
srijeet0406 commented on code in PR #6881:
URL: https://github.com/apache/trafficcontrol/pull/6881#discussion_r888396645
##########
traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go:
##########
@@ -212,7 +212,8 @@ func WrapAccessLog(secret string, h http.Handler) http.HandlerFunc {
imsType = IMSMISS
}
}
- log.EventfRaw(`%s - %s [%s] "%v %v?%v %s" %v %v %v "%v" %v %s`, r.RemoteAddr, user, time.Now().Format(AccessLogTimeFormat), r.Method, r.URL.Path, r.URL.RawQuery, r.Proto, iw.Code, iw.ByteCount, int(time.Now().Sub(start)/time.Millisecond), r.UserAgent(), r.Context().Value(RouteID), imsType)
+ routeID, _ := r.Context().Value(RouteID).(int)
Review Comment:
ugh, can't believe I pushed without testing, my bad. Should be done now.
--
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 #6881: Default routeID to 0, if it is not present in the request context
Posted by GitBox <gi...@apache.org>.
srijeet0406 commented on code in PR #6881:
URL: https://github.com/apache/trafficcontrol/pull/6881#discussion_r888377750
##########
traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go:
##########
@@ -212,7 +212,11 @@ func WrapAccessLog(secret string, h http.Handler) http.HandlerFunc {
imsType = IMSMISS
}
}
- log.EventfRaw(`%s - %s [%s] "%v %v?%v %s" %v %v %v "%v" %v %s`, r.RemoteAddr, user, time.Now().Format(AccessLogTimeFormat), r.Method, r.URL.Path, r.URL.RawQuery, r.Proto, iw.Code, iw.ByteCount, int(time.Now().Sub(start)/time.Millisecond), r.UserAgent(), r.Context().Value(RouteID), imsType)
+ routeID := r.Context().Value(RouteID)
Review Comment:
Done
--
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] rawlinp commented on a diff in pull request #6881: Default routeID to 0, if it is not present in the request context
Posted by GitBox <gi...@apache.org>.
rawlinp commented on code in PR #6881:
URL: https://github.com/apache/trafficcontrol/pull/6881#discussion_r888388655
##########
traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go:
##########
@@ -212,7 +212,8 @@ func WrapAccessLog(secret string, h http.Handler) http.HandlerFunc {
imsType = IMSMISS
}
}
- log.EventfRaw(`%s - %s [%s] "%v %v?%v %s" %v %v %v "%v" %v %s`, r.RemoteAddr, user, time.Now().Format(AccessLogTimeFormat), r.Method, r.URL.Path, r.URL.RawQuery, r.Proto, iw.Code, iw.ByteCount, int(time.Now().Sub(start)/time.Millisecond), r.UserAgent(), r.Context().Value(RouteID), imsType)
+ routeID, _ := r.Context().Value(RouteID).(int)
Review Comment:
Doh! This is actually being stored in the context as a string. So now it is always `0`. In routing.go L301 and 353, it's calling `strconv.Itoa`. We should change those lines to keep it stored as an int.
--
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] rawlinp merged pull request #6881: Default routeID to 0, if it is not present in the request context
Posted by GitBox <gi...@apache.org>.
rawlinp merged PR #6881:
URL: https://github.com/apache/trafficcontrol/pull/6881
--
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] rawlinp commented on a diff in pull request #6881: Default routeID to 0, if it is not present in the request context
Posted by GitBox <gi...@apache.org>.
rawlinp commented on code in PR #6881:
URL: https://github.com/apache/trafficcontrol/pull/6881#discussion_r888353554
##########
traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go:
##########
@@ -212,7 +212,11 @@ func WrapAccessLog(secret string, h http.Handler) http.HandlerFunc {
imsType = IMSMISS
}
}
- log.EventfRaw(`%s - %s [%s] "%v %v?%v %s" %v %v %v "%v" %v %s`, r.RemoteAddr, user, time.Now().Format(AccessLogTimeFormat), r.Method, r.URL.Path, r.URL.RawQuery, r.Proto, iw.Code, iw.ByteCount, int(time.Now().Sub(start)/time.Millisecond), r.UserAgent(), r.Context().Value(RouteID), imsType)
+ routeID := r.Context().Value(RouteID)
Review Comment:
Can we safely type-assert this to an int instead of checking nil? It looks strange because routeID looks like a pointer, yet we're assigning an int to it.
```
routeID, _ := r.Context().Value(RouteID).(int)
log.EventfRaw(...)
```
if it was nil, this would make routeID the zero-value of type int, which is 0. If non-nil, we have a real routeID int. We could also change the log format from `%v` to `%d` for the route ID
--
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