diff options
| author | Danny van Heumen <danny@dannyvanheumen.nl> | 2015-01-03 20:50:41 +0100 |
|---|---|---|
| committer | Danny van Heumen <danny@dannyvanheumen.nl> | 2015-01-03 20:50:41 +0100 |
| commit | 19704ebffd6460243785947ed16cb342fdba08a9 (patch) | |
| tree | 80d0a02ec664c9545945ef24efb3e0480a272f5e /src/net/java/sip/communicator/plugin | |
| parent | f5fe0f1283166d90db09df721ffc906d6bacbaeb (diff) | |
| download | jitsi-19704ebffd6460243785947ed16cb342fdba08a9.zip jitsi-19704ebffd6460243785947ed16cb342fdba08a9.tar.gz jitsi-19704ebffd6460243785947ed16cb342fdba08a9.tar.bz2 | |
Proxy: check for non-null user name before returning PasswordAuthentication instance.
Diffstat (limited to 'src/net/java/sip/communicator/plugin')
| -rw-r--r-- | src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyPluginActivator.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyPluginActivator.java b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyPluginActivator.java index eef1eb3..9e7dcc6 100644 --- a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyPluginActivator.java +++ b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyPluginActivator.java @@ -257,8 +257,12 @@ public class GlobalProxyPluginActivator implements BundleActivator if(getRequestingProtocol().startsWith(type) && getRequestingHost().equals(host) && port == getRequestingPort() - && getRequestorType().equals(Authenticator.RequestorType.SERVER)) + && getRequestorType().equals(Authenticator.RequestorType.SERVER) + && username != null) { + // user name must be non-null, since otherwise SOCKS + // authenticate will fail immediately (HTTP authentication + // assumes non-null) final char[] pass; if (password == null) { |