dataflow-core 1.0.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

authenticator/dataflowairflowauthenticator.py

@@ -60,7 +60,7 @@ class DataflowAirflowAuthenticator(FabAirflowSecurityManagerOverride):
 
             if not user:
                 user_role = self.find_role(user_data.role.title())
-                user = self.add_user(username=user_data.user_name, first_name=self.not_none(user_data.first_name), last_name=self.not_none(user_data.last_name), email=self.not_none(user_data.email), role=user_role)
+                user = self.add_user(username=user_data.user_name, first_name=self.not_none(user_data.first_name), last_name=self.not_none(user_data.last_name), email=self.not_none(user_data.email), role=user_role, password=self.not_none(user_data.password))
 
             environ['REMOTE_USER'] = user.username
             self.write_user_id(user_data.user_id)

authenticator/dataflowsupersetauthenticator.py

@@ -0,0 +1,57 @@
+from flask import redirect, request
+from flask_appbuilder.security.views import AuthDBView
+from superset.security import SupersetSecurityManager
+from flask_appbuilder.security.views import expose
+from flask_login import login_user
+from .package.configuration import ConfigurationManager
+from .package.models.database import DatabaseManager
+from .package.models import (
+    user as m_user,
+    session as m_session
+    )
+
+class CustomAuthDBView(AuthDBView):
+    def __init__(self):
+        self.dataflow_config = ConfigurationManager('/dataflow/app/config/dataflow.cfg')
+        self.dataflow_database_url = self.dataflow_config.get_config_value('database', 'database_url')
+        self.dataflow_db_instance = DatabaseManager(self.dataflow_database_url)
+        self.dataflow_db = next(self.dataflow_db_instance.get_session())
+        m_user.Base.metadata.create_all(bind=self.dataflow_db_instance.get_engine())
+        m_session.Base.metadata.create_all(bind=self.dataflow_db_instance.get_engine())
+
+    def _get_user_id_from_session(self, session_id):
+        query = self.dataflow_db.query(m_session.Session_table).filter(m_session.Session_table.session_id == session_id).first()
+        return query.user_id if query!=None else None
+
+    def _get_user_details_from_user_table(self, user_id):
+        user_details = self.dataflow_db.query(m_user.User).filter(m_user.User.user_id == user_id).first()
+        return user_details if user_details!=None else None
+    
+    def not_none(self, value):
+        return value if value is not None else ""
+
+    @expose('/login/', methods=['GET'])
+    def login(self):
+        try:
+            session_id = request.cookies.get('dataflow_session')
+            
+            user_id = self._get_user_id_from_session(session_id)
+            user_details = self._get_user_details_from_user_table(user_id)
+            user = self.appbuilder.sm.find_user(username=user_details.user_name)
+            if user:
+                login_user(user, remember=False)
+            else:
+                user = self.appbuilder.sm.add_user(username=self.not_none(user_details.user_name), first_name=self.not_none(user_details.first_name), last_name=self.not_none(user_details.last_name), email=self.not_none(user_details.email), role=self.appbuilder.sm.find_role('Admin'), password=self.not_none(user_details.password))
+                if user:
+                    login_user(user, remember=False)
+                    
+            return redirect(self.appbuilder.get_url_for_index)
+
+        except Exception as e:
+            return super().login()
+
+
+class CustomSecurityManager(SupersetSecurityManager):
+    authdbview = CustomAuthDBView
+    def __init__(self, appbuilder):
+        super(CustomSecurityManager, self).__init__(appbuilder)

dataflow/dataflow.py

@@ -47,8 +47,9 @@ class Dataflow:
             host_name = os.environ["HOSTNAME"]
             user_name = host_name.replace("jupyter-","")
             
-            vault_path = "variable"
-            return self.secrets_manager.get_secret_by_key(vault_path, user_name, variable_name)
+            vault_path = "variables"
+            variable_data =  self.secrets_manager.get_secret_by_key(vault_path, user_name, variable_name)
+            return variable_data['value']
             
         except Exception as e:
             return None

{dataflow_core-1.0.0.dist-info → dataflow_core-2.0.1.dist-info}/METADATA

@@ -1,15 +1,11 @@
 Metadata-Version: 2.1
 Name: dataflow-core
