From 701599be6e570a4dc1e62405618c047b2c725f73 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 13 Aug 2012 10:39:02 -0400 Subject: [PATCH] fix urn support for sfi config --- sfa/client/sfaclientlib.py | 3 ++- sfa/client/sfi.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sfa/client/sfaclientlib.py b/sfa/client/sfaclientlib.py index 521a220b..ef039e2c 100644 --- a/sfa/client/sfaclientlib.py +++ b/sfa/client/sfaclientlib.py @@ -10,6 +10,7 @@ import sys import os,os.path from datetime import datetime +from sfa.util.xrn import Xrn import sfa.util.sfalogging # importing sfa.utils.faults does pull a lot of stuff @@ -238,7 +239,7 @@ class SfaClientBootstrap: # the expected filenames for the various pieces def private_key_filename (self): - return self.fullpath ("%s.pkey"%self.hrn) + return self.fullpath ("%s.pkey" % Xrn.unescape(self.hrn)) def self_signed_cert_filename (self): return self.fullpath ("%s.sscert"%self.hrn) def my_credential_filename (self): diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index e29cbe1f..3695f9a2 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -637,7 +637,7 @@ class Sfi: if not os.path.isfile(client_bootstrap.private_key_filename()): self.logger.info ("private key not found, trying legacy name") try: - legacy_private_key = os.path.join (self.options.sfi_dir, "%s.pkey"%get_leaf(self.user)) + legacy_private_key = os.path.join (self.options.sfi_dir, "%s.pkey"%Xrn.unescape(get_leaf(self.user))) self.logger.debug("legacy_private_key=%s"%legacy_private_key) client_bootstrap.init_private_key_if_missing (legacy_private_key) self.logger.info("Copied private key from legacy location %s"%legacy_private_key) -- 2.43.0