incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make AllowUnregisteredUsers work on BB also

Browse Source
This commit is contained in:
Martin Michelsen
2022-07-01 22:17:37 -07:00
parent f823c2b907
commit d5308449e3
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+12 -4
View File
@@ -5,6 +5,7 @@
#include <memory> #include <memory>
#include <phosg/Filesystem.hh> #include <phosg/Filesystem.hh>
#include <phosg/Hash.hh>
#include <phosg/Network.hh> #include <phosg/Network.hh>
#include <phosg/Random.hh> #include <phosg/Random.hh>
#include <phosg/Strings.hh> #include <phosg/Strings.hh>
@@ -331,10 +332,17 @@ void process_login_bb(shared_ptr<ServerState> s, shared_ptr<Client> c,
auto l = s->license_manager->verify_bb(cmd.username, cmd.password); auto l = s->license_manager->verify_bb(cmd.username, cmd.password);
c->set_license(l); c->set_license(l);
} catch (const exception& e) { } catch (const exception& e) {
u16string message = u"Login failed: " + decode_sjis(e.what()); if (!s->allow_unregistered_users) {
send_message_box(c, message.c_str()); u16string message = u"Login failed: " + decode_sjis(e.what());
c->should_disconnect = true; send_message_box(c, message.c_str());
return; c->should_disconnect = true;
return;
} else {
shared_ptr<License> l = LicenseManager::create_license_bb(
fnv1a32(cmd.username), cmd.username, cmd.password, true);
s->license_manager->add(l);
c->set_license(l);
}
} }
try { try {
system/config.example.json
+7 -4
View File
@@ -141,10 +141,13 @@
}, },
// By default, the server only allows users who are registered in the license // By default, the server only allows users who are registered in the license
// file to connect. By enabling this option, all non-BB users will be allowed // file to connect. By enabling this option, all users will be allowed to
// to connect. This option has no effect for Blue Burst clients; they are // connect. Each time a user connects with an unregistered license (serial
// always required to be registered before connecting. Keep in mind that // number / access key combination, or username/password combination on BB), a
// unregistered users cannot be banned! // temporary license is created for them, which lasts until the server is
// shut down. This license is not saved to the license file. For BB, player
// and account data is still saved on the server, even for users with
// temporary licenses.
"AllowUnregisteredUsers": false, "AllowUnregisteredUsers": false,
// User to run the server as. If present, newserv will attempt to switch to // User to run the server as. If present, newserv will attempt to switch to