-Version: 1.0.0
+Version: 2.0.1
 Summary: Dataflow core package
-Home-page: UNKNOWN
 Author: Dataflow
-Author-email: UNKNOWN
-License: UNKNOWN
-Platform: UNKNOWN
+Author-email: 
 Requires-Dist: sqlalchemy
 Requires-Dist: boto3
-
-UNKNOWN
-
+Requires-Dist: psycopg2-binary
+Requires-Dist: pymysql
 

{dataflow_core-1.0.0.dist-info → dataflow_core-2.0.1.dist-info}/RECORD

@@ -1,6 +1,7 @@
 authenticator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-authenticator/dataflowairflowauthenticator.py,sha256=gOmRbNbHAINfeVuE-cHDuk7mbo5q7K1wqRT0B20g6PA,4746
+authenticator/dataflowairflowauthenticator.py,sha256=wzd807UAb5ojIVMO8FVHQnNi3Tc78NjkhbDSfzgo2Qg,4790
 authenticator/dataflowhubauthenticator.py,sha256=jsxpB_NZz3n_FGFJzW0yfXR3i-KK1dsVVIQVIN84Pfc,2540
+authenticator/dataflowsupersetauthenticator.py,sha256=UNgem68eg8G-1uAok2yVc6NvUeXaJ-9MPmdpfSyr9Jg,2759
 authenticator/package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 authenticator/package/configuration.py,sha256=7To6XwH1eESiYp39eqPcswXWwrdBUdPF6xN6WnazOF0,663
 authenticator/package/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,15 +10,15 @@ authenticator/package/models/session.py,sha256=j6PhbrTMJxEkeDT4Vf5SqGtM_LI_vZy9O
 authenticator/package/models/user.py,sha256=IYogp_vt0yDBG5i936uNPjgTis77VYPzITn9XpQUIyw,788
 dataflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dataflow/configuration.py,sha256=7To6XwH1eESiYp39eqPcswXWwrdBUdPF6xN6WnazOF0,663
-dataflow/dataflow.py,sha256=tczUTSLQgSVxfYwzzB5lk_J3Yu51a0UtoE5-5L6zxPQ,3673
+dataflow/dataflow.py,sha256=CAn47BkdUwmTWe-kTSFKfRZYnjx29MG0SrYsXpvSkuo,3726
 dataflow/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dataflow/models/database.py,sha256=y09pqnglsBBtDZlyhvqDAlpUSFovwAzBAi6jOYl_XNk,896
 dataflow/models/session.py,sha256=C9crPh6ZDFuL27hZ_zhUXDZZ0ZiIDE8ZD19O_4WPw-I,488
 dataflow/models/user.py,sha256=IYogp_vt0yDBG5i936uNPjgTis77VYPzITn9XpQUIyw,788
 dataflow/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dataflow/utils/aws_secrets_manager.py,sha256=FqHm3YRynv580FpFsS0RfI1MSGY5aq-V7t4blpiYsS4,2588
-dataflow_core-1.0.0.dist-info/METADATA,sha256=KC7hRTfyRuONXqiHxyA7wYM0a5Wl0QV1wRZxaxprYeQ,239
-dataflow_core-1.0.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-dataflow_core-1.0.0.dist-info/entry_points.txt,sha256=lDLG2MMWlKfkqsVWFghF7sx-yEvM2xqMmHE7rMTysE4,118
-dataflow_core-1.0.0.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
-dataflow_core-1.0.0.dist-info/RECORD,,
+dataflow_core-2.0.1.dist-info/METADATA,sha256=a-wXk53ZIMavCWlfKh6S1G_t6yq3qHpyW7eFe9ix_K8,222
+dataflow_core-2.0.1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+dataflow_core-2.0.1.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
+dataflow_core-2.0.1.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
+dataflow_core-2.0.1.dist-info/RECORD,,

{dataflow_core-1.0.0.dist-info → dataflow_core-2.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{dataflow_core-1.0.0.dist-info → dataflow_core-2.0.1.dist-info}/entry_points.txt

@@ -1,3 +1,2 @@
 [jupyterhub.authenticators]
 dataflow_authenticator = authenticator.dataflowhubauthenticator:DataflowHubAuthenticator
-