| 1 |
prometheanfire 13/05/24 14:46:37 |
| 2 |
|
| 3 |
Added: 0.2.3-upstream-1181157.patch |
| 4 |
Log: |
| 5 |
keystoneclient fix for upstream bug https://bugs.launchpad.net/opensuse/+bug/1181157 |
| 6 |
|
| 7 |
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-python/python-keystoneclient/files/0.2.3-upstream-1181157.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-keystoneclient/files/0.2.3-upstream-1181157.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-keystoneclient/files/0.2.3-upstream-1181157.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 0.2.3-upstream-1181157.patch |
| 16 |
=================================================================== |
| 17 |
From 03012e641d6c2a98fbfe3780102e28a65d11a887 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Dolph Mathews <dolph.mathews@×××××.com> |
| 19 |
Date: Fri, 17 May 2013 10:38:25 -0500 |
| 20 |
Subject: [PATCH] Default signing_dir to secure temp dir (bug 1181157) |
| 21 |
|
| 22 |
Change-Id: I1a29f50b07a60de3d0519bf40074dbea92fa8656 |
| 23 |
--- |
| 24 |
keystoneclient/middleware/auth_token.py | 8 +++++--- |
| 25 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 26 |
|
| 27 |
diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py |
| 28 |
index e6cf99f..befa79e 100644 |
| 29 |
--- a/keystoneclient/middleware/auth_token.py |
| 30 |
+++ b/keystoneclient/middleware/auth_token.py |
| 31 |
@@ -150,6 +150,7 @@ import json |
| 32 |
import logging |
| 33 |
import os |
| 34 |
import stat |
| 35 |
+import tempfile |
| 36 |
import time |
| 37 |
import urllib |
| 38 |
import webob.exc |
| 39 |
@@ -211,8 +212,7 @@ opts = [ |
| 40 |
cfg.StrOpt('cache', default=None), # env key for the swift cache |
| 41 |
cfg.StrOpt('certfile'), |
| 42 |
cfg.StrOpt('keyfile'), |
| 43 |
- cfg.StrOpt('signing_dir', |
| 44 |
- default=os.path.expanduser('~/keystone-signing')), |
| 45 |
+ cfg.StrOpt('signing_dir'), |
| 46 |
cfg.ListOpt('memcache_servers'), |
| 47 |
cfg.IntOpt('token_cache_time', default=300), |
| 48 |
cfg.IntOpt('revocation_cache_time', default=1), |
| 49 |
@@ -292,8 +292,10 @@ class AuthProtocol(object): |
| 50 |
self.cert_file = self._conf_get('certfile') |
| 51 |
self.key_file = self._conf_get('keyfile') |
| 52 |
|
| 53 |
- #signing |
| 54 |
+ # signing |
| 55 |
self.signing_dirname = self._conf_get('signing_dir') |
| 56 |
+ if self.signing_dirname is None: |
| 57 |
+ self.signing_dirname = tempfile.mkdtemp(prefix='keystone-signing-') |
| 58 |
self.LOG.info('Using %s as cache directory for signing certificate' % |
| 59 |
self.signing_dirname) |
| 60 |
if os.path.exists(self.signing_dirname): |
| 61 |
-- |
| 62 |
1.8.1.5 |
Archives