Update rkwebutil

conductor/Makefile

@@ -1,6 +1,6 @@
 INSTALLDIR = test_install
 
-toinstall = webservice.py db.py flaskauth.py updater.py run_conductor.sh \
+toinstall = webservice.py rkauth_flask.py updater.py run_conductor.sh \
 	static/conductor.js static/conductor_start.js static/rkwebutil.js \
 	static/resetpasswd_start.js static/rkauth.js static/seechange.css \
 	templates/base.html templates/conductor_root.html

conductor/rkauth_flask.py

@@ -0,0 +1 @@
+../webap/rkwebutil/rkauth_flask.py

conductor/webservice.py

@@ -387,16 +387,29 @@ def do_the_things( self ):
 # Import and configure the auth subapp
 
 sys.path.insert( 0, pathlib.Path(__name__).parent )
-import flaskauth
+import rkauth_flask
+
+kwargs = {
+    'db_host': cfg.value( 'db.host' ),
+    'db_port': cfg.value( 'db.port' ),
+    'db_name': cfg.value( 'db.database' ),
+    'db_user': cfg.value( 'db.user' )
+}
+password = cfg.value( 'db.password' )
+if password is None:
+    if cfg.value( 'db.password_file' ) is None:
+        raise RuntimeError( 'In config, one of db.password or db.password_file must be specified' )
+    with open( cfg.value( 'db.password_file' ) ) as ifp:
+        password = ifp.readline().strip()
+kwargs[ 'db_password' ] = password
+
 for attr in [ 'email_from', 'email_subject', 'email_system_name',
               'smtp_server', 'smtp_port', 'smtp_use_ssl', 'smtp_username', 'smtp_password' ]:
-    setattr( flaskauth.RKAuthConfig, attr, cfg.value( f'conductor.{attr}' ) )
-flaskauth.RKAuthConfig.webap_url = cfg.value('conductor.conductor_url')
-if flaskauth.RKAuthConfig.webap_url[-1] != '/':
-    flaskauth.RKAuthConfig.webap_url += '/'
-flaskauth.RKAuthConfig.webap_url += "auth"
-# app.logger.debug( f'webap_url is {flaskauth.RKAuthConfig.webap_url}' )
-app.register_blueprint( flaskauth.bp )
+    kwargs[ attr ] = cfg.value( f'conductor.{attr}' )
+
+rkauth_flask.RKAuthConfig.setdbparams( **kwargs )
+
+app.register_blueprint( rkauth_flask.bp )
 
 # Configure urls
 

docker/application/Dockerfile

@@ -285,7 +285,7 @@ ADD conductor/ /usr/src/seechange/conductor/
 # Need special handling of symlinks, because the
 #  ADD above copied the links as is, but they point
 #  to something that won't exist at the destination.
-ADD conductor/flaskauth.py /usr/src/seechange/conductor/flaskauth.py
+ADD conductor/rkauth_flask.py /usr/src/seechange/conductor/rkauth_flask.py
 ADD conductor/static/rkwebutil.js /usr/src/seechange/conductor/static/rkwebutil.js
 ADD conductor/static/rkauth.js /usr/src/seechange/conductor/static/rkauth.js
 ADD conductor/static/seechange.css /usr/src/seechange/conductor/static/seechange.css

docs/testing.md

