mirror of
https://github.com/aria2/aria2.git
synced 2025-01-24 02:31:29 +00:00
7ff627079f
To integrate Netrc into exsiting classes: * src/Request.h (_userDefinedAuthConfig): New variable. (findNetrcAuthenticator): New function. (segment): Removed. (setUserDefinedAuthConfig): New function. (resolveHttpAuthConfigItem): New function. (resolveFtpAuthConfigItem): New function. (resolveHttpProxyAuthConfigItem): New function. * src/HttpRequest.h (authConfig): Removed. (proxyAuthConfig): Removed. (setAuthConfig): Removed. (setProxyAuthConfig): Removed. * src/UrlRequest.h (getHeadResult): Added a parameter: authConfigHandle * src/common.h (SingletonHolder.h): New include. * src/main.cc (Netrc.h): New include. (main): Removed initial values of PREF_FTP_USER, PREF_FTP_PASSWD. Added initial value of PREF_NETRC_PATH. Added the initialization of netrc. * src/AuthConfig.h: New class. * src/prefs.h (PREF_NETRC_PATH): New definition. * src/HttpAuthConfig.h: Removed. * src/Netrc.cc (getRequiredNextToken): New function. (skipMacdef): New function. (parse): Rewritten. * src/Netrc.h (getRequiredNextToken): New function. (skipMacdef): New function. * src/Util.h, src/Util.cc (getHomeDir): New function. * src/TrackerWatcherComand.cc (createRequestCommand): Use AuthConfig. * src/FtpConnection.cc (sendUser): Use Request::resolveFtpAuthConfigItem(). (sendPass): Use Request::resolveFtpAuthConfigItem(). * src/Request.cc (findNetrcAuthenticator): New function. (resolveHttpAuthConfigItem): New function. (resolveFtpAuthConfigItem): New function. (resolveHttpProxyAuthConfigItem): New function. * src/UrlRequestInfo.cc: Use AuthConfig. * src/HttpRequest.cc (createRequest): Use authConfig. (getProxyAuthString): Use authConfig. (configure): Removed PREF_HTTP_USER, PREF_HTTP_PASSWD, PREF_HTTP_PROXY_USER, PREF_HTTP_PROXY_PASSWD.
110 lines
3.4 KiB
C++
110 lines
3.4 KiB
C++
#include "Netrc.h"
|
|
#include "Exception.h"
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
using namespace std;
|
|
|
|
class NetrcTest : public CppUnit::TestFixture {
|
|
|
|
CPPUNIT_TEST_SUITE(NetrcTest);
|
|
CPPUNIT_TEST(testFindAuthenticator);
|
|
CPPUNIT_TEST(testParse);
|
|
CPPUNIT_TEST(testParse_fileNotFound);
|
|
CPPUNIT_TEST(testParse_emptyfile);
|
|
CPPUNIT_TEST(testParse_malformedNetrc);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
|
|
public:
|
|
void setUp() {
|
|
}
|
|
|
|
void testFindAuthenticator();
|
|
void testParse();
|
|
void testParse_fileNotFound();
|
|
void testParse_emptyfile();
|
|
void testParse_malformedNetrc();
|
|
};
|
|
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION( NetrcTest );
|
|
|
|
void NetrcTest::testFindAuthenticator()
|
|
{
|
|
Netrc netrc;
|
|
netrc.addAuthenticator(new Authenticator("host1", "tujikawa", "tujikawapasswd", "tujikawaaccount"));
|
|
netrc.addAuthenticator(new Authenticator("host2", "aria2", "aria2password", "aria2account"));
|
|
netrc.addAuthenticator(new DefaultAuthenticator("default", "defaultpassword", "defaultaccount"));
|
|
|
|
AuthenticatorHandle aria2auth = netrc.findAuthenticator("host2");
|
|
CPPUNIT_ASSERT(!aria2auth.isNull());
|
|
CPPUNIT_ASSERT_EQUAL(string("aria2"), aria2auth->getLogin());
|
|
CPPUNIT_ASSERT_EQUAL(string("aria2password"), aria2auth->getPassword());
|
|
CPPUNIT_ASSERT_EQUAL(string("aria2account"), aria2auth->getAccount());
|
|
|
|
AuthenticatorHandle defaultauth = netrc.findAuthenticator("host3");
|
|
CPPUNIT_ASSERT(!defaultauth.isNull());
|
|
CPPUNIT_ASSERT_EQUAL(string("default"), defaultauth->getLogin());
|
|
CPPUNIT_ASSERT_EQUAL(string("defaultpassword"), defaultauth->getPassword());
|
|
CPPUNIT_ASSERT_EQUAL(string("defaultaccount"), defaultauth->getAccount());
|
|
}
|
|
|
|
void NetrcTest::testParse()
|
|
{
|
|
Netrc netrc;
|
|
netrc.parse("sample.netrc");
|
|
Authenticators::const_iterator itr = netrc.getAuthenticators().begin();
|
|
|
|
AuthenticatorHandle tujikawaauth = *itr;
|
|
CPPUNIT_ASSERT(!tujikawaauth.isNull());
|
|
CPPUNIT_ASSERT_EQUAL(string("host1"), tujikawaauth->getMachine());
|
|
CPPUNIT_ASSERT_EQUAL(string("tujikawa"), tujikawaauth->getLogin());
|
|
CPPUNIT_ASSERT_EQUAL(string("tujikawapassword"), tujikawaauth->getPassword());
|
|
CPPUNIT_ASSERT_EQUAL(string("tujikawaaccount"), tujikawaauth->getAccount());
|
|
++itr;
|
|
AuthenticatorHandle aria2auth = *itr;
|
|
CPPUNIT_ASSERT(!aria2auth.isNull());
|
|
CPPUNIT_ASSERT_EQUAL(string("host2"), aria2auth->getMachine());
|
|
CPPUNIT_ASSERT_EQUAL(string("aria2"), aria2auth->getLogin());
|
|
CPPUNIT_ASSERT_EQUAL(string("aria2password"), aria2auth->getPassword());
|
|
CPPUNIT_ASSERT_EQUAL(string("aria2account"), aria2auth->getAccount());
|
|
++itr;
|
|
DefaultAuthenticatorHandle defaultauth = *itr;
|
|
CPPUNIT_ASSERT(!defaultauth.isNull());
|
|
CPPUNIT_ASSERT_EQUAL(string("anonymous"), defaultauth->getLogin());
|
|
CPPUNIT_ASSERT_EQUAL(string("ARIA2@USER"), defaultauth->getPassword());
|
|
CPPUNIT_ASSERT_EQUAL(string("ARIA2@ACCT"), defaultauth->getAccount());
|
|
}
|
|
|
|
void NetrcTest::testParse_fileNotFound()
|
|
{
|
|
Netrc netrc;
|
|
try {
|
|
netrc.parse("");
|
|
CPPUNIT_FAIL("exception must be threw.");
|
|
} catch(Exception* e) {
|
|
cerr << e->getMsg() << endl;
|
|
delete e;
|
|
}
|
|
}
|
|
|
|
void NetrcTest::testParse_emptyfile()
|
|
{
|
|
Netrc netrc;
|
|
netrc.parse("emptyfile");
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, netrc.getAuthenticators().size());
|
|
}
|
|
|
|
void NetrcTest::testParse_malformedNetrc()
|
|
{
|
|
Netrc netrc;
|
|
try {
|
|
netrc.parse("malformed.netrc");
|
|
CPPUNIT_FAIL("exception must be threw.");
|
|
} catch(Exception* e) {
|
|
cerr << e->getMsg() << endl;
|
|
delete e;
|
|
}
|
|
}
|