Magpie adapter process visibility

magpie/adapter/__init__.py

@@ -2,7 +2,7 @@
 from magpie.definitions.ziggurat_definitions import *
 from magpie.definitions.twitcher_definitions import *
 from magpie.adapter.magpieowssecurity import *
-from magpie.adapter.magpieservice import *
+from magpie.adapter.magpieservice import MagpieServiceStore
 from magpie.models import get_user
 from magpie.security import auth_config_from_settings
 from magpie.db import *
@@ -19,9 +19,9 @@ def servicestore_factory(self, registry, headers=None):
         return MagpieServiceStore(registry=registry)
 
     def processstore_factory(self, registry):
-        # no reimplementation of processes on magpie side
-        # simply return the default twitcher process store
-        return DefaultAdapter().processstore_factory(registry)
+        # import here to avoid import errors on default twitcher not implementing processes
+        from magpie.adapter.magpieprocess import MagpieProcessStore
+        return MagpieProcessStore(registry=registry)
 
     def jobstore_factory(self, registry):
         # no reimplementation of jobs on magpie side

magpie/adapter/magpieservice.py

@@ -9,7 +9,7 @@
 LOGGER = logging.getLogger("TWITCHER")
 
 from magpie.definitions.twitcher_definitions import *
-from magpie.definitions.pyramid_definitions import ConfigurationError
+from magpie.definitions.pyramid_definitions import ConfigurationError, HTTPOk
 
 
 class MagpieServiceStore(ServiceStore):
@@ -51,7 +51,7 @@ def list_services(self, request=None):
         path = '/users/current/services?inherit=True&cascade=True'
         response = requests.get('{url}{path}'.format(url=self.magpie_url, path=path),
                                 cookies=request.cookies)
-        if response.status_code != 200:
+        if response.status_code != HTTPOk.code:
             raise response.raise_for_status()
         services = json.loads(response.text)
         for service_type in services['services']:

magpie/api/api_rest_schemas.py

@@ -375,42 +375,42 @@ class InternalServerErrorResponseSchema(colander.MappingSchema):
 
 
 class ProvidersListSchema(colander.SequenceSchema):
