diff options
| author | Joan Touzet <joant@atypical.net> | 2017-07-08 01:28:39 -0400 |
|---|---|---|
| committer | Joan Touzet <wohali@users.noreply.github.com> | 2017-07-09 18:06:00 -0400 |
| commit | 34b803a35531f305e05080c35c3e9af9e3b9dbf2 (patch) | |
| tree | 8ef25bac1891c68449ec156b07d885516ceb63e1 /rel | |
| parent | 017d76ff5b1b72e97699b957cc05a3fcce98d6c0 (diff) | |
| download | couchdb-34b803a35531f305e05080c35c3e9af9e3b9dbf2.tar.gz | |
Remove deprecated OAuth 1.0 implementation
Helps resolve issue #656. Implementation broken since bigcouch merge.
Replicator oauth hooks are left in place for future work towards
adding cookie-based authentication support.
Diffstat (limited to 'rel')
| -rw-r--r-- | rel/overlay/etc/default.ini | 29 | ||||
| -rw-r--r-- | rel/reltool.config | 2 |
2 files changed, 2 insertions, 29 deletions
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index 30a03bc87..eaa0801b7 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -76,10 +76,10 @@ delete_dbs = false [httpd] port = {{backend_port}} bind_address = 127.0.0.1 -authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler} +authentication_handlers = {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler} default_handler = {couch_httpd_db, handle_request} secure_rewrites = true -vhost_global_handlers = _utils, _uuids, _session, _oauth, _users +vhost_global_handlers = _utils, _uuids, _session, _users allow_jsonp = false ; Options for the MochiWeb HTTP server. ;server_options = [{backlog, 128}, {acceptor_pool_size, 16}] @@ -196,30 +196,6 @@ credentials = false ; List of hosts separated by a comma. * means accept all ; hosts = -[couch_httpd_oauth] -; If set to 'true', oauth token and consumer secrets will be looked up -; in the authentication database (_users). These secrets are stored in -; a top level property named "oauth" in user documents. Example: -; { -; "_id": "org.couchdb.user:joe", -; "type": "user", -; "name": "joe", -; "password_sha": "fe95df1ca59a9b567bdca5cbaf8412abd6e06121", -; "salt": "4e170ffeb6f34daecfd814dfb4001a73" -; "roles": ["foo", "bar"], -; "oauth": { -; "consumer_keys": { -; "consumerKey1": "key1Secret", -; "consumerKey2": "key2Secret" -; }, -; "tokens": { -; "token1": "token1Secret", -; "token2": "token2Secret" -; } -; } -; } -use_users_db = false - [query_servers] javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js @@ -266,7 +242,6 @@ _uuids = {couch_httpd_misc_handlers, handle_uuids_req} _restart = {couch_httpd_misc_handlers, handle_restart_req} _stats = {couch_stats_httpd, handle_stats_req} _session = {couch_httpd_auth, handle_session_req} -_oauth = {couch_httpd_oauth, handle_oauth_req} _plugins = {couch_plugins_httpd, handle_req} _system = {chttpd_misc, handle_system_req} diff --git a/rel/reltool.config b/rel/reltool.config index 135d38676..762848f22 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -53,7 +53,6 @@ mango, mem3, mochiweb, - oauth, rexi, setup, snappy @@ -107,7 +106,6 @@ {app, mango, [{incl_cond, include}]}, {app, mem3, [{incl_cond, include}]}, {app, mochiweb, [{incl_cond, include}]}, - {app, oauth, [{incl_cond, include}]}, {app, rexi, [{incl_cond, include}]}, {app, setup, [{incl_cond, include}]}, {app, snappy, [{incl_cond, include}]} |