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

Allow HTTP auth servers again.

Browse Source 
only `localhost` are allowed in a release build.
 when debug assertions are on, others are also allowed.

This change undoes the changes to the settings, so compared to master, there is no effect
This commit is contained in:
Marcel Märtens 2021-03-11 16:57:50 +01:00
parent 381bb5eef0
commit 728bff610b
12 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -278,7 +278,7 @@ dependencies = [
[[package]]
name = "auth-common"
version = "0.1.0"
source = "git+https://gitlab.com/veloren/auth.git?rev=f3683798bc5ea656845010f9bae11b05dd671ece#f3683798bc5ea656845010f9bae11b05dd671ece"
source = "git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4962b367253f8f2f92760ef44d2679c9a"
dependencies = [
"rand 0.8.3",
"serde",
@ -288,7 +288,7 @@ dependencies = [
[[package]]
name = "authc"
version = "1.0.0"
source = "git+https://gitlab.com/veloren/auth.git?rev=f3683798bc5ea656845010f9bae11b05dd671ece#f3683798bc5ea656845010f9bae11b05dd671ece"
source = "git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4962b367253f8f2f92760ef44d2679c9a"
dependencies = [
"auth-common",
"fxhash",

1
assets/voxygen/i18n/en/main.ron
View File

@ -42,6 +42,7 @@ https://veloren.net/account/."#,
"main.login.server_not_found": "Server not found",
"main.login.authentication_error": "Auth error on server",
"main.login.failed_auth_server_url_invalid": "Failed to connect to auth server",
"main.login.insecure_auth_scheme": "The auth Scheme HTTP is NOT supported. It's insecure! For development purposes, HTTP is allowed for 'localhost' or debug builds",
"main.login.server_full": "Server is full",
"main.login.untrusted_auth_server": "Auth server not trusted",
"main.login.outdated_client_or_server": "ServerWentMad: Probably versions are incompatible, check for updates.",

2
client/Cargo.toml
View File

@ -27,7 +27,7 @@ rayon = "1.5"
specs = { git = "https://github.com/amethyst/specs.git", rev = "5a9b71035007be0e3574f35184acac1cd4530496" }
vek = { version = "=0.14.1", features = ["serde"] }
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "f3683798bc5ea656845010f9bae11b05dd671ece" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }
[dev-dependencies]
tracing-subscriber = { version = "0.2.3", default-features = false, features = ["fmt", "chrono", "ansi", "smallvec"] }

2
client/examples/chat-cli/main.rs
View File

@ -62,7 +62,7 @@ fn main() {
runtime
.block_on(client.register(username, password, |provider| {
provider == "auth.veloren.net"
provider == "https:://auth.veloren.net"
}))
.unwrap();

27
client/src/lib.rs
View File

@ -489,14 +489,25 @@ impl Client {
Some(addr) => {
// Query whether this is a trusted auth server
if auth_trusted(&addr) {
use std::str::FromStr;
match authc::Authority::from_str(&addr) {
Ok(addr) => Ok(authc::AuthClient::new(addr)
.sign_in(&username, &password)
.await?
.serialize()),
Err(_) => Err(Error::AuthServerUrlInvalid(addr.to_string())),
}
let (scheme, authority) = match addr.split_once("://") {
Some((s, a)) => (s, a),
None => return Err(Error::AuthServerUrlInvalid(addr.to_string())),
};
let scheme = match scheme.parse::<authc::Scheme>() {
Ok(s) => s,
Err(_) => return Err(Error::AuthServerUrlInvalid(addr.to_string())),
};
let authority = match authority.parse::<authc::Authority>() {
Ok(a) => a,
Err(_) => return Err(Error::AuthServerUrlInvalid(addr.to_string())),
};
Ok(authc::AuthClient::new(scheme, authority)?
.sign_in(&username, &password)
.await?
.serialize())
} else {
Err(Error::AuthServerNotTrusted)
}

2
common/net/Cargo.toml
View File

@ -21,7 +21,7 @@ tracing = { version = "0.1", default-features = false }
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] }
# Auth
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "f3683798bc5ea656845010f9bae11b05dd671ece" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }
# ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" }

2
server/Cargo.toml
View File

@ -42,7 +42,7 @@ rayon = "1.5"
crossbeam-channel = "0.5"
prometheus = { version = "0.12", default-features = false}
portpicker = { git = "https://github.com/xMAC94x/portpicker-rs", rev = "df6b37872f3586ac3b21d08b56c8ec7cd92fb172" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "f3683798bc5ea656845010f9bae11b05dd671ece" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }
libsqlite3-sys = { version = "0.18", features = ["bundled"] }
diesel = { version = "1.4.3", features = ["sqlite"] }
diesel_migrations = "1.4.0"

3
server/src/lib.rs
View File

@ -6,7 +6,8 @@
bool_to_option,
drain_filter,
option_unwrap_none,
option_zip
option_zip,
str_split_once
)]
#![cfg_attr(not(feature = "worldgen"), feature(const_panic))]

15
server/src/login_provider.rs
View File

@ -44,8 +44,19 @@ pub struct LoginProvider {
impl LoginProvider {
pub fn new(auth_addr: Option<String>, runtime: Arc<Runtime>) -> Self {
tracing::trace!(?auth_addr, "Starting LoginProvider");
let auth_server = auth_addr
.map(|addr| Arc::new(AuthClient::new(authc::Authority::from_str(&addr).unwrap())));
let auth_server = auth_addr.map(|addr| {
let (scheme, authority) = addr.split_once("://").expect("invalid auth url");
let scheme = scheme
.parse::<authc::Scheme>()
.expect("invalid auth url scheme");
let authority = authority
.parse::<authc::Authority>()
.expect("invalid auth url authority");
Arc::new(AuthClient::new(scheme, authority).expect("insecure auth scheme"))
});
Self {
runtime,

2
server/src/settings.rs
View File

@ -49,7 +49,7 @@ impl Default for Settings {
Self {
gameserver_address: SocketAddr::from(([0; 4], 14004)),
metrics_address: SocketAddr::from(([0; 4], 14005)),
auth_server_address: Some("auth.veloren.net".into()),
auth_server_address: Some("https://auth.veloren.net".into()),
world_seed: DEFAULT_WORLD_SEED,
server_name: "Veloren Alpha".into(),
max_players: 100,

3
voxygen/src/menu/main/mod.rs
View File

@ -197,6 +197,9 @@ impl PlayState for MainMenuState {
localized_strings.get("main.login.failed_sending_request"),
e
),
client::AuthClientError::InsecureSchema => localized_strings
.get("main.login.insecure_auth_scheme")
.into(),
client::AuthClientError::ServerError(_, e) => {
String::from_utf8_lossy(&e).to_string()
},

5
voxygen/src/settings.rs
View File

@ -526,7 +526,10 @@ impl Default for NetworkingSettings {
username: "".to_string(),
servers: vec!["server.veloren.net".to_string()],
default_server: "server.veloren.net".to_string(),
trusted_auth_servers: ["auth.veloren.net"].iter().map(|s| s.to_string()).collect(),
trusted_auth_servers: ["https://auth.veloren.net"]
.iter()
.map(|s| s.to_string())
.collect(),
}
}
}