Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions rust/auth-impls/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,9 +41,11 @@ pub(crate) struct Claims {
const BEARER_PREFIX: &str = "Bearer ";

impl JWTAuthorizer {
/// Create new instance of [`JWTAuthorizer`]
pub async fn new(jwt_issuer_key: DecodingKey) -> Self {
Self { jwt_issuer_key }
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
Ok(Self { jwt_issuer_key })
}
}

Expand DownExpand Up@@ -74,7 +76,7 @@ mod tests {
use crate::JWTAuthorizer;
use api::auth::Authorizer;
use api::error::VssError;
use jsonwebtoken::{encode, Algorithm, DecodingKey, EncodingKey, Header};
use jsonwebtoken::{encode, Algorithm, EncodingKey, Header};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::time::SystemTime;
Expand DownExpand Up@@ -132,7 +134,7 @@ mod tests {
)
.expect("Failed to create Encoding Key.");

let decoding_key = DecodingKey::from_rsa_pem(
let decoding_key = String::from(
"-----BEGIN PUBLIC KEY-----\
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAysGpKU+I9i9b+QZSANu/\
ExaA6w4qiQdFZaXeReiz49r1oDfABwKIFW9gK/kNnrnL9H8P+pYfj7jqUJ/glmgq\
Expand All@@ -141,12 +143,10 @@ mod tests {
8YsTa5piV8KgJpG/rwYTGXuu3lcCmnWwjmbeDq1zFFrCDDVkaIHkGJgRuFIDPXaH\
yUw5H2HvKlP94ySbvTDLXWZj6TyzHEHDbstqs4DgvurB/bIhi/dQ7zK3EIXL8KRB\
hwIDAQAB\
-----END PUBLIC KEY-----"
.as_bytes(),
)
.expect("Failed to create Decoding Key.");
-----END PUBLIC KEY-----",
);

let jwt_authorizer = JWTAuthorizer::new(decoding_key).await;
let jwt_authorizer = JWTAuthorizer::new(&decoding_key).await.unwrap();

let valid_jwt_token =
encode(&Header::new(Algorithm::RS256), &claims, &valid_encoding_key).unwrap();
Expand Down
1 change: 1 addition & 0 deletions rust/server/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
api = { path = "../api" }
auth-impls = { path = "../auth-impls" }
impls = { path = "../impls" }

hyper = { version = "1", default-features = false, features = ["server", "http1"] }
Expand Down
62 changes: 44 additions & 18 deletions rust/server/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,21 +10,23 @@
#![deny(missing_docs)]

use std::net::SocketAddr;
use std::sync::Arc;

use tokio::net::TcpListener;
use tokio::signal::unix::SignalKind;

use hyper::server::conn::http1;
use hyper_util::rt::TokioIo;

use crate::vss_service::VssService;
use api::auth::{Authorizer, NoopAuthorizer};
use api::kv_store::KvStore;
use auth_impls::JWTAuthorizer;
use impls::postgres_store::{Certificate, PostgresPlaintextBackend, PostgresTlsBackend};
use std::sync::Arc;
use util::config::{Config, ServerConfig};
use vss_service::VssService;

pub(crate) mod util;
pub(crate) mod vss_service;
mod util;
mod vss_service;

fn main() {
let args: Vec<String> = std::env::args().collect();
Expand All@@ -33,22 +35,21 @@ fn main() {
std::process::exit(1);
}

let config = match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};

let addr: SocketAddr =
match format!("{}:{}", config.server_config.host, config.server_config.port).parse() {
Ok(addr) => addr,
let Config { server_config: ServerConfig { host, port }, jwt_auth_config, postgresql_config } =
match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};
let addr: SocketAddr = match format!("{}:{}", host, port).parse() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a lot going on here. Can we declutter this? Btw, since we're already here, might make sense to switch this to the From<(I, u16)> for SocketAddr implementation rather than allocating a string and then parsing it again.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is personal preference, but in the follow-up PR I consolidate the host and port setting into a single address setting, string type, ie "127.0.0.1:54234". We would then allocate the string upfront. WDYT ? Overall looking to reduce the number of lines in the config files, and the number of different settings. The address the server binds to is a single setting in my head :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah probably makes sense to make it one.

Ok(addr) => addr,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
std::process::exit(1);
},
};

let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
Ok(runtime) => Arc::new(runtime),
Expand All@@ -66,9 +67,33 @@ fn main() {
std::process::exit(-1);
},
};
let authorizer: Arc<dyn Authorizer> = Arc::new(NoopAuthorizer {});

let rsa_pem_env = match std::env::var("VSS_JWT_RSA_PEM") {
Ok(env) => Some(env),
Err(std::env::VarError::NotPresent) => None,
Err(e) => {
println!("Failed to load the VSS_JWT_RSA_PEM env var: {}", e);
std::process::exit(-1);
},
};
let rsa_pem = rsa_pem_env.or(jwt_auth_config.map(|config| config.rsa_pem));
let authorizer: Arc<dyn Authorizer> = if let Some(pem) = rsa_pem {
let authorizer = match JWTAuthorizer::new(pem.as_str()).await {
Ok(auth) => auth,
Err(e) => {
println!("Failed to parse the PEM formatted RSA public key: {}", e);
std::process::exit(-1);
},
};
println!("Configured JWT authorizer with RSA public key");
Arc::new(authorizer)
} else {
println!("No JWT authentication method configured");
Arc::new(NoopAuthorizer {})
};

