2007-03-21 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	* src/Request.h: Use AuthResolver to get authentication 
information.
	* src/main.cc: Made RequestFactory a singleton object. Netrc is 
now
	set to RequestFactory object.
	* src/AuthConfigItem.h, src/AuthConfigItem.cc: Removed.
	* src/AuthConfig.h, src/AuthConfig.cc: Rewritten.
	* src/TrackerWatcherComand.cc: Use RequestFactorySingletonHolder 
to
	create Request object.

1 files changed, 58 insertions, 0 deletions

diff --git a/src/NetrcAuthResolver.cc b/src/NetrcAuthResolver.cc
new file mode 100644
index 00000000..c055a88f
--- /dev/null
+++ b/src/NetrcAuthResolver.cc
@@ -0,0 +1,58 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2006 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "NetrcAuthResolver.h"
+
+AuthConfigHandle NetrcAuthResolver::resolveAuthConfig(const string& hostname)
+{
+  if(_userDefinedAuthConfig.isNull()) {
+    return findNetrcAuthenticator(hostname);
+  } else {
+    return _userDefinedAuthConfig;
+  }
+}
+
+AuthConfigHandle NetrcAuthResolver::findNetrcAuthenticator(const string& hostname) const
+{
+  if(_netrc.isNull()) {
+    return _defaultAuthConfig;
+  } else {
+    AuthenticatorHandle auth = _netrc->findAuthenticator(hostname);
+    if(auth.isNull()) {
+      return _defaultAuthConfig;
+    } else {
+      return new AuthConfig(auth->getLogin(), auth->getPassword());
+    }
+  }
+}