fixing a bug for aaf authentication

[optf/osdf.git] / osdf / webapp / appcontroller.py

diff --git a/osdf/webapp/appcontroller.py b/osdf/webapp/appcontroller.py
index 49f84ff..3a5385d 100644 (file)
--- a/osdf/webapp/appcontroller.py
+++ b/osdf/webapp/appcontroller.py
@@ -21,7 +21,8 @@ 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()
 
@@ -45,3 +46,14 @@ def auth_error():
     response.headers.add('content-length', len(unauthorized_message))
     response.status_code = 401
     return response
+
+
+@auth_basic.verify_password
+def verify_pw(username, password):
+    is_aaf_enabled = osdf_config.deployment.get('is_aaf_enabled', False)
+    if is_aaf_enabled:
+        return aaf_auth.authenticate(username, password)
+    else:
+        pw = get_pw(username)
+        return pw == password
+    return False
\ No newline at end of file