testing

Dockerfile

@@ -1,4 +1,4 @@
-FROM tapis/flaskbase:1.5.0
+FROM tapis/flaskbase:1.6.3
 
 ADD requirements.txt /home/tapis/requirements.txt
 RUN pip install -r /home/tapis/requirements.txt

docker-compose.yml

@@ -4,13 +4,13 @@ version: "3.5"
 
 services:
     globus-proxy:
-        # image: tapis/globus-proxy
-        build: .
-        volumes:
-            - ./configschema.json:/home/tapis/configschema.json
-            - ./config-local.json:/home/tapis/config.json
-            - ./service.log:/home/tapis/service.log
-            - ../gpsettings.json:/home/tapis/gpsettings.json
+        image: tapis/globus-proxy:1.4.0
+        # build: .
+        # volumes:
+        #     - ./configschema.json:/home/tapis/configschema.json
+        #     - ./config-local.json:/home/tapis/config.json
+        #     - ./service.log:/home/tapis/service.log
+        #     - ../gpsettings.json:/home/tapis/gpsettings.json
         container_name: globus-proxy
         networks: 
             - tapis

service/api.py

@@ -56,4 +56,6 @@ def log_before():
 def log_after(response):
     # logger.debug(f'request complete with status:: {response.data['status']}')
     logger.debug(f'request complete with status:: {response.status}\n')
+    if response.status == '500 INTERNAL SERVER ERROR':
+        print(f'its all messed up')
     return response

service/auth.py

@@ -16,6 +16,7 @@ def authn_and_authz():
     :return:
     """
    # skip_sk = False
+    logger.debug(f'in authn and authz for tapis')
     authentication()
     #authorization(skip_sk)
 
@@ -28,7 +29,7 @@ def authentication():
     # authorization.
     # we always try to call the primary tapis authentication function to add authentication information to the
     # thread-local. If it fails due to a missing token, we then check if there is a public endpoint
-    logger.debug(request.headers)
+    logger.debug(f'in tapis authentication with {request.headers}')
     try:
         tapisflask.auth.authentication()
         logger.debug(f"Threadlocal tenant id: "+str(conf.tenant[g.tenant_id]))
@@ -46,6 +47,9 @@ def authentication():
                 g.tenant_id = request.args.get('tenant')
                 logger.debug(f"Threadlocal tenant id: "+str(g.tenant_id))
                 return True
+    except Exception as e:
+         logger.error(e)
+         print(e)
 
 # this is the Tapis client that tenants will use for interacting with other services, such as the security kernel.
 Tenants = TenantCache()