shockrah/freechat
shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ Adding command line flag [-H/--hmac] to specify hmac file path

Browse Source 
This is really just for testing purposes since the files tend to be in
awkward to reach path

- Removing if args.len == 0 check
Basically cannon-fodder tbh

* Auth now reads hmac path from environment var

! All of the above is added for the wss hmac as well

+ Adding command line flag [-W/--wss-hmac] to specify wss-hmac file path
This commit is contained in:
shockrah 2021-04-26 01:58:18 -07:00
parent 1ee2f1a321
commit c9658ad5b4
5 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
json-api/.env
View File

@ -5,6 +5,11 @@ DATABASE_USER=freechat_dev
DATABASE_HOST=localhost DATABASE_HOST=localhost
DATABASE_PORT=3306 DATABASE_PORT=3306
# Note that these should literally never point to the same file
# that completely breaks the web socket's permissions+authentication model
HMAC_PATH=hmac.secret
WSS_HMAC_PATH=wss-hmac.secret
# Server meta things # Server meta things
SERVER_NAME="Freechat Dev Server" SERVER_NAME="Freechat Dev Server"

6
json-api/src/auth.rs
View File

@ -13,7 +13,11 @@ use db::{Response, Member};
use jsonwebtoken::EncodingKey; use jsonwebtoken::EncodingKey;
lazy_static! { lazy_static! {
static ref HMAC_SECRET: Vec<u8> = { static ref HMAC_SECRET: Vec<u8> = {
std::fs::read("hmac.secret").expect("Couldn't get HMAC secret") let path = match std::env::var("HMAC_PATH") {
Ok(p) => p,
Err(_) => "hmac.secret".into()
};
std::fs::read(path).expect("Couldn't get HMAC secret")
}; };
static ref ENCODING_KEY: EncodingKey = { static ref ENCODING_KEY: EncodingKey = {

2
json-api/src/invites.rs
View File

@ -176,7 +176,7 @@ pub async fn create(pool: &Pool, response: &mut Response<Body>, params: HashMap<
Ok(_) => { Ok(_) => {
// return the id of the invite // return the id of the invite
// Link format from here is basically hostname.io:4536/join?code=<some-code> // Link format from here is basically hostname.io:4536/join?code=<some-code>
http::set_json_body(response, serde_json::json!(invite)) http::set_json_body(response, serde_json::json!({"invite":invite}))
}, },
Err(mysqle) => { Err(mysqle) => {
println!("\tINVITES::CREATE::ERROR: {}", mysqle); println!("\tINVITES::CREATE::ERROR: {}", mysqle);

33
json-api/src/main.rs
View File

@ -230,27 +230,19 @@ async fn main() -> Result<(), u16>{
.long("port") .long("port")
.default_value("4536") .default_value("4536")
.help("Set the port to use: Default is 4536")) .help("Set the port to use: Default is 4536"))
.arg(Arg::with_name("hmac")
.short("H")
.long("hmac")
.value_name("HMAC")
.help("Sets the path to the hmac.secret file"))
.arg(Arg::with_name("wss-hmac")
.short("w")
.long("wss-hmac")
.value_name("WSS_HMAC")
.help("Sets the path the wss-hmac.secret file"))
.get_matches(); .get_matches();
if args.args.len() == 0 {
println!("Freechat Server 0.1
shockrah
Decentralized chat system
USAGE:
freechat-server [FLAGS] [OPTIONS]
FLAGS:
-h, --help Prints help information
-s, --server Starts the API server
-V, --version Prints version information
OPTIONS:
-c, --create-owner <Owner> Creates an account with full permissions in the SQL database.
-d, --db-url <DATABASE URL> Sets the DATABASE URL via an environment variable");
}
if let Some(db_url) = args.value_of("db-url") { if let Some(db_url) = args.value_of("db-url") {
set_var("DATABASE_URL", db_url); set_var("DATABASE_URL", db_url);
} }
@ -263,6 +255,11 @@ OPTIONS:
attempt_owner_creation(owner_name).await; attempt_owner_creation(owner_name).await;
} }
// This check overrides the value set in the .env since this
if let Some(hmac) = args.value_of("hmac") {
std::env::set_var("HMAC_PATH", hmac);
}
if args.is_present("server") { if args.is_present("server") {
if main_ret == NO_ERR { if main_ret == NO_ERR {
main_ret = start_server(main_ret, port).await; main_ret = start_server(main_ret, port).await;

6
json-api/src/rtc.rs
View File

@ -26,7 +26,11 @@ use url::Url;
lazy_static! { lazy_static! {
static ref HMAC_SECRET: Vec<u8> = { static ref HMAC_SECRET: Vec<u8> = {
std::fs::read("wss-hmac.secret").expect("Couldn't get HMAC secret") let path = match std::env::var("WSS_HMAC_PATH") {
Ok(p) => p,
Err(_) => "wss-hmac.secret".into()
};
std::fs::read(path).expect("Couldn't get HMAC secret")
}; };
static ref WSS_KEY: EncodingKey = { static ref WSS_KEY: EncodingKey = {
EncodingKey::from_secret(&HMAC_SECRET) EncodingKey::from_secret(&HMAC_SECRET)