From dc0feb41a073563e32e8ab212aeaa953f73d2bf8 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Fri, 9 Mar 2012 13:56:31 +0000 Subject: [PATCH] Displays account display name when password is wrong. Adds more logging when connecting using xmpp. --- .../icq/ProtocolProviderServiceIcqImpl.java | 2 +- .../protocol/jabber/IceUdpTransportManager.java | 2 +- .../jabber/ProtocolProviderServiceJabberImpl.java | 15 ++++++++++++++- .../msn/ProtocolProviderServiceMsnImpl.java | 2 +- .../protocol/sip/security/SipSecurityManager.java | 3 ++- .../yahoo/ProtocolProviderServiceYahooImpl.java | 2 +- 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java index 726b55788..20a78d34b 100644 --- a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java @@ -276,7 +276,7 @@ private void connectAndLogin(SecurityAuthority authority, int reasonCode) //request a password from the user credentials = authority.obtainCredentials( - getProtocolName(), + accountID.getDisplayName(), credentials, reasonCode); diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java b/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java index 1af115846..9f3a977f5 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java @@ -132,7 +132,7 @@ protected Agent createIceAgent() //request a password from the user credentials = provider.getAuthority().obtainCredentials( - ProtocolNames.JABBER, + accID.getDisplayName(), credentials, SecurityAuthority.AUTHENTICATION_REQUIRED); diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java index 7273fc007..00a5fb8cf 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java @@ -647,14 +647,21 @@ private void connectAndLogin(SecurityAuthority authority, if(customXMPPDomain != null && !hadDnsSecException[0]) { + logger.info("Connect using custom xmpp domain: " + + customXMPPDomain); + state = connectUsingSRVRecords( customXMPPDomain, password, serviceName, hadDnsSecException); + + logger.info("state for connectUsingSRVRecords: " + state); + if(hadDnsSecException[0]) { setDnssecLoginFailure(); return; } + if(state == ConnectState.ABORT_CONNECTING || state == ConnectState.STOP_TRYING) return; @@ -784,6 +791,7 @@ private ConnectState connectUsingSRVRecords( logger.error("DNSSEC failure for A/AAAA lookup of SRV", e); dnssecState[0] = true; } + if (addrs == null || addrs.length == 0) { logger.error("No A/AAAA addresses found for " + @@ -814,7 +822,12 @@ private ConnectState connectUsingSRVRecords( } catch(XMPPException ex) { + logger.error("Error connecting to " + isa + + " for domain:" + domain + + " serviceName:" + serviceName, ex); + disconnectAndCleanConnection(); + if(isAuthenticationFailed(ex)) throw ex; } @@ -953,7 +966,7 @@ private String loadPassword(SecurityAuthority authority, int reasonCode) //request a password from the user credentials = authority.obtainCredentials( - ProtocolNames.JABBER, + getAccountID().getDisplayName(), credentials, reasonCode); diff --git a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java index 350530cac..1474abf91 100644 --- a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java @@ -164,7 +164,7 @@ private void connectAndLogin(SecurityAuthority authority, int reasonCode) credentials = authority .obtainCredentials( - ProtocolNames.MSN, + accountID.getDisplayName(), credentials, reasonCode); diff --git a/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java b/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java index 4fcc27377..0fbc91919 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java @@ -724,7 +724,8 @@ private CredentialsCacheEntry createCcEntryWithNewCredentials( defaultCredentials.setUserName(accountID.getUserID()); UserCredentials newCredentials = getSecurityAuthority() - .obtainCredentials( realm, defaultCredentials, reasonCode); + .obtainCredentials( accountID.getDisplayName(), + defaultCredentials, reasonCode); // in case user has canceled the login window if(newCredentials == null) diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderServiceYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderServiceYahooImpl.java index 1fa37f7ae..bc2414d79 100644 --- a/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderServiceYahooImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderServiceYahooImpl.java @@ -142,7 +142,7 @@ private void connectAndLogin( SecurityAuthority authority, //request a password from the user credentials = authority.obtainCredentials( - ProtocolNames.YAHOO, + getAccountID().getDisplayName(), credentials, authReasonCode);