Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed the authenitication client factory to produce test clients, too

This commit is contained in:
fgerlits 2004-11-24 11:42:49 +00:00
parent 06a2fcd2a0
commit 0a7ca4196c
4 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
livesupport/modules/authentication/etc/authenticationClient.xml
View File

@ -1,7 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE authenticationClientFactory [ <!DOCTYPE authenticationClientFactory [
<!ELEMENT authenticationClientFactory (webAuthentication) > <!ELEMENT authenticationClientFactory (testAuthentication?,
webAuthentication?)>
<!ELEMENT testAuthentication (user) >
<!ELEMENT user EMPTY >
<!ATTLIST user login CDATA #REQUIRED >
<!ATTLIST user password CDATA #REQUIRED >
<!ELEMENT webAuthentication (location) > <!ELEMENT webAuthentication (location) >
@ -9,8 +16,12 @@
<!ATTLIST location server CDATA #REQUIRED > <!ATTLIST location server CDATA #REQUIRED >
<!ATTLIST location port NMTOKEN #REQUIRED > <!ATTLIST location port NMTOKEN #REQUIRED >
<!ATTLIST location path CDATA #REQUIRED > <!ATTLIST location path CDATA #REQUIRED >
]> ]>
<authenticationClientFactory> <authenticationClientFactory>
<testAuthentication>
<user login="root" password="q" />
</testAuthentication>
<webAuthentication> <webAuthentication>
<location server="localhost" port="80" <location server="localhost" port="80"
path="/storage/var/xmlrpc/xrLocStor.php" /> path="/storage/var/xmlrpc/xrLocStor.php" />

23
livesupport/modules/authentication/src/AuthenticationClientFactory.cxx
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.1 $ Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/AuthenticationClientFactory.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/AuthenticationClientFactory.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -34,6 +34,7 @@
#endif #endif
#include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h"
#include "TestAuthenticationClient.h"
#include "LiveSupport/Authentication/WebAuthenticationClient.h" #include "LiveSupport/Authentication/WebAuthenticationClient.h"
using namespace LiveSupport::Core; using namespace LiveSupport::Core;
@ -92,8 +93,20 @@ AuthenticationClientFactory :: configure(const xmlpp::Element & element)
authenticationClient.reset(); authenticationClient.reset();
// try to look for an WebAuthenticationClient configuration element // try to look for a TestAuthenticationClient configuration element
xmlpp::Node::NodeList nodes = xmlpp::Node::NodeList nodes =
element.get_children(TestAuthenticationClient::getConfigElementName());
if (nodes.size() >= 1) {
const xmlpp::Element * configElement =
dynamic_cast<const xmlpp::Element*> (*(nodes.begin()));
Ptr<TestAuthenticationClient>::Ref tac(new TestAuthenticationClient());
tac->configure(*configElement);
authenticationClient = tac;
return;
}
// try to look for a WebAuthenticationClient configuration element
nodes =
element.get_children(WebAuthenticationClient::getConfigElementName()); element.get_children(WebAuthenticationClient::getConfigElementName());
if (nodes.size() >= 1) { if (nodes.size() >= 1) {
const xmlpp::Element * configElement = const xmlpp::Element * configElement =
@ -101,11 +114,9 @@ AuthenticationClientFactory :: configure(const xmlpp::Element & element)
Ptr<WebAuthenticationClient>::Ref wac(new WebAuthenticationClient()); Ptr<WebAuthenticationClient>::Ref wac(new WebAuthenticationClient());
wac->configure(*configElement); wac->configure(*configElement);
authenticationClient = wac; authenticationClient = wac;
return;
} }
if (!authenticationClient) { throw std::invalid_argument("no authentication client configuration found");
throw std::invalid_argument("no authentication client factories "
"to configure");
}
} }

13
livesupport/modules/storage/etc/authenticationClient.xml
View File

@ -1,7 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE authenticationClientFactory [ <!DOCTYPE authenticationClientFactory [
<!ELEMENT authenticationClientFactory (webAuthentication) > <!ELEMENT authenticationClientFactory (testAuthentication?,
webAuthentication?)>
<!ELEMENT testAuthentication (user) >
<!ELEMENT user EMPTY >
<!ATTLIST user login CDATA #REQUIRED >
<!ATTLIST user password CDATA #REQUIRED >
<!ELEMENT webAuthentication (location) > <!ELEMENT webAuthentication (location) >
@ -9,8 +16,12 @@
<!ATTLIST location server CDATA #REQUIRED > <!ATTLIST location server CDATA #REQUIRED >
<!ATTLIST location port NMTOKEN #REQUIRED > <!ATTLIST location port NMTOKEN #REQUIRED >
<!ATTLIST location path CDATA #REQUIRED > <!ATTLIST location path CDATA #REQUIRED >
]> ]>
<authenticationClientFactory> <authenticationClientFactory>
<testAuthentication>
<user login="root" password="q" />
</testAuthentication>
<webAuthentication> <webAuthentication>
<location server="localhost" port="80" <location server="localhost" port="80"
path="/storage/var/xmlrpc/xrLocStor.php" /> path="/storage/var/xmlrpc/xrLocStor.php" />

13
livesupport/products/scheduler/etc/authenticationClient.xml
View File

@ -1,7 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE authenticationClientFactory [ <!DOCTYPE authenticationClientFactory [
<!ELEMENT authenticationClientFactory (webAuthentication) > <!ELEMENT authenticationClientFactory (testAuthentication?,
webAuthentication?)>
<!ELEMENT testAuthentication (user) >
<!ELEMENT user EMPTY >
<!ATTLIST user login CDATA #REQUIRED >
<!ATTLIST user password CDATA #REQUIRED >
<!ELEMENT webAuthentication (location) > <!ELEMENT webAuthentication (location) >
@ -9,8 +16,12 @@
<!ATTLIST location server CDATA #REQUIRED > <!ATTLIST location server CDATA #REQUIRED >
<!ATTLIST location port NMTOKEN #REQUIRED > <!ATTLIST location port NMTOKEN #REQUIRED >
<!ATTLIST location path CDATA #REQUIRED > <!ATTLIST location path CDATA #REQUIRED >
]> ]>
<authenticationClientFactory> <authenticationClientFactory>
<testAuthentication>
<user login="root" password="q" />
</testAuthentication>
<webAuthentication> <webAuthentication>
<location server="localhost" port="80" <location server="localhost" port="80"
path="/storage/var/xmlrpc/xrLocStor.php" /> path="/storage/var/xmlrpc/xrLocStor.php" />