stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Spectrum2 manager server: Allow registration of users

Browse source
This commit is contained in:
Jan Kaluza 2016-01-07 18:32:17 +01:00
parent 4c938e9f17
commit 8df5cd7d1b
8 changed files with 89 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/transport/Frontend.h
View file

@ -93,6 +93,7 @@ class Frontend {
virtual std::string setOAuth2Code(const std::string &code, const std::string &state) { return "OAuth2 code is not needed for this frontend."; }
virtual std::string getOAuth2URL(const std::vector<std::string> &args) { return ""; }
virtual std::string getRegistrationFields() { return "Jabber ID\n3rd-party network username\n3rd-party network password"; }
boost::signal<void (User *, const std::string &name, unsigned int id)> onVCardRequired;
boost::signal<void (User *, boost::shared_ptr<Swift::VCard> vcard)> onVCardUpdated;

2
include/transport/UserRegistration.h
View file

@ -50,7 +50,7 @@ class UserRegistration {
/// Registers new user. This function stores user into database and subscribe user to transport.
/// \param userInfo UserInfo struct with informations about registered user
/// \return false if user is already registered
bool registerUser(const UserInfo &userInfo);
bool registerUser(const UserInfo &userInfo, bool allowPasswordChange = false);
/// Unregisters user. This function removes all data about user from databa, unsubscribe all buddies
/// managed by this transport and disconnects user if he's connected.

6
libtransport/AdminInterface.cpp
View file

@ -325,6 +325,10 @@ void AdminInterface::handleQuery(Swift::Message::ref message) {
message->setBody("Bad argument count. See 'help'.");
}
}
else if (message->getBody() == "registration_fields") {
std::string fields = m_component->getFrontend()->getRegistrationFields();
message->setBody(fields);
}
else if (message->getBody().find("help") == 0) {
std::string help;
help += "General:\n";
@ -363,7 +367,7 @@ void AdminInterface::handleQuery(Swift::Message::ref message) {
message->setBody(help);
}
else {
message->setBody("Unknown command. Try \"help\"");
message->setBody("Unknown command \"" + message->getBody() + "\". Try \"help\"");
}
}

10
libtransport/UserRegistration.cpp
View file

@ -47,13 +47,15 @@ UserRegistration::UserRegistration(Component *component, UserManager *userManage
UserRegistration::~UserRegistration(){
}
bool UserRegistration::registerUser(const UserInfo &row) {
bool UserRegistration::registerUser(const UserInfo &row, bool allowPasswordChange) {
UserInfo dummy;
bool registered = m_storageBackend->getUser(row.jid, dummy);
m_storageBackend->setUser(row);
doUserRegistration(row);
onUserRegistered(row);
if (registered && !allowPasswordChange) {
m_storageBackend->setUser(row);
doUserRegistration(row);
onUserRegistered(row);
}
return !registered;
}

4
spectrum/src/frontends/slack/SlackFrontend.cpp
View file

@ -122,6 +122,10 @@ std::string SlackFrontend::getOAuth2URL(const std::vector<std::string> &args) {
return static_cast<SlackUserManager *>(m_userManager)->getOAuth2URL(args);
}
std::string SlackFrontend::getRegistrationFields() {
return "Slack team name\n3rd-party network username\n3rd-party network password";
}
void SlackFrontend::disconnectFromServer() {
}

1
spectrum/src/frontends/slack/SlackFrontend.h
View file

@ -67,6 +67,7 @@ namespace Transport {
virtual void addRoomToRoomList(const std::string &handle, const std::string &name);
virtual std::string setOAuth2Code(const std::string &code, const std::string &state);
virtual std::string getOAuth2URL(const std::vector<std::string> &args);
virtual std::string getRegistrationFields();
void handleMessage(boost::shared_ptr<Swift::Message> message);

1
spectrum_manager/src/html/login/index.html
View file

@ -34,6 +34,7 @@
<div id="main_content_wrap" class="outer">
<section id="main_content" class="inner">
<p>If you don't have Spectrum 2 master account yet, you can <a href="/users">Register it here</a>. You will be able to manager your Spectrum 2 IM transports after that.</p>
<form action="/authorize" class="basic-grey" method="POST">
<h1>Login form

107
spectrum_manager/src/server.cpp
View file

@ -189,6 +189,8 @@ bool Server::is_authorized(const struct mg_connection *conn, struct http_message
!mg_vcmp(&hm->uri, "/form.css") ||
!mg_vcmp(&hm->uri, "/style.css") ||
!mg_vcmp(&hm->uri, "/logo.png") ||
!mg_vcmp(&hm->uri, "/users") ||
!mg_vcmp(&hm->uri, "/users/add") ||
!mg_vcmp(&hm->uri, "/authorize")) {
return true;
}
@ -315,24 +317,26 @@ void Server::serve_logout(struct mg_connection *conn, struct http_message *hm) {
}
void Server::serve_users_add(struct mg_connection *conn, struct http_message *hm) {
Server:session *session = get_session(hm);
if (!session->admin) {
redirect_to(conn, hm, "/");
return;
}
std::string user = get_http_var(hm, "user");
std::string password = get_http_var(hm, "password");
if (!user.empty() && !password.empty()) {
UserInfo info;
info.jid = user;
info.password = password;
if (m_storage) {
m_storage->setUser(info);
UserInfo dummy;
bool registered = m_storage->getUser(user, dummy);
if (!registered) {
UserInfo info;
info.jid = user;
info.password = password;
m_storage->setUser(info);
}
else {
redirect_to(conn, hm, "/users?error=This+username+is+already+registered");
return;
}
}
}
redirect_to(conn, hm, "/users");
redirect_to(conn, hm, "/users?ok=1");
}
void Server::serve_users_remove(struct mg_connection *conn, struct http_message *hm) {
@ -354,19 +358,35 @@ void Server::serve_users_remove(struct mg_connection *conn, struct http_message
}
void Server::serve_users(struct mg_connection *conn, struct http_message *hm) {
std::string html = "<h2>Spectrum 2 manager users</h2>";
std::string html;
Server:session *session = get_session(hm);
if (!session->admin) {
html += "<p>Only Spectrum 2 manager administrator can access this page.</p>";
print_html(conn, hm, html);
return;
if (!session) {
std::string ok = get_http_var(hm, "ok");
if (!ok.empty()) {
redirect_to(conn, hm, "/");
return;
}
html += "<h2>Register new Spectrum 2 master account</h2>";
}
else {
html += "<h2>Spectrum 2 manager users</h2>";
if (!session->admin) {
html += "<p>Only Spectrum 2 manager administrator can access this page.</p>";
print_html(conn, hm, html);
return;
}
html += "<p>Here, you can add new users who will have access to this web interface. "
"These users will be able to register new accounts on all Spectrum 2 instances "
"running on these server. They won't be able to change any Spectrum 2 instance "
"configuration influencing other users.</p>";
}
html += "<p>Here, you can add new users who will have access to this web interface. "
"These users will be able to register new accounts on all Spectrum 2 instances "
"running on these server. They won't be able to change any Spectrum 2 instance "
"configuration influencing other users.</p>";
std::string error = get_http_var(hm, "error");
if (!error.empty()) {
html += "<p><b>Error: " + error + "</b></p>";
}
if (!m_storage) {
print_html(conn, hm, html);
@ -374,8 +394,8 @@ void Server::serve_users(struct mg_connection *conn, struct http_message *hm) {
}
html += "<form action=\"/users/add\" class=\"basic-grey\" method=\"POST\"> \
<h1>Add user \
<span>Add new user to Spectrum 2 manager web interface.</span> \
<h1>Register user \
<span>Register new user to Spectrum 2 manager web interface.</span> \
</h1> \
<label> \
<span>Username:</span> \
@ -392,14 +412,16 @@ void Server::serve_users(struct mg_connection *conn, struct http_message *hm) {
std::vector<std::string> users;
m_storage->getUsers(users);
html += "<table><tr><th>User<th>Action</th></tr>";
BOOST_FOREACH(std::string &user, users) {
html += "<tr>";
html += "<td><a href=\"/users?jid=" + user + "\">" + user + "</a></td>";
html += "<td><a href=\"/users/remove?user=" + user + "\">Remove</a></td>";
html += "</tr>";
if (session) {
html += "<table><tr><th>User<th>Action</th></tr>";
BOOST_FOREACH(std::string &user, users) {
html += "<tr>";
html += "<td><a href=\"/users?jid=" + user + "\">" + user + "</a></td>";
html += "<td><a href=\"/users/remove?user=" + user + "\">Remove</a></td>";
html += "</tr>";
}
html += "</table>";
}
html += "</table>";
print_html(conn, hm, html);
}
@ -487,21 +509,32 @@ void Server::serve_instances_register(struct mg_connection *conn, struct http_me
m_storage->getUser(session->user, info);
if (jid.empty() || uin.empty() || password.empty()) {
std::string response = send_command(instance, "registration_fields");
std::vector<std::string> fields;
boost::split(fields, response, boost::is_any_of("\n"));
if (fields.size() < 3) {
fields.clear();
fields.push_back("Jabber ID");
fields.push_back("3rd-party network username");
fields.push_back("3rd-party network password");
}
std::string html = "<h2>Register Spectrum 2 instance</h2>";
html += "<form action=\"/instances/register\" class=\"basic-grey\" method=\"POST\"> \
<h1>Register Spectrum 2 instance \
<span>Write the Slack team name, 3rd-party network username and password.</span> \
<span>Write the " + fields[0] + ", " + fields[1] + " and " + fields[2] + ".</span> \
</h1> \
<label> \
<span>Slack team name:</span> \
<input type=\"text\" id=\"jid\" name=\"jid\" placeholder=\"Slack team name\"></textarea> \
<span>" + fields[0] + ":</span> \
<input type=\"text\" id=\"jid\" name=\"jid\" placeholder=\""+ fields[0] +"\"></textarea> \
</label> \
<label> \
<span>3rd-party network username:</span> \
<input type=\"text\" id=\"uin\" name=\"uin\" placeholder=\"3rd-party network username\"></textarea> \
<span>" + fields[1] + ":</span> \
<input type=\"text\" id=\"uin\" name=\"uin\" placeholder=\"" + fields[1] + "\"></textarea> \
</label> \
<label><span>Password:</span> \
<input type=\"password\" id=\"password\" name=\"password\" placeholder=\"3rd-party network password\"></textarea> \
<label><span>" + fields[2] + ":</span> \
<input type=\"password\" id=\"password\" name=\"password\" placeholder=\"" + fields[2] + "\"></textarea> \
</label> \
<label> \
<span>&nbsp;</span> \