From: <ez...@us...> - 2014-02-07 07:03:36
|
Revision: 23404 http://sourceforge.net/p/jedit/svn/23404 Author: ezust Date: 2014-02-07 07:03:32 +0000 (Fri, 07 Feb 2014) Log Message: ----------- Made MaxAuthTries a plugin option. Modified Paths: -------------- plugins/FTP/trunk/FTP.props plugins/FTP/trunk/ftp/OptionPane.java plugins/FTP/trunk/users-guide.xml Modified: plugins/FTP/trunk/FTP.props =================================================================== --- plugins/FTP/trunk/FTP.props 2014-02-06 20:48:16 UTC (rev 23403) +++ plugins/FTP/trunk/FTP.props 2014-02-07 07:03:32 UTC (rev 23404) @@ -32,6 +32,7 @@ options.ftp.useKeyFile.tooltip=Saves an AES256 hash of the master password here options.sftp.enableCompression=Enable compression over SFTP options.ftp.disableWeakCrypto=Disable (don't fallback on) weak encryption when saving passwords +options.sftp.MaxAuthTries=SFTP MaxAuthTries # Actions open-ftp.label=Open from FTP Server... Modified: plugins/FTP/trunk/ftp/OptionPane.java =================================================================== --- plugins/FTP/trunk/ftp/OptionPane.java 2014-02-06 20:48:16 UTC (rev 23403) +++ plugins/FTP/trunk/ftp/OptionPane.java 2014-02-07 07:03:32 UTC (rev 23404) @@ -24,9 +24,14 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; + import javax.swing.JCheckBox; +import javax.swing.JComboBox; + import org.gjt.sp.jedit.AbstractOptionPane; + import common.gui.FileTextField; + import org.gjt.sp.jedit.jEdit; @@ -40,8 +45,8 @@ FileTextField keyFile; JCheckBox enableCompression; JCheckBox disableWeakCrypto; + JComboBox<String> sftpMaxAuthTries; - public OptionPane() { super("ftp"); } @@ -69,11 +74,19 @@ jEdit.getBooleanProperty("vfs.sftp.compression")); addComponent(enableCompression); + String[] retriesValues = new String[] {"1", "2", "3", "4", "5", "6" }; + sftpMaxAuthTries = new JComboBox<String>(retriesValues); + sftpMaxAuthTries.setSelectedItem(jEdit.getProperty("vfs.sftp.MaxAuthTries")); + + addComponent(jEdit.getProperty("options.sftp.MaxAuthTries"), sftpMaxAuthTries); + + } public void actionPerformed(ActionEvent e) { useKeyFile.setEnabled(storePasswords.isSelected()); - keyFile.setEnabled(useKeyFile.isSelected() && storePasswords.isSelected()); + keyFile.setEnabled(useKeyFile.isSelected() && storePasswords.isSelected()); + disableWeakCrypto.setEnabled(storePasswords.isSelected()); } protected void _save() { @@ -86,6 +99,7 @@ } jEdit.setBooleanProperty("vfs.ftp.storePassword", storePasswords.isSelected()); jEdit.setBooleanProperty("vfs.sftp.compression", enableCompression.isSelected()); + jEdit.setProperty("vfs.sftp.MaxAuthTries", sftpMaxAuthTries.getSelectedItem().toString()); } } Modified: plugins/FTP/trunk/users-guide.xml =================================================================== --- plugins/FTP/trunk/users-guide.xml 2014-02-06 20:48:16 UTC (rev 23403) +++ plugins/FTP/trunk/users-guide.xml 2014-02-07 07:03:32 UTC (rev 23404) @@ -192,6 +192,16 @@ something to happen and it is not, check the "Errors" status bar widget, or the Activity Log dockable to find out what happened. </para></listitem> +<listitem><para> The Plugin Option <guilabel>MaxAuthTries</guilabel> is +a tweak which tells the SFTP protocol to retry that number of times before +giving up with an "Auth Fail". In Versions prior to 1.0.3, the value was 6, +which meant that with incorrect passwords, 6 bad password attempts would be +made, often causing accidental lockout from the server. In FTP 1.0.7, the value +was changed to 1, which caused Auth Fail problems on other systems, using keys +and not even passwords. It is for this reason that the default value is now 2 +and configrable via this new plugin option. Hopefully people will not need to +change this value but it is there if you need it. </para></listitem> + <listitem><para> If for some reason the FTP plugin is in a non-working state and you are unable to do anything, you can reset the plugin by invoking the <guimenuitem>Plugins - Ftp - Reset FTP Plugin</guimenuitem>, which is similar to @@ -221,7 +231,9 @@ Yihua Zhang) </para></listitem> <listitem><para> Fix #1773, Undo a regression introduced in 1.0.5, where <literal>ssh.keys</literal> properties were cleared out at the wrong time. - (Alan Ezust) </para></listitem> + (Alan Ezust) </para></listitem> + <listitem><para> SFTP MaxAuthTries is a new plugin option. (Alan Ezust) + </para></listitem> <listitem><para> jzlib updated to version 1.1.2 and separated into jzlib.jar. </para></listitem> </itemizedlist> </listitem> @@ -237,11 +249,11 @@ <listitem><para> Fix #3615163: No longer repeatedly asking for master password after the user hits "cancel". </para></listitem> <listitem><para> Patch #3615165: Fix accidental SSH account lockout on - bad passwd (Camilo J. Diaz Repka) </para></listitem> + bad passwd by changing SFTP MaxAuthTries from 6 (the previous default) to + 1. (Camilo J. Diaz Repka) </para></listitem> </itemizedlist> </listitem> - <listitem><para> <emphasis role="bold">Version 1.0.6</emphasis> By Alan Ezust Requires Java 1.6, CommonControls, and jEdit 4.5. </para> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |