From d00a0ca46fcde3e3e580afea6a548b9c12aeac25 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:18:02 -0400
Subject: [PATCH] Update to slf4j 1.6.6 and log4j 1.2.17

---
 src/com/gitblit/utils/ConnectionUtils.java |   89 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 deletions(-)

diff --git a/src/com/gitblit/utils/ConnectionUtils.java b/src/com/gitblit/utils/ConnectionUtils.java
index 9ad62d0..f0b4111 100644
--- a/src/com/gitblit/utils/ConnectionUtils.java
+++ b/src/com/gitblit/utils/ConnectionUtils.java
@@ -16,16 +16,22 @@
 package com.gitblit.utils;
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.UnknownHostException;
+import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
+import javax.net.SocketFactory;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
@@ -87,6 +93,89 @@
 		}
 		return conn;
 	}
+		
+	// Copyright (C) 2009 The Android Open Source Project
+	//
+	// Licensed under the Apache License, Version 2.0 (the "License");
+	// you may not use this file except in compliance with the License.
+	// You may obtain a copy of the License at
+	//
+	// http://www.apache.org/licenses/LICENSE-2.0
+	//
+	// Unless required by applicable law or agreed to in writing, software
+	// distributed under the License is distributed on an "AS IS" BASIS,
+	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	// See the License for the specific language governing permissions and
+	// limitations under the License.
+	public static class BlindSSLSocketFactory extends SSLSocketFactory {
+		private static final BlindSSLSocketFactory INSTANCE;
+
+		static {
+			try {
+				final SSLContext context = SSLContext.getInstance("SSL");
+				final TrustManager[] trustManagers = { new DummyTrustManager() };
+				final SecureRandom rng = new SecureRandom();
+				context.init(null, trustManagers, rng);
+				INSTANCE = new BlindSSLSocketFactory(context.getSocketFactory());
+			} catch (GeneralSecurityException e) {
+				throw new RuntimeException("Cannot create BlindSslSocketFactory", e);
+			}
+		}
+
+		public static SocketFactory getDefault() {
+			return INSTANCE;
+		}
+
+		private final SSLSocketFactory sslFactory;
+
+		private BlindSSLSocketFactory(final SSLSocketFactory sslFactory) {
+			this.sslFactory = sslFactory;
+		}
+
+		@Override
+		public Socket createSocket(Socket s, String host, int port, boolean autoClose)
+				throws IOException {
+			return sslFactory.createSocket(s, host, port, autoClose);
+		}
+
+		@Override
+		public String[] getDefaultCipherSuites() {
+			return sslFactory.getDefaultCipherSuites();
+		}
+
+		@Override
+		public String[] getSupportedCipherSuites() {
+			return sslFactory.getSupportedCipherSuites();
+		}
+
+		@Override
+		public Socket createSocket() throws IOException {
+			return sslFactory.createSocket();
+		}
+
+		@Override
+		public Socket createSocket(String host, int port) throws IOException,
+		UnknownHostException {
+			return sslFactory.createSocket(host, port);
+		}
+
+		@Override
+		public Socket createSocket(InetAddress host, int port) throws IOException {
+			return sslFactory.createSocket(host, port);
+		}
+
+		@Override
+		public Socket createSocket(String host, int port, InetAddress localHost,
+				int localPort) throws IOException, UnknownHostException {
+			return sslFactory.createSocket(host, port, localHost, localPort);
+		}
+
+		@Override
+		public Socket createSocket(InetAddress address, int port,
+				InetAddress localAddress, int localPort) throws IOException {
+			return sslFactory.createSocket(address, port, localAddress, localPort);
+		}
+	}
 
 	/**
 	 * DummyTrustManager trusts all certificates.

--
Gitblit v1.9.1