Merge branch 'release/1.0.2'

Author: Ubuntu

luigi-interface/monitor.py

@@ -24,7 +24,7 @@ def getTouchfile(bucket_name, touchfile_name):
 # Luigi Scraping below
 # 
 def getJobList():
-	server = os.getenv("LUIGI_SERVER") + ":8082/api/"
+	server = os.getenv("LUIGI_SERVER") + ":" + os.getenv("LUIGI_PORT", "8082") + "/api/"
 	#print "SERVER:", server
 	running_url   = server + "task_list?data=%7B%22status%22%3A%22RUNNING%22%2C%22upstream_status%22%3A%22%22%2C%22search%22%3A%22%22%7D"
 	batch_url     = server + "task_list?data=%7B%22status%22%3A%22BATCH_RUNNING%22%2C%22upstream_status%22%3A%22%22%2C%22search%22%3A%22%22%7D"
@@ -84,7 +84,7 @@ def get_consonance_status(consonance_uuid):
 # Database initialization, creation if table doesn't exist
 #
 # Change echo to True to show SQL code... unnecessary
-db = create_engine('postgresql://{}:{}@db/monitor'.format(os.getenv("POSTGRES_USER"), os.getenv("POSTGRES_PASSWORD")), echo=False)
+db = create_engine('postgresql://{}:{}@db/{}'.format(os.getenv("POSTGRES_USER"), os.getenv("POSTGRES_PASSWORD"), os.getenv("POSTGRES_DB")), echo=False)
 conn = db.connect()
 metadata = MetaData(db)
 luigi = Table('luigi', metadata,
@@ -146,7 +146,7 @@ def get_consonance_status(consonance_uuid):
 	try:
 		status_json = get_consonance_status(jsonMetadata['consonance_job_uuid'])
 	except:
-		# Add consonance job uuid print t ocstderr,
+		# Add consonance job uuid print to stderr,
 		# print job uuid and time when it happeneds
 		status_json = {
 			'create_timestamp' : job_dict['start_time'],
@@ -197,11 +197,12 @@ def get_consonance_status(consonance_uuid):
 # 
 # This should be accomplished by:
 # 
-# Select all from the table, pipe it into a list
+# Select all from the table, pipe results into a list
 # 
 # for job in list
 #     consonance status using job.consonance_uuid
 #     update that job using the information from status return
+#
 select_query = select([luigi])
 select_result = conn.execute(select_query)
 result_list = [dict(row) for row in select_result]
@@ -228,6 +229,7 @@ def get_consonance_status(consonance_uuid):
 			created = status_json['create_timestamp']
 			updated = status_json['update_timestamp']
 
+			# DEBUG to check if state, created, and updated are collected
 			#print "STATE:", state
 			#print "CREATED:", created
 			#print "UPDATED:", updated

mapi.py

@@ -1,5 +1,8 @@
-from flask import Flask, jsonify, request
+from flask import Flask, jsonify, request, session
+from flask_login import LoginManager, login_required, \
+     current_user, UserMixin
 import json
+from flask_sqlalchemy import SQLAlchemy
 from flask_cors import CORS, cross_origin
 from flask_migrate import Migrate
 import flask_excel as excel
@@ -22,18 +25,51 @@
 # import json
 class Config(object):
     SQLALCHEMY_DATABASE_URI = os.environ.get("DATABASE_URL")
-
+    SQLALCHEMY_BINDS = {
+       'login-db': 'postgresql://{}:{}@login-db/{}'.format(os.getenv("L_POSTGRES_USER"), os.getenv("L_POSTGRES_PASSWORD"), os.getenv("L_POSTGRES_DB"))
+    }
+    SECRET_KEY = os.environ.get("SECRET_KEY") or "somethingsecret"
 
 apache_path = os.environ.get("APACHE_PATH", "")
 es_service = os.environ.get("ES_SERVICE", "localhost")
 
 app = Flask(__name__)
 app.config.from_object(Config)
+login_db = SQLAlchemy(app)
+login_manager = LoginManager(app)
+login_manager.login_view = "login"
+login_manager.session_protection = "strong"
 db.init_app(app)
 migrate = Migrate(app, db)
 #es = Elasticsearch()
 es = Elasticsearch(['http://'+es_service+':9200/'])
+
+""" DB Models """
+class User(login_db.Model, UserMixin):
+    __tablename__ = "users"
+    __bind_key__ = "login-db"
+    id = login_db.Column(login_db.Integer, primary_key=True)
+    email = login_db.Column(login_db.String(100), unique=True, nullable=False)
+    name = login_db.Column(login_db.String(100), nullable=True)
+    avatar = login_db.Column(login_db.String(200))
+    access_token = login_db.Column(login_db.String(5000))
+    redwood_token = login_db.Column(login_db.String(5000))
+    tokens = login_db.Column(login_db.Text)
+    created_at = login_db.Column(login_db.DateTime, default=datetime.datetime.utcnow())
+
+@login_manager.user_loader
+def load_user(user_id):
+    return User.query.get(int(user_id))
+
+@app.route('/login')
+def login(): 
+    if current_user.is_authenticated:
+        redirect('https://{}'.format(os.getenv('DCC_DASHBOARD_HOST')))
+    else:
+        redirect('https://{}/login'.format(os.getenv('DCC_DASHBOARD_HOST')))
+
 @app.route('/invoices')
+@login_required
 @cross_origin()
 def find_invoices():
     project = str(request.args.get('project'))
@@ -1514,6 +1550,7 @@ def get_manifes_full():
 
 #Get the manifest. You need to pass on the filters
 @app.route('/action/service')
+@login_required
 @cross_origin()
 def get_action_service():
 	db = create_engine('postgresql://{}:{}@db/monitor'.format(os.getenv("POSTGRES_USER"), os.getenv("POSTGRES_PASSWORD")), echo=False)

requirements.txt

@@ -19,6 +19,7 @@ Flask-Migrate==2.0.0
 Flask-Script==2.0.5
 Flask-SQLAlchemy==2.1
 active_alchemy==1.0.0
+flask-login==0.4.0
 funcsigs==1.0.2
 futures==3.0.5
 idna==2.2