-    item = colander.SchemaNode(
+    provider_name = colander.SchemaNode(
         colander.String(),
         description="Available login providers.",
-        example=["ziggurat", "openid"],
+        example="openid",
     )
 
 
 class ResourceTypesListSchema(colander.SequenceSchema):
-    item = colander.SchemaNode(
+    resource_type = colander.SchemaNode(
         colander.String(),
         description="Available resource type under root service.",
-        example=["file", "dictionary"],
+        example="file",
     )
 
 
 class GroupNamesListSchema(colander.SequenceSchema):
-    item = colander.SchemaNode(
+    group_name = colander.SchemaNode(
         colander.String(),
         description="List of groups depending on context.",
-        example=["anonymous"]
+        example="administrators"
     )
 
 
 class UserNamesListSchema(colander.SequenceSchema):
-    item = colander.SchemaNode(
+    user_name = colander.SchemaNode(
         colander.String(),
         description="Users registered in the db",
-        example=["anonymous", "admin", "toto"]
+        example="bob"
     )
 
 
 class PermissionListSchema(colander.SequenceSchema):
-    item = colander.SchemaNode(
+    permission_name = colander.SchemaNode(
         colander.String(),
         description="Permissions applicable to the service/resource",
-        example=["read", "write"]
+        example="read"
     )
 
 
@@ -423,7 +423,9 @@ class UserBodySchema(colander.MappingSchema):
         colander.String(),
         description="Email of the user.",
         example="[email protected]")
-    group_names = GroupNamesListSchema()
+    group_names = GroupNamesListSchema(
+        example=['administrators', 'users']
+    )
 
 
 class GroupBodySchema(colander.MappingSchema):
@@ -445,15 +447,20 @@ class GroupBodySchema(colander.MappingSchema):
         description="Number of users member of the group.",
         example=2,
         missing=colander.drop)
-    user_names = UserNamesListSchema(missing=colander.drop)
+    user_names = UserNamesListSchema(
+        example=['alice', 'bob'],
+        missing=colander.drop
+    )
 
 
 class ServiceBodySchema(colander.MappingSchema):
     resource_id = colander.SchemaNode(
         colander.Integer(),
         description="Resource identification number",
     )
-    permission_names = PermissionListSchema()
+    permission_names = PermissionListSchema(
+        example=['read', 'write']
+    )
     service_name = colander.SchemaNode(
         colander.String(),
         description="Name of the service",

magpie/api/management/user/user_views.py

@@ -298,7 +298,7 @@ def get_user_inherited_services_view(request):
 @LoggedUserServiceInheritedPermissionsAPI.get(schema=UserServicePermissions_GET_RequestSchema,
                                               tags=[LoggedUserTag], api_security=SecurityEveryoneAPI,
                                               response_schemas=LoggedUserServicePermissions_GET_responses)
-@view_config(route_name=UserServicePermissionsAPI.name, request_method='GET', permission=NO_PERMISSION_REQUIRED)
+@view_config(route_name=UserServiceInheritedPermissionsAPI.name, request_method='GET', permission=NO_PERMISSION_REQUIRED)
 def get_user_service_inherited_permissions_view(request):
     """List all permissions a user has on a service using all his inherited user and groups permissions."""
     LOGGER.warn("Route deprecated: [{0}], Instead Use: [{1}]"

magpie/definitions/pyramid_definitions.py

@@ -16,6 +16,7 @@
     HTTPUnprocessableEntity,
     HTTPInternalServerError,
 )
+from pyramid.settings import asbool
 from pyramid.interfaces import IAuthenticationPolicy, IAuthorizationPolicy
 from pyramid.response import Response, FileResponse
 from pyramid.view import (

magpie/definitions/twitcher_definitions.py

@@ -3,7 +3,7 @@
 from twitcher.owsproxy import owsproxy
 from twitcher.owssecurity import OWSSecurityInterface
 from twitcher.owsexceptions import OWSAccessForbidden
-from twitcher.utils import parse_service_name
+from twitcher.utils import parse_service_name, get_twitcher_url
 from twitcher.esgf import fetch_certificate, ESGF_CREDENTIALS
 from twitcher.datatype import Service
 from twitcher.store.base import ServiceStore

magpie/magpiectl.py

@@ -10,6 +10,7 @@
 import time
 import warnings
 import logging
+import logging.config
 LOGGER = logging.getLogger(__name__)
 
 # -- Definitions

magpie/register.py

@@ -163,18 +163,19 @@ def get_magpie_url():
 
 
 def get_twitcher_protected_service_url(magpie_service_name, hostname=None):
-    hostname = hostname or get_constant('HOSTNAME')
     twitcher_proxy_url = get_constant('TWITCHER_PROTECTED_URL', raise_not_set=False)
-    if twitcher_proxy_url:
-        return twitcher_proxy_url
-    twitcher_proxy = get_constant('TWITCHER_PROTECTED_PATH', raise_not_set=False)
-    if not twitcher_proxy.endswith('/'):
-        twitcher_proxy = twitcher_proxy + '/'
-    if not twitcher_proxy.startswith('/'):
-        twitcher_proxy = '/' + twitcher_proxy
-    if not twitcher_proxy.startswith('/twitcher'):
-        twitcher_proxy = '/twitcher' + twitcher_proxy
-    return "https://{0}{1}{2}".format(hostname, twitcher_proxy, magpie_service_name)
+    if not twitcher_proxy_url:
+        twitcher_proxy = get_constant('TWITCHER_PROTECTED_PATH', raise_not_set=False)
+        if not twitcher_proxy.endswith('/'):
+            twitcher_proxy = twitcher_proxy + '/'
+        if not twitcher_proxy.startswith('/'):
+            twitcher_proxy = '/' + twitcher_proxy
+        if not twitcher_proxy.startswith('/twitcher'):
+            twitcher_proxy = '/twitcher' + twitcher_proxy
+        hostname = hostname or get_constant('HOSTNAME')
+        twitcher_proxy_url = "https://{0}{1}".format(hostname, twitcher_proxy)
+    twitcher_proxy_url.rstrip('/')
+    return "{0}/{1}".format(twitcher_proxy_url, magpie_service_name)
 
 
 def register_services(register_service_url, services_dict, cookies,

requirements.txt

@@ -6,7 +6,6 @@ pluggy
 flake8==3.5.0
 coverage==4.0
 Sphinx==1.3.1
-logging
 #cryptography==1.9
 PyYAML>=3.11
 pyramid==1.8.3
@@ -22,7 +21,7 @@ lxml>=3.7
 bcrypt==3.1.3
 futures==3.1.1
 zope.sqlalchemy
-gunicorn
+gunicorn==19.8.1
 alembic==0.9.6
 paste
 python-dotenv