From 3bd01810b3740bf91f617fd7bfb546a16c187c54 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Tue, 14 Jun 2016 12:30:42 +0200 Subject: [PATCH 1/7] permissions: Fix permissions for authentication plugin settings view. --- rhodecode/authentication/views.py | 6 ++++++ rhodecode/login/views.py | 2 ++ 2 files changed, 8 insertions(+) diff --git a/rhodecode/authentication/views.py b/rhodecode/authentication/views.py index b71db6c0..192d26be 100644 --- a/rhodecode/authentication/views.py +++ b/rhodecode/authentication/views.py @@ -44,7 +44,10 @@ class AuthnPluginViewBase(object): self.request = request self.context = context self.plugin = context.plugin + self._rhodecode_user = request.user + @LoginRequired() + @HasPermissionAllDecorator('hg.admin') def settings_get(self, defaults=None, errors=None): """ View that displays the plugin settings as a form. @@ -67,6 +70,9 @@ class AuthnPluginViewBase(object): return template_context + @LoginRequired() + @HasPermissionAllDecorator('hg.admin') + @auth.CSRFRequired() def settings_post(self): """ View that validates and stores the plugin settings. diff --git a/rhodecode/login/views.py b/rhodecode/login/views.py index f4d44257..5f2a9379 100644 --- a/rhodecode/login/views.py +++ b/rhodecode/login/views.py @@ -208,6 +208,8 @@ class LoginView(object): }) return render_ctx + @HasPermissionAnyDecorator( + 'hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate') @view_config( route_name='register', request_method='POST', renderer='rhodecode:templates/register.html') From f26b3f313a0644e9a23cc9a97790e133c6c1b973 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 14 Jun 2016 16:39:17 +0200 Subject: [PATCH 2/7] docs: added info about release 4.1.1 --- docs/release-notes/release-notes-4.1.1.rst | 15 +++++++++++++++ docs/release-notes/release-notes.rst | 1 + 2 files changed, 16 insertions(+) create mode 100644 docs/release-notes/release-notes-4.1.1.rst diff --git a/docs/release-notes/release-notes-4.1.1.rst b/docs/release-notes/release-notes-4.1.1.rst new file mode 100644 index 00000000..f99a41e3 --- /dev/null +++ b/docs/release-notes/release-notes-4.1.1.rst @@ -0,0 +1,15 @@ +|RCE| 4.1.1 |RNS| +----------------- + +Release Date +^^^^^^^^^^^^ + +- 2016-06-14 + +Fixes +^^^^^ + +- security: fixed permissions issues on pyramid auth-plugins views. + They no longer raise an internal server error page when accessed unauthorized. + +- search: use better ElasticSearch repo filters. (EE only) diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst index 2788d59c..618a816f 100644 --- a/docs/release-notes/release-notes.rst +++ b/docs/release-notes/release-notes.rst @@ -9,6 +9,7 @@ Release Notes .. toctree:: :maxdepth: 1 + release-notes-4.1.1.rst release-notes-4.1.0.rst release-notes-4.0.1.rst release-notes-4.0.0.rst From 97fb3837a4b02a1961b73833fdd3d5fc59f498e7 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 14 Jun 2016 23:12:07 +0200 Subject: [PATCH 3/7] release: remove nix_dependencies_moved task --- .release.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/.release.cfg b/.release.cfg index 86aaffc7..740c3e40 100644 --- a/.release.cfg +++ b/.release.cfg @@ -7,9 +7,6 @@ done = true [task:changelog_updated] done = true -[task:nix_dependencies_moved] -done = true - [task:bump_version] done = true From ab5316a2b34ad00dedf5d61d6563cc0b20ceae1f Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 15 Jun 2016 02:29:27 +0200 Subject: [PATCH 4/7] release: Start preparation for 4.1.1 --- .bumpversion.cfg | 2 +- .release.cfg | 22 +++++++++++----------- rhodecode/VERSION | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a3bba223..e8a1326b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.1.0 +current_version = 4.1.1 message = release: Bump version {current_version} to {new_version} [bumpversion:file:rhodecode/VERSION] diff --git a/.release.cfg b/.release.cfg index 740c3e40..e0fb9d14 100644 --- a/.release.cfg +++ b/.release.cfg @@ -1,24 +1,24 @@ [DEFAULT] done = false -[task:fixes_on_stable] -done = true - -[task:changelog_updated] -done = true - [task:bump_version] done = true -[task:generate_js_routes] -done = true +[task:rc_tools_pinned] + +[task:fixes_on_stable] + +[task:pip2nix_generated] + +[task:changelog_updated] [task:generate_api_docs] -done = true + +[task:generate_js_routes] [release] -state = prepared -version = 3.8.3 +state = in_progress +version = 4.1.1 [task:updated_translation] diff --git a/rhodecode/VERSION b/rhodecode/VERSION index 99eba4de..2582dddf 100644 --- a/rhodecode/VERSION +++ b/rhodecode/VERSION @@ -1 +1 @@ -4.1.0 \ No newline at end of file +4.1.1 \ No newline at end of file From 5bd9692450c7a7e6fef5379639215be8425fdc9d Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 15 Jun 2016 03:00:11 +0200 Subject: [PATCH 5/7] release: updated pip2nix output for 4.1.1 --- .release.cfg | 5 +++++ pkgs/python-packages.nix | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.release.cfg b/.release.cfg index e0fb9d14..070f076f 100644 --- a/.release.cfg +++ b/.release.cfg @@ -5,16 +5,21 @@ done = false done = true [task:rc_tools_pinned] +done = true [task:fixes_on_stable] +done = true [task:pip2nix_generated] [task:changelog_updated] +done = true [task:generate_api_docs] +done = true [task:generate_js_routes] +done = true [release] state = in_progress diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix index 60bce9bb..dc80397f 100644 --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -950,13 +950,13 @@ }; }; python-editor = super.buildPythonPackage { - name = "python-editor-1.0"; + name = "python-editor-1.0.1"; buildInputs = with self; []; doCheck = false; propagatedBuildInputs = with self; []; src = fetchurl { - url = "https://pypi.python.org/packages/f5/d9/01eb441489c8bd2adb33ee4f3aea299a3db531a584cb39c57a0ecf516d9c/python-editor-1.0.tar.gz"; - md5 = "a5ead611360b17b52507297d8590b4e8"; + url = "https://pypi.python.org/packages/2b/c0/df7b87d5cf016f82eab3b05cd35f53287c1178ad8c42bfb6fa61b89b22f6/python-editor-1.0.1.tar.gz"; + md5 = "e1fa63535b40e022fa4fd646fd8b511a"; }; }; python-ldap = super.buildPythonPackage { @@ -1040,7 +1040,7 @@ }; }; rhodecode-enterprise-ce = super.buildPythonPackage { - name = "rhodecode-enterprise-ce-4.1.0"; + name = "rhodecode-enterprise-ce-4.1.1"; buildInputs = with self; [WebTest configobj cssselect flake8 lxml mock pytest pytest-cov pytest-runner]; doCheck = true; propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments Pylons Pyro4 Routes SQLAlchemy Tempita URLObject WebError WebHelpers WebHelpers2 WebOb WebTest Whoosh alembic amqplib anyjson appenlight-client authomatic backport-ipaddress celery colander decorator docutils gunicorn infrae.cache ipython iso8601 kombu msgpack-python packaging psycopg2 pycrypto pycurl pyparsing pyramid pyramid-debugtoolbar pyramid-mako pyramid-beaker pysqlite python-dateutil python-ldap python-memcached python-pam recaptcha-client repoze.lru requests simplejson waitress zope.cachedescriptors psutil py-bcrypt]; @@ -1177,13 +1177,13 @@ }; }; urllib3 = super.buildPythonPackage { - name = "urllib3-1.15.1"; + name = "urllib3-1.16"; buildInputs = with self; []; doCheck = false; propagatedBuildInputs = with self; []; src = fetchurl { - url = "https://pypi.python.org/packages/49/26/a7d12ea00cb4b9fa1e13b5980e5a04a1fe7c477eb8f657ce0b757a7a497d/urllib3-1.15.1.tar.gz"; - md5 = "5be254b0dbb55d1307ede99e1895c8dd"; + url = "https://pypi.python.org/packages/3b/f0/e763169124e3f5db0926bc3dbfcd580a105f9ca44cf5d8e6c7a803c9f6b5/urllib3-1.16.tar.gz"; + md5 = "fcaab1c5385c57deeb7053d3d7d81d59"; }; }; venusian = super.buildPythonPackage { From 4b56299d1fb7df921ce49042579a25a24b94377f Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 15 Jun 2016 03:00:11 +0200 Subject: [PATCH 6/7] release: Finish preparation for 4.1.1 --- .release.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index 070f076f..ab019a8c 100644 --- a/.release.cfg +++ b/.release.cfg @@ -11,6 +11,7 @@ done = true done = true [task:pip2nix_generated] +done = true [task:changelog_updated] done = true @@ -22,7 +23,7 @@ done = true done = true [release] -state = in_progress +state = prepared version = 4.1.1 [task:updated_translation] From 11e283bac84bcf338923b693f7a4a7ed3f73aa8f Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 15 Jun 2016 03:00:11 +0200 Subject: [PATCH 7/7] Added tag v4.1.1 for changeset 7fd5c850745e