summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <joant@atypical.net>2018-07-23 19:49:00 -0400
committerJoan Touzet <wohali@users.noreply.github.com>2018-07-24 03:25:18 -0400
commit98eec314ca4cf05399cc44d330d5abf038e399c1 (patch)
tree8b4c23a06a15b9c4b8bb3e4cf45458d0525a56e3
parent7597abf850870bb63e115ec004106b403a9be42c (diff)
downloadcouchdb-98eec314ca4cf05399cc44d330d5abf038e399c1.tar.gz
Enable replication client _session auth by default
Relates to #1153 and #1176
-rw-r--r--rel/overlay/etc/default.ini9
-rw-r--r--src/couch_replicator/src/couch_replicator_auth.erl2
2 files changed, 5 insertions, 6 deletions
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index aa9763ce0..084a16ec2 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -433,13 +433,12 @@ ssl_certificate_max_depth = 3
; There are currently two plugins available:
; couch_replicator_auth_session - use _session cookie authentication
; couch_replicator_auth_noop - use basic authentication (previous default)
-; Currently previous default behavior is still the default. To start using
-; session auth, use this as the list of plugins:
-; `couch_replicator_auth_session,couch_replicator_auth_noop`.
-; In a future release the session plugin might be used by default.
+; Currently, the new _session cookie authentication is tried first, before
+; falling back to the old basic authenticaion default:
+;auth_plugins = couch_replicator_auth_session,couch_replicator_auth_noop
+; To restore the old behaviour, use the following value:
;auth_plugins = couch_replicator_auth_noop
-
[compaction_daemon]
; The delay, in seconds, between each check for which database and view indexes
; need to be compacted.
diff --git a/src/couch_replicator/src/couch_replicator_auth.erl b/src/couch_replicator/src/couch_replicator_auth.erl
index 60273fc32..7f51cdd1c 100644
--- a/src/couch_replicator/src/couch_replicator_auth.erl
+++ b/src/couch_replicator/src/couch_replicator_auth.erl
@@ -28,7 +28,7 @@
-type code() :: non_neg_integer().
--define(DEFAULT_PLUGINS, "couch_replicator_auth_noop").
+-define(DEFAULT_PLUGINS, "couch_replicator_auth_session,couch_replicator_auth_noop").
% Behavior API