diff options
| author | Jesse Andrews <anotherjesse@gmail.com> | 2010-05-30 15:21:34 -0700 |
|---|---|---|
| committer | Jesse Andrews <anotherjesse@gmail.com> | 2010-05-30 15:21:34 -0700 |
| commit | 94518726fbb850ad5e81a7f937e197052f26bef2 (patch) | |
| tree | 8cf585bb3f83db07ad2f5585c6bc37bad4602533 /nova/crypto.py | |
| parent | fd278ade0bf19ba9deba65976ce6af7c59c4443a (diff) | |
| download | nova-94518726fbb850ad5e81a7f937e197052f26bef2.tar.gz nova-94518726fbb850ad5e81a7f937e197052f26bef2.tar.xz nova-94518726fbb850ad5e81a7f937e197052f26bef2.zip | |
Merged Vish's work on adding projects to nova
Diffstat (limited to 'nova/crypto.py')
| -rw-r--r-- | nova/crypto.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index 6add55ee5..1f35ffa39 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -39,21 +39,20 @@ flags.DEFINE_string('keys_path', utils.abspath('../keys'), 'Where we keep our ke flags.DEFINE_string('ca_path', utils.abspath('../CA'), 'Where we keep our root CA') flags.DEFINE_boolean('use_intermediate_ca', False, 'Should we use intermediate CAs for each project?') - -def ca_path(username): - if username: - return "%s/INTER/%s/cacert.pem" % (FLAGS.ca_path, username) +def ca_path(project_id): + if project_id: + return "%s/INTER/%s/cacert.pem" % (FLAGS.ca_path, project_id) return "%s/cacert.pem" % (FLAGS.ca_path) -def fetch_ca(username=None, chain=True): +def fetch_ca(project_id=None, chain=True): if not FLAGS.use_intermediate_ca: - username = None + project_id = None buffer = "" - if username: - with open(ca_path(username),"r") as cafile: + if project_id: + with open(ca_path(project_id),"r") as cafile: buffer += cafile.read() - if username and not chain: - return buffer + if not chain: + return buffer with open(ca_path(None),"r") as cafile: buffer += cafile.read() return buffer @@ -104,7 +103,6 @@ def generate_x509_cert(subject="/C=US/ST=California/L=The Mission/O=CloudFed/OU= shutil.rmtree(tmpdir) return (private_key, csr) - def sign_csr(csr_text, intermediate=None): if not FLAGS.use_intermediate_ca: intermediate = None @@ -118,7 +116,6 @@ def sign_csr(csr_text, intermediate=None): os.chdir(start) return _sign_csr(csr_text, user_ca) - def _sign_csr(csr_text, ca_folder): tmpfolder = tempfile.mkdtemp() csrfile = open("%s/inbound.csr" % (tmpfolder), "w") @@ -197,7 +194,7 @@ def mkcacert(subject='nova', years=1): # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. |