let postgresql_config =
config.postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
let endpoint = postgresql_config.to_postgresql_endpoint();
let db_name = postgresql_config.database;
let store: Arc<dyn KvStore> = if let Some(tls_config) = postgresql_config.tls {
Expand DownExpand Up@@ -109,6 +134,7 @@ fn main() {
Arc::new(postgres_plaintext_backend)
};
println!("Connected to PostgreSQL backend with DSN: {}/{}", endpoint, db_name);

let rest_svc_listener =
TcpListener::bind(&addr).await.expect("Failed to bind listening port");
println!("Listening for incoming connections on {}", addr);
Expand Down
6 changes: 6 additions & 0 deletions rust/server/src/util/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ use serde::Deserialize;
#[derive(Deserialize)]
pub(crate) struct Config {
pub(crate) server_config: ServerConfig,
pub(crate) jwt_auth_config: Option<JwtAuthConfig>,
pub(crate) postgresql_config: Option<PostgreSQLConfig>,
}

Expand All@@ -12,6 +13,11 @@ pub(crate) struct ServerConfig {
pub(crate) port: u16,
}

#[derive(Deserialize)]
pub(crate) struct JwtAuthConfig {
pub(crate) rsa_pem: String,
}

#[derive(Deserialize)]
pub(crate) struct PostgreSQLConfig {
pub(crate) username: Option<String>, // Optional in TOML, can be overridden by env
Expand Down
15 changes: 15 additions & 0 deletions rust/server/vss-server-config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,21 @@
host = "127.0.0.1"
port = 8080

# Uncomment the table below to verify JWT tokens in the HTTP Authorization header against the given RSA public key,
# can be overridden by env var `VSS_JWT_RSA_PEM`
# [jwt_auth_config]
# rsa_pem = """
# -----BEGIN PUBLIC KEY-----
# MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstPJs4ut+tFAI0qrOyGt
# /3FN5jWc5gLv/j9Rc6lgr4hm7lyR05PU/G+4rfxdXGNyGTlQ6dRqcVy78CjxWz9f
# 8l08EKLERPh8JhE5el6vr+ehWD5iQxSP3ejpx0Mr977fKMNKg6jlFiL+y50hOEp2
# 6iN9QzZQjLxotDT3aQvbCA/DZpI+fV6WKDKWGS+pZGDVgOz5x/RcStJQXxkX3ACK
# WhVdrtN3h6mHlhIt7ZIqVvQmY4NL03QPyljt13sYHoiFaoxINF/funBMCjrfSLcB
# ko1rWE2BWdOrFqi27RtBs5AHOSAWXuz/2SUGpFuTQuJi7U68QUfjKeQO46JpQf+v
# kQIDAQAB
# -----END PUBLIC KEY-----
# """

[postgresql_config]
username = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_USERNAME`
password = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_PASSWORD`
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions rust/auth-impls/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,9 +41,11 @@ pub(crate) struct Claims {
const BEARER_PREFIX: &str = "Bearer ";

impl JWTAuthorizer {
/// Create new instance of [`JWTAuthorizer`]
pub async fn new(jwt_issuer_key: DecodingKey) -> Self {
Self { jwt_issuer_key }
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
Ok(Self { jwt_issuer_key })
}
}

Expand DownExpand Up@@ -74,7 +76,7 @@ mod tests {
use crate::JWTAuthorizer;
use api::auth::Authorizer;
use api::error::VssError;
use jsonwebtoken::{encode, Algorithm, DecodingKey, EncodingKey, Header};
use jsonwebtoken::{encode, Algorithm, EncodingKey, Header};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::time::SystemTime;
Expand DownExpand Up@@ -132,7 +134,7 @@ mod tests {
)
.expect("Failed to create Encoding Key.");

let decoding_key = DecodingKey::from_rsa_pem(
let decoding_key = String::from(
"-----BEGIN PUBLIC KEY-----\
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAysGpKU+I9i9b+QZSANu/\
ExaA6w4qiQdFZaXeReiz49r1oDfABwKIFW9gK/kNnrnL9H8P+pYfj7jqUJ/glmgq\
Expand All@@ -141,12 +143,10 @@ mod tests {
8YsTa5piV8KgJpG/rwYTGXuu3lcCmnWwjmbeDq1zFFrCDDVkaIHkGJgRuFIDPXaH\
yUw5H2HvKlP94ySbvTDLXWZj6TyzHEHDbstqs4DgvurB/bIhi/dQ7zK3EIXL8KRB\
hwIDAQAB\
-----END PUBLIC KEY-----"
.as_bytes(),
)
.expect("Failed to create Decoding Key.");
-----END PUBLIC KEY-----",
);

let jwt_authorizer = JWTAuthorizer::new(decoding_key).await;
let jwt_authorizer = JWTAuthorizer::new(&decoding_key).await.unwrap();

let valid_jwt_token =
encode(&Header::new(Algorithm::RS256), &claims, &valid_encoding_key).unwrap();
Expand Down
1 change: 1 addition & 0 deletions rust/server/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
api = { path = "../api" }
auth-impls = { path = "../auth-impls" }
impls = { path = "../impls" }

hyper = { version = "1", default-features = false, features = ["server", "http1"] }
Expand Down
62 changes: 44 additions & 18 deletions rust/server/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,21 +10,23 @@
#![deny(missing_docs)]

use std::net::SocketAddr;
use std::sync::Arc;

use tokio::net::TcpListener;
use tokio::signal::unix::SignalKind;

use hyper::server::conn::http1;
use hyper_util::rt::TokioIo;

use crate::vss_service::VssService;
use api::auth::{Authorizer, NoopAuthorizer};
use api::kv_store::KvStore;
use auth_impls::JWTAuthorizer;
use impls::postgres_store::{Certificate, PostgresPlaintextBackend, PostgresTlsBackend};
use std::sync::Arc;
use util::config::{Config, ServerConfig};
use vss_service::VssService;

pub(crate) mod util;
pub(crate) mod vss_service;
mod util;
mod vss_service;

fn main() {
let args: Vec<String> = std::env::args().collect();
Expand All@@ -33,22 +35,21 @@ fn main() {
std::process::exit(1);
}

let config = match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};

let addr: SocketAddr =
match format!("{}:{}", config.server_config.host, config.server_config.port).parse() {
Ok(addr) => addr,
let Config { server_config: ServerConfig { host, port }, jwt_auth_config, postgresql_config } =
match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};
let addr: SocketAddr = match format!("{}:{}", host, port).parse() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a lot going on here. Can we declutter this? Btw, since we're already here, might make sense to switch this to the From<(I, u16)> for SocketAddr implementation rather than allocating a string and then parsing it again.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is personal preference, but in the follow-up PR I consolidate the host and port setting into a single address setting, string type, ie "127.0.0.1:54234". We would then allocate the string upfront. WDYT ? Overall looking to reduce the number of lines in the config files, and the number of different settings. The address the server binds to is a single setting in my head :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah probably makes sense to make it one.

Ok(addr) => addr,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
std::process::exit(1);
},
};

let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
Ok(runtime) => Arc::new(runtime),
Expand All@@ -66,9 +67,33 @@ fn main() {
std::process::exit(-1);
},
};
let authorizer: Arc<dyn Authorizer> = Arc::new(NoopAuthorizer {});

let rsa_pem_env = match std::env::var("VSS_JWT_RSA_PEM") {
Ok(env) => Some(env),
Err(std::env::VarError::NotPresent) => None,
Err(e) => {
println!("Failed to load the VSS_JWT_RSA_PEM env var: {}", e);
std::process::exit(-1);
},
};
let rsa_pem = rsa_pem_env.or(jwt_auth_config.map(|config| config.rsa_pem));
let authorizer: Arc<dyn Authorizer> = if let Some(pem) = rsa_pem {
let authorizer = match JWTAuthorizer::new(pem.as_str()).await {
Ok(auth) => auth,
Err(e) => {
println!("Failed to parse the PEM formatted RSA public key: {}", e);
std::process::exit(-1);
},
};
println!("Configured JWT authorizer with RSA public key");
Arc::new(authorizer)
} else {
println!("No JWT authentication method configured");
Arc::new(NoopAuthorizer {})
};

let postgresql_config =
config.postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
let endpoint = postgresql_config.to_postgresql_endpoint();
let db_name = postgresql_config.database;
let store: Arc<dyn KvStore> = if let Some(tls_config) = postgresql_config.tls {
Expand DownExpand Up@@ -109,6 +134,7 @@ fn main() {
Arc::new(postgres_plaintext_backend)
};
println!("Connected to PostgreSQL backend with DSN: {}/{}", endpoint, db_name);

let rest_svc_listener =
TcpListener::bind(&addr).await.expect("Failed to bind listening port");
println!("Listening for incoming connections on {}", addr);
Expand Down
6 changes: 6 additions & 0 deletions rust/server/src/util/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ use serde::Deserialize;
#[derive(Deserialize)]
pub(crate) struct Config {
pub(crate) server_config: ServerConfig,
pub(crate) jwt_auth_config: Option<JwtAuthConfig>,
pub(crate) postgresql_config: Option<PostgreSQLConfig>,
}

Expand All@@ -12,6 +13,11 @@ pub(crate) struct ServerConfig {
pub(crate) port: u16,
}

#[derive(Deserialize)]
pub(crate) struct JwtAuthConfig {
pub(crate) rsa_pem: String,
}

#[derive(Deserialize)]
pub(crate) struct PostgreSQLConfig {
pub(crate) username: Option<String>, // Optional in TOML, can be overridden by env
Expand Down
15 changes: 15 additions & 0 deletions rust/server/vss-server-config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,21 @@
host = "127.0.0.1"
port = 8080

# Uncomment the table below to verify JWT tokens in the HTTP Authorization header against the given RSA public key,
# can be overridden by env var `VSS_JWT_RSA_PEM`
# [jwt_auth_config]
# rsa_pem = """
# -----BEGIN PUBLIC KEY-----
# MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstPJs4ut+tFAI0qrOyGt
# /3FN5jWc5gLv/j9Rc6lgr4hm7lyR05PU/G+4rfxdXGNyGTlQ6dRqcVy78CjxWz9f
# 8l08EKLERPh8JhE5el6vr+ehWD5iQxSP3ejpx0Mr977fKMNKg6jlFiL+y50hOEp2
# 6iN9QzZQjLxotDT3aQvbCA/DZpI+fV6WKDKWGS+pZGDVgOz5x/RcStJQXxkX3ACK
# WhVdrtN3h6mHlhIt7ZIqVvQmY4NL03QPyljt13sYHoiFaoxINF/funBMCjrfSLcB
# ko1rWE2BWdOrFqi27RtBs5AHOSAWXuz/2SUGpFuTQuJi7U68QUfjKeQO46JpQf+v
# kQIDAQAB
# -----END PUBLIC KEY-----
# """

[postgresql_config]
username = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_USERNAME`
password = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_PASSWORD`
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions rust/auth-impls/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,9 +41,11 @@ pub(crate) struct Claims {
const BEARER_PREFIX: &str = "Bearer ";

impl JWTAuthorizer {
/// Create new instance of [`JWTAuthorizer`]
pub async fn new(jwt_issuer_key: DecodingKey) -> Self {
Self { jwt_issuer_key }
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
Ok(Self { jwt_issuer_key })
}
}

Expand DownExpand Up@@ -74,7 +76,7 @@ mod tests {
use crate::JWTAuthorizer;
use api::auth::Authorizer;
use api::error::VssError;
use jsonwebtoken::{encode, Algorithm, DecodingKey, EncodingKey, Header};
use jsonwebtoken::{encode, Algorithm, EncodingKey, Header};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::time::SystemTime;
Expand DownExpand Up@@ -132,7 +134,7 @@ mod tests {
)
.expect("Failed to create Encoding Key.");

let decoding_key = DecodingKey::from_rsa_pem(
let decoding_key = String::from(
"-----BEGIN PUBLIC KEY-----\
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAysGpKU+I9i9b+QZSANu/\
ExaA6w4qiQdFZaXeReiz49r1oDfABwKIFW9gK/kNnrnL9H8P+pYfj7jqUJ/glmgq\
Expand All@@ -141,12 +143,10 @@ mod tests {
8YsTa5piV8KgJpG/rwYTGXuu3lcCmnWwjmbeDq1zFFrCDDVkaIHkGJgRuFIDPXaH\
yUw5H2HvKlP94ySbvTDLXWZj6TyzHEHDbstqs4DgvurB/bIhi/dQ7zK3EIXL8KRB\
hwIDAQAB\
-----END PUBLIC KEY-----"
.as_bytes(),
)
.expect("Failed to create Decoding Key.");
-----END PUBLIC KEY-----",
);

let jwt_authorizer = JWTAuthorizer::new(decoding_key).await;
let jwt_authorizer = JWTAuthorizer::new(&decoding_key).await.unwrap();

let valid_jwt_token =
encode(&Header::new(Algorithm::RS256), &claims, &valid_encoding_key).unwrap();
Expand Down
1 change: 1 addition & 0 deletions rust/server/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
api = { path = "../api" }
auth-impls = { path = "../auth-impls" }
impls = { path = "../impls" }

hyper = { version = "1", default-features = false, features = ["server", "http1"] }
Expand Down
62 changes: 44 additions & 18 deletions rust/server/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,21 +10,23 @@
#![deny(missing_docs)]

use std::net::SocketAddr;
use std::sync::Arc;

use tokio::net::TcpListener;
use tokio::signal::unix::SignalKind;

use hyper::server::conn::http1;
use hyper_util::rt::TokioIo;

use crate::vss_service::VssService;
use api::auth::{Authorizer, NoopAuthorizer};
use api::kv_store::KvStore;
use auth_impls::JWTAuthorizer;
use impls::postgres_store::{Certificate, PostgresPlaintextBackend, PostgresTlsBackend};
use std::sync::Arc;
use util::config::{Config, ServerConfig};
use vss_service::VssService;

pub(crate) mod util;
pub(crate) mod vss_service;
mod util;
mod vss_service;

fn main() {
let args: Vec<String> = std::env::args().collect();
Expand All@@ -33,22 +35,21 @@ fn main() {
std::process::exit(1);
}

let config = match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};

let addr: SocketAddr =
match format!("{}:{}", config.server_config.host, config.server_config.port).parse() {
Ok(addr) => addr,
let Config { server_config: ServerConfig { host, port }, jwt_auth_config, postgresql_config } =
match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};
let addr: SocketAddr = match format!("{}:{}", host, port).parse() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a lot going on here. Can we declutter this? Btw, since we're already here, might make sense to switch this to the From<(I, u16)> for SocketAddr implementation rather than allocating a string and then parsing it again.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is personal preference, but in the follow-up PR I consolidate the host and port setting into a single address setting, string type, ie "127.0.0.1:54234". We would then allocate the string upfront. WDYT ? Overall looking to reduce the number of lines in the config files, and the number of different settings. The address the server binds to is a single setting in my head :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah probably makes sense to make it one.

Ok(addr) => addr,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
std::process::exit(1);
},
};

let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
Ok(runtime) => Arc::new(runtime),
Expand All@@ -66,9 +67,33 @@ fn main() {
std::process::exit(-1);
},
};
let authorizer: Arc<dyn Authorizer> = Arc::new(NoopAuthorizer {});

let rsa_pem_env = match std::env::var("VSS_JWT_RSA_PEM") {
Ok(env) => Some(env),
Err(std::env::VarError::NotPresent) => None,
Err(e) => {
println!("Failed to load the VSS_JWT_RSA_PEM env var: {}", e);
std::process::exit(-1);
},
};
let rsa_pem = rsa_pem_env.or(jwt_auth_config.map(|config| config.rsa_pem));
let authorizer: Arc<dyn Authorizer> = if let Some(pem) = rsa_pem {
let authorizer = match JWTAuthorizer::new(pem.as_str()).await {
Ok(auth) => auth,
Err(e) => {
println!("Failed to parse the PEM formatted RSA public key: {}", e);
std::process::exit(-1);
},
};
println!("Configured JWT authorizer with RSA public key");
Arc::new(authorizer)
} else {
println!("No JWT authentication method configured");
Arc::new(NoopAuthorizer {})
};

let postgresql_config =
config.postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
let endpoint = postgresql_config.to_postgresql_endpoint();
let db_name = postgresql_config.database;
let store: Arc<dyn KvStore> = if let Some(tls_config) = postgresql_config.tls {
Expand DownExpand Up@@ -109,6 +134,7 @@ fn main() {
Arc::new(postgres_plaintext_backend)
};
println!("Connected to PostgreSQL backend with DSN: {}/{}", endpoint, db_name);

let rest_svc_listener =
TcpListener::bind(&addr).await.expect("Failed to bind listening port");
println!("Listening for incoming connections on {}", addr);
Expand Down
6 changes: 6 additions & 0 deletions rust/server/src/util/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ use serde::Deserialize;
#[derive(Deserialize)]
pub(crate) struct Config {
pub(crate) server_config: ServerConfig,
pub(crate) jwt_auth_config: Option<JwtAuthConfig>,
pub(crate) postgresql_config: Option<PostgreSQLConfig>,
}

Expand All@@ -12,6 +13,11 @@ pub(crate) struct ServerConfig {
pub(crate) port: u16,
}

#[derive(Deserialize)]
pub(crate) struct JwtAuthConfig {
pub(crate) rsa_pem: String,
}

#[derive(Deserialize)]
pub(crate) struct PostgreSQLConfig {
pub(crate) username: Option<String>, // Optional in TOML, can be overridden by env
Expand Down
15 changes: 15 additions & 0 deletions rust/server/vss-server-config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,21 @@
host = "127.0.0.1"
port = 8080

# Uncomment the table below to verify JWT tokens in the HTTP Authorization header against the given RSA public key,
# can be overridden by env var `VSS_JWT_RSA_PEM`
# [jwt_auth_config]
# rsa_pem = """
# -----BEGIN PUBLIC KEY-----
# MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstPJs4ut+tFAI0qrOyGt
# /3FN5jWc5gLv/j9Rc6lgr4hm7lyR05PU/G+4rfxdXGNyGTlQ6dRqcVy78CjxWz9f
# 8l08EKLERPh8JhE5el6vr+ehWD5iQxSP3ejpx0Mr977fKMNKg6jlFiL+y50hOEp2
# 6iN9QzZQjLxotDT3aQvbCA/DZpI+fV6WKDKWGS+pZGDVgOz5x/RcStJQXxkX3ACK
# WhVdrtN3h6mHlhIt7ZIqVvQmY4NL03QPyljt13sYHoiFaoxINF/funBMCjrfSLcB
# ko1rWE2BWdOrFqi27RtBs5AHOSAWXuz/2SUGpFuTQuJi7U68QUfjKeQO46JpQf+v
# kQIDAQAB
# -----END PUBLIC KEY-----
# """

[postgresql_config]
username = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_USERNAME`
password = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_PASSWORD`
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions rust/auth-impls/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,9 +41,11 @@ pub(crate) struct Claims {
const BEARER_PREFIX: &str = "Bearer ";

impl JWTAuthorizer {
/// Create new instance of [`JWTAuthorizer`]
pub async fn new(jwt_issuer_key: DecodingKey) -> Self {
Self { jwt_issuer_key }
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
Ok(Self { jwt_issuer_key })
}
}

Expand DownExpand Up@@ -74,7 +76,7 @@ mod tests {
use crate::JWTAuthorizer;
use api::auth::Authorizer;
use api::error::VssError;
use jsonwebtoken::{encode, Algorithm, DecodingKey, EncodingKey, Header};
use jsonwebtoken::{encode, Algorithm, EncodingKey, Header};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::time::SystemTime;
Expand DownExpand Up@@ -132,7 +134,7 @@ mod tests {
)
.expect("Failed to create Encoding Key.");

let decoding_key = DecodingKey::from_rsa_pem(
let decoding_key = String::from(
"-----BEGIN PUBLIC KEY-----\
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAysGpKU+I9i9b+QZSANu/\
ExaA6w4qiQdFZaXeReiz49r1oDfABwKIFW9gK/kNnrnL9H8P+pYfj7jqUJ/glmgq\
Expand All@@ -141,12 +143,10 @@ mod tests {
8YsTa5piV8KgJpG/rwYTGXuu3lcCmnWwjmbeDq1zFFrCDDVkaIHkGJgRuFIDPXaH\
yUw5H2HvKlP94ySbvTDLXWZj6TyzHEHDbstqs4DgvurB/bIhi/dQ7zK3EIXL8KRB\
hwIDAQAB\
-----END PUBLIC KEY-----"
.as_bytes(),
)
.expect("Failed to create Decoding Key.");
-----END PUBLIC KEY-----",
);

let jwt_authorizer = JWTAuthorizer::new(decoding_key).await;
let jwt_authorizer = JWTAuthorizer::new(&decoding_key).await.unwrap();

let valid_jwt_token =
encode(&Header::new(Algorithm::RS256), &claims, &valid_encoding_key).unwrap();
Expand Down
1 change: 1 addition & 0 deletions rust/server/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
api = { path = "../api" }
auth-impls = { path = "../auth-impls" }
impls = { path = "../impls" }

hyper = { version = "1", default-features = false, features = ["server", "http1"] }
Expand Down
62 changes: 44 additions & 18 deletions rust/server/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,21 +10,23 @@
#![deny(missing_docs)]

use std::net::SocketAddr;
use std::sync::Arc;

use tokio::net::TcpListener;
use tokio::signal::unix::SignalKind;

use hyper::server::conn::http1;
use hyper_util::rt::TokioIo;

use crate::vss_service::VssService;
use api::auth::{Authorizer, NoopAuthorizer};
use api::kv_store::KvStore;
use auth_impls::JWTAuthorizer;
use impls::postgres_store::{Certificate, PostgresPlaintextBackend, PostgresTlsBackend};
use std::sync::Arc;
use util::config::{Config, ServerConfig};
use vss_service::VssService;

pub(crate) mod util;
pub(crate) mod vss_service;
mod util;
mod vss_service;

fn main() {
let args: Vec<String> = std::env::args().collect();
Expand All@@ -33,22 +35,21 @@ fn main() {
std::process::exit(1);
}

let config = match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};

let addr: SocketAddr =
match format!("{}:{}", config.server_config.host, config.server_config.port).parse() {
Ok(addr) => addr,
let Config { server_config: ServerConfig { host, port }, jwt_auth_config, postgresql_config } =
match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};
let addr: SocketAddr = match format!("{}:{}", host, port).parse() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a lot going on here. Can we declutter this? Btw, since we're already here, might make sense to switch this to the From<(I, u16)> for SocketAddr implementation rather than allocating a string and then parsing it again.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is personal preference, but in the follow-up PR I consolidate the host and port setting into a single address setting, string type, ie "127.0.0.1:54234". We would then allocate the string upfront. WDYT ? Overall looking to reduce the number of lines in the config files, and the number of different settings. The address the server binds to is a single setting in my head :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah probably makes sense to make it one.

Ok(addr) => addr,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
std::process::exit(1);
},
};

let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
Ok(runtime) => Arc::new(runtime),
Expand All@@ -66,9 +67,33 @@ fn main() {
std::process::exit(-1);
},
};
let authorizer: Arc<dyn Authorizer> = Arc::new(NoopAuthorizer {});

let rsa_pem_env = match std::env::var("VSS_JWT_RSA_PEM") {
Ok(env) => Some(env),
Err(std::env::VarError::NotPresent) => None,
Err(e) => {
println!("Failed to load the VSS_JWT_RSA_PEM env var: {}", e);
std::process::exit(-1);
},
};
let rsa_pem = rsa_pem_env.or(jwt_auth_config.map(|config| config.rsa_pem));
let authorizer: Arc<dyn Authorizer> = if let Some(pem) = rsa_pem {
let authorizer = match JWTAuthorizer::new(pem.as_str()).await {
Ok(auth) => auth,
Err(e) => {
println!("Failed to parse the PEM formatted RSA public key: {}", e);
std::process::exit(-1);
},
};
println!("Configured JWT authorizer with RSA public key");
Arc::new(authorizer)
} else {
println!("No JWT authentication method configured");
Arc::new(NoopAuthorizer {})
};

let postgresql_config =
config.postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
let endpoint = postgresql_config.to_postgresql_endpoint();
let db_name = postgresql_config.database;
let store: Arc<dyn KvStore> = if let Some(tls_config) = postgresql_config.tls {
Expand DownExpand Up@@ -109,6 +134,7 @@ fn main() {
Arc::new(postgres_plaintext_backend)
};
println!("Connected to PostgreSQL backend with DSN: {}/{}", endpoint, db_name);

let rest_svc_listener =
TcpListener::bind(&addr).await.expect("Failed to bind listening port");
println!("Listening for incoming connections on {}", addr);
Expand Down
6 changes: 6 additions & 0 deletions rust/server/src/util/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ use serde::Deserialize;
#[derive(Deserialize)]
pub(crate) struct Config {
pub(crate) server_config: ServerConfig,
pub(crate) jwt_auth_config: Option<JwtAuthConfig>,
pub(crate) postgresql_config: Option<PostgreSQLConfig>,
}

Expand All@@ -12,6 +13,11 @@ pub(crate) struct ServerConfig {
pub(crate) port: u16,
}

#[derive(Deserialize)]
pub(crate) struct JwtAuthConfig {
pub(crate) rsa_pem: String,
}

#[derive(Deserialize)]
pub(crate) struct PostgreSQLConfig {
pub(crate) username: Option<String>, // Optional in TOML, can be overridden by env
Expand Down
15 changes: 15 additions & 0 deletions rust/server/vss-server-config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,21 @@
host = "127.0.0.1"
port = 8080

# Uncomment the table below to verify JWT tokens in the HTTP Authorization header against the given RSA public key,
# can be overridden by env var `VSS_JWT_RSA_PEM`
# [jwt_auth_config]
# rsa_pem = """
# -----BEGIN PUBLIC KEY-----
# MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstPJs4ut+tFAI0qrOyGt
# /3FN5jWc5gLv/j9Rc6lgr4hm7lyR05PU/G+4rfxdXGNyGTlQ6dRqcVy78CjxWz9f
# 8l08EKLERPh8JhE5el6vr+ehWD5iQxSP3ejpx0Mr977fKMNKg6jlFiL+y50hOEp2
# 6iN9QzZQjLxotDT3aQvbCA/DZpI+fV6WKDKWGS+pZGDVgOz5x/RcStJQXxkX3ACK
# WhVdrtN3h6mHlhIt7ZIqVvQmY4NL03QPyljt13sYHoiFaoxINF/funBMCjrfSLcB
# ko1rWE2BWdOrFqi27RtBs5AHOSAWXuz/2SUGpFuTQuJi7U68QUfjKeQO46JpQf+v
# kQIDAQAB
# -----END PUBLIC KEY-----
# """

[postgresql_config]
username = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_USERNAME`
password = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_PASSWORD`
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions rust/auth-impls/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,9 +41,11 @@ pub(crate) struct Claims {
const BEARER_PREFIX: &str = "Bearer ";

impl JWTAuthorizer {
/// Create new instance of [`JWTAuthorizer`]
pub async fn new(jwt_issuer_key: DecodingKey) -> Self {
Self { jwt_issuer_key }
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
Ok(Self { jwt_issuer_key })
}
}

Expand DownExpand Up@@ -74,7 +76,7 @@ mod tests {
use crate::JWTAuthorizer;
use api::auth::Authorizer;
use api::error::VssError;
use jsonwebtoken::{encode, Algorithm, DecodingKey, EncodingKey, Header};
use jsonwebtoken::{encode, Algorithm, EncodingKey, Header};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::time::SystemTime;
Expand DownExpand Up@@ -132,7 +134,7 @@ mod tests {
)
.expect("Failed to create Encoding Key.");

let decoding_key = DecodingKey::from_rsa_pem(
let decoding_key = String::from(
"-----BEGIN PUBLIC KEY-----\
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAysGpKU+I9i9b+QZSANu/\
ExaA6w4qiQdFZaXeReiz49r1oDfABwKIFW9gK/kNnrnL9H8P+pYfj7jqUJ/glmgq\
Expand All@@ -141,12 +143,10 @@ mod tests {
8YsTa5piV8KgJpG/rwYTGXuu3lcCmnWwjmbeDq1zFFrCDDVkaIHkGJgRuFIDPXaH\
yUw5H2HvKlP94ySbvTDLXWZj6TyzHEHDbstqs4DgvurB/bIhi/dQ7zK3EIXL8KRB\
hwIDAQAB\
-----END PUBLIC KEY-----"
.as_bytes(),
)
.expect("Failed to create Decoding Key.");
-----END PUBLIC KEY-----",
);

let jwt_authorizer = JWTAuthorizer::new(decoding_key).await;
let jwt_authorizer = JWTAuthorizer::new(&decoding_key).await.unwrap();

let valid_jwt_token =
encode(&Header::new(Algorithm::RS256), &claims, &valid_encoding_key).unwrap();
Expand Down
1 change: 1 addition & 0 deletions rust/server/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
api = { path = "../api" }
auth-impls = { path = "../auth-impls" }
impls = { path = "../impls" }

hyper = { version = "1", default-features = false, features = ["server", "http1"] }
Expand Down
62 changes: 44 additions & 18 deletions rust/server/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,21 +10,23 @@
#![deny(missing_docs)]

use std::net::SocketAddr;
use std::sync::Arc;

use tokio::net::TcpListener;
use tokio::signal::unix::SignalKind;

use hyper::server::conn::http1;
use hyper_util::rt::TokioIo;

use crate::vss_service::VssService;
use api::auth::{Authorizer, NoopAuthorizer};
use api::kv_store::KvStore;
use auth_impls::JWTAuthorizer;
use impls::postgres_store::{Certificate, PostgresPlaintextBackend, PostgresTlsBackend};
use std::sync::Arc;
use util::config::{Config, ServerConfig};
use vss_service::VssService;

pub(crate) mod util;
pub(crate) mod vss_service;
mod util;
mod vss_service;

fn main() {
let args: Vec<String> = std::env::args().collect();
Expand All@@ -33,22 +35,21 @@ fn main() {
std::process::exit(1);
}

let config = match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};

let addr: SocketAddr =
match format!("{}:{}", config.server_config.host, config.server_config.port).parse() {
Ok(addr) => addr,
let Config { server_config: ServerConfig { host, port }, jwt_auth_config, postgresql_config } =
match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};
let addr: SocketAddr = match format!("{}:{}", host, port).parse() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a lot going on here. Can we declutter this? Btw, since we're already here, might make sense to switch this to the From<(I, u16)> for SocketAddr implementation rather than allocating a string and then parsing it again.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is personal preference, but in the follow-up PR I consolidate the host and port setting into a single address setting, string type, ie "127.0.0.1:54234". We would then allocate the string upfront. WDYT ? Overall looking to reduce the number of lines in the config files, and the number of different settings. The address the server binds to is a single setting in my head :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah probably makes sense to make it one.

Ok(addr) => addr,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
std::process::exit(1);
},
};

let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
Ok(runtime) => Arc::new(runtime),
Expand All@@ -66,9 +67,33 @@ fn main() {
std::process::exit(-1);
},
};
let authorizer: Arc<dyn Authorizer> = Arc::new(NoopAuthorizer {});

let rsa_pem_env = match std::env::var("VSS_JWT_RSA_PEM") {
Ok(env) => Some(env),
Err(std::env::VarError::NotPresent) => None,
Err(e) => {
println!("Failed to load the VSS_JWT_RSA_PEM env var: {}", e);
std::process::exit(-1);
},
};
let rsa_pem = rsa_pem_env.or(jwt_auth_config.map(|config| config.rsa_pem));
let authorizer: Arc<dyn Authorizer> = if let Some(pem) = rsa_pem {
let authorizer = match JWTAuthorizer::new(pem.as_str()).await {
Ok(auth) => auth,
Err(e) => {
println!("Failed to parse the PEM formatted RSA public key: {}", e);
std::process::exit(-1);
},
};
println!("Configured JWT authorizer with RSA public key");
Arc::new(authorizer)
} else {
println!("No JWT authentication method configured");
Arc::new(NoopAuthorizer {})
};

let postgresql_config =
config.postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
let endpoint = postgresql_config.to_postgresql_endpoint();
let db_name = postgresql_config.database;
let store: Arc<dyn KvStore> = if let Some(tls_config) = postgresql_config.tls {
Expand DownExpand Up@@ -109,6 +134,7 @@ fn main() {
Arc::new(postgres_plaintext_backend)
};
println!("Connected to PostgreSQL backend with DSN: {}/{}", endpoint, db_name);

let rest_svc_listener =
TcpListener::bind(&addr).await.expect("Failed to bind listening port");
println!("Listening for incoming connections on {}", addr);
Expand Down
6 changes: 6 additions & 0 deletions rust/server/src/util/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ use serde::Deserialize;
#[derive(Deserialize)]
pub(crate) struct Config {
pub(crate) server_config: ServerConfig,
pub(crate) jwt_auth_config: Option<JwtAuthConfig>,
pub(crate) postgresql_config: Option<PostgreSQLConfig>,
}

Expand All@@ -12,6 +13,11 @@ pub(crate) struct ServerConfig {
pub(crate) port: u16,
}

#[derive(Deserialize)]
pub(crate) struct JwtAuthConfig {
pub(crate) rsa_pem: String,
}

#[derive(Deserialize)]
pub(crate) struct PostgreSQLConfig {
pub(crate) username: Option<String>, // Optional in TOML, can be overridden by env
Expand Down
15 changes: 15 additions & 0 deletions rust/server/vss-server-config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,21 @@
host = "127.0.0.1"
port = 8080

# Uncomment the table below to verify JWT tokens in the HTTP Authorization header against the given RSA public key,
# can be overridden by env var `VSS_JWT_RSA_PEM`
# [jwt_auth_config]
# rsa_pem = """
# -----BEGIN PUBLIC KEY-----
# MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstPJs4ut+tFAI0qrOyGt
# /3FN5jWc5gLv/j9Rc6lgr4hm7lyR05PU/G+4rfxdXGNyGTlQ6dRqcVy78CjxWz9f
# 8l08EKLERPh8JhE5el6vr+ehWD5iQxSP3ejpx0Mr977fKMNKg6jlFiL+y50hOEp2
# 6iN9QzZQjLxotDT3aQvbCA/DZpI+fV6WKDKWGS+pZGDVgOz5x/RcStJQXxkX3ACK
# WhVdrtN3h6mHlhIt7ZIqVvQmY4NL03QPyljt13sYHoiFaoxINF/funBMCjrfSLcB
# ko1rWE2BWdOrFqi27RtBs5AHOSAWXuz/2SUGpFuTQuJi7U68QUfjKeQO46JpQf+v
# kQIDAQAB
# -----END PUBLIC KEY-----
# """

[postgresql_config]
username = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_USERNAME`
password = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_PASSWORD`
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions rust/auth-impls/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,9 +41,11 @@ pub(crate) struct Claims {
const BEARER_PREFIX: &str = "Bearer ";

impl JWTAuthorizer {
/// Create new instance of [`JWTAuthorizer`]
pub async fn new(jwt_issuer_key: DecodingKey) -> Self {
Self { jwt_issuer_key }
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
Ok(Self { jwt_issuer_key })
}
}

Expand DownExpand Up@@ -74,7 +76,7 @@ mod tests {
use crate::JWTAuthorizer;
use api::auth::Authorizer;
use api::error::VssError;
use jsonwebtoken::{encode, Algorithm, DecodingKey, EncodingKey, Header};
use jsonwebtoken::{encode, Algorithm, EncodingKey, Header};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::time::SystemTime;
Expand DownExpand Up@@ -132,7 +134,7 @@ mod tests {
)
.expect("Failed to create Encoding Key.");

let decoding_key = DecodingKey::from_rsa_pem(
let decoding_key = String::from(
"-----BEGIN PUBLIC KEY-----\
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAysGpKU+I9i9b+QZSANu/\
ExaA6w4qiQdFZaXeReiz49r1oDfABwKIFW9gK/kNnrnL9H8P+pYfj7jqUJ/glmgq\
Expand All@@ -141,12 +143,10 @@ mod tests {
8YsTa5piV8KgJpG/rwYTGXuu3lcCmnWwjmbeDq1zFFrCDDVkaIHkGJgRuFIDPXaH\
yUw5H2HvKlP94ySbvTDLXWZj6TyzHEHDbstqs4DgvurB/bIhi/dQ7zK3EIXL8KRB\
hwIDAQAB\
-----END PUBLIC KEY-----"
.as_bytes(),
)
.expect("Failed to create Decoding Key.");
-----END PUBLIC KEY-----",
);

let jwt_authorizer = JWTAuthorizer::new(decoding_key).await;
let jwt_authorizer = JWTAuthorizer::new(&decoding_key).await.unwrap();

let valid_jwt_token =
encode(&Header::new(Algorithm::RS256), &claims, &valid_encoding_key).unwrap();
Expand Down
1 change: 1 addition & 0 deletions rust/server/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
api = { path = "../api" }
auth-impls = { path = "../auth-impls" }
impls = { path = "../impls" }

hyper = { version = "1", default-features = false, features = ["server", "http1"] }
Expand Down
62 changes: 44 additions & 18 deletions rust/server/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,21 +10,23 @@
#![deny(missing_docs)]

use std::net::SocketAddr;
use std::sync::Arc;

use tokio::net::TcpListener;
use tokio::signal::unix::SignalKind;

use hyper::server::conn::http1;
use hyper_util::rt::TokioIo;

use crate::vss_service::VssService;
use api::auth::{Authorizer, NoopAuthorizer};
use api::kv_store::KvStore;
use auth_impls::JWTAuthorizer;
use impls::postgres_store::{Certificate, PostgresPlaintextBackend, PostgresTlsBackend};
use std::sync::Arc;
use util::config::{Config, ServerConfig};
use vss_service::VssService;

pub(crate) mod util;
pub(crate) mod vss_service;
mod util;
mod vss_service;

fn main() {
let args: Vec<String> = std::env::args().collect();
Expand All@@ -33,22 +35,21 @@ fn main() {
std::process::exit(1);
}

let config = match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};

let addr: SocketAddr =
match format!("{}:{}", config.server_config.host, config.server_config.port).parse() {
Ok(addr) => addr,
let Config { server_config: ServerConfig { host, port }, jwt_auth_config, postgresql_config } =
match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};
let addr: SocketAddr = match format!("{}:{}", host, port).parse() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a lot going on here. Can we declutter this? Btw, since we're already here, might make sense to switch this to the From<(I, u16)> for SocketAddr implementation rather than allocating a string and then parsing it again.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is personal preference, but in the follow-up PR I consolidate the host and port setting into a single address setting, string type, ie "127.0.0.1:54234". We would then allocate the string upfront. WDYT ? Overall looking to reduce the number of lines in the config files, and the number of different settings. The address the server binds to is a single setting in my head :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah probably makes sense to make it one.

Ok(addr) => addr,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
std::process::exit(1);
},
};

let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
Ok(runtime) => Arc::new(runtime),
Expand All@@ -66,9 +67,33 @@ fn main() {
std::process::exit(-1);
},
};
let authorizer: Arc<dyn Authorizer> = Arc::new(NoopAuthorizer {});

let rsa_pem_env = match std::env::var("VSS_JWT_RSA_PEM") {
Ok(env) => Some(env),
Err(std::env::VarError::NotPresent) => None,
Err(e) => {
println!("Failed to load the VSS_JWT_RSA_PEM env var: {}", e);
std::process::exit(-1);
},
};
let rsa_pem = rsa_pem_env.or(jwt_auth_config.map(|config| config.rsa_pem));
let authorizer: Arc<dyn Authorizer> = if let Some(pem) = rsa_pem {
let authorizer = match JWTAuthorizer::new(pem.as_str()).await {
Ok(auth) => auth,
Err(e) => {
println!("Failed to parse the PEM formatted RSA public key: {}", e);
std::process::exit(-1);
},
};
println!("Configured JWT authorizer with RSA public key");
Arc::new(authorizer)
} else {
println!("No JWT authentication method configured");
Arc::new(NoopAuthorizer {})
};

let postgresql_config =
config.postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
let endpoint = postgresql_config.to_postgresql_endpoint();
let db_name = postgresql_config.database;
let store: Arc<dyn KvStore> = if let Some(tls_config) = postgresql_config.tls {
Expand DownExpand Up@@ -109,6 +134,7 @@ fn main() {
Arc::new(postgres_plaintext_backend)
};
println!("Connected to PostgreSQL backend with DSN: {}/{}", endpoint, db_name);

let rest_svc_listener =
TcpListener::bind(&addr).await.expect("Failed to bind listening port");
println!("Listening for incoming connections on {}", addr);
Expand Down
6 changes: 6 additions & 0 deletions rust/server/src/util/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ use serde::Deserialize;
#[derive(Deserialize)]
pub(crate) struct Config {
pub(crate) server_config: ServerConfig,
pub(crate) jwt_auth_config: Option<JwtAuthConfig>,
pub(crate) postgresql_config: Option<PostgreSQLConfig>,
}

Expand All@@ -12,6 +13,11 @@ pub(crate) struct ServerConfig {
pub(crate) port: u16,
}

#[derive(Deserialize)]
pub(crate) struct JwtAuthConfig {
pub(crate) rsa_pem: String,
}

#[derive(Deserialize)]
pub(crate) struct PostgreSQLConfig {
pub(crate) username: Option<String>, // Optional in TOML, can be overridden by env
Expand Down
15 changes: 15 additions & 0 deletions rust/server/vss-server-config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,21 @@
host = "127.0.0.1"
port = 8080

# Uncomment the table below to verify JWT tokens in the HTTP Authorization header against the given RSA public key,
# can be overridden by env var `VSS_JWT_RSA_PEM`
# [jwt_auth_config]
# rsa_pem = """
# -----BEGIN PUBLIC KEY-----
# MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstPJs4ut+tFAI0qrOyGt
# /3FN5jWc5gLv/j9Rc6lgr4hm7lyR05PU/G+4rfxdXGNyGTlQ6dRqcVy78CjxWz9f
# 8l08EKLERPh8JhE5el6vr+ehWD5iQxSP3ejpx0Mr977fKMNKg6jlFiL+y50hOEp2
# 6iN9QzZQjLxotDT3aQvbCA/DZpI+fV6WKDKWGS+pZGDVgOz5x/RcStJQXxkX3ACK
# WhVdrtN3h6mHlhIt7ZIqVvQmY4NL03QPyljt13sYHoiFaoxINF/funBMCjrfSLcB
# ko1rWE2BWdOrFqi27RtBs5AHOSAWXuz/2SUGpFuTQuJi7U68QUfjKeQO46JpQf+v
# kQIDAQAB
# -----END PUBLIC KEY-----
# """

[postgresql_config]
username = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_USERNAME`
password = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_PASSWORD`
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions rust/auth-impls/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,9 +41,11 @@ pub(crate) struct Claims {
const BEARER_PREFIX: &str = "Bearer ";

impl JWTAuthorizer {
/// Create new instance of [`JWTAuthorizer`]
pub async fn new(jwt_issuer_key: DecodingKey) -> Self {
Self { jwt_issuer_key }
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
Ok(Self { jwt_issuer_key })
}
}

Expand DownExpand Up@@ -74,7 +76,7 @@ mod tests {
use crate::JWTAuthorizer;
use api::auth::Authorizer;
use api::error::VssError;
use jsonwebtoken::{encode, Algorithm, DecodingKey, EncodingKey, Header};
use jsonwebtoken::{encode, Algorithm, EncodingKey, Header};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::time::SystemTime;
Expand DownExpand Up@@ -132,7 +134,7 @@ mod tests {
)
.expect("Failed to create Encoding Key.");

let decoding_key = DecodingKey::from_rsa_pem(
let decoding_key = String::from(
"-----BEGIN PUBLIC KEY-----\
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAysGpKU+I9i9b+QZSANu/\
ExaA6w4qiQdFZaXeReiz49r1oDfABwKIFW9gK/kNnrnL9H8P+pYfj7jqUJ/glmgq\
Expand All@@ -141,12 +143,10 @@ mod tests {
8YsTa5piV8KgJpG/rwYTGXuu3lcCmnWwjmbeDq1zFFrCDDVkaIHkGJgRuFIDPXaH\
yUw5H2HvKlP94ySbvTDLXWZj6TyzHEHDbstqs4DgvurB/bIhi/dQ7zK3EIXL8KRB\
hwIDAQAB\
-----END PUBLIC KEY-----"
.as_bytes(),
)
.expect("Failed to create Decoding Key.");
-----END PUBLIC KEY-----",
);

let jwt_authorizer = JWTAuthorizer::new(decoding_key).await;
let jwt_authorizer = JWTAuthorizer::new(&decoding_key).await.unwrap();

let valid_jwt_token =
encode(&Header::new(Algorithm::RS256), &claims, &valid_encoding_key).unwrap();
Expand Down
1 change: 1 addition & 0 deletions rust/server/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
api = { path = "../api" }
auth-impls = { path = "../auth-impls" }
impls = { path = "../impls" }

hyper = { version = "1", default-features = false, features = ["server", "http1"] }
Expand Down
62 changes: 44 additions & 18 deletions rust/server/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,21 +10,23 @@
#![deny(missing_docs)]

use std::net::SocketAddr;
use std::sync::Arc;

use tokio::net::TcpListener;
use tokio::signal::unix::SignalKind;

use hyper::server::conn::http1;
use hyper_util::rt::TokioIo;

use crate::vss_service::VssService;
use api::auth::{Authorizer, NoopAuthorizer};
use api::kv_store::KvStore;
use auth_impls::JWTAuthorizer;
use impls::postgres_store::{Certificate, PostgresPlaintextBackend, PostgresTlsBackend};
use std::sync::Arc;
use util::config::{Config, ServerConfig};
use vss_service::VssService;

pub(crate) mod util;
pub(crate) mod vss_service;
mod util;
mod vss_service;

fn main() {
let args: Vec<String> = std::env::args().collect();
Expand All@@ -33,22 +35,21 @@ fn main() {
std::process::exit(1);
}

let config = match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};

let addr: SocketAddr =
match format!("{}:{}", config.server_config.host, config.server_config.port).parse() {
Ok(addr) => addr,
let Config { server_config: ServerConfig { host, port }, jwt_auth_config, postgresql_config } =
match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};
let addr: SocketAddr = match format!("{}:{}", host, port).parse() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a lot going on here. Can we declutter this? Btw, since we're already here, might make sense to switch this to the From<(I, u16)> for SocketAddr implementation rather than allocating a string and then parsing it again.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is personal preference, but in the follow-up PR I consolidate the host and port setting into a single address setting, string type, ie "127.0.0.1:54234". We would then allocate the string upfront. WDYT ? Overall looking to reduce the number of lines in the config files, and the number of different settings. The address the server binds to is a single setting in my head :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah probably makes sense to make it one.

Ok(addr) => addr,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
std::process::exit(1);
},
};

let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
Ok(runtime) => Arc::new(runtime),
Expand All@@ -66,9 +67,33 @@ fn main() {
std::process::exit(-1);
},
};
let authorizer: Arc<dyn Authorizer> = Arc::new(NoopAuthorizer {});

let rsa_pem_env = match std::env::var("VSS_JWT_RSA_PEM") {
Ok(env) => Some(env),
Err(std::env::VarError::NotPresent) => None,
Err(e) => {
println!("Failed to load the VSS_JWT_RSA_PEM env var: {}", e);
std::process::exit(-1);
},
};
let rsa_pem = rsa_pem_env.or(jwt_auth_config.map(|config| config.rsa_pem));
let authorizer: Arc<dyn Authorizer> = if let Some(pem) = rsa_pem {
let authorizer = match JWTAuthorizer::new(pem.as_str()).await {
Ok(auth) => auth,
Err(e) => {
println!("Failed to parse the PEM formatted RSA public key: {}", e);
std::process::exit(-1);
},
};
println!("Configured JWT authorizer with RSA public key");
Arc::new(authorizer)
} else {
println!("No JWT authentication method configured");
Arc::new(NoopAuthorizer {})
};

let postgresql_config =
config.postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
let endpoint = postgresql_config.to_postgresql_endpoint();
let db_name = postgresql_config.database;
let store: Arc<dyn KvStore> = if let Some(tls_config) = postgresql_config.tls {
Expand DownExpand Up@@ -109,6 +134,7 @@ fn main() {
Arc::new(postgres_plaintext_backend)
};
println!("Connected to PostgreSQL backend with DSN: {}/{}", endpoint, db_name);

let rest_svc_listener =
TcpListener::bind(&addr).await.expect("Failed to bind listening port");
println!("Listening for incoming connections on {}", addr);
Expand Down
6 changes: 6 additions & 0 deletions rust/server/src/util/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ use serde::Deserialize;
#[derive(Deserialize)]
pub(crate) struct Config {
pub(crate) server_config: ServerConfig,
pub(crate) jwt_auth_config: Option<JwtAuthConfig>,
pub(crate) postgresql_config: Option<PostgreSQLConfig>,
}

Expand All@@ -12,6 +13,11 @@ pub(crate) struct ServerConfig {
pub(crate) port: u16,
}

#[derive(Deserialize)]
pub(crate) struct JwtAuthConfig {
pub(crate) rsa_pem: String,
}

#[derive(Deserialize)]
pub(crate) struct PostgreSQLConfig {
pub(crate) username: Option<String>, // Optional in TOML, can be overridden by env
Expand Down
15 changes: 15 additions & 0 deletions rust/server/vss-server-config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,21 @@
host = "127.0.0.1"
port = 8080

# Uncomment the table below to verify JWT tokens in the HTTP Authorization header against the given RSA public key,
# can be overridden by env var `VSS_JWT_RSA_PEM`
# [jwt_auth_config]
# rsa_pem = """
# -----BEGIN PUBLIC KEY-----
# MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstPJs4ut+tFAI0qrOyGt
# /3FN5jWc5gLv/j9Rc6lgr4hm7lyR05PU/G+4rfxdXGNyGTlQ6dRqcVy78CjxWz9f
# 8l08EKLERPh8JhE5el6vr+ehWD5iQxSP3ejpx0Mr977fKMNKg6jlFiL+y50hOEp2
# 6iN9QzZQjLxotDT3aQvbCA/DZpI+fV6WKDKWGS+pZGDVgOz5x/RcStJQXxkX3ACK
# WhVdrtN3h6mHlhIt7ZIqVvQmY4NL03QPyljt13sYHoiFaoxINF/funBMCjrfSLcB
# ko1rWE2BWdOrFqi27RtBs5AHOSAWXuz/2SUGpFuTQuJi7U68QUfjKeQO46JpQf+v
# kQIDAQAB
# -----END PUBLIC KEY-----
# """

[postgresql_config]
username = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_USERNAME`
password = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_PASSWORD`
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions rust/auth-impls/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,9 +41,11 @@ pub(crate) struct Claims {
const BEARER_PREFIX: &str = "Bearer ";

impl JWTAuthorizer {
/// Create new instance of [`JWTAuthorizer`]
pub async fn new(jwt_issuer_key: DecodingKey) -> Self {
Self { jwt_issuer_key }
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
Ok(Self { jwt_issuer_key })
}
}

Expand DownExpand Up@@ -74,7 +76,7 @@ mod tests {
use crate::JWTAuthorizer;
use api::auth::Authorizer;
use api::error::VssError;
use jsonwebtoken::{encode, Algorithm, DecodingKey, EncodingKey, Header};
use jsonwebtoken::{encode, Algorithm, EncodingKey, Header};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::time::SystemTime;
Expand DownExpand Up@@ -132,7 +134,7 @@ mod tests {
)
.expect("Failed to create Encoding Key.");

let decoding_key = DecodingKey::from_rsa_pem(
let decoding_key = String::from(
"-----BEGIN PUBLIC KEY-----\
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAysGpKU+I9i9b+QZSANu/\
ExaA6w4qiQdFZaXeReiz49r1oDfABwKIFW9gK/kNnrnL9H8P+pYfj7jqUJ/glmgq\
Expand All@@ -141,12 +143,10 @@ mod tests {
8YsTa5piV8KgJpG/rwYTGXuu3lcCmnWwjmbeDq1zFFrCDDVkaIHkGJgRuFIDPXaH\
yUw5H2HvKlP94ySbvTDLXWZj6TyzHEHDbstqs4DgvurB/bIhi/dQ7zK3EIXL8KRB\
hwIDAQAB\
-----END PUBLIC KEY-----"
.as_bytes(),
)
.expect("Failed to create Decoding Key.");
-----END PUBLIC KEY-----",
);

let jwt_authorizer = JWTAuthorizer::new(decoding_key).await;
let jwt_authorizer = JWTAuthorizer::new(&decoding_key).await.unwrap();

let valid_jwt_token =
encode(&Header::new(Algorithm::RS256), &claims, &valid_encoding_key).unwrap();
Expand Down
1 change: 1 addition & 0 deletions rust/server/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
api = { path = "../api" }
auth-impls = { path = "../auth-impls" }
impls = { path = "../impls" }

hyper = { version = "1", default-features = false, features = ["server", "http1"] }
Expand Down
62 changes: 44 additions & 18 deletions rust/server/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,21 +10,23 @@
#![deny(missing_docs)]

use std::net::SocketAddr;
use std::sync::Arc;

use tokio::net::TcpListener;
use tokio::signal::unix::SignalKind;

use hyper::server::conn::http1;
use hyper_util::rt::TokioIo;

use crate::vss_service::VssService;
use api::auth::{Authorizer, NoopAuthorizer};
use api::kv_store::KvStore;
use auth_impls::JWTAuthorizer;
use impls::postgres_store::{Certificate, PostgresPlaintextBackend, PostgresTlsBackend};
use std::sync::Arc;
use util::config::{Config, ServerConfig};
use vss_service::VssService;

pub(crate) mod util;
pub(crate) mod vss_service;
mod util;
mod vss_service;

fn main() {
let args: Vec<String> = std::env::args().collect();
Expand All@@ -33,22 +35,21 @@ fn main() {
std::process::exit(1);
}

let config = match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};

let addr: SocketAddr =
match format!("{}:{}", config.server_config.host, config.server_config.port).parse() {
Ok(addr) => addr,
let Config { server_config: ServerConfig { host, port }, jwt_auth_config, postgresql_config } =
match util::config::load_config(&args[1]) {
Ok(cfg) => cfg,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
eprintln!("Failed to load configuration: {}", e);
std::process::exit(1);
},
};
let addr: SocketAddr = match format!("{}:{}", host, port).parse() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a lot going on here. Can we declutter this? Btw, since we're already here, might make sense to switch this to the From<(I, u16)> for SocketAddr implementation rather than allocating a string and then parsing it again.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is personal preference, but in the follow-up PR I consolidate the host and port setting into a single address setting, string type, ie "127.0.0.1:54234". We would then allocate the string upfront. WDYT ? Overall looking to reduce the number of lines in the config files, and the number of different settings. The address the server binds to is a single setting in my head :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah probably makes sense to make it one.

Ok(addr) => addr,
Err(e) => {
eprintln!("Invalid host/port configuration: {}", e);
std::process::exit(1);
},
};

let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
Ok(runtime) => Arc::new(runtime),
Expand All@@ -66,9 +67,33 @@ fn main() {
std::process::exit(-1);
},
};
let authorizer: Arc<dyn Authorizer> = Arc::new(NoopAuthorizer {});

let rsa_pem_env = match std::env::var("VSS_JWT_RSA_PEM") {
Ok(env) => Some(env),
Err(std::env::VarError::NotPresent) => None,
Err(e) => {
println!("Failed to load the VSS_JWT_RSA_PEM env var: {}", e);
std::process::exit(-1);
},
};
let rsa_pem = rsa_pem_env.or(jwt_auth_config.map(|config| config.rsa_pem));
let authorizer: Arc<dyn Authorizer> = if let Some(pem) = rsa_pem {
let authorizer = match JWTAuthorizer::new(pem.as_str()).await {
Ok(auth) => auth,
Err(e) => {
println!("Failed to parse the PEM formatted RSA public key: {}", e);
std::process::exit(-1);
},
};
println!("Configured JWT authorizer with RSA public key");
Arc::new(authorizer)
} else {
println!("No JWT authentication method configured");
Arc::new(NoopAuthorizer {})
};

let postgresql_config =
config.postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
postgresql_config.expect("PostgreSQLConfig must be defined in config file.");
let endpoint = postgresql_config.to_postgresql_endpoint();
let db_name = postgresql_config.database;
let store: Arc<dyn KvStore> = if let Some(tls_config) = postgresql_config.tls {
Expand DownExpand Up@@ -109,6 +134,7 @@ fn main() {
Arc::new(postgres_plaintext_backend)
};
println!("Connected to PostgreSQL backend with DSN: {}/{}", endpoint, db_name);

let rest_svc_listener =
TcpListener::bind(&addr).await.expect("Failed to bind listening port");
println!("Listening for incoming connections on {}", addr);
Expand Down
6 changes: 6 additions & 0 deletions rust/server/src/util/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ use serde::Deserialize;
#[derive(Deserialize)]
pub(crate) struct Config {
pub(crate) server_config: ServerConfig,
pub(crate) jwt_auth_config: Option<JwtAuthConfig>,
pub(crate) postgresql_config: Option<PostgreSQLConfig>,
}

Expand All@@ -12,6 +13,11 @@ pub(crate) struct ServerConfig {
pub(crate) port: u16,
}

#[derive(Deserialize)]
pub(crate) struct JwtAuthConfig {
pub(crate) rsa_pem: String,
}

#[derive(Deserialize)]
pub(crate) struct PostgreSQLConfig {
pub(crate) username: Option<String>, // Optional in TOML, can be overridden by env
Expand Down
15 changes: 15 additions & 0 deletions rust/server/vss-server-config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,21 @@
host = "127.0.0.1"
port = 8080

# Uncomment the table below to verify JWT tokens in the HTTP Authorization header against the given RSA public key,
# can be overridden by env var `VSS_JWT_RSA_PEM`
# [jwt_auth_config]
# rsa_pem = """
# -----BEGIN PUBLIC KEY-----
# MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstPJs4ut+tFAI0qrOyGt
# /3FN5jWc5gLv/j9Rc6lgr4hm7lyR05PU/G+4rfxdXGNyGTlQ6dRqcVy78CjxWz9f
# 8l08EKLERPh8JhE5el6vr+ehWD5iQxSP3ejpx0Mr977fKMNKg6jlFiL+y50hOEp2
# 6iN9QzZQjLxotDT3aQvbCA/DZpI+fV6WKDKWGS+pZGDVgOz5x/RcStJQXxkX3ACK
# WhVdrtN3h6mHlhIt7ZIqVvQmY4NL03QPyljt13sYHoiFaoxINF/funBMCjrfSLcB
# ko1rWE2BWdOrFqi27RtBs5AHOSAWXuz/2SUGpFuTQuJi7U68QUfjKeQO46JpQf+v
# kQIDAQAB
# -----END PUBLIC KEY-----
# """

[postgresql_config]
username = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_USERNAME`
password = "postgres" # Optional in TOML, can be overridden by env var `VSS_POSTGRESQL_PASSWORD`
Expand Down