### $Id$
### $URL$
-
+import re
from sfa.util.faults import *
-
URN_PREFIX = "urn:publicid:IDN"
def get_leaf(hrn):
parts = hrn.split(".")
return ".".join(parts[-1:])
-def get_authority(hrn):
+def get_authority(xrn):
+ hrn, type = urn_to_hrn(xrn)
+ if type and type == 'authority':
+ return hrn
+
parts = hrn.split(".")
return ".".join(parts[:-1])
"""
convert a urn to hrn
return a tuple (hrn, type)
+ Warning: urn_to_hrn() replces some special characters that
+ are not replaced in hrn_to_urn(). Due to this,
+ urn_to_hrn() -> hrn_to_urn() may not return the original urn
"""
# if this is already a hrn dont do anything
name = urn[len(URN_PREFIX):]
hrn_parts = name.split("+")
+ type = hrn_parts.pop(2)
- # type is always the second to last element in the list
- type = hrn_parts.pop(-2)
+
+ # Remove the authority name (e.g. '.sa')
+ if type == 'authority':
+ hrn_parts = hrn_parts[:-1]
# convert hrn_parts (list) into hrn (str) by doing the following
+ # dont allow special characters (except ':') in the site login base
# remove blank elements
# replace ':' with '.'
# join list elements using '.'
- hrn = '.'.join([part.replace(':', '.') for part in hrn_parts if part])
-
+ only_alphanum = re.compile('[^a-zA-Z0-9:]+')
+ valid_chars = lambda x: only_alphanum.sub('', x).replace(':', '.')
+ hrn = '.'.join([valid_chars(part) for part in hrn_parts if part])
+
return str(hrn), str(type)
authority = get_authority(hrn)
name = get_leaf(hrn)
- urn = "+".join([unicode(part).replace('.', ':') \
- for part in ['',authority,type,name]])
-
+
+ if type == 'authority':
+ authority = hrn
+ name = 'sa'
+
+ if authority.startswith("plc"):
+ if type == None:
+ urn = "+".join(['',authority.replace('.',':'),name])
+ else:
+ urn = "+".join(['',authority.replace('.',':'),type,name])
+
+ else:
+ urn = "+".join(['',authority,type,name])
+
return URN_PREFIX + urn