Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 2e86a5721 -> 89a6ed117
[TC-125] Lowercase FQDNs generated by Traffic Ops for use as DNSSEC key names, and lowercase the corresponding usage on the Traffic Router side. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/db671350 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/db671350 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/db671350 Branch: refs/heads/master Commit: db671350180234260e53f1884e6173833f15f937 Parents: 2e86a57 Author: Jeff Elsloo <jeffrey_els...@cable.comcast.com> Authored: Wed Feb 1 11:49:37 2017 -0700 Committer: Dave Neuman <neu...@apache.org> Committed: Thu Feb 2 16:01:12 2017 -0700 ---------------------------------------------------------------------- traffic_ops/app/lib/UI/DeliveryService.pm | 3 ++- .../traffic_router/core/dns/DNSKeyPairWrapper.java | 2 +- .../traffic_router/core/dns/DnsSecKeyPairImpl.java | 2 +- .../traffic_control/traffic_router/core/dns/SignatureManager.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/db671350/traffic_ops/app/lib/UI/DeliveryService.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/UI/DeliveryService.pm b/traffic_ops/app/lib/UI/DeliveryService.pm index 089cfcf..076ed30 100644 --- a/traffic_ops/app/lib/UI/DeliveryService.pm +++ b/traffic_ops/app/lib/UI/DeliveryService.pm @@ -78,7 +78,8 @@ sub get_cdn_domain { distinct => 1 } )->get_column('value')->single(); - return $cdn_domain; + # Always return a lowercase FQDN. + return lc($cdn_domain); } sub get_example_urls { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/db671350/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java index b717b09..17b204c 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java @@ -45,7 +45,7 @@ public class DNSKeyPairWrapper extends DnsKeyPair implements DnsSecKeyPair { this.effective = new Date(1000L * keyPair.getLong("effectiveDate")); this.expiration = new Date(1000L * keyPair.getLong("expirationDate")); this.ttl = keyPair.optLong("ttl", defaultTTL); - this.name = keyPair.getString("name"); + this.name = keyPair.getString("name").toLowerCase(); final byte[] privateKey = DatatypeConverter.parseBase64Binary(keyPair.getString("private")); final byte[] publicKey = DatatypeConverter.parseBase64Binary(keyPair.getString("public")); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/db671350/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java index 1d052dd..8a42bd0 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java @@ -52,7 +52,7 @@ public class DnsSecKeyPairImpl implements DnsSecKeyPair { this.effective = new Date(1000L * keyPair.getLong("effectiveDate")); this.expiration = new Date(1000L * keyPair.getLong("expirationDate")); this.ttl = keyPair.optLong("ttl", defaultTTL); - this.name = keyPair.getString("name"); + this.name = keyPair.getString("name").toLowerCase(); final Decoder mimeDecoder = getMimeDecoder(); try { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/db671350/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java index 55a0b0c..f5b60f9 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java @@ -281,7 +281,7 @@ public final class SignatureManager { @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"}) private List<DnsSecKeyPair> getKeyPairs(final Name name, final boolean wantKsk, final boolean wantSigningKey, final long maxTTL) throws IOException, NoSuchAlgorithmException { - final List<DnsSecKeyPair> keyPairs = keyMap.get(name.toString()); + final List<DnsSecKeyPair> keyPairs = keyMap.get(name.toString().toLowerCase()); DnsSecKeyPair signingKey = null; if (keyPairs == null) {
