commit 9f200d29ea175da786fe333e9e1357fceb04e7c0
author David Ostrovsky <david@ostrovsky.org> Sat Apr 17 14:06:12 2021 +0200
committer David Ostrovsky <david.ostrovsky@gmail.com> Mon Apr 26 09:05:10 2021 +0000
tree 9e7585e5e6d7f02bd20a91bd2cd2456515f5eb2b
parent 411d9a544d3b9c0240a528c3d08040698f47296e

Disable peer IP in reflog record per default

Bug: Issue 10810
Change-Id: Ia7a04cdce0425989059b92131afd8c2f6030d10b

Documentation/config-gerrit.txt

diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index a144a67..b4baff4 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -2300,7 +2300,7 @@
 
 Record actual peer IP address in ref log entry for identified user.
 
-Defaults to true.
+Defaults to false.
 
 [[gerrit.secureStoreClass]]gerrit.secureStoreClass::
 +

java/com/google/gerrit/server/config/EnablePeerIPInReflogRecordProvider.java

diff --git a/java/com/google/gerrit/server/config/EnablePeerIPInReflogRecordProvider.java b/java/com/google/gerrit/server/config/EnablePeerIPInReflogRecordProvider.java
index 07c1b4e..c274b84 100644
--- a/java/com/google/gerrit/server/config/EnablePeerIPInReflogRecordProvider.java
+++ b/java/com/google/gerrit/server/config/EnablePeerIPInReflogRecordProvider.java
@@ -24,7 +24,7 @@
   @Inject
   EnablePeerIPInReflogRecordProvider(@GerritServerConfig Config config) {
     enablePeerIPInReflogRecord =
-        config.getBoolean("gerrit", null, "enablePeerIPInReflogRecord", true);
+        config.getBoolean("gerrit", null, "enablePeerIPInReflogRecord", false);
   }
 
   @Override

javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java

diff --git a/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java b/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java
index a927ea4..df668a5 100644
--- a/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java
@@ -66,6 +66,7 @@
   }
 
   @Test
+  @GerritConfig(name = "gerrit.enablePeerIPInReflogRecord", value = "true")
   public void peerIPIncludedInReflogRecord() throws Exception {
     PushOneCommit.Result r = createChange();
     Change.Id id = r.getChange().getId();
@@ -85,7 +86,6 @@
   }
 
   @Test
-  @GerritConfig(name = "gerrit.enablePeerIPInReflogRecord", value = "false")
   public void emaiIncludedInReflogRecord() throws Exception {
     PushOneCommit.Result r = createChange();
     Change.Id id = r.getChange().getId();

javatests/com/google/gerrit/server/IdentifiedUserTest.java

diff --git a/javatests/com/google/gerrit/server/IdentifiedUserTest.java b/javatests/com/google/gerrit/server/IdentifiedUserTest.java
index 217bec1..463af35 100644
--- a/javatests/com/google/gerrit/server/IdentifiedUserTest.java
+++ b/javatests/com/google/gerrit/server/IdentifiedUserTest.java
@@ -81,7 +81,7 @@
           protected void configure() {
             bind(Boolean.class)
                 .annotatedWith(EnablePeerIPInReflogRecord.class)
-                .toInstance(Boolean.TRUE);
+                .toInstance(Boolean.FALSE);
             bind(Config.class).annotatedWith(GerritServerConfig.class).toInstance(config);
             bind(String.class)
                 .annotatedWith(AnonymousCowardName.class)

javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java

diff --git a/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java
index 94b6a19..a5cb456 100644
--- a/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java
+++ b/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java
@@ -154,7 +154,7 @@
                     .toInstance("http://localhost:8080/");
                 bind(Boolean.class)
                     .annotatedWith(EnablePeerIPInReflogRecord.class)
-                    .toInstance(Boolean.TRUE);
+                    .toInstance(Boolean.FALSE);
                 bind(Realm.class).to(FakeRealm.class);
                 bind(GroupBackend.class).to(SystemGroupBackend.class).in(SINGLETON);
                 bind(AccountCache.class).toInstance(accountCache);