Ubuntu
python-keystonemiddleware package

Merge lp:~corey.bryant/ubuntu/trusty/python-keystonemiddleware/juno-http_connect_timeout into lp:~ubuntu-server-dev/ubuntu/trusty/python-keystonemiddleware/juno

  1. Trusty (14.04)
  2. juno-http_connect_timeout
  3. Merge into juno
Proposed by Corey Bryant
Status: Merged
Merged at revision: 3
Proposed branch: lp:~corey.bryant/ubuntu/trusty/python-keystonemiddleware/juno-http_connect_timeout
Merge into: lp:~ubuntu-server-dev/ubuntu/trusty/python-keystonemiddleware/juno
Diff against target: 54 lines (+34/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/fix-1368545.patch (+26/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~corey.bryant/ubuntu/trusty/python-keystonemiddleware/juno-http_connect_timeout
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+267668@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/ubuntu/trusty/python-keystonemiddleware/juno-http_connect_timeout updated
3. By Corey Bryant

debian/patches/fix-1368545.patch: Changing the value type of
http_connect_timeout to IntOpt. (LP: #1368545).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-08-06 08:51:25 +0000
3+++ debian/changelog 2015-08-11 14:31:16 +0000
4@@ -1,3 +1,10 @@
5+python-keystonemiddleware (1.0.0-1ubuntu0.14.10.3~cloud0) UNRELEASED; urgency=medium
6+
7+ * debian/patches/fix-1368545.patch: Changing the value type of
8+ http_connect_timeout to IntOpt. (LP: #1368545).
9+
10+ -- Jorge Niedbalski <jorge.niedbalski@canonical.com> Fri, 07 Aug 2015 11:35:49 -0300
11+
12 python-keystonemiddleware (1.0.0-1ubuntu0.14.10.2~cloud0) trusty-juno; urgency=medium
13
14 * SECURITY UPDATE: incorrect cert verification with ssl_insecure option
15
16=== added file 'debian/patches/fix-1368545.patch'
17--- debian/patches/fix-1368545.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/fix-1368545.patch 2015-08-11 14:31:16 +0000
19@@ -0,0 +1,26 @@
20+Description: Changing the value type of http_connect_timeout
21+
22+The value type of http_connect_timeout definition
23+is changed from Bool to Int value. Python treats
24+a value more than 1 as True but oslo config defines
25+Boolean values as 'true, '1', 'yes' and 'on'.
26+So http_connect_timeout is only configured 1 or None.
27+
28+Change-Id: I53075cc04d0ccea543f8e657279534208ed03058
29+Closes-bug: #1368545.
30+
31+Origin: upstream, https://review.openstack.org/#/c/126543
32+Bug-Ubuntu: https://bugs.launchpad.net/keystonemiddleware/+bug/1368545
33+
34+
35+--- python-keystonemiddleware-1.0.0.orig/keystonemiddleware/auth_token.py
36++++ python-keystonemiddleware-1.0.0/keystonemiddleware/auth_token.py
37+@@ -231,7 +231,7 @@ _OPTS = [
38+ help='Do not handle authorization requests within the'
39+ ' middleware, but delegate the authorization decision to'
40+ ' downstream WSGI components'),
41+- cfg.BoolOpt('http_connect_timeout',
42++ cfg.IntOpt('http_connect_timeout',
43+ default=None,
44+ help='Request timeout value for communicating with Identity'
45+ ' API server.'),
46
47=== modified file 'debian/patches/series'
48--- debian/patches/series 2015-08-06 08:51:25 +0000
49+++ debian/patches/series 2015-08-11 14:31:16 +0000
50@@ -1,3 +1,4 @@
51 removes-discover-from-test-requirements.txt
52 refresh-expired-admin-token.patch
53 CVE-2015-1852.patch
54+fix-1368545.patch

Subscribers

People subscribed via source and target branches