From c19b05b352d9b6052f79e8c3f48b059e493a82b2 Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Thu, 16 Jun 2016 10:43:17 +0200 Subject: [PATCH 1/7] login: Log redirection target on debug level We have some magic when computing the URL, it is good if we can see in the debug log this detail. --- rhodecode/login/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rhodecode/login/views.py b/rhodecode/login/views.py index 5f2a9379..874c3622 100644 --- a/rhodecode/login/views.py +++ b/rhodecode/login/views.py @@ -154,6 +154,7 @@ class LoginView(object): self.session, username=form_result['username'], remember=form_result['remember']) + log.debug('Redirecting to "%s" after login.', came_from) raise HTTPFound(came_from, headers=headers) except formencode.Invalid as errors: defaults = errors.value From f53ce87693cec29e6cd0fc464c98f5192f662983 Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Thu, 16 Jun 2016 11:35:55 +0200 Subject: [PATCH 2/7] config: Move HttpsFixup middleware up Wrapping it around the Pyramid application makes SSL work. Since it also does things with the strict transport security headers, I kept it this way for now. Most probably we can shrink it to only contain the htsts things and use the prefix middleware of paste. --- rhodecode/config/middleware.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py index bdf968f2..73ed5905 100644 --- a/rhodecode/config/middleware.py +++ b/rhodecode/config/middleware.py @@ -120,9 +120,6 @@ def make_app(global_conf, full_stack=True, static_files=True, **app_conf): else: app = StatusCodeRedirect(app, [400, 401, 403, 404, 500]) - # enable https redirects based on HTTP_X_URL_SCHEME set by proxy - app = HttpsFixup(app, config) - # Establish the Registry for this application app = RegistryManager(app) @@ -253,8 +250,12 @@ def wrap_app_in_wsgi_middlewares(pyramid_app, config): """ settings = config.registry.settings + # enable https redirects based on HTTP_X_URL_SCHEME set by proxy + pyramid_app = HttpsFixup(pyramid_app, settings) + # Add RoutesMiddleware. Currently we have two instances in the stack. This # is the upper one to support the pylons compatibility tween during + # migration to pyramid. pyramid_app = RoutesMiddleware( pyramid_app, config.registry._pylons_compat_config['routes.map']) From bf61e48b4eeca7c92ca39f7a7f3c95e6bb5417fc Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 16 Jun 2016 20:27:49 +0200 Subject: [PATCH 3/7] docs: added release notes for release 4.1.2 --- docs/release-notes/release-notes-4.1.2.rst | 16 ++++++++++++++++ docs/release-notes/release-notes.rst | 1 + 2 files changed, 17 insertions(+) create mode 100644 docs/release-notes/release-notes-4.1.2.rst diff --git a/docs/release-notes/release-notes-4.1.2.rst b/docs/release-notes/release-notes-4.1.2.rst new file mode 100644 index 00000000..f678cb77 --- /dev/null +++ b/docs/release-notes/release-notes-4.1.2.rst @@ -0,0 +1,16 @@ +|RCE| 4.1.2 |RNS| +----------------- + +Release Date +^^^^^^^^^^^^ + +- 2016-06-16 + +Fixes +^^^^^ + +- ssl: fixed http middleware so it works correctly with pyramid views. This + fixed http -> https redirection problems on login. + +- ldap: fixed ldap usergroup authentication plugin so after upgrade it's + possible to change the settings again (EE only). diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst index 618a816f..9c7d0beb 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.2.rst release-notes-4.1.1.rst release-notes-4.1.0.rst release-notes-4.0.1.rst From 37372e739bef22569f709b02b67cb96142e6f319 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 16 Jun 2016 23:03:42 +0200 Subject: [PATCH 4/7] release: Start preparation for 4.1.2 --- .bumpversion.cfg | 2 +- .release.cfg | 10 ++-------- rhodecode/VERSION | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e8a1326b..b4e4386d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.1.1 +current_version = 4.1.2 message = release: Bump version {current_version} to {new_version} [bumpversion:file:rhodecode/VERSION] diff --git a/.release.cfg b/.release.cfg index ab019a8c..c411eacc 100644 --- a/.release.cfg +++ b/.release.cfg @@ -5,26 +5,20 @@ done = false done = true [task:rc_tools_pinned] -done = true [task:fixes_on_stable] -done = true [task:pip2nix_generated] -done = true [task:changelog_updated] -done = true [task:generate_api_docs] -done = true [task:generate_js_routes] -done = true [release] -state = prepared -version = 4.1.1 +state = in_progress +version = 4.1.2 [task:updated_translation] diff --git a/rhodecode/VERSION b/rhodecode/VERSION index 2582dddf..cd9b8f55 100644 --- a/rhodecode/VERSION +++ b/rhodecode/VERSION @@ -1 +1 @@ -4.1.1 \ No newline at end of file +4.1.2 \ No newline at end of file From cc84222385cc73f743bdc5968e3e9cdb40bf42b7 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 16 Jun 2016 23:06:43 +0200 Subject: [PATCH 5/7] release: updated pip2nix output for 4.1.2 --- .release.cfg | 5 +++++ pkgs/python-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index c411eacc..f333e0cf 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 dc80397f..ad5d5f30 100644 --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1040,7 +1040,7 @@ }; }; rhodecode-enterprise-ce = super.buildPythonPackage { - name = "rhodecode-enterprise-ce-4.1.1"; + name = "rhodecode-enterprise-ce-4.1.2"; 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]; From f3f967954c0a5bf0831a2d4444c6482472eaf29b Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 16 Jun 2016 23:06:44 +0200 Subject: [PATCH 6/7] release: Finish preparation for 4.1.2 --- .release.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index f333e0cf..527fe420 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.2 [task:updated_translation] From a10185d584d367e5c8cec4f6f4c150c5b83bd745 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 16 Jun 2016 23:06:44 +0200 Subject: [PATCH 7/7] Added tag v4.1.2 for changeset 41c87da28a17