Changeset - 0498acd07a1d
Parent rev.
Child rev.
[Not reviewed]
0 4 0
Jan Kaluza - 14 years ago 2011-06-21 13:37:01
hanzz.k@gmail.com
Added support for loading .cfg files with logging configuration
4 files changed with 19 insertions and 4 deletions:
spectrum/src/sample.cfg
5
spectrum/src/sample2.cfg
4
src/config.cpp
2
src/transport.cpp
8
4
0 comments (0 inline, 0 general)
spectrum/src/sample.cfg
➞
Show inline comments
 
[service]
 
jid = localhost
 
password = secret
 
server = 127.0.0.1
 
port = 5222
 
server_mode = 1
 
backend_host=localhost # < this option doesn't work yet
 
backend_port=10001
 
#cert= #patch to PKCS#12 certificate
 
#cert_password= #password to that certificate if any
 
users_per_backend=2
 
backend=../../backends/libpurple/spectrum_libpurple_backend
 
#backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 
#protocol=prpl-jabber
 
protocol=prpl-msn
 
#protocol=prpl-icq
 

			




	
	
	
		
 
[logging]

			




	
	
	
		
 
#config=logging.cfg # log4cxx/log4j logging configuration file

			




	
	
	
		
 
#backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends

			




	
	
	
		
 
#config=test.cfg

			




	
	
	
		
 

			




	
	
	
		
 
[database]

			




	
	
	
		
 
type = sqlite3 # or "none" without database backend

			




	
	
	
		
 
database = test.sql

			




	
	
	
		
 
prefix=icq

			




        

    


    
    

    

        

                

                    spectrum/src/sample2.cfg
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
[service]

			




	
	
	
		
 
jid = localhost

			




	
	
	
		
 
password = secret

			




	
	
	
		
 
server = 127.0.0.1

			




	
	
	
		
 
port = 5222

			




	
	
	
		
 
server_mode = 1

			




	
	
	
		
 
backend_host=localhost # < this option doesn't work yet

			




	
	
	
		
 
backend_port=10001

			




	
	
	
		
 
#cert= #patch to PKCS#12 certificate

			




	
	
	
		
 
#cert_password= #password to that certificate if any

			




	
	
	
		
 
users_per_backend=2

			




	
	
	
		
 
backend=spectrum_libpurple_backend

			




	
	
	
		
 
#backend=spectrum_libircclient-qt_backend

			




	
	
	
		
 
protocol=prpl-jabber

			




	
	
	
		
 
#protocol=prpl-msn

			




	
	
	
		
 
#protocol=prpl-icq

			




	
	
	
		
 

			




	
	
	
		
 
[logging]

			




	
	
	
		
 
#config=logging.cfg # log4cxx/log4j logging configuration file

			




	
	
	
		
 
#backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends

			




	
	
	
		
 

			




	
	
	
		
 
[database]

			




	
	
	
		
 
type = none # "sqlite3" or "none" without database backend

			




	
	
	
		
 
database = test.sql

			




	
	
	
		
 
#prefix=icq

			




        

    


    
    

    

        

                

                    src/config.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -32,42 +32,44 @@ bool Config::load(const std::string &configfile, boost::program_options::options

			




	
	
	
		
 

			




	
	
	
		
 
	opts.add_options()

			




	
	
	
		
 
		("service.jid", value<std::string>()->default_value(""), "Transport Jabber ID")

			




	
	
	
		
 
		("service.server", value<std::string>()->default_value(""), "Server to connect to")

			




	
	
	
		
 
		("service.password", value<std::string>()->default_value(""), "Password used to auth the server")

			




	
	
	
		
 
		("service.port", value<int>()->default_value(0), "Port the server is listening on")

			




	
	
	
		
 
		("service.backend", value<std::string>()->default_value("libpurple_backend"), "Backend")

			




	
	
	
		
 
		("service.protocol", value<std::string>()->default_value(""), "Protocol")

			




	
	
	
		
 
		("service.allowed_servers", value<std::string>()->default_value(""), "Only users from these servers can connect")

			




	
	
	
		
 
		("service.server_mode", value<bool>()->default_value(false), "True if Spectrum should behave as server")

			




	
	
	
		
 
		("service.users_per_backend", value<int>()->default_value(100), "Number of users per one legacy network backend")

			




	
	
	
		
 
		("service.backend_host", value<std::string>()->default_value("localhost"), "Host to bind backend server to")

			




	
	
	
		
 
		("service.backend_port", value<std::string>()->default_value("10000"), "Port to bind backend server to")

			




	
	
	
		
 
		("service.cert", value<std::string>()->default_value(""), "PKCS#12 Certificate.")

			




	
	
	
		
 
		("service.cert_password", value<std::string>()->default_value(""), "PKCS#12 Certificate password.")

			




	
	
	
		
 
		("registration.enable_public_registration", value<bool>()->default_value(true), "True if users should be able to register.")

			




	
	
	
		
 
		("registration.language", value<std::string>()->default_value("en"), "Default language for registration form")

			




	
	
	
		
 
		("registration.instructions", value<std::string>()->default_value(""), "Instructions showed to user in registration form")

			




	
	
	
		
 
		("registration.username_field", value<std::string>()->default_value(""), "Label for username field")

			




	
	
	
		
 
		("registration.username_mask", value<std::string>()->default_value(""), "Username mask")

			




	
	
	
		
 
		("registration.encoding", value<std::string>()->default_value("en"), "Default encoding in registration form")

			




	
	
	
		
 
		("database.type", value<std::string>()->default_value("none"), "Database type.")

			




	
	
	
		
 
		("database.database", value<std::string>()->default_value(""), "Database used to store data")

			




	
	
	
		
 
		("database.prefix", value<std::string>()->default_value(""), "Prefix of tables in database")

			




	
	
	
		
 
		("logging.config", value<std::string>()->default_value(""), "Path to log4cxx config file which is used for Spectrum 2 instance")

			




	
	
	
		
 
		("logging.backend_config", value<std::string>()->default_value(""), "Path to log4cxx config file which is used for backends")

			




	
	
	
		
 
	;

			




	
	
	
		
 

			




	
	
	
		
 
	store(parse_config_file(ifs, opts), m_variables);

			




	
	
	
		
 
	notify(m_variables);

			




	
	
	
		
 

			




	
	
	
		
 
	m_file = configfile;

			




	
	
	
		
 

			




	
	
	
		
 
	onConfigReloaded();

			




	
	
	
		
 

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool Config::load(const std::string &configfile) {

			




	
	
	
		
 
	options_description opts("Transport options");

			




	
	
	
		
 
	return load(configfile, opts);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/transport.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -10,89 +10,93 @@

			




	
	
	
		
 
 *

			




	
	
	
		
 
 * 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  02111-1301  USA

			




	
	
	
		
 
 */

			




	
	
	
		
 

			




	
	
	
		
 
#include "transport/transport.h"

			




	
	
	
		
 
#include <boost/bind.hpp>

			




	
	
	
		
 
#include "transport/storagebackend.h"

			




	
	
	
		
 
#include "transport/factory.h"

			




	
	
	
		
 
#include "discoinforesponder.h"

			




	
	
	
		
 
#include "discoitemsresponder.h"

			




	
	
	
		
 
#include "storageparser.h"

			




	
	
	
		
 
#include "Swiften/TLS/OpenSSL/OpenSSLServerContext.h"

			




	
	
	
		
 
#include "Swiften/TLS/PKCS12Certificate.h"

			




	
	
	
		
 
#include "Swiften/TLS/OpenSSL/OpenSSLServerContextFactory.h"

			




	
	
	
		
 
#include "log4cxx/logger.h"

			




	
	
	
		
 
#include "log4cxx/consoleappender.h"

			




	
	
	
		
 
#include "log4cxx/patternlayout.h"

			




	
	
	
		
 
#include "log4cxx/propertyconfigurator.h"

			




	
	
	
		
 

			




	
	
	
		
 
using namespace Swift;

			




	
	
	
		
 
using namespace boost;

			




	
	
	
		
 
using namespace log4cxx;

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 
	

			




	
	
	
		
 
static LoggerPtr logger = Logger::getLogger("Component");

			




	
	
	
		
 
static LoggerPtr logger_xml = Logger::getLogger("Component.XML");

			




	
	
	
		
 

			




	
	
	
		
 
class MyUserRegistry : public Swift::UserRegistry {

			




	
	
	
		
 
	public:

			




	
	
	
		
 
		MyUserRegistry(Component *c) {component = c;}

			




	
	
	
		
 
		~MyUserRegistry() {}

			




	
	
	
		
 
		bool isValidUserPassword(const JID& user, const Swift::SafeByteArray& password) const {

			




	
	
	
		
 
			users[user.toBare().toString()] = Swift::safeByteArrayToString(password);

			




	
	
	
		
 
			Swift::Presence::ref response = Swift::Presence::create();

			




	
	
	
		
 
			response->setTo(component->getJID());

			




	
	
	
		
 
			response->setFrom(user);

			




	
	
	
		
 
			response->setType(Swift::Presence::Available);

			




	
	
	
		
 
			component->onUserPresenceReceived(response);

			




	
	
	
		
 
			std::cout << "CONNECTED LOGIN 1" << user.toString() << "\n";

			




	
	
	
		
 
			return true;

			




	
	
	
		
 
		}

			




	
	
	
		
 
		mutable std::map<std::string, std::string> users;

			




	
	
	
		
 
		mutable Component *component;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
Component::Component(Swift::EventLoop *loop, Config *config, Factory *factory) {

			




	
	
	
		
 
	m_component = NULL;

			




	
	
	
		
 
	m_userRegistry = NULL;

			




	
	
	
		
 
	m_server = NULL;

			




	
	
	
		
 
	m_reconnectCount = 0;

			




	
	
	
		
 
	m_config = config;

			




	
	
	
		
 
	m_factory = factory;

			




	
	
	
		
 
	m_loop = loop;

			




	
	
	
		
 

			




	
	
	
		
 
// 	BasicConfigurator::configure();

			




	
	
	
		
 

			




	
	
	
		
 
	LoggerPtr root = Logger::getRootLogger();

			




	
	
	
		
 
	root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));

			




	
	
	
		
 
	if (CONFIG_STRING(m_config, "logging.config").empty()) {

			




	
	
	
		
 
		LoggerPtr root = Logger::getRootLogger();

			




	
	
	
		
 
		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		log4cxx::PropertyConfigurator::configure(CONFIG_STRING(m_config, "logging.config"));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
	m_jid = Swift::JID(CONFIG_STRING(m_config, "service.jid"));

			




	
	
	
		
 

			




	
	
	
		
 
	m_factories = new BoostNetworkFactories(loop);

			




	
	
	
		
 

			




	
	
	
		
 
	m_reconnectTimer = m_factories->getTimerFactory()->createTimer(1000);

			




	
	
	
		
 
	m_reconnectTimer->onTick.connect(bind(&Component::start, this)); 

			




	
	
	
		
 

			




	
	
	
		
 
	if (CONFIG_BOOL(m_config, "service.server_mode")) {

			




	
	
	
		
 
		LOG4CXX_INFO(logger, "Creating component in server mode on port " << CONFIG_INT(m_config, "service.port"));

			




	
	
	
		
 
		m_userRegistry = new MyUserRegistry(this);

			




	
	
	
		
 
		m_server = new Swift::Server(loop, m_factories, m_userRegistry, m_jid, CONFIG_INT(m_config, "service.port"));

			




	
	
	
		
 
		if (!CONFIG_STRING(m_config, "service.cert").empty()) {

			




	
	
	
		
 
			LOG4CXX_INFO(logger, "Using PKCS#12 certificate " << CONFIG_STRING(m_config, "service.cert"));

			




	
	
	
		
 
			TLSServerContextFactory *f = new OpenSSLServerContextFactory();

			




	
	
	
		
 
			m_server->addTLSEncryption(f, PKCS12Certificate(CONFIG_STRING(m_config, "service.cert"), createSafeByteArray(CONFIG_STRING(m_config, "service.cert_password"))));

			




	
	
	
		
 
		}

			




	
	
	
		
 
		else {

			




	
	
	
		
 
			LOG4CXX_WARN(logger, "No PKCS#12 certificate used. TLS is disabled.");

			




	
	
	
		
 
		}

			




	
	
	
		
 
// 		m_server->start();

			




	
	
	
		
 
		m_stanzaChannel = m_server->getStanzaChannel();

			




	
	
	
		
 
		m_iqRouter = m_server->getIQRouter();

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-3934
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support