@@ -63,7 +63,7 @@ Normally, all of these image should already be present in the `ghcr.io` archive,
 
 To build and push the docker images, in the `tests` subdirectory run:
 ```
-   IMTGAG=[tag] docker compose build
+   IMGTAG=[tag] docker compose build
 ```
 where [tag] is exactly what you see in the `docker-compose.yaml` file, followed by:
 ```
@@ -84,4 +84,4 @@ This set of docker images depend on the following files:
 * `webap/*`
 * `requirements.text`
 
-If you change any of those files, you will need to build and push new docker images.  Before doing that, edit `tests/docker-compose.yaml` and bump the date part of the tag for _every_ image, so that your changed images will only get used for your branch while you're still finalizing your pull request, and so that the updated images will get used by everybody else once your branch has been merged to main.
+If you change any of those files, you will need to build and push new docker images.  Before doing that, edit `tests/docker-compose.yaml` and bump the date part of the tag for _every_ image (search and replace is your friend), so that your changed images will only get used for your branch while you're still finalizing your pull request, and so that the updated images will get used by everybody else once your branch has been merged to main.

models/user.py

@@ -1,14 +1,8 @@
-from datetime import datetime, timedelta
-import dateutil.parser
-import pytz
 import uuid
-
 import sqlalchemy as sa
 from sqlalchemy.dialects.postgresql import UUID as sqlUUID
 from sqlalchemy.dialects.postgresql import JSONB
-from models.base import Base, SmartSession
-from util.util import as_UUID, as_datetime
-
+from models.base import Base
 
 class AuthUser(Base):
     __tablename__ = "authuser"
@@ -20,61 +14,9 @@ class AuthUser(Base):
     pubkey = sa.Column( sa.Text )
     privkey = sa.Column( JSONB )
 
-    # This is here rather than just using things already defined in base
-    #   because this table is designed to work with the pre-existing auth
-    #   library in rkwebutil.
-    @classmethod
-    def get( cls, id, session=None ):
-        id = id if isinstance( id, uuid.UUID) else uuid.UUID( id )
-        with SmartSession(session) as sess:
-            q = sess.query(cls).filter( cls.id==id )
-            if q.count() > 1:
-                raise ErrorMsg( f'Error, {cls.__name__} {id} multiply defined!  This shouldn\'t happen.' )
-            if q.count() == 0:
-                return None
-            return q[0]
-
-    @classmethod
-    def getbyusername( cls, name, session=None ):
-        with SmartSession(session) as sess:
-            q = sess.query(cls).filter( cls.username==name )
-            return q.all()
-
-    @classmethod
-    def getbyemail( cls, email, session=None ):
-        with SmartSession(session) as sess:
-            q = sess.query(cls).filter( cls.email==email )
-            return q.all()
-
-
 class PasswordLink(Base):
     __tablename__ = "passwordlink"
 
     id = sa.Column( sqlUUID(as_uuid=True), primary_key=True, default=uuid.uuid4 )
     userid = sa.Column( sqlUUID(as_uuid=True), sa.ForeignKey("authuser.id", ondelete="CASCADE"), index=True )
     expires = sa.Column( sa.DateTime(timezone=True) )
-
-    @classmethod
-    def new( cls, userid, expires=None, session=None ):
-        if expires is None:
-            expires = datetime.now(pytz.utc) + timedelta(hours=1)
-        else:
-            expires = as_datetime( expires )
-        with SmartSession(session) as sess:
-            link = PasswordLink( userid = as_UUID(userid),
-                                 expires = expires )
-            sess.add( link )
-            sess.commit()
-            return link
-
-    # This is here rather than just using things already defined in base
-    #   because this table is designed to work with the pre-existing auth
-    #   library in rkwebutil.
-    @classmethod
-    def get( cls, uuid, session=None ):
-        with SmartSession(session) as sess:
-            q = sess.query( PasswordLink ).filter( PasswordLink.id==uuid )
-            if q.count() == 0:
-                return None
-            else:
-                return q.first()

tests/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   make-archive-directories:
-    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/upload-connector:${IMGTAG:-tests20240628}
+    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/upload-connector:${IMGTAG:-test20240715}
     build:
       context: ../extern/nersc-upload-connector
       args:
@@ -20,7 +20,7 @@ services:
     depends_on:
       make-archive-directories:
         condition: service_completed_successfully
-    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/upload-connector:${IMGTAG:-tests20240628}
+    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/upload-connector:${IMGTAG:-test20240715}
     build:
       context: ../extern/nersc-upload-connector
       args:
@@ -47,7 +47,7 @@ services:
     user: ${USERID:-0}:${GROUPID:-0}
 
   postgres:
-    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/postgres:${IMGTAG:-tests20240628}
+    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/postgres:${IMGTAG:-test20240715}
     build:
       context: ../docker/postgres
     environment:
@@ -60,7 +60,7 @@ services:
       retries: 5
 
   setuptables:
-    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange:${IMGTAG:-tests20240628}
+    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange:${IMGTAG:-test20240715}
     build:
       context: ../
       dockerfile: ./docker/application/Dockerfile
@@ -84,7 +84,7 @@ services:
         - "${MAILHOG_PORT:-8025}:8025"
 
   conductor:
-    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/conductor:${IMGTAG:-tests20240628}
+    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/conductor:${IMGTAG:-test20240715}
     build:
       context: ../
       dockerfile: ./docker/application/Dockerfile
@@ -114,7 +114,7 @@ services:
         condition: service_completed_successfully
       make-archive-directories:
         condition: service_completed_successfully
-    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange-webap:${IMGTAG:-tests20240628}
+    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange-webap:${IMGTAG:-test20240715}
     build:
       context: ../webap
     user: ${USERID:-0}:${GROUPID:-0}
@@ -135,7 +135,7 @@ services:
     entrypoint: [ "gunicorn", "-w", "4", "-b", "0.0.0.0:8081", "--timeout", "0", "seechange_webap:app" ]
 
   runtests:
-    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange:${IMGTAG:-tests20240628}
+    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange:${IMGTAG:-test20240715}
     build:
       context: ../
       dockerfile: ./docker/application/Dockerfile
@@ -165,7 +165,7 @@ services:
     entrypoint: "pytest -v /seechange/$TEST_SUBFOLDER"
 
   runalltests:
-    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange:${IMGTAG:-tests20240628}
+    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange:${IMGTAG:-test20240715}
     build:
       context: ../
       dockerfile: ./docker/application/Dockerfile
@@ -195,7 +195,7 @@ services:
     entrypoint: "pytest -v /seechange/tests"
 
   shell:
-    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange:${IMGTAG:-tests20240628}
+    image: ghcr.io/${GITHUB_REPOSITORY_OWNER:-c3-time-domain}/seechange:${IMGTAG:-test20240715}
     build:
       context: ../
       dockerfile: ./docker/application/Dockerfile

tests/pipeline/test_pipeline_exposure_launcher.py

@@ -85,7 +85,7 @@ def test_exposure_launcher( conductor_connector,
             measq = session.query( Measurements ).join( Cutouts ).join( SourceList ).join( Image )
             meas0 = measq.filter( Image.id==sub0.id ).all()
             meas1 = measq.filter( Image.id==sub1.id ).all()
-            assert len(meas0) == 3
+            assert len(meas0) == 2
             assert len(meas1) == 6
 
     finally: