984-idrop-web-redesign

5 files changed, 83 insertions, 87 deletions

diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index ab5b1ea..11d2e4f 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -22,67 +22,15 @@ iDrop-swing uses Maven for dependency management.  See the pom.xml file for refe
 
 Note that the following bug and feature requests are logged in GForge with related commit information [[https://code.renci.org/gf/project/irodsidrop/tracker/]]
 
-==Bug Fixes==
+==Features==
 
-*15GB streaming has issue in field (rules specify no parallel txfrs)	2011-08-12 07:26:57
-*gui position for login dialog from prefs/switch grids	2011-08-15 16:43:39
-*get transfer not updating intra-file progress	2011-08-19 10:43:03
-*Misc gui glitches and cleanup for 1.0.0 RC1 testing	2011-08-19 12:57:31
-*z fighting errors password change dialog	2011-08-25 15:10:24
-*error rename function in context menu	2011-12-30 08:54:36
-*put operation fails with parallel threads	2012-01-11 12:56:53
-*Idrop-swing hangs while logging in as other user then rods - msAccessPolicy set to strict	2012-01-17 05:04:34
-*mutli-file irods delete not working	2011-06-02 11:42:24
-*refresh of irodsFileTree does not scroll down to selected item	2011-06-05 15:33:17
-*Unable to build details for transfer type in queue manager dialog when copy	2011-06-06 12:26:14
-*-321000 error on copy in idrop	2011-06-06 12:35:59
-*info not synchronizing on tree select	2011-06-30 09:51:56
-*delete nodes in ll, refresh issue?	2011-06-30 16:41:36
-*drag/select feedback missing on some platforms	2011-07-01 08:35:17
-*fedora linux error when selecting node for info	2011-08-09 08:41:15
-*Txfr iRODS to local on WinXP, refresh collapses	2011-08-09 11:10:56
-*on txfr from local irods, did not update tree	2011-08-10 16:04:54
-*node delete issue seen on mac and win	2011-08-10 16:09:37
-*after refresh info panel selections skewed	2011-08-12 10:47:08
-*hit cancel button on switch grid or change password shouldn't exit	2011-08-15 16:22:54
-*drag from local to top level dir in LL causes warning	2011-08-29 09:43:10
-*new folder via context menu of tree not working	2011-12-17 11:53:39
-*rename error on win	2012-01-02 14:56:09
-*delete needs a 'busy' modal dialog until completion	2012-01-13 16:22:26
-*idrop-swing does not get irods file list	2011-04-18 13:21:37
-*511017 on copy	2011-06-07 14:13:57
-*confirmation dialogs are not consistent	2011-07-08 11:06:35
-*multi select local file delete error	2011-08-17 15:39:12
-*local-irods synch path scheme implemented	2011-08-17 16:09:23
-*access error on copy	2011-08-22 07:48:03
-*cannot delete a synchronization	2011-09-28 20:36:33
-*drop startup error with numberformatexception	2011-10-31 12:19:47
-*for strict acl mode show home dir as root in tree	2012-01-11 11:23:50
-
-[#943] startp errors LL windows
-
-[#947] x/x file transfer counts and byte count labels seem reversed or repeated
+*[#870] jargon support for PAM
+** added support for PAM logins
+
+
+==Bug Fixes==
 
-==Features==
 
-*info view for local file system	
-*upload/download in info views and on menu	
-*make web view options sticky	
-*login preset capability	
-*LL - sync management preferences for single device	
-*add within-file progress bar	
-*DnD and tree cleanup	2011-11-16 15:41:58
-*Add progress bar to bottom of iDrop and links to view queue from idrop menu	
-*copy irods function	
-*headless auto-backup	
-*drag and drop, desktop to irods file should use irods parent as target	
-*password change update synchs and transfers with new	
-*Fix search results screen to show info, including toolbar	
-* [#691] revamp startup sequence
-* [#775] 1.1.0 refactoring activities
-** iDrop main gui redesign, including info tabs and icons
-** account information 'gutter' with change resource and switch grids
-**  [#866] IP - simplify login, advanced view, resource/resource group setting
 
 ==Outstanding Issues==
 
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
index c06aac3..bf5ce9d 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
@@ -170,7 +170,7 @@
         <Container class="javax.swing.JPanel" name="jPanel1">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-              <GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+              <GridBagConstraints gridX="1" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
             </Constraint>
           </Constraints>
 
@@ -195,6 +195,33 @@
             </Component>
           </SubComponents>
         </Container>
+        <Component class="javax.swing.JLabel" name="lblLoginMode">
+          <Properties>
+            <Property name="horizontalAlignment" type="int" value="4"/>
+            <Property name="text" type="java.lang.String" value="Login Mode:"/>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+              <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+            </Constraint>
+          </Constraints>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="comboLoginMode">
+          <Properties>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+              <StringArray count="2">
+                <StringItem index="0" value="Standard"/>
+                <StringItem index="1" value="PAM"/>
+              </StringArray>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value="Authentication mode used at login"/>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+              <GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
+            </Constraint>
+          </Constraints>
+        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="pnlToolbar">
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
index b9ce467..422f7aa 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
@@ -2,7 +2,6 @@ package org.irods.jargon.idrop.desktop.systraygui;
 
 import java.awt.Color;
 import java.awt.event.ActionEvent;
-import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -20,7 +19,6 @@ import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationServ
 import org.irods.jargon.idrop.desktop.systraygui.utils.IdropPropertiesHelper;
 import org.irods.jargon.idrop.exceptions.IdropException;
 import org.irods.jargon.idrop.exceptions.IdropRuntimeException;
-import org.openide.util.Exceptions;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -64,6 +62,14 @@ public class LoginDialog extends JDialog {
         if (port == null || port.isEmpty()) {
             port = "1247";
         }
+        
+        String mode = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_LOGIN_MODE);
+        if (mode == null || mode.isEmpty()) {
+            mode = IRODSAccount.AuthScheme.STANDARD.name();
+        } else {
+            comboLoginMode.setSelectedItem(mode);
+        }
+        
         txtPort.setText(port);
         String zone = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_ZONE);
         txtZone.setText(zone);
@@ -71,7 +77,7 @@ public class LoginDialog extends JDialog {
         txtResource.setText(resource);
         String username = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_USER_NAME);
         txtUserName.setText(username);
-        hidePortAndResource();
+        hideAdvancedViewFields();
     }
 
     private void loginUsingPreset() {
@@ -85,6 +91,8 @@ public class LoginDialog extends JDialog {
         lblResource.setVisible(false);
         txtResource.setVisible(false);
         chkAdvancedLogin.setVisible(false);
+        lblLoginMode.setVisible(false);
+        comboLoginMode.setVisible(false);
     }
 
     /**
@@ -120,13 +128,7 @@ public class LoginDialog extends JDialog {
                 txtResource.setBackground(Color.red);
             }
         }
-        
-        
-        
-        
-        
-        
-        
+      
         txtUserName.setBackground(Color.white);
         password.setBackground(Color.white);
         if (txtUserName.getText().length() == 0) {
@@ -138,16 +140,8 @@ public class LoginDialog extends JDialog {
         StringBuilder sb = new StringBuilder();
         final IRODSAccount irodsAccount;
         
-        
-        
-        
-        
         try {
             
-            
-            
-          
-
             // validated, now try to log in
             if (idropCore.getIdropConfig().isLoginPreset()) {
                 log.debug("creating account with presets");
@@ -199,7 +193,11 @@ public class LoginDialog extends JDialog {
             MessageManager.showError(this, ex.getMessage(), MessageManager.TITLE_MESSAGE);
             return true;
         }
-
+        
+        if (comboLoginMode.getSelectedItem().toString().equals(IRODSAccount.AuthScheme.PAM.name())) {
+            irodsAccount.setAuthenticationScheme(IRODSAccount.AuthScheme.PAM);
+        } 
+        
         IRODSFileSystem irodsFileSystem = null;
 
         /*
@@ -296,6 +294,8 @@ public class LoginDialog extends JDialog {
         jPanel1 = new javax.swing.JPanel();
         chkAdvancedLogin = new javax.swing.JCheckBox();
         chkGuestLogin = new javax.swing.JCheckBox();
+        lblLoginMode = new javax.swing.JLabel();
+        comboLoginMode = new javax.swing.JComboBox();
         pnlToolbar = new javax.swing.JPanel();
         btnOK = new javax.swing.JButton();
         btnCancel = new javax.swing.JButton();
@@ -416,9 +416,24 @@ public class LoginDialog extends JDialog {
 
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 1;
-        gridBagConstraints.gridy = 6;
+        gridBagConstraints.gridy = 7;
         pnlLoginInfo.add(jPanel1, gridBagConstraints);
 
+        lblLoginMode.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
+        lblLoginMode.setText("Login Mode:");
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 6;
+        pnlLoginInfo.add(lblLoginMode, gridBagConstraints);
+
+        comboLoginMode.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Standard", "PAM" }));
+        comboLoginMode.setToolTipText("Authentication mode used at login");
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 1;
+        gridBagConstraints.gridy = 6;
+        gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
+        pnlLoginInfo.add(comboLoginMode, gridBagConstraints);
+
         getContentPane().add(pnlLoginInfo, java.awt.BorderLayout.CENTER);
 
         pnlToolbar.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT, 2, 5));
@@ -454,17 +469,17 @@ public class LoginDialog extends JDialog {
     private void chkAdvancedLoginActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkAdvancedLoginActionPerformed
         // TODO add your handling code here:
         if (chkAdvancedLogin.isSelected()) {
-            showPortAndResource();
+            showAdvancedViewFields();
         } else {
-            hidePortAndResource();
+            hideAdvancedViewFields();
         }
     }//GEN-LAST:event_chkAdvancedLoginActionPerformed
 
     private void chkGuestLoginActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkGuestLoginActionPerformed
         if (chkGuestLogin.isSelected()) {
-            hideUserAndPassword();
+            hideForGuestLogin();
         } else {
-            showUserAndPassword();
+            showWhenGuestLogin();
         }
     }//GEN-LAST:event_chkGuestLoginActionPerformed
 
@@ -480,9 +495,11 @@ public class LoginDialog extends JDialog {
     private javax.swing.JButton btnOK;
     private javax.swing.JCheckBox chkAdvancedLogin;
     private javax.swing.JCheckBox chkGuestLogin;
+    private javax.swing.JComboBox comboLoginMode;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JLabel lblHost;
     private javax.swing.JLabel lblLogin;
+    private javax.swing.JLabel lblLoginMode;
     private javax.swing.JLabel lblPassword;
     private javax.swing.JLabel lblPort;
     private javax.swing.JLabel lblResource;
@@ -498,28 +515,30 @@ public class LoginDialog extends JDialog {
     private javax.swing.JTextField txtZone;
     // End of variables declaration//GEN-END:variables
 
-    private void showPortAndResource() {
+    private void showAdvancedViewFields() {
         txtResource.setVisible(true);
         txtPort.setVisible(true);
         lblPort.setVisible(true);
         lblResource.setVisible(true);
     }
 
-    private void hidePortAndResource() {
+    private void hideAdvancedViewFields() {
         txtResource.setVisible(false);
         txtPort.setVisible(false);
         lblPort.setVisible(false);
         lblResource.setVisible(false);
     }
 
-    private void hideUserAndPassword() {
+    private void hideForGuestLogin() {
         lblUserName.setVisible(false);
         txtUserName.setVisible(false);
         lblPassword.setVisible(false);
         password.setVisible(false);
+         lblLoginMode.setVisible(false);
+        comboLoginMode.setVisible(false);
     }
 
-    private void showUserAndPassword() {
+    private void showWhenGuestLogin() {
         lblUserName.setVisible(true);
         txtUserName.setVisible(true);
         lblPassword.setVisible(true);
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
index 25742ca..2b136a9 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
@@ -33,6 +33,7 @@ public interface IdropConfigurationService  {
     public static final String ACCOUNT_CACHE_RESOURCE = "irods.account.resource";
     public static final String ACCOUNT_CACHE_USER_NAME = "irods.account.user";
     public static final String ACCOUNT_CACHE_ROOT_DIR = "irods.account.root.dir";
+    public static final String ACCOUNT_CACHE_LOGIN_MODE = "irods.account.login.mode";
     public static final String POLICY_AWARE_PROPERTY = "policy.aware";
     public static final String LOOK_AND_FEEL = "idrop.lookandfeel";
     public static final String TRANSFER_ENGINE_RECORD_SUCCESSFUL_FILES = "transferengine.record.successful.files";
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
index 7ae1326..936bbd7 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
@@ -250,6 +250,7 @@ public class IdropConfigurationServiceImpl implements IdropConfigurationService
         updateConfig(IdropConfigurationService.ACCOUNT_CACHE_ROOT_DIR, irodsAccount.getHomeDirectory());
         updateConfig(IdropConfigurationService.ACCOUNT_CACHE_ZONE, irodsAccount.getZone());
         updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_NAME, irodsAccount.getUserName());
+        updateConfig(IdropConfigurationService.ACCOUNT_CACHE_LOGIN_MODE, irodsAccount.getAuthenticationScheme().name());
         log.info("config updated");
     }