YDA-5550: pam user error message

UtrechtUniversity · Nov 30, 2023 · 4ac40a9 · 4ac40a9
1 parent e43cb65
commit 4ac40a9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/user/templates/user/login.html b/user/templates/user/login.html
@@ -3,6 +3,18 @@
 {% block title %}{{ super() }} &dash; Sign in{% endblock title %}
 
 {% block content %}
+<div
+    id="alert-user-not-in-instance"
+    {% if alert_user_not_in_instance is defined and alert_user_not_in_instance %}
+    class="alert alert-danger alert-dismissible fade show" 
+    {% else %}
+    class="alert alert-danger alert-dismissible fade hidden" 
+    {% endif %}
+    role="alert">
+    Your user is not part of this Yoda instance (yet).
+    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+</div>
+
 <div class="row">
     <div class="offset-md-2 col-md-8">
         <div class="card">

diff --git a/user/user.py b/user/user.py
@@ -10,7 +10,18 @@
 
 import jwt
 import requests
-from flask import Blueprint, current_app as app, flash, g, redirect, render_template, request, Response, session, url_for
+from flask import (
+    Blueprint,
+    current_app as app,
+    flash,
+    g,
+    redirect,
+    render_template,
+    request,
+    Response,
+    session,
+    url_for
+)
 from irods.exception import CAT_INVALID_AUTHENTICATION, CAT_INVALID_USER, iRODSException, PAM_AUTH_PASSWORD_FAILED
 from irods.session import iRODSSession
 
@@ -93,6 +104,14 @@ def login() -> Response:
             log_error("iRODS authentication failed for user " + username)
             return render_template('user/login.html', login_placeholder=get_login_placeholder())
 
+        except CAT_INVALID_USER:
+            log_error("iRODSException CAT_INVALID_USER for login of user " + str(username), True)
+            return render_template(
+                'user/login.html',
+                login_placeholder=get_login_placeholder(),
+                alert_user_not_in_instance=True
+            )
+
         except iRODSException:
             flash(
                 'An error occurred while connecting to iRODS. '

diff --git a/vault/static/vault/js/vault.js b/vault/static/vault/js/vault.js
@@ -666,7 +666,7 @@ function topInformation (dir, showAlert) {
       { quiet: true, rawResult: true }).then((dataRaw) => {
       const data = dataRaw.data
       if (dataRaw.status === 'error_nonexistent') {
-        Yoda.set_message('error', 'This vault space path does not exists: ' + dir)
+        Yoda.set_message('error', 'This vault space path does not exist: ' + dir)
         $('#file-browser_wrapper').addClass('hide')
         $('.top-information').addClass('hide')