Updates to dd login

fermitools · LTrestka · May 30, 2023 · May 31, 2023 · Jun 9, 2023 · Jun 9, 2023
commit f1e74861f85e992ab255b5d42a5b0eb6b2c40587
diff --git a/submission_broker/submission_agent.py b/submission_broker/submission_agent.py
@@ -782,7 +782,7 @@ def main():
     """
 
     ap = argparse.ArgumentParser()
-    ap.add_argument("-c", "--config", default="./submission_agent.cfg")
+    ap.add_argument("-c", "--config", default=os.environ.get("WEB_CONFIG", "/home/poms/poms/submission_broker/submission_agent.cfg"))
     ap.add_argument("-d", "--debug", action="store_true")
     ap.add_argument("--since", type=str)
     ap.add_argument("-t", "--test", action="store_true", default=False)
@@ -794,17 +794,21 @@ def main():
         logging.basicConfig(level=logging.DEBUG, format="%(asctime)s %(filename)s:%(lineno)s:%(message)s")
     else:
         logging.basicConfig(level=logging.INFO, format="%(asctime)s %(filename)s:%(lineno)s:%(message)s")
-
+
+    config = args.config
+    if not config:
+        config = os.environ.get("WEB_CONFIG", "/home/poms/poms/submission_broker/submission_agent.cfg")
+    LOGIT.info("Submission Agent | Begin | Config: %s" % config)
     if args.test:
-        agent = Agent(poms_uri="http://127.0.0.1:8080", submission_uri=os.environ["SUBMISSION_INFO"], config=args.config)
+        agent = Agent(poms_uri="http://127.0.0.1:8080", submission_uri=os.environ["SUBMISSION_INFO"], config=config)
         for exp in agent.elist:
             agent.check_submissions(exp, since=args.since)
     elif args.one_time:
-        agent = Agent(config=args.config)
+        agent = Agent(config=config)
         for exp in agent.elist:
             agent.check_submissions(exp, since=args.since)
     else:
-        agent = Agent(config=args.config)
+        agent = Agent(config=config)
         agent.poll(since=args.since)
 
 

diff --git a/webservice/Ctx.py b/webservice/Ctx.py
@@ -59,7 +59,7 @@ def __init__(
         self.role = role if role else pathv[3] if len(pathv) >= 4 else cherrypy.request.params.get("role", None)
 
         self.username = username if username else get_user()
-        rows = self.db.execute("select txid_current();")
+        rows = self.db.execute(text("select txid_current();"))
         for r in rows:
             self.dbtransaction = r[0]
         rows.close()

diff --git a/webservice/DMRService.py b/webservice/DMRService.py
@@ -22,7 +22,6 @@
 config.read(os.environ.get("WEB_CONFIG","/home/poms/poms/webservice/poms.ini"))
 PIPE = -1
 
-
 def timestamp_to_readable(timestamp):
     if type(timestamp) != type(datetime.datetime):
         readable_format = timestamp.strftime("%A, %B %d, %Y")

diff --git a/webservice/StagesPOMS.py b/webservice/StagesPOMS.py
@@ -629,8 +629,8 @@ def show_campaign_stages(self, ctx, campaign_ids=None, campaign_name=None, **kwa
 
         csq = (
             ctx.db.query(CampaignStage)
-            .options(joinedload("experiment_obj"))
-            .options(joinedload("campaign_obj"))
+            .options(joinedload(CampaignStage.experiment_obj))
+            .options(joinedload(CampaignStage.campaign_obj))
             .options(joinedload(CampaignStage.experimenter_holder_obj))
             .options(joinedload(CampaignStage.experimenter_creator_obj))
             .options(joinedload(CampaignStage.experimenter_updater_obj))
@@ -1000,7 +1000,7 @@ def campaign_stage_submissions(self, ctx, campaign_name="", stage_name="", campa
 
         tuples = (
             ctx.db.query(Submission, SubmissionHistory, SubmissionStatus)
-            .join("experimenter_creator_obj")
+            .join(Submission.experimenter_creator_obj)
             .filter(
                 Submission.campaign_stage_id.in_(campaign_stage_ids),
                 SubmissionHistory.submission_id == Submission.submission_id,

diff --git a/webservice/poms_service.py b/webservice/poms_service.py
@@ -267,17 +267,15 @@ def activate_project(self, ctx, **kwargs):
             return {"project_handles": retval, "msg": "Fail"}
 
 
-    @poms_method()
+    @poms_method(rtype="json")
     def login_data_dispatcher(self, ctx, **kwargs):
         # Assuming user is either logging in the first time, or signing in as someone else,
         # hence, we will reinitialize the service and clear out any session info.
-        if kwargs.get('method', None) == 'password':
-            return ctx.dmr_service.login_with_password(kwargs.get('username', None), kwargs.get('password', None))
-        elif kwargs.get('method', None) == 'x509':
+        try:
             return ctx.dmr_service.login_with_x509()
-        else:
+        except:
             session_details = ctx.dmr_service.session_status()[1]
-            session_details['login_method'] = "Attempted login method: %s" % kwargs.get('method', None)
+            session_details['login_method'] = "Failed x509 login"
             return json.dumps(session_details)
 
     ####################

diff --git a/webservice/service.py b/webservice/service.py
@@ -15,7 +15,7 @@
 import cherrypy
 from cherrypy.process import plugins
 
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, text
 from sqlalchemy.orm import scoped_session, sessionmaker
 import sqlalchemy.exc
 
@@ -113,8 +113,8 @@ def bind_session(self):
         cherrypy.request.dmr_service = self.dmr_service
         try:
             # Disabiling pylint false positives
-            self.session.execute("SET SESSION lock_timeout = '300s';")  # pylint: disable=E1101
-            self.session.execute("SET SESSION statement_timeout = '400s';")  # pylint: disable=E1101
+            self.session.execute(text("SET SESSION lock_timeout = '300s';"))  # pylint: disable=E1101
+            self.session.execute(text("SET SESSION statement_timeout = '400s';"))  # pylint: disable=E1101
             self.session.commit()  # pylint: disable=E1101
         except sqlalchemy.exc.UnboundExecutionError:
             # restart database connection
@@ -123,8 +123,8 @@ def bind_session(self):
             cherrypy.engine.publish("bind", self.session)
             cherrypy.request.db = self.session
             self.session = scoped_session(sessionmaker(autoflush=True, autocommit=False, query_cls=FilterOutArchived))
-            self.session.execute("SET SESSION lock_timeout = '300s';")  # pylint: disable=E1101
-            self.session.execute("SET SESSION statement_timeout = '400s';")  # pylint: disable=E1101
+            self.session.execute(text("SET SESSION lock_timeout = '300s';"))  # pylint: disable=E1101
+            self.session.execute(text("SET SESSION statement_timeout = '400s';"))  # pylint: disable=E1101
             self.session.commit()  # pylint: disable=E1101
 
     def release_session(self):

diff --git a/webservice/static/js/data_dispatcher.js b/webservice/static/js/data_dispatcher.js
@@ -526,49 +526,49 @@ $(document).ready(function() {
         }
     });
 
-    $(`.login_submit`).on(`click`, (e) => {
+    $(`.login_submit`).on(`click`, async function(e){
         e.preventDefault();
-        $.post(`/poms/login_data_dispatcher`,{
-            method: (e.target.id == 'login_password'?'password':'x509'),
-            username: $(`#username`).val(),
-            experiment: $('#session_experiment_id option:selected').html(),
-            password: $(`#password`).val(),
-          }, (data)=>{
-            data = JSON.parse(data);
-            if (data != null){
-                if (data.login_status != null){
-                    $(`#login_status`).html(data.login_status);
-                    if (data.login_status != `Logged in`){
+        await $.ajax({
+            url: `${pomspath}/login_data_dispatcher`,
+            type: 'GET',
+            dataType: 'json',
+            success: function(data){
+                data = JSON.parse(data);
+                if (data != null){
+                    if (data.login_status != null){
+                        $(`#login_status`).html(data.login_status);
+                        if (data.login_status != `Logged in`){
+                            cancelTimestampUpdates=true;
+                            running=false;
+                            $(`#login_method`).html(`N/A`);
+                            $(`#signed-in-user`).html(`N/A`);
+                            $(`#experiment`).html(`N/A`);
+                            $(`#tokenLifespan`).val(``);
+                            $(`#timeTillExpire`).html(`N/A`);
+                        }
+                    }
+                    if(data.login_method != null){
+                        $(`#login_method`).html(data.login_method);
+                    }
+                    if (data.dd_username != null){
+                        $(`#signed-in-user`).html(data.dd_username);
+                    }
+                    if (data.dd_experiment != null){
+                        $(`#experiment`).html(data.dd_experiment);
+                    }
+                    if (data.timestamp != null){
+                        $(`#timeTillExpire`).html(`Loading.`);
+                        showLoading();
                         cancelTimestampUpdates=true;
-                        running=false;
-                        $(`#login_method`).html(`N/A`);
-                        $(`#signed-in-user`).html(`N/A`);
-                        $(`#experiment`).html(`N/A`);
-                        $(`#tokenLifespan`).val(``);
-                        $(`#timeTillExpire`).html(`N/A`);
+                        setTimeout(function() { 
+                            $(`#tokenLifespan`).val(data.timestamp);
+                            cancelTimestampUpdates=false;
+                            updateTimestamp();
+                        }, 2000);
                     }
                 }
-                if(data.login_method != null){
-                    $(`#login_method`).html(data.login_method);
-                }
-                if (data.dd_username != null){
-                    $(`#signed-in-user`).html(data.dd_username);
-                }
-                if (data.dd_experiment != null){
-                    $(`#experiment`).html(data.dd_experiment);
-                }
-                if (data.timestamp != null){
-                    $(`#timeTillExpire`).html(`Loading.`);
-                    showLoading();
-                    cancelTimestampUpdates=true;
-                    setTimeout(function() { 
-                        $(`#tokenLifespan`).val(data.timestamp);
-                        cancelTimestampUpdates=false;
-                        updateTimestamp();
-                     }, 2000);
-                }
-            }
-          });
+            },
+        });
     });
 
 

diff --git a/webservice/templates/data_dispatcher_overview.html b/webservice/templates/data_dispatcher_overview.html
@@ -18,27 +18,11 @@ <h2 class="sub header">Method Called: {{method}}</h2>
 {%block content %}
 <input id="tokenLifespan" value="{{timestamp}}" hidden>
 <div class="ui horizontal segments">
-	<div class="ui segment raised" style="width: 20%;">
-		<h3>Sign in with password</h3>
-		<div class=menu>
-            <div class="item">
-                <label for="username">Username</label>
-                <input id="username" type="text">
-            </div>
-            <div class="item">
-                <label for="password">Password</label>
-                <input id="password" type="password" >
-            </div>
-            <div class="item">
-                <button class="login_submit" id="login_password">Login</button>
-            </div>
-		</div>
-	</div>
     <div class="ui segment raised" style="width: 20%;">
-		<h3>Sign in as poms</h3>
+		<h3>POMS Sign-in</h3>
 		<div class=menu>
             <div class="item">
-                <button class="login_submit" id="login_token">Login</button>
+                <button class="login_submit" id="login_token">Reset Token</button>
             </div>
 		</div>
 	</div>

diff --git a/webservice/templates/login_setup_edit.html b/webservice/templates/login_setup_edit.html
@@ -76,7 +76,7 @@
     <tfoot>
       <tr>
         <th colspan="5">
-          <button class="ui labled teal icon button" onclick="add_template();return false;") {{ 'disabled' if (session_role=='superuser') }}>
+          <button class="ui labled teal icon button" onclick="add_template();return false;" {{ 'disabled' if (session_role=='superuser') }}>
             <i class="icon add square"></i>
             Add
           </button>