From 5bc04f3269c081137cdff52c6a38d4b1ff5991d2 Mon Sep 17 00:00:00 2001 From: Bernd Eichelberger <46166740+4-FLOSS-Free-Libre-Open-Source-Software@users.noreply.github.com> Date: Mon, 19 Sep 2022 10:03:43 +0200 Subject: [PATCH] feat: Replace default Health Ping URL to HTTPS (#1991) --- app/observatory/burst/config.pb.go | 2 +- app/observatory/burst/config.proto | 4 ++-- app/observatory/burst/healthping.go | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/observatory/burst/config.pb.go b/app/observatory/burst/config.pb.go index 217688524..e6c988cdf 100644 --- a/app/observatory/burst/config.pb.go +++ b/app/observatory/burst/config.pb.go @@ -77,7 +77,7 @@ type HealthPingConfig struct { unknownFields protoimpl.UnknownFields // destination url, need 204 for success return - // default http://www.google.com/gen_204 + // default https://connectivitycheck.gstatic.com/generate_204 Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` // connectivity check url Connectivity string `protobuf:"bytes,2,opt,name=connectivity,proto3" json:"connectivity,omitempty"` diff --git a/app/observatory/burst/config.proto b/app/observatory/burst/config.proto index 6448ffcf0..64bbcd155 100644 --- a/app/observatory/burst/config.proto +++ b/app/observatory/burst/config.proto @@ -21,7 +21,7 @@ message Config { message HealthPingConfig { // destination url, need 204 for success return - // default http://www.google.com/gen_204 + // default https://connectivitycheck.gstatic.com/generate_204 string destination = 1; // connectivity check url string connectivity = 2; @@ -31,4 +31,4 @@ message HealthPingConfig { int32 samplingCount = 4; // ping timeout, int64 values of time.Duration int64 timeout = 5; -} \ No newline at end of file +} diff --git a/app/observatory/burst/healthping.go b/app/observatory/burst/healthping.go index f4a0596e6..67bec6904 100644 --- a/app/observatory/burst/healthping.go +++ b/app/observatory/burst/healthping.go @@ -43,7 +43,10 @@ func NewHealthPing(ctx context.Context, config *HealthPingConfig) *HealthPing { } } if settings.Destination == "" { - settings.Destination = "http://www.google.com/gen_204" + // Destination URL, need 204 for success return default to chromium + // https://github.com/chromium/chromium/blob/main/components/safety_check/url_constants.cc#L10 + // https://chromium.googlesource.com/chromium/src/+/refs/heads/main/components/safety_check/url_constants.cc#10 + settings.Destination = "https://connectivitycheck.gstatic.com/generate_204" } if settings.Interval == 0 { settings.Interval = time.Duration(1) * time.Minute