update

Author: Leif Johansson

.gitignore

@@ -25,3 +25,5 @@ localconfig.py
 .whoosh
 
 docs/code
+src/pyff/web
+MANIFEST

npm_modules.txt

@@ -0,0 +1,2 @@
+@sunet/mdq-browser@1.0.2
+@theidentityselector/thiss@1.5.0-dev0

setup.py

@@ -2,14 +2,33 @@
 # -*- encoding: utf-8 -*-
 
 from distutils.core import setup
+from distutils.command.sdist import sdist
+from distutils.dir_util import copy_tree
 from pathlib import PurePath
 from platform import python_implementation
 from typing import List
-
+from tempfile import TemporaryDirectory
 from setuptools import find_packages
 
 __author__ = 'Leif Johansson'
-__version__ = '2.0.0'
+__version__ = '2.1.0dev0'
+
+
+class NPMSdist(sdist):
+    def run(self):
+        import subprocess
+
+        npm_modules = load_requirements(here.with_name('npm_modules.txt'))
+        with TemporaryDirectory() as tmp:
+            for npm_module in npm_modules:
+                subprocess.check_call(['npm', 'install', '--production', '--prefix', tmp, npm_module])
+            for npm_module in npm_modules:
+                (npm_module_path, _, _) = npm_module.rpartition('@')
+                copy_tree(
+                    "{}/node_modules/{}/dist".format(tmp, npm_module_path), './src/pyff/web/{}'.format(npm_module_path)
+                )
+
+        super().run()
 
 
 def load_requirements(path: PurePath) -> List[str]:
@@ -37,6 +56,7 @@ def load_requirements(path: PurePath) -> List[str]:
 
 setup(
     name='pyFF',
+    cmdclass={'sdist': NPMSdist},
     version=__version__,
     description="Federation Feeder",
     long_description=README + '\n\n' + NEWS,
@@ -55,7 +75,7 @@ def load_requirements(path: PurePath) -> List[str]:
     packages=find_packages('src'),
     package_dir={'': 'src'},
     include_package_data=True,
-    package_data={'pyff': ['xslt/*.xsl', 'schema/*.xsd']},
+    package_data={'pyff': ['xslt/*.xsl', 'schema/*.xsd', 'web/**/*']},
     zip_safe=False,
     install_requires=install_requires,
     scripts=['scripts/mirror-mdq.sh'],
@@ -64,6 +84,11 @@ def load_requirements(path: PurePath) -> List[str]:
         'paste.app_factory': ['pyffapp=pyff.wsgi:app_factory'],
         'paste.server_runner': ['pyffs=pyff.wsgi:server_runner'],
     },
-    message_extractors={'src': [('**.py', 'python', None), ('**/templates/**.html', 'mako', None),]},
+    message_extractors={
+        'src': [
+            ('**.py', 'python', None),
+            ('**/templates/**.html', 'mako', None),
+        ]
+    },
     python_requires='>=3.7',
 )

src/pyff/api.py

@@ -15,7 +15,6 @@
 from pyramid.events import NewRequest
 from pyramid.request import Request
 from pyramid.response import Response
-from pyramid.static import static_view
 from six import b
 from six.moves.urllib_parse import quote_plus
 
@@ -26,7 +25,7 @@
 from pyff.repo import MDRepository
 from pyff.resource import Resource
 from pyff.samlmd import entity_display_name
-from pyff.utils import b2u, dumptree, hash_id, json_serializer, utc_now, FrontendApp
+from pyff.utils import b2u, dumptree, hash_id, json_serializer, utc_now, FrontendApp, resource_filename
 
 log = get_log(__name__)
 
@@ -64,6 +63,7 @@ def json_response(data) -> Response:
     response.headers['Content-Type'] = 'application/json'
     return response
 
+
 def status_handler(request: Request) -> Response:
     """
     Implements the /api/status endpoint
@@ -572,17 +572,22 @@ def mkapp(*args: Any, **kwargs: Any) -> Any:
         ctx.add_route('call', '/api/call/{entry}', request_method=['POST', 'PUT'])
         ctx.add_view(process_handler, route_name='call')
 
-        if config.mdq_browser or config.thiss:
+        if config.mdq_browser is not None or config.thiss is not None:
             ctx.add_route_predicate('ext', ExtensionPredicate)
 
+            if config.mdq_browser is not None and len(config.mdq_browser) == 0:
+                config.mdq_browser = resource_filename('web/@sunet/mdq-browser')
+
             if config.mdq_browser:
-                os.environ['MDQ_URL'] = config.base_url + "/entities/"
-                FrontendApp.load(config.mdq_browser).add_route(ctx)
+                log.debug("serving mdq-browser from {}".format(config.mdq_browser))
+                FrontendApp.load('/', 'mdq_browser', config.mdq_browser).add_route(ctx)
+
+            if config.thiss is not None and len(config.thiss) == 0:
+                config.thiss = resource_filename('web/@theidentityselector/thiss')
 
             if config.thiss:
-                os.environ['BASE_URL'] = config.base_url
-                os.environ['STORAGE_DOMAIN'] = config.host  # TODO - make this configurable or grab from base_url
-                FrontendApp.load(config.thiss).add_route(ctx)
+                log.debug("serving thiss from {}".format(config.thiss))
+                FrontendApp.load('/thiss/', 'thiss', config.thiss).add_route(ctx)
 
         ctx.add_route('request', '/*path', request_method='GET')
         ctx.add_view(request_handler, route_name='request')

src/pyff/resource.py

@@ -264,7 +264,7 @@ def local_copy_fn(self):
 
     @property
     def post(
-        self,
+            self,
     ) -> Iterable[Callable]:  # TODO: move classes to make this work -> List[Union['Lambda', 'PipelineCallback']]:
         return self.opts.via
 

src/pyff/utils.py

@@ -6,6 +6,8 @@
 This module contains various utilities.
 
 """
+from __future__ import annotations
+
 import base64
 import cgi
 import contextlib
@@ -51,6 +53,8 @@
 from pyff.logs import get_log
 
 from pydantic import BaseModel
+from pyramid.static import static_view
+
 
 etree.set_default_parser(etree.XMLParser(resolve_entities=False))
 
@@ -985,14 +989,15 @@ def utc_now() -> datetime:
 
 
 class FrontendApp(BaseModel):
+    url_path: str
     name: str
     directory: str
     dirs: List[str] = []
-    exts: Set[str] = []
+    exts: Set[str] = set()
 
     @staticmethod
-    def load(name: str, directory: str) -> FrontendApp:
-        fa = FrontendApp(name=name, directory=directory)
+    def load(url_path: str, name: str, directory: str) -> FrontendApp:
+        fa = FrontendApp(url_path=url_path, name=name, directory=directory)
         with os.scandir(fa.directory) as it:
             for entry in it:
                 if not entry.name.startswith('.'):
@@ -1004,13 +1009,13 @@ def load(name: str, directory: str) -> FrontendApp:
         return fa
 
     def add_route(self, ctx):
-        for uri_part in ["/"] + [d + "/" for d in self.dirs]:
+        for uri_part in [self.url_path] + [self.url_path + d + "/" for d in self.dirs]:
             route = '{}_{}'.format(self.name, uri_part)
             path = '{:s}{{sep:/?}}{{path:.*}}'.format(uri_part)
             ctx.add_route(
                 route,
                 path,
                 request_method='GET',
-                ext=['path'] + self.exts,
+                ext=['path'] + list(self.exts),
             )
             ctx.add_view(static_view(self.directory, use_subpath=False), route_name=route)