11 files changed, 743 insertions, 1 deletions

diff --git a/src/Server/Application.cpp b/src/Server/Application.cpp
index f8340d5..157f5b6 100644
--- a/src/Server/Application.cpp
+++ b/src/Server/Application.cpp
@@ -19,13 +19,16 @@
 
 #include "Application.h"
 #include "ConnectionManager.h"
+#include "UserListManager.h"
 
 namespace Mad {
 namespace Server {
 
-Application::Application() : Common::Application(true), connectionManager(new ConnectionManager(this)) {}
+Application::Application() : Common::Application(true), connectionManager(new ConnectionManager(this)),
+    userListManager(new UserListManager(this)) {}
 
 Application::~Application() {
+  delete userListManager;
   delete connectionManager;
 }
 
diff --git a/src/Server/Application.h b/src/Server/Application.h
index 205d398..5dc1e63 100644
--- a/src/Server/Application.h
+++ b/src/Server/Application.h
@@ -28,10 +28,12 @@ namespace Mad {
 namespace Server {
 
 class ConnectionManager;
+class UserListManager;
 
 class MAD_SERVER_EXPORT Application : public Common::Application {
   private:
     ConnectionManager *connectionManager;
+    UserListManager *userListManager;
 
   public:
     Application();
@@ -40,6 +42,10 @@ class MAD_SERVER_EXPORT Application : public Common::Application {
     ConnectionManager* getConnectionManager() const {
       return connectionManager;
     }
+
+    UserListManager* getUserListManager() const {
+      return userListManager;
+    }
 };
 
 }
diff --git a/src/Server/CMakeLists.txt b/src/Server/CMakeLists.txt
index 80cf25d..4414bd8 100644
--- a/src/Server/CMakeLists.txt
+++ b/src/Server/CMakeLists.txt
@@ -5,6 +5,9 @@ mad_library(Server
   
   RequestHandlers/ConnectionRequestHandlerGroup.cpp RequestHandlers/ConnectionRequestHandlerGroup.h
   RequestHandlers/DaemonRequestHandlerGroup.cpp RequestHandlers/DaemonRequestHandlerGroup.h
+  RequestHandlers/UserListDiffUploadRequestHandler.cpp RequestHandlers/UserListDiffUploadRequestHandler.h
+  RequestHandlers/UserListRequestHandlerGroup.cpp RequestHandlers/UserListRequestHandlerGroup.h
+  RequestHandlers/UserListUploadRequestHandler.cpp RequestHandlers/UserListUploadRequestHandler.h
   RequestHandlers/UserRequestHandlerGroup.cpp RequestHandlers/UserRequestHandlerGroup.h
   
   Requests/CommandRequest.cpp Requests/CommandRequest.h
@@ -12,5 +15,6 @@ mad_library(Server
   
   Application.cpp Application.h
   ConnectionManager.cpp ConnectionManager.h
+  UserListManager.cpp UserListManager.h
 )
 target_link_libraries(Server Common Net Core)
diff --git a/src/Server/RequestHandlers/UserListDiffUploadRequestHandler.cpp b/src/Server/RequestHandlers/UserListDiffUploadRequestHandler.cpp
new file mode 100644
index 0000000..05aadf8
--- /dev/null
+++ b/src/Server/RequestHandlers/UserListDiffUploadRequestHandler.cpp
@@ -0,0 +1,84 @@
+/*
+ * UserListDiffUploadRequestHandler.cpp
+ *
+ * Copyright (C) 2009 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "UserListDiffUploadRequestHandler.h"
+#include "../Application.h"
+#include "../UserListManager.h"
+
+#include <Common/UserLists/Util.h>
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+namespace Mad {
+namespace Server {
+namespace RequestHandlers {
+
+void UserListDiffUploadRequestHandler::handlePacket(boost::shared_ptr<const Common::XmlData> packet) {
+  if(packet->getType() == "Cancel") {
+    Common::XmlData ret;
+    ret.setType("OK");
+    sendPacket(ret);
+
+    signalFinished();
+    return;
+  }
+  else if(packet->getType() != "UploadUserListDiff") {
+    getApplication()->log(Core::Logger::LOG_ERROR, "Received an unexpected packet.");
+
+    Common::XmlData ret;
+    ret.setType("Error");
+    ret.set("ErrorCode", Core::Exception::UNEXPECTED_PACKET);
+
+    sendPacket(ret);
+
+    signalFinished();
+    return;
+  }
+
+  if(!getConnection()->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  UserListManager *userListManager = dynamic_cast<Application*>(getApplication())->getUserListManager();
+
+  if(name.empty()) { // Request
+    name = packet->get<const std::string&>("name");
+
+    if(name.empty())
+      name = boost::posix_time::to_simple_string(boost::posix_time::second_clock::universal_time());
+
+    Common::XmlData ret;
+    ret.setType("Continue");
+    ret.set("exists", userListManager->existsUserListDiff(name));
+    sendPacket(ret);
+  }
+  else { // Upload
+    boost::shared_ptr<Common::UserLists::UserListDiff> diff = Common::UserLists::Util::deserializeUserListDiff(packet.get());
+    userListManager->storeUserListDiff(name, diff.get());
+
+    Common::XmlData ret;
+    ret.setType("OK");
+    sendPacket(ret);
+
+    signalFinished();
+  }
+}
+
+}
+}
+}
diff --git a/src/Server/RequestHandlers/UserListDiffUploadRequestHandler.h b/src/Server/RequestHandlers/UserListDiffUploadRequestHandler.h
new file mode 100644
index 0000000..3d74253
--- /dev/null
+++ b/src/Server/RequestHandlers/UserListDiffUploadRequestHandler.h
@@ -0,0 +1,47 @@
+/*
+ * UserListDiffUploadRequestHandler.h
+ *
+ * Copyright (C) 2009 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_SERVER_REQUESTHANDLERS_USERLISTDIFFUPLOADREQUESTHANDLER_H_
+#define MAD_SERVER_REQUESTHANDLERS_USERLISTDIFFUPLOADREQUESTHANDLER_H_
+
+#include <Common/RequestHandler.h>
+
+namespace Mad {
+namespace Server {
+
+class UserListManager;
+
+namespace RequestHandlers {
+
+class UserListDiffUploadRequestHandler : public Common::RequestHandler {
+  private:
+    std::string name;
+
+  protected:
+    virtual void handlePacket(boost::shared_ptr<const Common::XmlData> packet);
+
+  public:
+    UserListDiffUploadRequestHandler(Common::Application *application) : Common::RequestHandler(application) {}
+};
+
+}
+}
+}
+
+#endif /* MAD_SERVER_REQUESTHANDLERS_USERLISTDIFFUPLOADREQUESTHANDLER_H_ */
diff --git a/src/Server/RequestHandlers/UserListRequestHandlerGroup.cpp b/src/Server/RequestHandlers/UserListRequestHandlerGroup.cpp
new file mode 100644
index 0000000..bb18194
--- /dev/null
+++ b/src/Server/RequestHandlers/UserListRequestHandlerGroup.cpp
@@ -0,0 +1,161 @@
+/*
+ * UserListRequestHandlerGroup.cpp
+ *
+ * Copyright (C) 2009 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "UserListRequestHandlerGroup.h"
+#include "../Application.h"
+#include "../UserListManager.h"
+
+#include <Common/UserLists/Util.h>
+
+namespace Mad {
+namespace Server {
+namespace RequestHandlers {
+
+void UserListRequestHandlerGroup::handleUserListListRequest(boost::shared_ptr<const Common::XmlData> /*packet*/, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  const std::set<std::string> &userLists = application->getUserListManager()->getUserLists();
+
+  ret->setType("OK");
+  Common::XmlData::List *list = ret->createList("userLists");
+
+  for(std::set<std::string>::const_iterator userList = userLists.begin(); userList != userLists.end(); ++userList) {
+    Common::XmlData::List::iterator entry = list->addEntry();
+
+    entry->set("name", *userList);
+  }
+
+}
+
+void UserListRequestHandlerGroup::handleUserListDownloadRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  boost::shared_ptr<Common::UserLists::UserList> userList = application->getUserListManager()->loadUserList(packet->get<const std::string&>("name"));
+  if(!userList)
+    throw(Core::Exception(Core::Exception::NOT_FOUND));
+
+  ret->setType("OK");
+  Common::UserLists::Util::serializeUserList(userList.get(), ret);
+}
+
+void UserListRequestHandlerGroup::handleUserListCopyRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  application->getUserListManager()->copyUserList(packet->get<const std::string&>("fromName"), packet->get<const std::string&>("toName"));
+
+  ret->setType("OK");
+}
+
+void UserListRequestHandlerGroup::handleUserListRenameRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  application->getUserListManager()->renameUserList(packet->get<const std::string&>("fromName"), packet->get<const std::string&>("toName"));
+
+  ret->setType("OK");
+}
+
+void UserListRequestHandlerGroup::handleUserListRemoveRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  application->getUserListManager()->removeUserList(packet->get<const std::string&>("name"));
+
+  ret->setType("OK");
+}
+
+
+void UserListRequestHandlerGroup::handleUserListDiffListRequest(boost::shared_ptr<const Common::XmlData> /*packet*/, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  const std::set<std::string> &userListDiffs = application->getUserListManager()->getUserListDiffs();
+
+  ret->setType("OK");
+  Common::XmlData::List *list = ret->createList("userListDiffs");
+
+  for(std::set<std::string>::const_iterator diff = userListDiffs.begin(); diff != userListDiffs.end(); ++diff) {
+    Common::XmlData::List::iterator entry = list->addEntry();
+
+    entry->set("name", *diff);
+  }
+
+}
+
+void UserListRequestHandlerGroup::handleUserListDiffDownloadRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  boost::shared_ptr<Common::UserLists::UserListDiff> diff = application->getUserListManager()->loadUserListDiff(packet->get<const std::string&>("name"));
+  if(!diff)
+    throw(Core::Exception(Core::Exception::NOT_FOUND));
+
+  ret->setType("OK");
+  Common::UserLists::Util::serializeUserListDiff(diff.get(), ret);
+}
+
+void UserListRequestHandlerGroup::handleUserListDiffCopyRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  application->getUserListManager()->copyUserListDiff(packet->get<const std::string&>("fromName"), packet->get<const std::string&>("toName"));
+
+  ret->setType("OK");
+}
+
+void UserListRequestHandlerGroup::handleUserListDiffRenameRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  application->getUserListManager()->renameUserListDiff(packet->get<const std::string&>("fromName"), packet->get<const std::string&>("toName"));
+
+  ret->setType("OK");
+}
+
+void UserListRequestHandlerGroup::handleUserListDiffRemoveRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection) {
+  if(!connection->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  application->getUserListManager()->removeUserListDiff(packet->get<const std::string&>("name"));
+
+  ret->setType("OK");
+}
+
+
+UserListRequestHandlerGroup::UserListRequestHandlerGroup(Application *application0)
+: application(application0) {
+  registerHandler("ListUserLists", boost::bind(&UserListRequestHandlerGroup::handleUserListListRequest, this, _1, _2, _3));
+  registerHandler("DownloadUserList", boost::bind(&UserListRequestHandlerGroup::handleUserListDownloadRequest, this, _1, _2, _3));
+  registerHandler("CopyUserList", boost::bind(&UserListRequestHandlerGroup::handleUserListCopyRequest, this, _1, _2, _3));
+  registerHandler("RenameUserList", boost::bind(&UserListRequestHandlerGroup::handleUserListRenameRequest, this, _1, _2, _3));
+  registerHandler("RemoveUserList", boost::bind(&UserListRequestHandlerGroup::handleUserListRemoveRequest, this, _1, _2, _3));
+
+  registerHandler("ListUserListDiffs", boost::bind(&UserListRequestHandlerGroup::handleUserListDiffListRequest, this, _1, _2, _3));
+  registerHandler("DownloadUserListDiff", boost::bind(&UserListRequestHandlerGroup::handleUserListDiffDownloadRequest, this, _1, _2, _3));
+  registerHandler("CopyUserListDiff", boost::bind(&UserListRequestHandlerGroup::handleUserListDiffCopyRequest, this, _1, _2, _3));
+  registerHandler("RenameUserListDiff", boost::bind(&UserListRequestHandlerGroup::handleUserListDiffRenameRequest, this, _1, _2, _3));
+  registerHandler("RemoveUserListDiff", boost::bind(&UserListRequestHandlerGroup::handleUserListDiffRemoveRequest, this, _1, _2, _3));
+}
+
+}
+}
+}
diff --git a/src/Server/RequestHandlers/UserListRequestHandlerGroup.h b/src/Server/RequestHandlers/UserListRequestHandlerGroup.h
new file mode 100644
index 0000000..a7e09b3
--- /dev/null
+++ b/src/Server/RequestHandlers/UserListRequestHandlerGroup.h
@@ -0,0 +1,59 @@
+/*
+ * UserListRequestHandlerGroup.h
+ *
+ * Copyright (C) 2009 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_SERVER_REQUESTHANDLERS_USERLISTREQUESTHANDLERGROUP_H_
+#define MAD_SERVER_REQUESTHANDLERS_USERLISTREQUESTHANDLERGROUP_H_
+
+#include "../export.h"
+
+#include <Common/RequestHandlers/SimpleRequestHandlerGroup.h>
+
+namespace Mad {
+namespace Server {
+
+class Application;
+class UserListManager;
+
+namespace RequestHandlers {
+
+class MAD_SERVER_EXPORT UserListRequestHandlerGroup  : public Common::RequestHandlers::SimpleRequestHandlerGroup {
+  private:
+    Application *application;
+
+    void handleUserListListRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+    void handleUserListDownloadRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+    void handleUserListCopyRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+    void handleUserListRenameRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+    void handleUserListRemoveRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+
+    void handleUserListDiffListRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+    void handleUserListDiffDownloadRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+    void handleUserListDiffCopyRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+    void handleUserListDiffRenameRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+    void handleUserListDiffRemoveRequest(boost::shared_ptr<const Common::XmlData> packet, Common::XmlData *ret, Common::Connection *connection);
+
+  public:
+    UserListRequestHandlerGroup(Application *application0);
+};
+
+}
+}
+}
+
+#endif /* MAD_SERVER_REQUESTHANDLERS_USERLISTREQUESTHANDLERGROUP_H_ */
diff --git a/src/Server/RequestHandlers/UserListUploadRequestHandler.cpp b/src/Server/RequestHandlers/UserListUploadRequestHandler.cpp
new file mode 100644
index 0000000..307863a
--- /dev/null
+++ b/src/Server/RequestHandlers/UserListUploadRequestHandler.cpp
@@ -0,0 +1,85 @@
+/*
+ * UserListUploadRequestHandler.cpp
+ *
+ * Copyright (C) 2009 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "UserListUploadRequestHandler.h"
+#include "../Application.h"
+#include "../UserListManager.h"
+
+#include <Common/UserLists/Util.h>
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+
+namespace Mad {
+namespace Server {
+namespace RequestHandlers {
+
+void UserListUploadRequestHandler::handlePacket(boost::shared_ptr<const Common::XmlData> packet) {
+  if(packet->getType() == "Cancel") {
+    Common::XmlData ret;
+    ret.setType("OK");
+    sendPacket(ret);
+
+    signalFinished();
+    return;
+  }
+  else if(packet->getType() != "UploadUserList") {
+    getApplication()->log(Core::Logger::LOG_ERROR, "Received an unexpected packet.");
+
+    Common::XmlData ret;
+    ret.setType("Error");
+    ret.set("ErrorCode", Core::Exception::UNEXPECTED_PACKET);
+
+    sendPacket(ret);
+
+    signalFinished();
+    return;
+  }
+
+  if(!getConnection()->isAuthenticated())
+    throw(Core::Exception(Core::Exception::PERMISSION));
+
+  UserListManager *userListManager = dynamic_cast<Application*>(getApplication())->getUserListManager();
+
+  if(name.empty()) { // Request
+    name = packet->get<const std::string&>("name");
+
+    if(name.empty())
+      name = boost::posix_time::to_simple_string(boost::posix_time::second_clock::universal_time());
+
+    Common::XmlData ret;
+    ret.setType("Continue");
+    ret.set("exists", userListManager->existsUserList(name));
+    sendPacket(ret);
+  }
+  else { // Upload
+    boost::shared_ptr<Common::UserLists::UserList> userList = Common::UserLists::Util::deserializeUserList(packet.get());
+    userListManager->storeUserList(name, userList.get());
+
+    Common::XmlData ret;
+    ret.setType("OK");
+    sendPacket(ret);
+
+    signalFinished();
+  }
+}
+
+}
+}
+}
diff --git a/src/Server/RequestHandlers/UserListUploadRequestHandler.h b/src/Server/RequestHandlers/UserListUploadRequestHandler.h
new file mode 100644
index 0000000..4a20a4c
--- /dev/null
+++ b/src/Server/RequestHandlers/UserListUploadRequestHandler.h
@@ -0,0 +1,47 @@
+/*
+ * UserListUploadRequestHandler.h
+ *
+ * Copyright (C) 2009 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_SERVER_REQUESTHANDLERS_USERLISTUPLOADREQUESTHANDLER_H_
+#define MAD_SERVER_REQUESTHANDLERS_USERLISTUPLOADREQUESTHANDLER_H_
+
+#include <Common/RequestHandler.h>
+
+namespace Mad {
+namespace Server {
+
+class UserListManager;
+
+namespace RequestHandlers {
+
+class UserListUploadRequestHandler : public Common::RequestHandler {
+  private:
+    std::string name;
+
+  protected:
+    virtual void handlePacket(boost::shared_ptr<const Common::XmlData> packet);
+
+  public:
+    UserListUploadRequestHandler(Common::Application *application) : Common::RequestHandler(application) {}
+};
+
+}
+}
+}
+
+#endif /* MAD_SERVER_REQUESTHANDLERS_USERLISTUPLOADREQUESTHANDLER_H_ */
diff --git a/src/Server/UserListManager.cpp b/src/Server/UserListManager.cpp
new file mode 100644
index 0000000..d1a6e31
--- /dev/null
+++ b/src/Server/UserListManager.cpp
@@ -0,0 +1,151 @@
+/*
+ * UserListManager.cpp
+ *
+ * Copyright (C) 2009 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "UserListManager.h"
+#include "Application.h"
+#include "RequestHandlers/UserListRequestHandlerGroup.h"
+#include "RequestHandlers/UserListUploadRequestHandler.h"
+#include "RequestHandlers/UserListDiffUploadRequestHandler.h"
+
+#include <Common/RequestManager.h>
+#include <Common/StorageManager.h>
+#include <Common/UserManager.h>
+#include <Common/UserLists/UserList.h>
+#include <Common/UserLists/Util.h>
+#include <Core/ConfigManager.h>
+
+namespace Mad {
+namespace Server {
+
+UserListManager::UserListManager(Application *application0) : application(application0), requestHandlerGroup(new RequestHandlers::UserListRequestHandlerGroup(application)) {
+  application->getConfigManager()->registerConfigurable(this);
+}
+
+UserListManager::~UserListManager() {
+  application->getRequestManager()->unregisterPacketType("UploadUserList");
+  application->getRequestManager()->unregisterPacketType("UploadUserListDiff");
+  application->getRequestManager()->unregisterRequestHandlerGroup(requestHandlerGroup);
+  application->getConfigManager()->unregisterConfigurable(this);
+}
+
+
+void UserListManager::configFinished() {
+  userLists = application->getStorageManager()->list("UserList");
+  userListDiffs = application->getStorageManager()->list("UserListDiff");
+
+  application->getRequestManager()->registerRequestHandlerGroup(requestHandlerGroup);
+  application->getRequestManager()->registerPacketType<RequestHandlers::UserListUploadRequestHandler>("UploadUserList");
+  application->getRequestManager()->registerPacketType<RequestHandlers::UserListDiffUploadRequestHandler>("UploadUserListDiff");
+}
+
+bool UserListManager::existsUserList(const std::string &name) {
+  return application->getStorageManager()->exists("UserList", name);
+}
+
+boost::shared_ptr<Common::UserLists::UserList> UserListManager::loadUserList(const std::string &name) {
+  boost::shared_ptr<Common::XmlData> data = application->getStorageManager()->load("UserList", name);
+
+  if(!data)
+    return boost::shared_ptr<Common::UserLists::UserList>();
+
+  return Common::UserLists::Util::deserializeUserList(data.get());
+}
+
+void UserListManager::storeUserList(const std::string &name, const Common::UserLists::UserList *list) {
+  Common::XmlData data;
+
+  Common::UserLists::Util::serializeUserList(list, &data);
+  application->getStorageManager()->store("UserList", name, &data);
+}
+
+void UserListManager::copyUserList(const std::string &fromName, const std::string &toName) {
+  application->getStorageManager()->copy("UserList", fromName, toName);
+}
+
+void UserListManager::renameUserList(const std::string &fromName, const std::string &toName) {
+  application->getStorageManager()->rename("UserList", fromName, toName);
+}
+
+void UserListManager::removeUserList(const std::string &name) {
+  application->getStorageManager()->remove("UserList", name);
+}
+
+
+bool UserListManager::existsUserListDiff(const std::string &name) {
+  return application->getStorageManager()->exists("UserListDiff", name);
+}
+
+boost::shared_ptr<Common::UserLists::UserListDiff> UserListManager::loadUserListDiff(const std::string &name) {
+  boost::shared_ptr<Common::XmlData> data = application->getStorageManager()->load("UserListDiff", name);
+
+  if(!data)
+    return boost::shared_ptr<Common::UserLists::UserListDiff>();
+
+  return Common::UserLists::Util::deserializeUserListDiff(data.get());
+}
+
+void UserListManager::storeUserListDiff(const std::string &name, const Common::UserLists::UserListDiff *list) {
+  Common::XmlData data;
+
+  Common::UserLists::Util::serializeUserListDiff(list, &data);
+  application->getStorageManager()->store("UserListDiff", name, &data);
+}
+
+void UserListManager::copyUserListDiff(const std::string &fromName, const std::string &toName) {
+  application->getStorageManager()->copy("UserListDiff", fromName, toName);
+}
+
+void UserListManager::renameUserListDiff(const std::string &fromName, const std::string &toName) {
+  application->getStorageManager()->rename("UserListDiff", fromName, toName);
+}
+
+void UserListManager::removeUserListDiff(const std::string &name) {
+  application->getStorageManager()->remove("UserListDiff", name);
+}
+
+boost::shared_ptr<Common::UserLists::UserList> UserListManager::getCurrentUserList() {
+  boost::shared_ptr<Common::UserLists::UserList> list(new Common::UserLists::UserList);
+
+  boost::shared_ptr<const std::map<unsigned long, Common::UserInfo> > userList = application->getUserManager()->getUserList();
+  boost::shared_ptr<const std::map<unsigned long, Common::GroupInfo> > groupList = application->getUserManager()->getGroupList();
+
+  for(std::map<unsigned long, Common::UserInfo>::const_iterator user = userList->begin(); user != userList->end(); ++user) {
+    std::map<unsigned long, Common::GroupInfo>::const_iterator group = groupList->find(user->second.getGid());
+    std::string groupname;
+
+    if(group != groupList->end()) {
+      groupname = group->second.getName();
+    }
+    else {
+      std::ostringstream stream;
+      stream << user->second.getGid();
+      groupname = stream.str();
+    }
+
+    Common::UserLists::UserListEntry entry(user->second.getUsername(), groupname);
+    entry.setDetail("Full name", user->second.getFullName());
+
+    list->push_back(entry);
+  }
+
+  return list;
+}
+
+}
+}
diff --git a/src/Server/UserListManager.h b/src/Server/UserListManager.h
new file mode 100644
index 0000000..1651d42
--- /dev/null
+++ b/src/Server/UserListManager.h
@@ -0,0 +1,95 @@
+/*
+ * UserListManager.h
+ *
+ * Copyright (C) 2009 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_SERVER_USERLISTMANAGER_H_
+#define MAD_SERVER_USERLISTMANAGER_H_
+
+#include "export.h"
+
+#include <Core/Configurable.h>
+
+#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <set>
+
+namespace Mad {
+
+namespace Common {
+namespace UserLists {
+class UserList;
+class UserListDiff;
+}
+}
+
+namespace Server {
+
+class Application;
+
+namespace RequestHandlers {
+class UserListRequestHandlerGroup;
+}
+
+class MAD_SERVER_EXPORT UserListManager : private Core::Configurable, private boost::noncopyable {
+  private:
+    Application *application;
+
+    boost::shared_ptr<RequestHandlers::UserListRequestHandlerGroup> requestHandlerGroup;
+
+    std::set<std::string> userLists;
+    std::set<std::string> userListDiffs;
+
+  protected:
+    virtual void configFinished();
+
+  public:
+    virtual int getPriority() const {return -1;}
+
+    UserListManager(Application *application0);
+    virtual ~UserListManager();
+
+    const std::set<std::string>& getUserLists() const {
+      return userLists;
+    }
+
+    bool existsUserList(const std::string &name);
+    boost::shared_ptr<Common::UserLists::UserList> loadUserList(const std::string &name);
+    void storeUserList(const std::string &name, const Common::UserLists::UserList *list);
+    void copyUserList(const std::string &fromName, const std::string &toName);
+    void renameUserList(const std::string &fromName, const std::string &toName);
+    void removeUserList(const std::string &name);
+
+    const std::set<std::string>& getUserListDiffs() const {
+      return userListDiffs;
+    }
+
+    bool existsUserListDiff(const std::string &name);
+    boost::shared_ptr<Common::UserLists::UserListDiff> loadUserListDiff(const std::string &name);
+    void storeUserListDiff(const std::string &name, const Common::UserLists::UserListDiff *list);
+    void copyUserListDiff(const std::string &fromName, const std::string &toName);
+    void renameUserListDiff(const std::string &fromName, const std::string &toName);
+    void removeUserListDiff(const std::string &name);
+
+    boost::shared_ptr<Common::UserLists::UserList> getCurrentUserList();
+};
+
+}
+}
+
+#endif /* MAD_SERVER_USERLISTMANAGER_H_ */