[ARVADOS-WORKBENCH2] created: 1.4.1-332-g6d2e6d29

[Git user]

        at  6d2e6d292161d566f54e94f048805569ede8e3d5 (commit)


commit 6d2e6d292161d566f54e94f048805569ede8e3d5
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Thu May 14 14:31:28 2020 -0400

    15881: Use user/pass login if server config uses LDAP.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/src/common/config.ts b/src/common/config.ts
index f9fb9f6a..5c63fd69 100644
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -58,7 +58,18 @@ export interface ClusterConfigJSON {
     };
     Login: {
         LoginCluster: string;
-        PAM: boolean;
+        Google: {
+            Enable: boolean;
+        }
+        LDAP: {
+            Enable: boolean;
+        }
+        PAM: {
+            Enable: boolean;
+        }
+        SSO: {
+            Enable: boolean;
+        }
     };
     Collections: {
         ForwardSlashNameSubstitution: string;
@@ -188,7 +199,18 @@ export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
     },
     Login: {
         LoginCluster: "",
-        PAM: false,
+        Google: {
+            Enable: false,
+        },
+        LDAP: {
+            Enable: false,
+        },
+        PAM: {
+            Enable: false,
+        },
+        SSO: {
+            Enable: false,
+        },
     },
     Collections: {
         ForwardSlashNameSubstitution: "",
diff --git a/src/views/login-panel/login-panel.tsx b/src/views/login-panel/login-panel.tsx
index 25fee7eb..ba0f584f 100644
--- a/src/views/login-panel/login-panel.tsx
+++ b/src/views/login-panel/login-panel.tsx
@@ -49,7 +49,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     }
 });
 
-const doPAMLogin = (url: string) => (username: string, password: string) => {
+const doPasswordLogin = (url: string) => (username: string, password: string) => {
     const formData = [];
     formData.push('username='+encodeURIComponent(username));
     formData.push('password='+encodeURIComponent(password));
@@ -66,7 +66,7 @@ type LoginPanelProps = DispatchProp<any> & WithStyles<CssRules> & {
     localCluster: string,
     loginCluster: string,
     welcomePage: string,
-    pamLogin: boolean,
+    passwordLogin: boolean,
 };
 
 export const LoginPanel = withStyles(styles)(
@@ -76,9 +76,10 @@ export const LoginPanel = withStyles(styles)(
         localCluster: state.auth.localCluster,
         loginCluster: state.auth.loginCluster,
         welcomePage: state.auth.config.clusterConfig.Workbench.WelcomePageHTML,
-        pamLogin: state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster] &&
-            state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster].clusterConfig.Login.PAM || false,
-    }))(({ classes, dispatch, remoteHosts, homeCluster, localCluster, loginCluster, welcomePage, pamLogin }: LoginPanelProps) => {
+        passwordLogin: state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster] &&
+            state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster].clusterConfig.Login.LDAP.Enable ||
+            state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster].clusterConfig.Login.PAM.Enable || false,
+    }))(({ classes, dispatch, remoteHosts, homeCluster, localCluster, loginCluster, welcomePage, passwordLogin }: LoginPanelProps) => {
         const loginBtnLabel = `Log in${(localCluster !== homeCluster && loginCluster !== homeCluster) ? " to "+localCluster+" with user from "+homeCluster : ''}`;
 
         return (<Grid container justify="center" alignItems="center"
@@ -98,11 +99,11 @@ export const LoginPanel = withStyles(styles)(
                         </Select>
                     </Typography>}
 
-                {pamLogin
+                {passwordLogin
                 ? <Typography component="div">
                     <LoginForm dispatch={dispatch}
                         loginLabel={loginBtnLabel}
-                        handleSubmit={doPAMLogin(`https://${remoteHosts[loginCluster || homeCluster]}`)}/>
+                        handleSubmit={doPasswordLogin(`https://${remoteHosts[loginCluster || homeCluster]}`)}/>
                 </Typography>
                 : <Typography component="div" align="right">
                     <Button variant="contained" color="primary" style={{ margin: "1em" }}
diff --git a/tools/arvados_config.yml b/tools/arvados_config.yml
index cf97e601..8882eac2 100644
--- a/tools/arvados_config.yml
+++ b/tools/arvados_config.yml
@@ -11,4 +11,5 @@ Clusters:
       TrustAllContent: true
       ForwardSlashNameSubstitution: /
     Login:
-      PAM: true
+      PAM:
+        Enable: true

-----------------------------------------------------------------------


hooks/post-receive
--