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/04/15 18:07:37 UTC
[GitHub] [trafficcontrol] mattjackson220 opened a new pull request, #6757: updated cert expirations to only show Active DSes
mattjackson220 opened a new pull request, #6757:
URL: https://github.com/apache/trafficcontrol/pull/6757
<!--
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 updates the certificate expirations endpoint to only show certs for Active delivery services.
<!-- **^ 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. -->
Run TO and TP
Check that the Cert Expirations page works
Set one of the DSes to Not Active
Verify that it no longer shows up on the Cert Expirations Page
## 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. -->
- [x] 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 #6757: updated cert expirations to only show Active DSes
Posted by GitBox <gi...@apache.org>.
srijeet0406 commented on code in PR #6757:
URL: https://github.com/apache/trafficcontrol/pull/6757#discussion_r854427219
##########
traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/postgres.go:
##########
@@ -199,12 +215,10 @@ func (p *Postgres) GetExpirationInformation(tx *sql.Tx, ctx context.Context, day
if err = rows.Scan(&expirationInfo.DeliveryService, &expirationInfo.CDN, &expirationInfo.Provider, &expirationInfo.Expiration); err != nil {
return []tc.SSLKeyExpirationInformation{}, err
}
- expirationInfo.Federated = false
- for _, fed := range fedList {
- if fed == expirationInfo.DeliveryService {
- expirationInfo.Federated = true
- }
+ if util.ContainsStr(inactiveList, expirationInfo.DeliveryService) {
Review Comment:
If we have a large number of inactive delivery services, this call might have to iterate over a number of items trying to find a match. Do you think a map could be better, in terms of reducing the lookup time, etc.?
--
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 #6757: updated cert expirations to only show Active DSes
Posted by GitBox <gi...@apache.org>.
srijeet0406 commented on code in PR #6757:
URL: https://github.com/apache/trafficcontrol/pull/6757#discussion_r855641313
##########
traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/postgres.go:
##########
@@ -199,12 +215,10 @@ func (p *Postgres) GetExpirationInformation(tx *sql.Tx, ctx context.Context, day
if err = rows.Scan(&expirationInfo.DeliveryService, &expirationInfo.CDN, &expirationInfo.Provider, &expirationInfo.Expiration); err != nil {
return []tc.SSLKeyExpirationInformation{}, err
}
- expirationInfo.Federated = false
- for _, fed := range fedList {
- if fed == expirationInfo.DeliveryService {
- expirationInfo.Federated = true
- }
+ if inactiveList[expirationInfo.DeliveryService] {
+ continue
}
+ expirationInfo.Federated = util.ContainsStr(fedList, expirationInfo.DeliveryService)
Review Comment:
I should have explained better in my previous comment, my bad. But, do you think converting the `fedList` into a map also makes sense, because of the same reason? That way we won't have to traverse the `fedList` array to look for the `expirationInfo.DeliveryService` key.
--
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 #6757: updated cert expirations to only show Active DSes
Posted by GitBox <gi...@apache.org>.
srijeet0406 merged PR #6757:
URL: https://github.com/apache/trafficcontrol/pull/6757
--
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