Add anonymizeIP to GA privacy config

See #4751

diff --git a/config/privacy/privacyConfig.go b/config/privacy/privacyConfig.go
index 9c2a8df66c9f55f1a51f05e2b3089db67b6504b6..33e98754ca698f4ec670c2589343a93f29ef09da 100644 (file)
--- a/config/privacy/privacyConfig.go
+++ b/config/privacy/privacyConfig.go
@@ -48,6 +48,9 @@ type GoogleAnalytics struct {
        // Enabling this will make the GA templates respect the
        // "Do Not Track" HTTP header. See  https://www.paulfurley.com/google-analytics-dnt/.
        RespectDoNotTrack bool
+
+       // Enabling this will make it so the users' IP addresses are anonymized within Google Analytics.
+       AnonymizeIP bool
 }
 
 // Instagram holds the privacy configuration settings related to the Instagram shortcode.

diff --git a/config/privacy/privacyConfig_test.go b/config/privacy/privacyConfig_test.go
index 6b07ef7e69a930fc420ee67af9aa07353d3e2417..112e459885037ba3cd67b06b9838483894b5f8ea 100644 (file)
--- a/config/privacy/privacyConfig_test.go
+++ b/config/privacy/privacyConfig_test.go
@@ -34,6 +34,7 @@ disable = true
 [privacy.googleAnalytics]
 disable = true
 respectDoNotTrack = true
+anonymizeIP = true
 [privacy.instagram]
 disable = true
 simple = true
@@ -59,6 +60,7 @@ simple = true
        assert.True(pc.Disqus.Disable)
        assert.True(pc.GoogleAnalytics.Disable)
        assert.True(pc.GoogleAnalytics.RespectDoNotTrack)
+       assert.True(pc.GoogleAnalytics.AnonymizeIP)
        assert.True(pc.Instagram.Disable)
        assert.True(pc.Instagram.Simple)
        assert.True(pc.SpeakerDeck.Disable)

diff --git a/hugolib/embedded_templates_test.go b/hugolib/embedded_templates_test.go
index fd620bd15d652e65ca9b99dffa686046d8ef0b2a..e04a37f6380feaf83cb409c685eb0a3301f738c2 100644 (file)
--- a/hugolib/embedded_templates_test.go
+++ b/hugolib/embedded_templates_test.go
@@ -47,7 +47,10 @@ Disqus:
        b.Build(BuildCfg{})
 
        // Gheck GA regular and async
-       b.AssertFileContent("public/index.html", "'script','https://www.google-analytics.com/analytics.js','ga');\n\tga('create', 'ga_id', 'auto')", "<script async src='//www.google-analytics.com/analytics.js'>")
+       b.AssertFileContent("public/index.html",
+               "'anonymizeIp', true",
+               "'script','https://www.google-analytics.com/analytics.js','ga');\n\tga('create', 'ga_id', 'auto')",
+               "<script async src='//www.google-analytics.com/analytics.js'>")
 
        // Disqus
        b.AssertFileContent("public/index.html", "\"disqus_shortname\" + '.disqus.com/embed.js';")

diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go
index 7a93fcd9a667f460ad91b9d07c2ddfc25249ed5b..28dd8c125f44ce756dc404ccc6d0ab18edb03597 100644 (file)
--- a/hugolib/testhelpers_test.go
+++ b/hugolib/testhelpers_test.go
@@ -143,6 +143,23 @@ shortname = "disqus_shortname"
 [services.googleAnalytics]
 id = "ga_id"
 
+[privacy]
+[privacy.disqus]
+disable = false
+[privacy.googleAnalytics]
+respectDoNotTrack = true
+anonymizeIP = true
+[privacy.instagram]
+simple = true
+[privacy.speakerDeck]
+[privacy.twitter]
+enableDNT = true
+[privacy.vimeo]
+disable = false
+[privacy.youtube]
+disable = false
+privacyEnhanced = true
+
 `
 
 func (s *sitesBuilder) WithSimpleConfigFile() *sitesBuilder {

diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go
index 9b4db35d65ffbcac53e5fed2fd74b4da93b02b87..9637deb10210abed94807e1f87f696dd435f0850 100644 (file)
--- a/tpl/tplimpl/embedded/templates.autogen.go
+++ b/tpl/tplimpl/embedded/templates.autogen.go
@@ -111,6 +111,7 @@ if (!doNotTrack) {
        })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
        ga('create', '{{ . }}', 'auto');
        ga('send', 'pageview');
+       {{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
 }
 </script>
 {{ end }}
@@ -133,6 +134,7 @@ if (!doNotTrack) {
        window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
        ga('create', '{{ . }}', 'auto');
        ga('send', 'pageview');
+       {{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
 }
 </script>
 <script async src='//www.google-analytics.com/analytics.js'></script>

diff --git a/tpl/tplimpl/embedded/templates/google_analytics.html b/tpl/tplimpl/embedded/templates/google_analytics.html
index ae4898c7a219dc478b0277d64271d11f5a7aae81..611c1c7261da10a4fafe79da24580be2f038ed93 100755 (executable)
--- a/tpl/tplimpl/embedded/templates/google_analytics.html
+++ b/tpl/tplimpl/embedded/templates/google_analytics.html
@@ -10,6 +10,7 @@ if (!doNotTrack) {
        })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
        ga('create', '{{ . }}', 'auto');
        ga('send', 'pageview');
+       {{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
 }
 </script>
 {{ end }}

diff --git a/tpl/tplimpl/embedded/templates/google_analytics_async.html b/tpl/tplimpl/embedded/templates/google_analytics_async.html
index b81ade02571239b3dead684926eb245786d532fd..18e18a16897544d581664a9921e4795a2ee06ee1 100755 (executable)
--- a/tpl/tplimpl/embedded/templates/google_analytics_async.html
+++ b/tpl/tplimpl/embedded/templates/google_analytics_async.html
@@ -7,6 +7,7 @@ if (!doNotTrack) {
        window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
        ga('create', '{{ . }}', 'auto');
        ga('send', 'pageview');
+       {{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
 }
 </script>
 <script async src='//www.google-analytics.com/analytics.js'></script>