hacked htgettoken to flush its output while still running, so we can use it to display URL

Author: wagn0033

devtools/hwdb-htgettoken-alt

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+tokendir=~/.sisyphus
+vault=${tokendir}/vault_token
+bearer=${tokendir}/bearer_token
+
+do_htgettoken() {
+    #echo CALLING
+    python -u \
+    $(which alt-htgettoken) \
+        -q \
+        --configdir=${tokendir} \
+        --vaulttokenfile=${vault} \
+        --outfile=${bearer} \
+        --vaultserver=htvaultprod.fnal.gov \
+        --issuer=fermilab \
+        --web-open-command=
+    #echo FINISHED
+}
+
+
+if [[ "$1" == "--reset" ]] ; then
+    rm -f ${vault} ${bearer} ${tokendir}/credkey-fermilab-default
+    do_htgettoken
+
+elif [[ "$1" == "--clear" ]] ; then
+    rm -f ${vault} ${bearer} ${tokendir}/credkey-fermilab-default
+
+else
+    do_htgettoken
+
+fi

hwdb-htgettoken

@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+import htgettoken as ht
+def log(*args, **kwargs):
+    print(" ".join(map(str,args)), file=sys.stdout, flush=True, **kwargs)
+ht.log = log
+
+from htgettoken import main
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

lib/Sisyphus/RestApiV1/_RestApiV1.py

@@ -144,20 +144,26 @@ def create_proc():
             bearer_token_file = Config.BEARER_TOKEN_FILE
 
             tokens = [
-                'htgettoken',
+                #'python',
+                #'-u',
+                'hwdb-htgettoken',
                 '-q',
                 f'--configdir={config_dir}',
                 f'--vaulttokenfile={vault_token_file}',
                 f'--outfile={bearer_token_file}',
-                f'--vaultserver=htvaultprod.fnal.gov',
-                f'--issuer=fermilab'
+                '--vaultserver=htvaultprod.fnal.gov',
+                '--issuer=fermilab',
+                #'--web-open-command=',
             ]
 
+            #tokens = " ".join(tokens)
+
             try:
                 proc = subprocess.Popen(
                             tokens,
                             stdout=subprocess.PIPE,
-                            stderr=subprocess.PIPE)
+                            stderr=subprocess.PIPE,
+                            )
             except FileNotFoundError:
                 msg = ("htgettoken not found. Have you installed it? "
                                 "(try 'pip install htgettoken')")
@@ -199,7 +205,10 @@ def read_all(self):
                 except subprocess.TimeoutExpired:
                     outs, errs = proc.communicate()
         #.....................................................................
-        def display_message(msg):
+        def display_message(msg, time_elapsed):
+            outer_width = 80
+            inner_width = 78
+
             if threading.current_thread().name == "MainThread":
                 erase_msg = "".join([
                         Style.cursor_abs_horizontal(1),
@@ -210,11 +219,17 @@ def display_message(msg):
                 sys.stdout.flush()
 
             msg = ' \n '.join([Style.info(s) for s in msg.split('\n')])
-            inner = MessageBox(msg, width=66, outer_border='normal', border_color=Style.info._fg)
+            inner = MessageBox(
+                        msg, 
+                        width=inner_width, 
+                        outer_border='normal', 
+                        border_color=Style.info._fg)
 
             info = ' \n '.join([
                 '',
-                Style.warning('The call to htgettoken is taking longer than expected.'),
+                Style.warning(
+                #f'The call to htgettoken is taking longer than expected. ({time_elapsed})'),
+                f'The call to htgettoken is taking longer than expected.'),
                 '',
                 'htgettoken may have attempted to open a browser window. Use this',
                 'window to complete your authentication.',
@@ -228,7 +243,11 @@ def display_message(msg):
 
             msg2 = '\n'.join([info, inner])
 
-            outer = MessageBox(msg2, width=72, outer_border='strong', border_color=Style.warning._fg)
+            outer = MessageBox(
+                        msg2, 
+                        width=outer_width, 
+                        outer_border='strong', 
+                        border_color=Style.warning._fg)
             print(outer)
         #.....................................................................
 
@@ -241,41 +260,81 @@ def display_message(msg):
 
         proc = create_proc()
 
-        osf = output_so_far(proc.stdout)
+        osf_stdout = output_so_far(proc.stdout)
+        osf_stderr = output_so_far(proc.stderr)
 
-        finished = False
-        displayed_response = False
-        interval = 5
+        timed_out = None
+        #displayed_response = False
+        interval = 10
         total_time = 0
         max_time = 120
 
+        last_stdout = ""
+        last_stderr = ""
+
         while True:
             timed_out = False
             try:
                 proc.wait(interval)
-                finished = True
+                timed_out = False
             except subprocess.TimeoutExpired as err:
                 timed_out = True
 
             if not timed_out:
                 break
 
             total_time += interval
-
-            if not displayed_response:
-                outb = osf.read()
-                if len(outb) > 0:
-                    outs = outb.decode('utf-8')
-                    display_message(outs)
-                    displayed_response = True
-
             if total_time >= max_time:
                 break
 
+            current_stdout = osf_stdout.read().decode('utf-8')
+            current_stderr = osf_stderr.read().decode('utf-8')
+
+            if current_stdout != last_stdout:
+                display_message(current_stdout, total_time)
+                last_stdout = current_stdout
+            if current_stderr != last_stderr:
+                display_message(current_stderr, total_time)
+                last_stderr = current_stderr
+
+
+        if timed_out:
+            proc.kill()
+        current_stdout = osf_stdout.read_all().decode('utf-8')
+        current_stderr = osf_stderr.read_all().decode('utf-8')
+        
+        #if current_stdout != last_stdout:
+        #    display_message(current_stdout)
+        #    last_stdout = current_stdout
+        #if current_stderr != last_stderr:
+        #    display_message(current_stderr)
+        #    last_stderr = current_stderr
+
         if proc.returncode is None:
-            raise RuntimeError("The call to htgettoken timed out.")
+            err = "The call to htgettoken timed out."
+            msg = "".join(
+                        [
+                            err, '\n',
+                            f"stdout: {current_stdout} ",
+                            f"stderr: {current_stderr} ",
+                        ])
+            logger.error(msg)
+            raise RuntimeError(err)
         elif proc.returncode != 0:
-            raise RuntimeError("The call to htgettoken failed.")
+            err = "The call to htgettoken failed."
+            msg = "".join(
+                        [
+                            err, '\n',
+                            f"stdout: {current_stdout} ",
+                            f"stderr: {current_stderr} ",
+                        ])
+            logger.error(msg)
+            raise RuntimeError(err)
+
+        msg = ("The call to htgettoken succeeded. "
+                f"stdout: {current_stdout} "
+                f"stderr: {current_stderr} ")
+        logger.info(msg)
 
         _refresh_required = False