ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-10 22:43:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor capability-checks

Browse Source
This commit is contained in:
meejah 2019-12-21 16:01:23 -07:00
parent a21e31aed8
commit 67bd9c0b2f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/web/directory.py
View File

@ -24,7 +24,13 @@ from foolscap.api import fireEventually
from allmydata.util import base32 from allmydata.util import base32
from allmydata.util.encodingutil import to_str from allmydata.util.encodingutil import to_str
from allmydata.uri import from_string_dirnode from allmydata.uri import (
from_string_dirnode,
from_string,
CHKFileURI,
WriteableSSKFileURI,
ReadonlySSKFileURI,
)
from allmydata.interfaces import IDirectoryNode, IFileNode, IFilesystemNode, \ from allmydata.interfaces import IDirectoryNode, IFileNode, IFilesystemNode, \
IImmutableFileNode, IMutableFileNode, ExistingChildError, \ IImmutableFileNode, IMutableFileNode, ExistingChildError, \
NoSuchChildError, EmptyPathnameComponentError, SDMF_VERSION, MDMF_VERSION NoSuchChildError, EmptyPathnameComponentError, SDMF_VERSION, MDMF_VERSION
@ -1034,10 +1040,10 @@ def _cap_to_link(root, path, cap):
either a valid local link (tags.a instance) to the capability either a valid local link (tags.a instance) to the capability
or an empty string. or an empty string.
""" """
# TODO: we need a clean consistent way to get the type of a cap string
if cap: if cap:
root_url = URL.from_text(u"{}".format(root)) root_url = URL.from_text(u"{}".format(root))
if cap.startswith(u"URI:CHK") or cap.startswith(u"URI:SSK"): cap_obj = from_string(cap)
if isinstance(cap_obj, (CHKFileURI, WriteableSSKFileURI, ReadonlySSKFileURI)):
uri_link = root_url.child( uri_link = root_url.child(
u"file", u"file",
u"{}".format(urllib.quote(cap)), u"{}".format(urllib.quote(cap)),