mitchell852 closed pull request #2245: Anonymous IP TP Implementation
URL: https://github.com/apache/incubator-trafficcontrol/pull/2245
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index 741a7d6af..c0e1beb42 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
@@ -326,6 +326,19 @@
</div>
</div>
+ <div class="form-group" ng-class="{'has-error':
hasError(deliveryServiceForm.anonymousBlockingEnabled), 'has-feedback':
hasError(deliveryServiceForm.anonymousBlockingEnabled)}">
+ <label class="control-label col-md-2 col-sm-2 col-xs-12">
+ <span
uib-popover-html="label('anonymousBlockingEnabled', 'desc')"
popover-trigger="mouseenter" popover-placement="top"
popover-append-to-body="true" popover-class="popover-class">*
{{label('anonymousBlockingEnabled', 'title')}}</span>
+ </label>
+ <div class="col-md-10 col-sm-10 col-xs-12">
+ <select name="anonymousBlockingEnabled"
class="form-control" ng-model="deliveryService.anonymousBlockingEnabled"
ng-options="x.value as x.label for x in falseTrue" required>
+ <option value="">Select...</option>
+ </select>
+ <small class="input-error"
ng-show="hasPropertyError(deliveryServiceForm.anonymousBlockingEnabled,
'required')">Required</small>
+ <small class="input-diff" ng-show="settings.isRequest
&& open() && deliveryService.anonymousBlockingEnabled !=
dsCurrent.anonymousBlockingEnabled">Current Value: [
{{dsCurrent.anonymousBlockingEnabled}} ]</small>
+ </div>
+ </div>
+
<div class="form-group" ng-class="{'has-error':
hasError(deliveryServiceForm.geoProvider), 'has-feedback':
hasError(deliveryServiceForm.geoProvider)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">
<span uib-popover-html="label('geoProvider', 'desc')"
popover-trigger="mouseenter" popover-placement="top"
popover-append-to-body="true" popover-class="popover-class">*
{{label('geoProvider', 'title')}}</span>
diff --git a/traffic_portal/app/src/traffic_portal_properties.json
b/traffic_portal/app/src/traffic_portal_properties.json
index 452d724e0..a50a78db6 100644
--- a/traffic_portal/app/src/traffic_portal_properties.json
+++ b/traffic_portal/app/src/traffic_portal_properties.json
@@ -128,7 +128,8 @@
"logsEnabled": false,
"geoProvider": 0,
"geoLimit": 0,
- "ccrDnsTtl": 30
+ "ccrDnsTtl": 30,
+ "anonymousBlockingEnabled": false
},
"DNS": {
"routingName": "cdn",
@@ -144,7 +145,8 @@
"missLong": -87.627778,
"signingAlgorithm": null,
"ccrDnsTtl": 30,
- "regionalGeoBlocking": false
+ "regionalGeoBlocking": false,
+ "anonymousBlockingEnabled": false
},
"HTTP": {
"routingName": "cdn",
@@ -162,7 +164,8 @@
"missLat": 41.881944,
"missLong": -87.627778,
"signingAlgorithm": null,
- "ccrDnsTtl": 3600
+ "ccrDnsTtl": 3600,
+ "anonymousBlockingEnabled": false
},
"STEERING": {
"dscp": 0,
@@ -172,7 +175,8 @@
"geoProvider": 0,
"geoLimit": 0,
"regionalGeoBlocking": false,
- "ccrDnsTtl": 30
+ "ccrDnsTtl": 30,
+ "anonymousBlockingEnabled": false
},
"descriptions": {
"_comments": "This is the text used to configure delivery service
field titles/descriptions",
@@ -180,6 +184,10 @@
"title": "Active",
"desc": "When this is set to false Traffic Router will not serve
DNS or HTTP responses for this delivery service."
},
+ "anonymousBlockingEnabled": {
+ "title": "Anonymous Blocking",
+ "desc": "Set to true to enable blocking of anonymous IPs for this
delivery service -- requires MaxMind's Anonymous IP database."
+ },
"cacheurl": {
"title": "Cache URL expression",
"desc": "Cache URL rule to apply to this delivery
service.<br><br>See <a
href=\"https://docs.trafficserver.apache.org/en/latest/admin-guide/plugins/cacheurl.en.html\";
target=\"_blank\">ATS documentation on cacheurl...</a>"
@@ -252,10 +260,10 @@
"title": "Global Max TPS",
"desc": "The maximum transactions this delivery service can serve
across all EDGE caches before traffic will be diverted to the bypass
destination. For a DNS delivery service, the Bypass Ipv4 or Ipv6 will be used
(depending on whether this was a A or AAAA request), and for HTTP delivery
services the Bypass FQDN will be used."
},
- "fqPacingRate": {
- "title": "Fair Queuing Pacing Rate Bps",
+ "fqPacingRate": {
+ "title": "Fair Queuing Pacing Rate Bps",
"desc": "The maximum bytes per second a cache will delivery on any
single TCP connection. This uses the Linux kernel's Fair Queuing
setsockopt(SO_MAX_PACING_RATE) to limit the rate of delivery."
- },
+ },
"httpBypassFqdn": {
"title": "HTTP Bypass FQDN",
"desc": "This is the FQDN Traffic Router will redirect to (with
the same path) when the max Bps or Max Tps for this delivery service are
exceeded."
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
