mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1739

Browse Source
This commit is contained in:
speedy01
2016-05-05 16:19:51 -05:00
parent 1122172ed2
commit 8fd0361d83
1 changed files with 53 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/java/org/jivesoftware/LoginDialog.java
View File

@ -20,40 +20,34 @@
package org.jivesoftware; package org.jivesoftware;
import java.awt.BorderLayout; import org.dom4j.Document;
import java.awt.CardLayout; import org.dom4j.DocumentException;
import java.awt.Color; import org.dom4j.Element;
import java.awt.Dimension; import org.dom4j.io.SAXReader;
import java.awt.EventQueue; import org.jivesoftware.resource.Default;
import java.awt.Font; import org.jivesoftware.resource.Res;
import java.awt.Graphics; import org.jivesoftware.resource.SparkRes;
import java.awt.Graphics2D; import org.jivesoftware.smack.*;
import java.awt.GridBagConstraints; import org.jivesoftware.smack.proxy.ProxyInfo;
import java.awt.GridBagLayout; import org.jivesoftware.smack.sasl.javax.SASLExternalMechanism;
import java.awt.Image; import org.jivesoftware.smack.tcp.XMPPTCPConnection;
import java.awt.Insets; import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
import java.awt.event.ActionEvent; import org.jivesoftware.smack.util.TLSUtils;
import java.awt.event.ActionListener; import org.jivesoftware.smackx.chatstates.ChatStateManager;
import java.awt.event.FocusEvent; import org.jivesoftware.spark.SessionManager;
import java.awt.event.FocusListener; import org.jivesoftware.spark.SparkManager;
import java.awt.event.KeyEvent; import org.jivesoftware.spark.Workspace;
import java.awt.event.KeyListener; import org.jivesoftware.spark.component.RolloverButton;
import java.awt.event.MouseAdapter; import org.jivesoftware.spark.util.*;
import java.awt.event.MouseEvent; import org.jivesoftware.spark.util.SwingWorker;
import java.awt.event.WindowAdapter; import org.jivesoftware.spark.util.log.Log;
import java.awt.event.WindowEvent; import org.jivesoftware.sparkimpl.plugin.layout.LayoutSettings;
import java.awt.geom.AffineTransform; import org.jivesoftware.sparkimpl.plugin.layout.LayoutSettingsManager;
import java.io.File; import org.jivesoftware.sparkimpl.settings.JiveInfo;
import java.io.IOException; import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import java.net.InetAddress; import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import java.net.UnknownHostException; import org.jxmpp.util.XmppStringUtils;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import javax.naming.NamingException; import javax.naming.NamingException;
import javax.naming.directory.Attribute; import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes; import javax.naming.directory.Attributes;
@ -67,52 +61,20 @@ import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.login.Configuration; import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException; import javax.security.auth.login.LoginException;
import javax.swing.ImageIcon; import javax.swing.*;
import javax.swing.JCheckBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
import javax.swing.JPopupMenu;
import javax.swing.JSplitPane;
import javax.swing.JTextField;
import javax.swing.UIManager;
import javax.swing.text.JTextComponent; import javax.swing.text.JTextComponent;
import java.awt.*;
import org.dom4j.Document; import java.awt.event.*;
import org.dom4j.DocumentException; import java.awt.geom.AffineTransform;
import org.dom4j.Element; import java.io.File;
import org.dom4j.io.SAXReader; import java.io.IOException;
import org.jivesoftware.resource.Default; import java.net.InetAddress;
import org.jivesoftware.resource.Res; import java.net.UnknownHostException;
import org.jivesoftware.resource.SparkRes; import java.security.KeyManagementException;
import org.jivesoftware.smack.*; import java.security.NoSuchAlgorithmException;
import org.jivesoftware.smack.proxy.ProxyInfo; import java.security.Principal;
import org.jivesoftware.smack.packet.XMPPError; import java.util.*;
import org.jivesoftware.smack.sasl.javax.SASLExternalMechanism; import java.util.List;
import org.jivesoftware.smack.tcp.XMPPTCPConnection;
import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.chatstates.ChatStateManager;
import org.jivesoftware.spark.SessionManager;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.Workspace;
import org.jivesoftware.spark.component.RolloverButton;
import org.jivesoftware.spark.util.BrowserLauncher;
import org.jivesoftware.spark.util.DummySSLSocketFactory;
import org.jivesoftware.spark.util.GraphicUtils;
import org.jivesoftware.spark.util.ModelUtil;
import org.jivesoftware.spark.util.ResourceUtils;
import org.jivesoftware.spark.util.SwingWorker;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.settings.JiveInfo;
import org.jivesoftware.sparkimpl.plugin.layout.LayoutSettings;
import org.jivesoftware.sparkimpl.plugin.layout.LayoutSettingsManager;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jxmpp.util.XmppStringUtils;
/** /**
* Dialog to log in a user into the Spark Server. The LoginDialog is used only * Dialog to log in a user into the Spark Server. The LoginDialog is used only
@ -277,11 +239,22 @@ public class LoginDialog {
} }
final XMPPTCPConnectionConfiguration.Builder builder = XMPPTCPConnectionConfiguration.builder() final XMPPTCPConnectionConfiguration.Builder builder = XMPPTCPConnectionConfiguration.builder()
.setUsernameAndPassword( "username", "password" ) .setUsernameAndPassword( loginUsername, loginPassword )
.setServiceName( loginServer ) .setServiceName( loginServer )
.setPort( port ) .setPort( port )
.setSendPresence( false ) .setSendPresence( false )
.setCompressionEnabled( localPref.isCompressionEnabled() ); .setCompressionEnabled( localPref.isCompressionEnabled() );
try {
TLSUtils.acceptAllCertificates(builder);
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
} catch (KeyManagementException e) {
e.printStackTrace();
}
if ( localPref.isDebuggerEnabled()) {
builder.setDebuggerEnabled( true );
}
if ( hostPortConfigured ) { if ( hostPortConfigured ) {
builder.setHost( localPref.getXmppHost() ); builder.setHost( localPref.getXmppHost() );