#define SQUID_UNIT_TEST 1
-#include "squid.h"
+#include "squid-old.h"
+
+#if USE_AUTH
+
#include "testAuth.h"
#include "auth/Gadgets.h"
#include "auth/UserRequest.h"
}
static
-AuthConfig *
+Auth::Config *
getConfig(char const *type_str)
{
- Auth::authConfig &config = Auth::TheConfig;
+ Auth::ConfigVector &config = Auth::TheConfig;
/* find a configuration for the scheme */
- AuthConfig *scheme = AuthConfig::Find(type_str);
+ Auth::Config *scheme = Auth::Config::Find(type_str);
if (scheme == NULL) {
/* Create a configuration */
- AuthScheme::Pointer theScheme = AuthScheme::Find(type_str);
+ Auth::Scheme::Pointer theScheme = Auth::Scheme::Find(type_str);
if (theScheme == NULL) {
return NULL;
static
void
-setup_scheme(AuthConfig *scheme, char const **params, unsigned param_count)
+setup_scheme(Auth::Config *scheme, char const **params, unsigned param_count)
{
- Auth::authConfig &config = Auth::TheConfig;
+ Auth::ConfigVector &config = Auth::TheConfig;
for (unsigned position=0; position < param_count; position++) {
char *param_str=xstrdup(params[position]);
Mem::Init();
- Auth::authConfig &config = Auth::TheConfig;
+ Auth::ConfigVector &config = Auth::TheConfig;
char const *digest_parms[]= {"program /home/robertc/install/squid/libexec/digest_pw_auth /home/robertc/install/squid/etc/digest.pwd",
"realm foo"
};
for (unsigned scheme=0; scheme < 4; scheme++) {
- AuthConfig *schemeConfig;
+ Auth::Config *schemeConfig;
schemeConfig = getConfig(params[scheme].name);
if (schemeConfig != NULL)
setup_scheme(schemeConfig, params[scheme].params,
setup=true;
}
-/* AuthConfig::CreateAuthUser works for all
+/* Auth::Config::CreateAuthUser works for all
* authentication types
*/
void
Debug::Levels[29]=9;
fake_auth_setup();
- for (AuthScheme::iterator i = AuthScheme::GetSchemes().begin(); i != AuthScheme::GetSchemes().end(); ++i) {
- AuthUserRequest::Pointer authRequest = AuthConfig::CreateAuthUser(find_proxy_auth((*i)->type()));
+ for (Auth::Scheme::iterator i = Auth::Scheme::GetSchemes().begin(); i != Auth::Scheme::GetSchemes().end(); ++i) {
+ AuthUserRequest::Pointer authRequest = Auth::Config::CreateAuthUser(find_proxy_auth((*i)->type()));
CPPUNIT_ASSERT(authRequest != NULL);
}
}
Debug::Levels[29]=9;
fake_auth_setup();
- for (AuthScheme::iterator i = AuthScheme::GetSchemes().begin(); i != AuthScheme::GetSchemes().end(); ++i) {
+ for (Auth::Scheme::iterator i = Auth::Scheme::GetSchemes().begin(); i != Auth::Scheme::GetSchemes().end(); ++i) {
// create a user request
// check its scheme matches *i
- AuthUserRequest::Pointer authRequest = AuthConfig::CreateAuthUser(find_proxy_auth((*i)->type()));
+ AuthUserRequest::Pointer authRequest = Auth::Config::CreateAuthUser(find_proxy_auth((*i)->type()));
CPPUNIT_ASSERT_EQUAL(authRequest->scheme(), *i);
}
}
#if HAVE_AUTH_MODULE_BASIC
-#include "auth/basic/basicUserRequest.h"
-#include "auth/basic/auth_basic.h"
+#include "auth/basic/User.h"
+#include "auth/basic/UserRequest.h"
/* AuthBasicUserRequest::AuthBasicUserRequest works
*/
void
testAuthBasicUserRequest::username()
{
AuthUserRequest::Pointer temp = new AuthBasicUserRequest();
- BasicUser *basic_auth=new BasicUser(AuthConfig::Find("basic"));
+ Auth::Basic::User *basic_auth=new Auth::Basic::User(Auth::Config::Find("basic"));
basic_auth->username("John");
temp->user(basic_auth);
-#if USER_REQUEST_LOOP_DEAD
- basic_auth->addRequest(temp);
-#endif
CPPUNIT_ASSERT_EQUAL(0, strcmp("John", temp->username()));
}
#endif /* HAVE_AUTH_MODULE_BASIC */
#if HAVE_AUTH_MODULE_DIGEST
-#include "auth/digest/auth_digest.h"
+#include "auth/digest/User.h"
+#include "auth/digest/UserRequest.h"
/* AuthDigestUserRequest::AuthDigestUserRequest works
*/
void
testAuthDigestUserRequest::username()
{
AuthUserRequest::Pointer temp = new AuthDigestUserRequest();
- DigestUser *duser=new DigestUser(AuthConfig::Find("digest"));
+ Auth::Digest::User *duser=new Auth::Digest::User(Auth::Config::Find("digest"));
duser->username("John");
temp->user(duser);
-#if USER_REQUEST_LOOP_DEAD
- duser->addRequest(temp);
-#endif
CPPUNIT_ASSERT_EQUAL(0, strcmp("John", temp->username()));
}
#endif /* HAVE_AUTH_MODULE_DIGEST */
#if HAVE_AUTH_MODULE_NTLM
-#include "auth/ntlm/auth_ntlm.h"
+#include "auth/ntlm/User.h"
+#include "auth/ntlm/UserRequest.h"
/* AuthNTLMUserRequest::AuthNTLMUserRequest works
*/
void
testAuthNTLMUserRequest::username()
{
AuthUserRequest::Pointer temp = new AuthNTLMUserRequest();
- NTLMUser *nuser=new NTLMUser(AuthConfig::Find("ntlm"));
+ Auth::Ntlm::User *nuser=new Auth::Ntlm::User(Auth::Config::Find("ntlm"));
nuser->username("John");
temp->user(nuser);
-#if USER_REQUEST_LOOP_DEAD
- nuser->addRequest(temp);
-#endif
CPPUNIT_ASSERT_EQUAL(0, strcmp("John", temp->username()));
}
#endif /* HAVE_AUTH_MODULE_NTLM */
#if HAVE_AUTH_MODULE_NEGOTIATE
-#include "auth/negotiate/auth_negotiate.h"
+#include "auth/negotiate/User.h"
+#include "auth/negotiate/UserRequest.h"
/* AuthNegotiateUserRequest::AuthNegotiateUserRequest works
*/
void
testAuthNegotiateUserRequest::username()
{
AuthUserRequest::Pointer temp = new AuthNegotiateUserRequest();
- NegotiateUser *nuser=new NegotiateUser(AuthConfig::Find("negotiate"));
+ Auth::Negotiate::User *nuser=new Auth::Negotiate::User(Auth::Config::Find("negotiate"));
nuser->username("John");
temp->user(nuser);
-#if USER_REQUEST_LOOP_DEAD
- nuser->addRequest(temp);
-#endif
CPPUNIT_ASSERT_EQUAL(0, strcmp("John", temp->username()));
}
#endif /* HAVE_AUTH_MODULE_NEGOTIATE */
+#endif /* USE_AUTH */