diff options
| -rw-r--r-- | osdf/webapp/appcontroller.py | 4 | ||||
| -rw-r--r-- | test/test_aaf_authentication.py | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/osdf/webapp/appcontroller.py b/osdf/webapp/appcontroller.py index a56a53d..3a5385d 100644 --- a/osdf/webapp/appcontroller.py +++ b/osdf/webapp/appcontroller.py @@ -21,7 +21,7 @@ from flask_httpauth import HTTPBasicAuth from flask import Response import json import osdf -from osdf.config.base import http_basic_auth_credentials +from osdf.config.base import http_basic_auth_credentials, osdf_config from osdf.adapters.aaf import aaf_authentication as aaf_auth auth_basic = HTTPBasicAuth() @@ -50,7 +50,7 @@ def auth_error(): @auth_basic.verify_password def verify_pw(username, password): - is_aaf_enabled = osdf.deployment.get('is_aaf_enabled', False) + is_aaf_enabled = osdf_config.deployment.get('is_aaf_enabled', False) if is_aaf_enabled: return aaf_auth.authenticate(username, password) else: diff --git a/test/test_aaf_authentication.py b/test/test_aaf_authentication.py index 7f5207e..f20a860 100644 --- a/test/test_aaf_authentication.py +++ b/test/test_aaf_authentication.py @@ -1,3 +1,20 @@ +# ------------------------------------------------------------------------- +# Copyright (c) 2018 AT&T Intellectual Property +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- +# import os from flask import Flask from mock import mock |