lauri/certidude
1
0
Fork 0
mirror of https://github.com/laurivosandi/certidude synced 2024-12-22 08:15:18 +00:00
Code Issues Activity

api: attrib: drop usage of global authority import

Browse Source
This commit is contained in:
Priit Laes 2018-02-03 12:37:06 +02:00
parent 5cb7f89c1b
commit 863deafa59
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
certidude/api/__init__.py
View File

@ -228,7 +228,7 @@ def certidude_app(log_handlers=[]):
app.add_route("/api/token/", TokenResource())
# Extended attributes for scripting etc.
app.add_route("/api/signed/{cn}/attr/", AttributeResource(namespace="machine"))
app.add_route("/api/signed/{cn}/attr/", AttributeResource(authority, namespace="machine"))
app.add_route("/api/signed/{cn}/script/", ScriptResource())
# API calls used by pushed events on the JS end

9
certidude/api/attrib.py
View File

@ -4,7 +4,7 @@ import logging
import re
from xattr import setxattr, listxattr, removexattr
from datetime import datetime
from certidude import config, authority, push
from certidude import push
from certidude.decorators import serialize, csrf_protection
from certidude.firewall import whitelist_subject
from certidude.auth import login_required, login_optional, authorize_admin
@ -13,7 +13,8 @@ from ipaddress import ip_address
logger = logging.getLogger(__name__)
class AttributeResource(object):
def __init__(self, namespace):
def __init__(self, authority, namespace):
self.authority = authority
self.namespace = namespace
@serialize
@ -27,7 +28,7 @@ class AttributeResource(object):
Results made available only to lease IP address.
"""
try:
path, buf, cert, attribs = authority.get_attributes(cn, namespace=self.namespace)
path, buf, cert, attribs = self.authority.get_attributes(cn, namespace=self.namespace)
except IOError:
raise falcon.HTTPNotFound()
else:
@ -38,7 +39,7 @@ class AttributeResource(object):
def on_post(self, req, resp, cn):
namespace = ("user.%s." % self.namespace).encode("ascii")
try:
path, buf, cert, signed, expires = authority.get_signed(cn)
path, buf, cert, signed, expires = self.authority.get_signed(cn)
except IOError:
raise falcon.HTTPNotFound()
else: