You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2014/09/19 18:58:17 UTC
[1/8] couchdb commit: updated refs/heads/enable-csp-default to 4292bd5
Repository: couchdb
Updated Branches:
refs/heads/enable-csp-default e16abc958 -> 4292bd5bc (forced update)
Travis: Drop R15 build, add 17.1
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/70e9d571
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/70e9d571
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/70e9d571
Branch: refs/heads/enable-csp-default
Commit: 70e9d571a35bcfb9fe0120fed07a930c388ba88b
Parents: f8a6765
Author: Joan Touzet <wo...@apache.org>
Authored: Sat Sep 6 20:01:09 2014 -0400
Committer: Joan Touzet <wo...@apache.org>
Committed: Sat Sep 6 20:01:09 2014 -0400
----------------------------------------------------------------------
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/70e9d571/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c9fd820..10dbfad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,9 @@ script:
- grunt test
language: erlang
otp_release:
+ - 17.1
- 17.0
- R16B03-1
- - R15B03
- R14B04
git:
depth: 10
[2/8] couchdb commit: updated refs/heads/enable-csp-default to 4292bd5
Posted by ro...@apache.org.
Support passing in a complete URL for deps
closes #268
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/38cc17de
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/38cc17de
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/38cc17de
Branch: refs/heads/enable-csp-default
Commit: 38cc17dea8a945c202b512afe2f0278c4fa8bed8
Parents: 70e9d57
Author: William Cummings <wc...@hubspot.com>
Authored: Sat Sep 6 17:58:20 2014 -0400
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Sep 7 16:25:59 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/38cc17de/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 8e14f89..4e9a58d 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -50,6 +50,10 @@ DepDescs = [
BaseUrl = "https://git-wip-us.apache.org/repos/asf/",
MakeDep = fun
+ ({AppName, {url, Url}, Version}) ->
+ {AppName, ".*", {git, Url, Version}};
+ ({AppName, {url, Url}, Version, Options}) ->
+ {AppName, ".*", {git, Url, Version}, Options};
({AppName, RepoName, Version}) ->
Url = BaseUrl ++ "couchdb-" ++ RepoName ++ ".git",
{AppName, ".*", {git, Url, Version}};
[8/8] couchdb commit: updated refs/heads/enable-csp-default to 4292bd5
Posted by ro...@apache.org.
Enable CSP support for /_utils per default
With Futon getting removed in 2.x, which had too much inline-
JavaScript etc., is not used any more. Fauxton is able to work
with our default CSP settings.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4292bd5b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4292bd5b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4292bd5b
Branch: refs/heads/enable-csp-default
Commit: 4292bd5bcd3e218341c105e2a573e46ed4bc32a2
Parents: bb7ad62
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sat Sep 6 20:49:12 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Fri Sep 19 18:56:21 2014 +0200
----------------------------------------------------------------------
rel/overlay/etc/default.ini | 4 ++--
share/doc/src/experimental.rst | 17 -----------------
2 files changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4292bd5b/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 2585ebb..5aff5d0 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -79,9 +79,9 @@ iterations = 10 ; iterations for password hashing
; comma-separated list of public fields, 404 if empty
; public_fields =
-; Experimental CSP (Content Security Policy) Support for _utils
+; CSP (Content Security Policy) Support for _utils
[csp]
-enable = false
+enable = true
; header_value = default-src 'self'; img-src 'self'; font-src *; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';
[cors]
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4292bd5b/share/doc/src/experimental.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/experimental.rst b/share/doc/src/experimental.rst
index fae925c..077fcaa 100644
--- a/share/doc/src/experimental.rst
+++ b/share/doc/src/experimental.rst
@@ -79,20 +79,3 @@ Plugins
=======
See `src/couch_plugins/README.md`.
-
-
-Content-Security-Policy (CSP) Header Support for /_utils (Fauxton)
-==================================================================
-
-This will just work with Fauxton, and not Futon. You can enable it
-in your config: you can enable the feature in general and change
-the default header that is sent for everything in /_utils.
-
- .. code-block:: ini
-
- [csp]
- enable = true
-
-Then restart CouchDB.
-
-Have fun!
[7/8] couchdb commit: updated refs/heads/enable-csp-default to 4292bd5
Posted by ro...@apache.org.
Fauxton: remove almond.js license
was removed in couchdb-fauxton in #c7fbc1a
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bb7ad626
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bb7ad626
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bb7ad626
Branch: refs/heads/enable-csp-default
Commit: bb7ad626d1c79091649d2292b61c9ae107851fdf
Parents: f6224d6
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Fri Sep 19 18:48:11 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Fri Sep 19 18:48:11 2014 +0200
----------------------------------------------------------------------
LICENSE | 28 ----------------------------
NOTICE | 4 ----
2 files changed, 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb7ad626/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 21995cd..adbd792 100644
--- a/LICENSE
+++ b/LICENSE
@@ -627,34 +627,6 @@ For src/fauxton/apps/modules/pouchdb
License for the specific language governing permissions and limitations under
the License.
-For src/fauxton/assets/js/libs/almond.js
-
- Copyright (c) 2010-2011, The Dojo Foundation
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the Dojo Foundation nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
For src/fauxton/assets/js/libs/backbone.js
Copyright (c) 2010-2013 Jeremy Ashkenas, DocumentCloud
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb7ad626/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 921eebf..85a05b1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -86,10 +86,6 @@ This product also includes the following third-party components:
Copyright 2012, Jeremy Ashkenas
- * almond.js (http://github.com/jrburke/almond)
-
- Copyright 2011, The Dojo Foundation
-
* backbone.js (http://backbonejs.org/)
Copyright 2012, Jeremy Ashkenas, DocumentCloud Inc.
[6/8] couchdb commit: updated refs/heads/enable-csp-default to 4292bd5
Posted by ro...@apache.org.
Add missing committers
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f6224d6c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f6224d6c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f6224d6c
Branch: refs/heads/enable-csp-default
Commit: f6224d6cdab9fc49e868a9766e13234413bfb11b
Parents: ba39f0a
Author: Noah Slater <ns...@tumbolia.org>
Authored: Wed Sep 17 18:19:25 2014 +0200
Committer: Noah Slater <ns...@tumbolia.org>
Committed: Wed Sep 17 18:19:25 2014 +0200
----------------------------------------------------------------------
COMMITTERS | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f6224d6c/COMMITTERS
----------------------------------------------------------------------
diff --git a/COMMITTERS b/COMMITTERS
index 2252d50..ba8a2c8 100644
--- a/COMMITTERS
+++ b/COMMITTERS
@@ -14,7 +14,7 @@ mean this in the sense of being loyal to the project and its interests.
* Paul Joseph Davis <da...@apache.org>
* Adam Kocoloski <ko...@apache.org>
* Jason Davies <ja...@apache.org>
- * Mark Hammond <mh...@skippinet.com.au>
+ * Mark Hammond <mh...@apache.org>
* Benoît Chesneau <be...@apache.org>
* Filipe Manana <fd...@apache.org>
* Robert Newson <rn...@apache.org>
@@ -31,6 +31,17 @@ mean this in the sense of being loyal to the project and its interests.
* Andy Wenk <an...@apache.org>
* Klaus Trainer <kl...@apache.org>
* Benjamin Young <bi...@apache.org>
- * Robert Kowalski <ro...@kowalski.gd>
+ * Robert Kowalski <ro...@apache.org>
+ * Max Thayer <ga...@apache.org>
+ * Gianugo Rabellino <gi...@apache.org>
+ * Jenn Schiffer <je...@apache.org>
+ * Lena Reinhard <le...@apache.org>
+ * Simon Metson <me...@apache.org>
+ * Mike Wallace <mi...@apache.org>
+ * Nick North <ni...@apache.org>
+ * Ryan Ramage <ry...@apache.org>
+ * Sebastian Rothbucher <se...@apache.org>
+ * Ted Leung <tw...@apache.org>
+ * Wendall Cada <we...@apache.org>
For a list of other credits see the `THANKS` file.
[4/8] couchdb commit: updated refs/heads/enable-csp-default to 4292bd5
Posted by ro...@apache.org.
remove duplicate CSP section
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f02a9195
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f02a9195
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f02a9195
Branch: refs/heads/enable-csp-default
Commit: f02a9195dd486c86e9da1cf672f6552297c969a2
Parents: e7bdfa8
Author: Robert Newson <rn...@apache.org>
Authored: Wed Sep 10 10:55:28 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Sep 10 11:10:08 2014 +0100
----------------------------------------------------------------------
rel/overlay/etc/default.ini | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f02a9195/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 491c76a..2585ebb 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -95,11 +95,6 @@ credentials = false
; List of accepted methods
; methods =
-; Experimental CSP (Content Security Policy) Support for _utils
-[csp]
-enable = false
-; header_value = default-src 'self'; img-src 'self'; font-src *; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';
-
; Configuration for a vhost
;[cors:http://example.com]
; credentials = false
[5/8] couchdb commit: updated refs/heads/enable-csp-default to 4292bd5
Posted by ro...@apache.org.
Renamed AUTHORS to COMMITTERS
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ba39f0ae
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ba39f0ae
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ba39f0ae
Branch: refs/heads/enable-csp-default
Commit: ba39f0ae2264765185d10809f9d183f7f9630cb7
Parents: f02a919
Author: Noah Slater <ns...@tumbolia.org>
Authored: Wed Sep 17 18:11:00 2014 +0200
Committer: Noah Slater <ns...@tumbolia.org>
Committed: Wed Sep 17 18:11:04 2014 +0200
----------------------------------------------------------------------
AUTHORS | 34 ----------------------------------
COMMITTERS | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba39f0ae/AUTHORS
----------------------------------------------------------------------
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index a3c9ee5..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,34 +0,0 @@
-Apache CouchDB AUTHORS
-======================
-
-A number of people have contributed directly to Apache CouchDB by writing
-documentation or developing software. Some of these people are:
-
- * Damien Katz <da...@apache.org>
- * Jan Lehnardt <ja...@apache.org>
- * Noah Slater <ns...@apache.org>
- * Christopher Lenz <cm...@apache.org>
- * J. Chris Anderson <jc...@apache.org>
- * Paul Joseph Davis <da...@apache.org>
- * Adam Kocoloski <ko...@apache.org>
- * Jason Davies <ja...@apache.org>
- * Mark Hammond <mh...@skippinet.com.au>
- * Benoît Chesneau <be...@apache.org>
- * Filipe Manana <fd...@apache.org>
- * Robert Newson <rn...@apache.org>
- * Randall Leeds <ra...@apache.org>
- * Bob Dionne <bi...@apache.org>
- * Dave Cottlehuber <dc...@apache.org>
- * Jason Smith <jh...@apache.org>
- * Joan Touzet <wo...@apache.org>
- * Dale Harvey <da...@apache.org>
- * Dirkjan Ochtman <dj...@apache.org>
- * Alexander Shorin <kx...@apache.org>
- * Garren Smith <ga...@apache.org>
- * Sue Lockwood <de...@apache.org>
- * Andy Wenk <an...@apache.org>
- * Klaus Trainer <kl...@apache.org>
- * Benjamin Young <bi...@apache.org>
- * Robert Kowalski <ro...@kowalski.gd>
-
-For a list of other credits see the `THANKS` file.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba39f0ae/COMMITTERS
----------------------------------------------------------------------
diff --git a/COMMITTERS b/COMMITTERS
new file mode 100644
index 0000000..2252d50
--- /dev/null
+++ b/COMMITTERS
@@ -0,0 +1,36 @@
+Apache CouchDB COMMITTERS
+=========================
+
+Committers are given a binding vote in certain project decsions, as well as
+write access to public project infrastructure. The following people were
+elected as a committer in recognition of their commitment to the project. We
+mean this in the sense of being loyal to the project and its interests.
+
+ * Damien Katz <da...@apache.org>
+ * Jan Lehnardt <ja...@apache.org>
+ * Noah Slater <ns...@apache.org>
+ * Christopher Lenz <cm...@apache.org>
+ * J. Chris Anderson <jc...@apache.org>
+ * Paul Joseph Davis <da...@apache.org>
+ * Adam Kocoloski <ko...@apache.org>
+ * Jason Davies <ja...@apache.org>
+ * Mark Hammond <mh...@skippinet.com.au>
+ * Benoît Chesneau <be...@apache.org>
+ * Filipe Manana <fd...@apache.org>
+ * Robert Newson <rn...@apache.org>
+ * Randall Leeds <ra...@apache.org>
+ * Bob Dionne <bi...@apache.org>
+ * Dave Cottlehuber <dc...@apache.org>
+ * Jason Smith <jh...@apache.org>
+ * Joan Touzet <wo...@apache.org>
+ * Dale Harvey <da...@apache.org>
+ * Dirkjan Ochtman <dj...@apache.org>
+ * Alexander Shorin <kx...@apache.org>
+ * Garren Smith <ga...@apache.org>
+ * Sue Lockwood <de...@apache.org>
+ * Andy Wenk <an...@apache.org>
+ * Klaus Trainer <kl...@apache.org>
+ * Benjamin Young <bi...@apache.org>
+ * Robert Kowalski <ro...@kowalski.gd>
+
+For a list of other credits see the `THANKS` file.
[3/8] couchdb commit: updated refs/heads/enable-csp-default to 4292bd5
Posted by ro...@apache.org.
Make N value in dev/run configurable
This commit makes N (the number of development nodes spun up)
a command line option. It also fixes a magic number which was
preventing the value of N from changing the number of nodes
spun up.
Closes COUCHDB-2324
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e7bdfa83
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e7bdfa83
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e7bdfa83
Branch: refs/heads/enable-csp-default
Commit: e7bdfa83525d10b289db3c749dfcdb708b82bfc1
Parents: 38cc17d
Author: Mike Wallace <mi...@apache.org>
Authored: Wed Sep 10 10:06:01 2014 +0100
Committer: Mike Wallace <mi...@apache.org>
Committed: Wed Sep 10 10:34:08 2014 +0100
----------------------------------------------------------------------
dev/run | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e7bdfa83/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index a4f76cb..5bfe86d 100755
--- a/dev/run
+++ b/dev/run
@@ -31,7 +31,7 @@ USAGE = "%prog [options] [command to run...]"
DEV_PATH = os.path.dirname(os.path.abspath(__file__))
COUCHDB = os.path.dirname(DEV_PATH)
-N = 3
+DEFAULT_N = 3
PROCESSES = []
@@ -106,7 +106,7 @@ def write_configs(opts):
datadir = os.path.join(DEV_PATH, "data")
if not os.path.exists(datadir):
os.makedirs(datadir)
- for i in range(1,4):
+ for i in range(1, N+1):
node = "node%d" % i
args = {
"prefix": COUCHDB,
@@ -234,7 +234,9 @@ def wait_for_procs():
def options():
return [
op.make_option("-a", "--admin", metavar="USER:PASS", default=None,
- help="Add an admin account to the development cluster")
+ help="Add an admin account to the development cluster"),
+ op.make_option("-n", "--nodes", metavar="N", default=DEFAULT_N,
+ type="int", help="Number of development nodes to be spun up")
]
@@ -242,6 +244,9 @@ def main():
parser = op.OptionParser(usage=USAGE, option_list=options())
opts, args = parser.parse_args()
+ global N
+ N = opts.nodes
+
init_log_dir()
init_beams()
write_configs(opts)