Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

created basic AuthProvider which we can change to suit our needs

Browse Source
This commit is contained in:
telastrus
2019-08-08 18:24:14 -04:00
parent 07d3384b01
commit eadf3a7671
3 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/lib.rs
View File

@ -1,5 +1,6 @@
#![feature(drain_filter, bind_by_move_pattern_guards)]
pub mod auth_provider;
pub mod client;
pub mod cmd;
pub mod error;
@ -10,6 +11,7 @@ pub mod settings;
pub use crate::{error::Error, input::Input, settings::ServerSettings};
use crate::{
auth_provider::AuthProvider,
client::{Client, Clients},
cmd::CHAT_COMMANDS,
};
@ -26,7 +28,7 @@ use log::debug;
use rand::Rng;
use specs::{join::Join, world::EntityBuilder as EcsEntityBuilder, Builder, Entity as EcsEntity};
use std::{
collections::{HashMap, HashSet},
collections::HashSet,
i32,
net::SocketAddr,
sync::{mpsc, Arc},
@ -70,7 +72,7 @@ pub struct Server {
server_info: ServerInfo,
// TODO: anything but this
accounts: HashMap<String, String>,
accounts: AuthProvider,
}
impl Server {
@ -110,7 +112,7 @@ impl Server {
description: settings.server_description.clone(),
git_hash: common::util::GIT_HASH.to_string(),
},
accounts: HashMap::new(),
accounts: AuthProvider::new(),
server_settings: settings,
};
@ -529,13 +531,9 @@ impl Server {
},
// Valid player
ClientMsg::Register { player, password } if player.is_valid() => {
if let Some(pass) = accounts.get(&player.alias) {
if pass != &password {
client.error_state(RequestStateError::Denied);
break;
}
} else {
accounts.insert(player.alias.clone(), password);
if !accounts.query(player.alias.clone(), password) {
client.error_state(RequestStateError::Denied);
break;
}
match client.client_state {
ClientState::Connected => {